X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.h;h=c4955e3929de86c00c61481d5dec2a60a1286795;hp=0551a6e95a1fb8c95967fddef8a30eec237b6959;hb=5f390b415777db21894f1b856ab3d21c9c24f7c6;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/loaders.h b/loaders.h index 0551a6e9..c4955e39 100644 --- a/loaders.h +++ b/loaders.h @@ -1,9 +1,9 @@ -#ifndef _LOADERS_H -#define _LOADERS_H -#define LOADERS_H_VERSION "$Id: loaders.h,v 1.1 2001/05/13 21:57:06 administrator Exp $" +#ifndef LOADERS_H_INCLUDED +#define LOADERS_H_INCLUDED +#define LOADERS_H_VERSION "$Id: loaders.h,v 1.10 2001/09/22 16:36:59 jongfoster Exp $" /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/loaders.h,v $ + * File : $Source: /cvsroot/ijbswa/current/loaders.h,v $ * * Purpose : Functions to load and unload the various * configuration files. Also contains code to manage @@ -37,54 +37,111 @@ * * Revisions : * $Log: loaders.h,v $ + * Revision 1.10 2001/09/22 16:36:59 jongfoster + * Removing unused parameter fs from read_config_line() + * + * Revision 1.9 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * Revision 1.8 2001/07/29 18:58:15 jongfoster + * Removing nested #includes, adding forward declarations for needed + * structures, and changing the #define _FILENAME_H to FILENAME_H_INCLUDED. + * + * Revision 1.7 2001/07/13 14:01:54 oes + * Removed all #ifdef PCRS + * + * Revision 1.6 2001/06/07 23:14:38 jongfoster + * Removing ACL and forward file loaders - these files have + * been merged into the config file. + * + * Revision 1.5 2001/05/31 21:28:49 jongfoster + * Removed all permissionsfile code - it's now called the actions + * file, and (almost) all the code is in actions.c + * + * Revision 1.4 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.3 2001/05/26 00:28:36 jongfoster + * Automatic reloading of config file. + * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). + * Most of the global variables have been moved to a new + * struct configuration_spec, accessed through csp->config->globalname + * Most of the globals remaining are used by the Win32 GUI. + * + * Revision 1.2 2001/05/20 01:21:20 jongfoster + * Version 2.9.4 checkin. + * - Merged popupfile and cookiefile, and added control over PCRS + * filtering, in new "permissionsfile". + * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration + * file error you now get a message box (in the Win32 GUI) rather + * than the program exiting with no explanation. + * - Made killpopup use the PCRS MIME-type checking and HTTP-header + * skipping. + * - Removed tabs from "config" + * - Moved duplicated url parsing code in "loaders.c" to a new funcition. + * - Bumped up version number. + * + * Revision 1.1.1.1 2001/05/15 13:59:00 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ -#include "project.h" - #ifdef __cplusplus extern "C" { #endif -extern void sweep(void); -extern char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs); +/* Structures taken from project.h */ +struct client_state; +struct file_list; +struct configuration_spec; +struct url_spec; -extern int load_blockfile(struct client_state *csp); -extern int load_cookiefile(struct client_state *csp); -extern int load_forwardfile(struct client_state *csp); - -#ifdef ACL_FILES -extern int load_aclfile(struct client_state *csp); -#endif /* def ACL_FILES */ +extern void sweep(void); +extern char *read_config_line(char *buf, int buflen, FILE *fp); +extern int check_file_changed(const struct file_list * current, + const char * filename, + struct file_list ** newfl); -#ifdef USE_IMAGE_LIST -extern int load_imagefile(struct client_state *csp); -#endif /* def USE_IMAGE_LIST */ - -#ifdef KILLPOPUPS -extern int load_popupfile(struct client_state *csp); -#endif /* def KILLPOPUPS */ +extern int load_actions_file(struct client_state *csp); +extern int load_re_filterfile(struct client_state *csp); -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST extern int load_trustfile(struct client_state *csp); -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ -#ifdef PCRS -extern int load_re_filterfile(struct client_state *csp); -#endif /* def PCRS */ -extern void add_loader(int (*loader)(struct client_state *)); -extern int run_loader(struct client_state *csp); -extern void remove_all_loaders(void); -#ifdef PCRS -extern int load_re_filterfile(struct client_state *csp); -#endif /* def PCRS */ +extern jb_err create_url_spec(struct url_spec * url, char * buf); +extern void free_url(struct url_spec *url); -#ifdef KILLPOPUPS -extern int load_popupfile(struct client_state *csp); -#endif /* def KILLPOPUPS */ +extern void add_loader(int (*loader)(struct client_state *), + struct configuration_spec * config); +extern int run_loader(struct client_state *csp); /* Revision control strings from this header and associated .c file */ extern const char loaders_rcs[]; @@ -94,7 +151,7 @@ extern const char loaders_h_rcs[]; } /* extern "C" */ #endif -#endif /* ndef _LOADERS_H */ +#endif /* ndef LOADERS_H_INCLUDED */ /* Local Variables: