X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=18db099187adae7d9c226ca7b1ff94986fbe0ead;hp=96e760a97b1f5456ce2205a9ca14df1f8a87c8c6;hb=32b3455b3f9782f86bac0b0bff7f1049db292822;hpb=86e3b60f8f8bb9af979bd83184977ffcfce3a185 diff --git a/loadcfg.c b/loadcfg.c index 96e760a9..18db0991 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,5 +1,4 @@ -/* vim:ts=3: */ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.14 2001/06/07 14:46:25 joergs Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.19 2001/07/15 17:45:16 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -36,6 +35,31 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.14 2001/06/07 14:46:25 joergs Exp * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.19 2001/07/15 17:45:16 jongfoster + * Removing some unused #includes + * + * Revision 1.18 2001/07/13 14:01:14 oes + * - Removed all #ifdef PCRS + * - Removed vim-settings + * + * Revision 1.17 2001/06/29 13:31:03 oes + * - Improved comments + * - Fixed (actionsfile) and sorted hashes + * - Introduced admin_address and proxy-info-url + * as config parameters + * - Renamed config->proxy_args_invocation (which didn't have + * the invocation but the options!) to config->proxy_args + * - Various adaptions + * - Removed logentry from cancelled commit + * + * Revision 1.16 2001/06/09 10:55:28 jongfoster + * Changing BUFSIZ ==> BUFFER_SIZE + * + * Revision 1.15 2001/06/07 23:13:40 jongfoster + * Merging ACL and forward files into config file. + * Cosmetic: Sorting config file options alphabetically. + * Cosmetic: Adding brief syntax comments to config file options. + * * Revision 1.14 2001/06/07 14:46:25 joergs * Missing make_path() added for re_filterfile. * @@ -55,60 +79,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.14 2001/06/07 14:46:25 joergs Exp * Revision 1.10 2001/06/03 19:11:54 oes * introduced confdir option * - * Revision 1.10 2001/06/03 11:03:48 oes - * Makefile/in - * - * introduced cgi.c - * - * actions.c: - * - * adapted to new enlist_unique arg format - * - * conf loadcfg.c - * - * introduced confdir option - * - * filters.c filtrers.h - * - * extracted-CGI relevant stuff - * - * jbsockets.c - * - * filled comment - * - * jcc.c - * - * support for new cgi mechansim - * - * list.c list.h - * - * functions for new list type: "map" - * extended enlist_unique - * - * miscutil.c .h - * introduced bindup() - * - * parsers.c parsers.h - * - * deleted const struct interceptors - * - * pcrs.c - * added FIXME - * - * project.h - * - * added struct map - * added struct http_response - * changes struct interceptors to struct cgi_dispatcher - * moved HTML stuff to cgi.h - * - * re_filterfile: - * - * changed - * - * showargs.c - * NO TIME LEFT - * * Revision 1.9 2001/06/01 20:06:24 jongfoster * Removed support for "tinygif" option - moved to actions file. * @@ -231,13 +201,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.14 2001/06/07 14:46:25 joergs Exp #ifdef _WIN32 -# include # include -# include -# include -# ifdef TOGGLE -# include -# endif /* def TOGGLE */ # include "win32.h" # ifndef _WIN_CONSOLE @@ -284,18 +248,17 @@ const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; #define ijb_isupper(__X) isupper((int)(unsigned char)(__X)) #define ijb_tolower(__X) tolower((int)(unsigned char)(__X)) -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE /* by haroon - indicates if ijb is enabled */ int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */ -#endif +#endif /* def FEATURE_TOGGLE */ /* The filename of the configfile */ const char *configfile = NULL; /* - * The load_config function is now going to call `init_proxy_args', - * so it will need argc and argv. So we need to have these - * globally available. + * CGI functions will later need access to the invocation args, + * so we will make argc and argv global. */ int Argc = 0; const char **Argv = NULL; @@ -315,7 +278,8 @@ static struct file_list *current_configfile = NULL; * console and GUI specific options last). */ -#define hash_actions_file 3825730796ul /* FIXME "permissionsfile" */ +#define hash_actions_file 1196306641ul /* "actionsfile" */ +#define hash_admin_address 4112573064ul /* "admin-address" */ #define hash_confdir 1978389ul /* "confdir" */ #define hash_debug 78263ul /* "debug" */ #define hash_deny_access 1227333715ul /* "deny-access" */ @@ -327,17 +291,17 @@ static struct file_list *current_configfile = NULL; #define hash_logdir 422889ul /* "logdir" */ #define hash_logfile 2114766ul /* "logfile" */ #define hash_permit_access 3587953268ul /* "permit-access" */ +#define hash_proxy_info_url 3903079059ul /* "proxy-info-url" */ #define hash_re_filterfile 3877522444ul /* "re_filterfile" */ #define hash_single_threaded 4250084780ul /* "single-threaded" */ -#define hash_suppress_blocklists 1948693308ul /* ??? */ +#define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */ #define hash_toggle 447966ul /* "toggle" */ -#define hash_trust_info_url 449869467ul /* ??? */ +#define hash_trust_info_url 430331967ul /* "trust-info-url" */ #define hash_trustfile 56494766ul /* "trustfile" */ -#define hash_hide_console 2048809870ul /* "hide-console" */ - #define hash_activity_animation 1817904738ul /* "activity-animation" */ #define hash_close_button_minimizes 3651284693ul /* "close-button-minimizes" */ +#define hash_hide_console 2048809870ul /* "hide-console" */ #define hash_log_buffer_size 2918070425ul /* "log-buffer-size" */ #define hash_log_font_name 2866730124ul /* "log-font-name" */ #define hash_log_font_size 2866731014ul /* "log-font-size" */ @@ -347,6 +311,7 @@ static struct file_list *current_configfile = NULL; #define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */ + /********************************************************************* * * Function : unload_configfile @@ -363,7 +328,7 @@ void unload_configfile (void * data) { struct configuration_spec * config = (struct configuration_spec *)data; struct forward_spec *cur_fwd = config->forward; -#ifdef ACL_FILES +#ifdef FEATURE_ACL struct access_control_list *cur_acl = config->acl; while (cur_acl != NULL) @@ -373,7 +338,7 @@ void unload_configfile (void * data) cur_acl = next_acl; } config->acl = NULL; -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ while (cur_fwd != NULL) { @@ -387,13 +352,13 @@ void unload_configfile (void * data) } config->forward = NULL; -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR if ( NULL != config->jar ) { fclose( config->jar ); config->jar = NULL; } -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ freez((char *)config->confdir); freez((char *)config->logdir); @@ -402,18 +367,15 @@ void unload_configfile (void * data) freez((char *)config->logfile); freez((char *)config->actions_file); + freez((char *)config->admin_address); + freez((char *)config->proxy_info_url); + freez((char *)config->proxy_args); -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR freez((char *)config->jarfile); -#endif /* def JAR_FILES */ - -#ifndef SPLIT_PROXY_ARGS - freez((char *)config->suppress_message); -#endif /* ndef SPLIT_PROXY_ARGS */ +#endif /* def FEATURE_COOKIE_JAR */ -#ifdef PCRS freez((char *)config->re_filterfile); -#endif /* def PCRS */ } @@ -433,7 +395,7 @@ void unload_configfile (void * data) *********************************************************************/ struct configuration_spec * load_config(void) { - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; char *p, *q; FILE *configfp = NULL; struct configuration_spec * config = NULL; @@ -453,9 +415,9 @@ struct configuration_spec * load_config(void) log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE g_bToggleIJB = 1; -#endif +#endif /* def FEATURE_TOGGLE */ fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config)); @@ -478,8 +440,6 @@ struct configuration_spec * load_config(void) */ config->config_file_list = fs; - init_proxy_args(Argc, Argv, config); - /* * Set to defaults */ @@ -496,12 +456,12 @@ struct configuration_spec * load_config(void) while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL) { - char cmd[BUFSIZ]; - char arg[BUFSIZ]; - char tmp[BUFSIZ]; -#ifdef ACL_FILES + char cmd[BUFFER_SIZE]; + char arg[BUFFER_SIZE]; + char tmp[BUFFER_SIZE]; +#ifdef FEATURE_ACL struct access_control_list *cur_acl; -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ struct forward_spec *cur_fwd; int vec_count; char *vec[3]; @@ -548,7 +508,7 @@ struct configuration_spec * load_config(void) switch( hash_string( cmd ) ) { /**************************************************************************** - * permissionsfile actions-file-name + * actionsfile actions-file-name * In confdir by default ****************************************************************************/ case hash_actions_file : @@ -556,6 +516,14 @@ struct configuration_spec * load_config(void) config->actions_file = make_path(config->confdir, arg); continue; +/**************************************************************************** + * admin-address email-address + ****************************************************************************/ + case hash_admin_address : + freez((char *)config->admin_address); + config->admin_address = strdup(arg); + continue; + /**************************************************************************** * confdir directory-name ****************************************************************************/ @@ -575,7 +543,7 @@ struct configuration_spec * load_config(void) /**************************************************************************** * deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]] ****************************************************************************/ -#ifdef ACL_FILES +#ifdef FEATURE_ACL case hash_deny_access: vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); @@ -583,7 +551,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " "deny-access directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Wrong number of parameters for " "deny-access directive in configuration file.

\n"); continue; @@ -604,12 +572,12 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Invalid source IP for deny-access " "directive in configuration file: \"%s\"", vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Invalid source IP for deny-access directive" " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "\"

\n"); freez(cur_acl); continue; @@ -620,12 +588,12 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Invalid destination IP for deny-access " "directive in configuration file: \"%s\"", vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Invalid destination IP for deny-access directive" " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "\"

\n"); freez(cur_acl); continue; @@ -645,7 +613,7 @@ struct configuration_spec * load_config(void) config->acl = cur_acl; continue; -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ /**************************************************************************** * forward url-pattern (.|http-proxy-host[:port]) @@ -657,7 +625,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for forward " "directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward directive in configuration file."); continue; @@ -679,7 +647,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward " "directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward directive in configuration file."); continue; @@ -720,7 +688,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " "forward-socks4 directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4 directive in configuration file."); continue; @@ -742,7 +710,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4 " "directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward-socks4 directive in configuration file."); continue; @@ -801,7 +769,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " "forward-socks4a directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Wrong number of parameters for " "forward-socks4a directive in configuration file."); continue; @@ -823,7 +791,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4a " "directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Bad URL specifier for " "forward-socks4a directive in configuration file."); continue; @@ -873,12 +841,12 @@ struct configuration_spec * load_config(void) * jarfile jar-file-name * In logdir by default ****************************************************************************/ -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR case hash_jarfile : freez((char *)config->jarfile); config->jarfile = make_path(config->logdir, arg); continue; -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ /**************************************************************************** * listen-address [ip][:port] @@ -908,7 +876,7 @@ struct configuration_spec * load_config(void) /**************************************************************************** * permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]] ****************************************************************************/ -#ifdef ACL_FILES +#ifdef FEATURE_ACL case hash_permit_access: vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); @@ -916,7 +884,7 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for " "permit-access directive in configuration file."); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Wrong number of parameters for " "permit-access directive in configuration file.

\n"); @@ -938,12 +906,12 @@ struct configuration_spec * load_config(void) { log_error(LOG_LEVEL_ERROR, "Invalid source IP for permit-access " "directive in configuration file: \"%s\"", vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Invalid source IP for permit-access directive" " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "\"

\n"); freez(cur_acl); continue; @@ -955,12 +923,12 @@ struct configuration_spec * load_config(void) log_error(LOG_LEVEL_ERROR, "Invalid destination IP for " "permit-access directive in configuration file: \"%s\"", vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: Invalid destination IP for permit-access directive" " in configuration file: \""); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, vec[0]); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, + config->proxy_args = strsav( config->proxy_args, "\"

\n"); freez(cur_acl); continue; @@ -980,18 +948,24 @@ struct configuration_spec * load_config(void) config->acl = cur_acl; continue; -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ + +/**************************************************************************** + * proxy-info-url url + ****************************************************************************/ + case hash_proxy_info_url : + freez((char *)config->proxy_info_url); + config->proxy_info_url = strdup(arg); + continue; /**************************************************************************** * re_filterfile file-name * In confdir by default. ****************************************************************************/ -#ifdef PCRS case hash_re_filterfile : freez((char *)config->re_filterfile); config->re_filterfile = make_path(config->confdir, arg); continue; -#endif /* def PCRS */ /**************************************************************************** * single-threaded @@ -1000,53 +974,34 @@ struct configuration_spec * load_config(void) config->multi_threaded = 0; continue; -/**************************************************************************** - * FIXME: Document this - ****************************************************************************/ -#ifndef SPLIT_PROXY_ARGS - case hash_suppress_blocklists : - if (arg[0] != '\0') - { - config->suppress_message = strdup(arg); - } - else - { - /* There will be NO reference in proxy-args. */ - config->suppress_message = NULL; - } - - config->suppress_blocklists = 1; - continue; -#endif /* ndef SPLIT_PROXY_ARGS */ - /**************************************************************************** * toggle (0|1) ****************************************************************************/ -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE case hash_toggle : g_bToggleIJB = atoi(arg); continue; -#endif /* def TOGGLE */ +#endif /* def FEATURE_TOGGLE */ /**************************************************************************** - * FIXME: Please document this! + * trust-info-url url ****************************************************************************/ -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST case hash_trust_info_url : enlist(config->trust_info, arg); continue; -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ /**************************************************************************** * trustfile filename * (In confdir by default.) ****************************************************************************/ -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST case hash_trustfile : freez((char *)config->trustfile); config->trustfile = make_path(config->confdir, arg); continue; -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ /**************************************************************************** @@ -1137,28 +1092,22 @@ struct configuration_spec * load_config(void) /****************************************************************************/ /* Warnings about unsupported features */ /****************************************************************************/ -#ifndef ACL_FILES +#ifndef FEATURE_ACL case hash_deny_access: -#endif /* ndef ACL_FILES */ -#ifndef JAR_FILES +#endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_COOKIE_JAR case hash_jarfile : -#endif /* ndef JAR_FILES */ -#ifndef ACL_FILES +#endif /* ndef FEATURE_COOKIE_JAR */ +#ifndef FEATURE_ACL case hash_permit_access: -#endif /* ndef ACL_FILES */ -#ifndef PCRS - case hash_re_filterfile : -#endif /* ndef PCRS */ -#ifdef SPLIT_PROXY_ARGS - case hash_suppress_blocklists : -#endif /* def SPLIT_PROXY_ARGS */ -#ifndef TOGGLE +#endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_TOGGLE case hash_toggle : -#endif /* ndef TOGGLE */ -#ifndef TRUST_FILES +#endif /* ndef FEATURE_TOGGLE */ +#ifndef FEATURE_TRUST case hash_trustfile : case hash_trust_info_url : -#endif /* ndef TRUST_FILES */ +#endif /* ndef FEATURE_TRUST */ #ifndef _WIN_CONSOLE case hash_hide_console : @@ -1189,9 +1138,9 @@ struct configuration_spec * load_config(void) */ log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%luul) in " "configuration file: \"%s\"", hash_string( cmd ), buf); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, "
\nWARNING: unrecognized directive : "); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, buf); - config->proxy_args_invocation = strsav( config->proxy_args_invocation, "

\n"); + config->proxy_args = strsav( config->proxy_args, "
\nWARNING: unrecognized directive : "); + config->proxy_args = strsav( config->proxy_args, buf); + config->proxy_args = strsav( config->proxy_args, "

\n"); continue; /****************************************************************************/ @@ -1207,21 +1156,19 @@ struct configuration_spec * load_config(void) add_loader(load_actions_file, config); } -#ifdef PCRS if (config->re_filterfile) { add_loader(load_re_filterfile, config); } -#endif /* def PCRS */ -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST if (config->trustfile) { add_loader(load_trustfile, config); } -#endif +#endif /* def FEATURE_TRUST */ -#ifdef JAR_FILES +#ifdef FEATURE_COOKIE_JAR if ( NULL != config->jarfile ) { if ( NULL == (config->jar = fopen(config->jarfile, "a")) ) @@ -1231,7 +1178,7 @@ struct configuration_spec * load_config(void) } setbuf(config->jar, NULL); } -#endif /* def JAR_FILES */ +#endif /* def FEATURE_COOKIE_JAR */ if ( NULL == config->haddr ) { @@ -1277,23 +1224,15 @@ struct configuration_spec * load_config(void) } freez(fake_csp); -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - /* FIXME: this is a kludge for win32 */ #if defined(_WIN32) && !defined (_WIN_CONSOLE) g_actions_file = config->actions_file; -#ifdef PCRS g_re_filterfile = config->re_filterfile; -#endif -#ifdef TRUST_FILES + +#ifdef FEATURE_TRUST g_trustfile = config->trustfile; -#endif +#endif /* def FEATURE_TRUST */ #endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */