X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.h;h=3a5ac9f3ffacda49d21a3e3bfc283978b6e774ea;hp=e577fe679e8ad61deb29cb278e333dd0c1d9200a;hb=3ff0efdf338fc875d387c9b8dca58c03036b719c;hpb=72081f829de368392d04076728f8c991178c0080 diff --git a/filters.h b/filters.h index e577fe67..3a5ac9f3 100644 --- a/filters.h +++ b/filters.h @@ -1,9 +1,9 @@ #ifndef FILTERS_H_INCLUDED #define FILTERS_H_INCLUDED -#define FILTERS_H_VERSION "$Id: filters.h,v 1.20.2.2 2004/10/03 12:53:32 david__schmidt Exp $" +#define FILTERS_H_VERSION "$Id: filters.h,v 1.33 2008/02/23 16:57:12 fabiankeil Exp $" /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/Attic/filters.h,v $ + * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ * * Purpose : Declares functions to parse/crunch headers and pages. * Functions declared include: @@ -39,6 +39,60 @@ * * Revisions : * $Log: filters.h,v $ + * 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 + * care about de-chunking and decompression. As a side effect this enables + * decompression for gif_deanimate_response() and jpeg_inspect_response(). + * - Change remove_chunked_transfer_coding()'s return type to jb_err. + * Some clowns feel like chunking empty responses in which case + * (size == 0) is valid but previously would be interpreted as error. + * + * Revision 1.28 2007/09/02 15:31:20 fabiankeil + * Move match_portlist() from filter.c to urlmatch.c. + * It's used for url matching, not for filtering. + * + * Revision 1.27 2007/04/30 15:02:18 fabiankeil + * Introduce dynamic pcrs jobs that can resolve variables. + * + * Revision 1.26 2007/03/13 11:28:43 fabiankeil + * - Fix port handling in acl_addr() and use a temporary acl spec + * copy so error messages don't contain a truncated version. + * - Log size of iob before and after decompression. + * + * Revision 1.25 2007/01/12 15:36:44 fabiankeil + * Mark *csp as immutable for is_untrusted_url() + * and is_imageurl(). Closes FR 1237736. + * + * Revision 1.24 2006/12/29 18:30:46 fabiankeil + * Fixed gcc43 conversion warnings, + * changed sprintf calls to snprintf. + * + * Revision 1.23 2006/11/28 15:19:43 fabiankeil + * Implemented +redirect{s@foo@bar@} to generate + * a redirect based on a rewritten version of the + * original URL. + * + * Revision 1.22 2006/07/18 14:48:46 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * * Revision 1.20.2.2 2004/10/03 12:53:32 david__schmidt * Add the ability to check jpeg images for invalid * lengths of comment blocks. Defensive strategy @@ -230,9 +284,8 @@ struct url_spec; */ #ifdef FEATURE_ACL extern int block_acl(struct access_control_addr *dst, struct client_state *csp); -extern int acl_addr(char *aspec, struct access_control_addr *aca); +extern int acl_addr(const char *aspec, struct access_control_addr *aca); #endif /* def FEATURE_ACL */ -extern int match_portlist(const char *portlist, int port); /* * Interceptors @@ -247,37 +300,47 @@ extern struct http_response *trust_url(struct client_state *csp); * Request inspectors */ #ifdef FEATURE_TRUST -extern int is_untrusted_url(struct client_state *csp); +extern int is_untrusted_url(const struct client_state *csp); #endif /* def FEATURE_TRUST */ #ifdef FEATURE_IMAGE_BLOCKING -extern int is_imageurl(struct client_state *csp); +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 */ -extern char *pcrs_filter_response(struct client_state *csp); -extern char *gif_deanimate_response(struct client_state *csp); -extern char *jpeg_inspect_response(struct client_state *csp); -extern int remove_chunked_transfer_coding(char *buffer, const size_t size); + +typedef char *(*filter_function_ptr)(); +extern char *execute_content_filter(struct client_state *csp, filter_function_ptr content_filter); + +extern filter_function_ptr get_filter_function(struct client_state *csp); +extern char *execute_single_pcrs_command(char *subject, const char *pcrs_command, int *hits); +extern char *rewrite_url(char *old_url, const char *pcrs_command); +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 inline int content_filters_enabled(const struct client_state *csp); /* * Handling Max-Forwards: */ -extern struct http_response *direct_response( struct client_state *csp); +extern struct http_response *direct_response(struct client_state *csp); /*