X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.h;h=836cfa5329e1e2a27e21c07395d4dfbb7d834f90;hp=12bfdd74c95ed181bf07ec2e96237c609b62f926;hb=da7a7f71908233fdd4f8e5a480276bed9d1e04fb;hpb=8728cdead13a06cddc650bedd58e299d8cc78314 diff --git a/filters.h b/filters.h index 12bfdd74..836cfa53 100644 --- a/filters.h +++ b/filters.h @@ -1,6 +1,6 @@ #ifndef FILTERS_H_INCLUDED #define FILTERS_H_INCLUDED -#define FILTERS_H_VERSION "$Id: filters.h,v 1.29 2007/09/28 16:38:55 fabiankeil Exp $" +#define FILTERS_H_VERSION "$Id: filters.h,v 1.35 2008/05/03 16:40:45 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ @@ -39,6 +39,31 @@ * * Revisions : * $Log: filters.h,v $ + * Revision 1.35 2008/05/03 16:40:45 fabiankeil + * Change content_filters_enabled()'s parameter from + * csp->action to action so it can be also used in the + * CGI code. Don't bother checking if there are filters + * loaded, as that's somewhat besides the point. + * + * Revision 1.34 2008/03/02 12:25:25 fabiankeil + * Also use shiny new connect_port_is_forbidden() in jcc.c. + * + * Revision 1.33 2008/02/23 16:57:12 fabiankeil + * Rename url_actions() to get_url_actions() and let it + * use the standard parameter ordering. + * + * Revision 1.32 2008/02/23 16:33:43 fabiankeil + * Let forward_url() use the standard parameter ordering + * and mark its second parameter immutable. + * + * Revision 1.31 2007/10/19 16:53:28 fabiankeil + * Add helper function to check if any content filters are enabled. + * + * Revision 1.30 2007/09/29 10:21:16 fabiankeil + * - Move get_filter_function() from jcc.c to filters.c + * so the filter functions can be static. + * - Don't bother filtering body-less responses. + * * Revision 1.29 2007/09/28 16:38:55 fabiankeil * - Execute content filters through execute_content_filter(). * - Add prepare_for_filtering() so filter functions don't have to @@ -267,7 +292,7 @@ struct url_spec; * ACL checking */ #ifdef FEATURE_ACL -extern int block_acl(struct access_control_addr *dst, struct client_state *csp); +extern int block_acl(const struct access_control_addr *dst, const struct client_state *csp); extern int acl_addr(const char *aspec, struct access_control_addr *aca); #endif /* def FEATURE_ACL */ @@ -289,19 +314,21 @@ extern int is_untrusted_url(const struct client_state *csp); #ifdef FEATURE_IMAGE_BLOCKING extern int is_imageurl(const struct client_state *csp); #endif /* def FEATURE_IMAGE_BLOCKING */ +extern int connect_port_is_forbidden(const struct client_state *csp); /* * Determining applicable actions */ -extern void url_actions(struct http_request *http, - struct client_state *csp); +extern void get_url_actions(struct client_state *csp, + struct http_request *http); extern void apply_url_actions(struct current_action_spec *action, struct http_request *http, struct url_actions *b); /* * Determining parent proxies */ -extern const struct forward_spec *forward_url(struct http_request *http, struct client_state *csp); +extern const struct forward_spec *forward_url(struct client_state *csp, + const struct http_request *http); /* * Content modification @@ -317,11 +344,12 @@ extern char *get_last_url(char *subject, const char *redirect_mode); extern pcrs_job *compile_dynamic_pcrs_job_list(const struct client_state *csp, const struct re_filterfile_spec *b); +extern int content_filters_enabled(const struct current_action_spec *action); /* * Handling Max-Forwards: */ -extern struct http_response *direct_response( struct client_state *csp); +extern struct http_response *direct_response(struct client_state *csp); /*