X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.h;h=ec22e3650a3aa97ae191f020f215a94321791d42;hp=3de1dac4c392ca7c09627b4d1713654872b6966f;hb=63ac21816431ba8a41537376f7c2cdb1aa7b43bf;hpb=12f52e6af55d51d4b268af7956d97c772eebbb5c diff --git a/filters.h b/filters.h index 3de1dac4..ec22e365 100644 --- a/filters.h +++ b/filters.h @@ -1,6 +1,6 @@ #ifndef _FILTERS_H #define _FILTERS_H -#define FILTERS_H_VERSION "$Id: filters.h,v 1.5 2001/05/27 22:17:04 oes Exp $" +#define FILTERS_H_VERSION "$Id: filters.h,v 1.10 2001/06/29 13:29:01 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ @@ -8,7 +8,7 @@ * Purpose : Declares functions to parse/crunch headers and pages. * Functions declared include: * `acl_addr', `add_stats', `block_acl', `block_imageurl', - * `block_url', `url_permissions', `domaincmp', `dsplit', + * `block_url', `url_actions', `domaincmp', `dsplit', * `filter_popups', `forward_url' * `ij_untrusted_url', `intercept_url', `re_process_buffer', * `show_proxy_args', and `trust_url' @@ -40,6 +40,45 @@ * * Revisions : * $Log: filters.h,v $ + * Revision 1.10 2001/06/29 13:29:01 oes + * Cleaned up and updated to reflect the changesin + * filters.c + * + * Revision 1.9 2001/06/07 23:10:53 jongfoster + * Replacing struct gateway with struct forward_spec + * + * Revision 1.8 2001/06/03 19:12:00 oes + * extracted-CGI relevant stuff + * + * Revision 1.7 2001/05/31 21:21:30 jongfoster + * Permissionsfile / actions file changes: + * - Changed "permission" to "action" throughout + * - changes to file format to allow string parameters + * - Moved helper functions to actions.c + * + * Revision 1.6 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * * Revision 1.5 2001/05/27 22:17:04 oes * * - re_process_buffer no longer writes the modified buffer @@ -127,46 +166,58 @@ extern "C" { #endif +/* + * ACL checking + */ #ifdef ACL_FILES extern int block_acl(struct access_control_addr *dst, struct client_state *csp); extern int acl_addr(char *aspec, struct access_control_addr *aca); #endif /* def ACL_FILES */ -extern char *block_url(struct http_request *http, struct client_state *csp); +/* + * Interceptors + */ +extern struct http_response *block_url(struct client_state *csp); +extern struct http_response *redirect_url(struct client_state *csp); #ifdef TRUST_FILES -extern char *trust_url(struct http_request *http, struct client_state *csp); +extern struct http_response *trust_url(struct client_state *csp); #endif /* def TRUST_FILES */ -extern int intercept_url(struct http_request *http, struct client_state *csp); -extern char *redirect_url(struct http_request *http, struct client_state *csp); +/* + * Request inspectors + */ +#ifdef TRUST_FILES +extern int is_untrusted_url(struct client_state *csp); +#endif /* def TRUST_FILES */ #ifdef IMAGE_BLOCKING -extern int block_imageurl(struct http_request *http, struct client_state *csp); +extern int is_imageurl(struct client_state *csp); #endif /* def IMAGE_BLOCKING */ -extern int url_permissions(struct http_request *http, struct client_state *csp); -extern const struct gateway *forward_url(struct http_request *http, struct client_state *csp); +/* + * Determining applicable actions + */ +extern void url_actions(struct http_request *http, + struct client_state *csp); +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 struct url_spec dsplit(char *domain); extern int domaincmp(struct url_spec *pattern, struct url_spec *fqdn); -extern char *show_proxy_args(struct http_request *http, struct client_state *csp); -extern char *ijb_send_banner(struct http_request *http, struct client_state *csp); - -#ifdef TRUST_FILES -extern char *ij_untrusted_url(struct http_request *http, struct client_state *csp); -#endif /* def TRUST_FILES */ - -char *ijb_show_url_info(struct http_request *http, struct client_state *csp); - -#ifdef STATISTICS -extern char *add_stats(char *s); -#endif /* def STATISTICS */ - -#ifdef PCRS -extern char *re_process_buffer(struct client_state *csp); -#endif /* def PCRS */ - -/* Revision control strings from this header and associated .c file */ +/* + * Content modification + */ +extern char *pcrs_filter_response(struct client_state *csp); +extern char *gif_deanimate_response(struct client_state *csp); + +/* + * Revision control strings from this header and associated .c file + */ extern const char filters_rcs[]; extern const char filters_h_rcs[];