X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=47031ce35e214e0897ae0a1914ae632008ead083;hp=c38b2162e514c4f8aafaacc4efe61c0fd82fd3e8;hb=37144bca0f6a8dc3f429c7bb83b8ab03755aef35;hpb=89f4d632da7483f990e3fa75d4a11aee69c61386 diff --git a/loadcfg.c b/loadcfg.c index c38b2162..47031ce3 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.30 2002/01/22 23:31:43 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.41 2002/03/31 17:19:00 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -9,7 +9,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.30 2002/01/22 23:31:43 jongfoster * variables it writes to. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,43 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.30 2002/01/22 23:31:43 jongfoster * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.41 2002/03/31 17:19:00 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.40 2002/03/26 22:29:55 swa + * we have a new homepage! + * + * Revision 1.39 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.38 2002/03/24 13:05:48 jongfoster + * Renaming re_filterfile to filterfile + * + * Revision 1.37 2002/03/16 23:54:06 jongfoster + * Adding graceful termination feature, to help look for memory leaks. + * If you enable this (which, by design, has to be done by hand + * editing config.h) and then go to http://i.j.b/die, then the program + * will exit cleanly after the *next* request. It should free all the + * memory that was used. + * + * Revision 1.36 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.35 2002/03/07 03:52:44 oes + * Set logging to tty for --no-daemon mode + * + * Revision 1.34 2002/03/06 23:14:35 jongfoster + * Trivial cosmetic changes to make function comments easier to find. + * + * Revision 1.33 2002/03/05 04:52:42 oes + * Deleted non-errlog debugging code + * + * Revision 1.32 2002/03/04 18:24:53 oes + * Re-enabled output of unknown config directive hash + * + * Revision 1.31 2002/03/03 15:07:20 oes + * Re-enabled automatic config reloading + * * Revision 1.30 2002/01/22 23:31:43 jongfoster * Replacing strsav() with string_append() * @@ -258,6 +295,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.30 2002/01/22 23:31:43 jongfoster #ifdef _WIN32 +# ifndef STRICT +# define STRICT +# endif # include # include "win32.h" @@ -342,6 +382,7 @@ static struct file_list *current_configfile = NULL; #define hash_deny_access 1227333715ul /* "deny-access" */ #define hash_enable_edit_actions 2517097536ul /* "enable-edit-actions" */ #define hash_enable_remote_toggle 2979744683ul /* "enable-remote-toggle" */ +#define hash_filterfile 250887266ul /* "filterfile" */ #define hash_forward 2029845ul /* "forward" */ #define hash_forward_socks4 3963965521ul /* "forward-socks4" */ #define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */ @@ -351,7 +392,6 @@ static struct file_list *current_configfile = NULL; #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 /* "suppress-blocklists" */ #define hash_toggle 447966ul /* "toggle" */ @@ -440,6 +480,30 @@ void unload_configfile (void * data) } +#ifdef FEATURE_GRACEFUL_TERMINATION +/********************************************************************* + * + * Function : unload_current_config_file + * + * Description : Unloads current config file - reset to state at + * beginning of program. + * + * Parameters : None + * + * Returns : N/A + * + *********************************************************************/ +void unload_current_config_file(void) +{ + if (current_configfile) + { + current_configfile->unloader = unload_configfile; + current_configfile = NULL; + } +} +#endif + + /********************************************************************* * * Function : load_config @@ -463,7 +527,6 @@ struct configuration_spec * load_config(void) struct file_list *fs; unsigned long linenum = 0; - DBG(1, ("load_config() entered..\n") ); if ( !check_file_changed(current_configfile, configfile, &fs)) { /* No need to load */ @@ -475,9 +538,7 @@ struct configuration_spec * load_config(void) configfile); } - /* log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); - */ #ifdef FEATURE_TOGGLE g_bToggleIJB = 1; @@ -573,49 +634,49 @@ struct configuration_spec * load_config(void) switch( hash_string( cmd ) ) { -/**************************************************************************** +/* ************************************************************************* * actionsfile actions-file-name * In confdir by default - ****************************************************************************/ + * *************************************************************************/ case hash_actions_file : freez(config->actions_file); config->actions_file = make_path(config->confdir, arg); continue; -/**************************************************************************** +/* ************************************************************************* * admin-address email-address - ****************************************************************************/ + * *************************************************************************/ case hash_admin_address : freez(config->admin_address); config->admin_address = strdup(arg); continue; -/**************************************************************************** +/* ************************************************************************* * buffer-limit n - ****************************************************************************/ + * *************************************************************************/ case hash_buffer_limit : config->buffer_limit = (size_t) 1024 * atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * confdir directory-name - ****************************************************************************/ + * *************************************************************************/ case hash_confdir : freez(config->confdir); config->confdir = make_path( NULL, arg); continue; -/**************************************************************************** +/* ************************************************************************* * debug n * Specifies debug level, multiple values are ORed together. - ****************************************************************************/ + * *************************************************************************/ case hash_debug : config->debug |= atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]] - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_ACL case hash_deny_access: vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); @@ -688,9 +749,9 @@ struct configuration_spec * load_config(void) continue; #endif /* def FEATURE_ACL */ -/**************************************************************************** +/* ************************************************************************* * enable-edit-actions 0|1 - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_CGI_EDIT_ACTIONS case hash_enable_edit_actions: if ((*arg != '\0') && (0 != atoi(arg))) @@ -704,9 +765,9 @@ struct configuration_spec * load_config(void) continue; #endif /* def FEATURE_CGI_EDIT_ACTIONS */ -/**************************************************************************** +/* ************************************************************************* * enable-remote-toggle 0|1 - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_CGI_EDIT_ACTIONS case hash_enable_remote_toggle: if ((*arg != '\0') && (0 != atoi(arg))) @@ -720,9 +781,9 @@ struct configuration_spec * load_config(void) continue; #endif /* def FEATURE_CGI_EDIT_ACTIONS */ -/**************************************************************************** +/* ************************************************************************* * forward url-pattern (.|http-proxy-host[:port]) - ****************************************************************************/ + * *************************************************************************/ case hash_forward: vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); @@ -765,7 +826,7 @@ struct configuration_spec * load_config(void) { cur_fwd->forward_host = strdup(p); - if ((p = strchr(cur_fwd->forward_host, ':'))) + if (NULL != (p = strchr(cur_fwd->forward_host, ':'))) { *p++ = '\0'; cur_fwd->forward_port = atoi(p); @@ -783,9 +844,9 @@ struct configuration_spec * load_config(void) continue; -/**************************************************************************** +/* ************************************************************************* * forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port]) - ****************************************************************************/ + * *************************************************************************/ case hash_forward_socks4: vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); @@ -828,7 +889,7 @@ struct configuration_spec * load_config(void) { cur_fwd->gateway_host = strdup(p); - if ((p = strchr(cur_fwd->gateway_host, ':'))) + if (NULL != (p = strchr(cur_fwd->gateway_host, ':'))) { *p++ = '\0'; cur_fwd->gateway_port = atoi(p); @@ -846,7 +907,7 @@ struct configuration_spec * load_config(void) { cur_fwd->forward_host = strdup(p); - if ((p = strchr(cur_fwd->forward_host, ':'))) + if (NULL != (p = strchr(cur_fwd->forward_host, ':'))) { *p++ = '\0'; cur_fwd->forward_port = atoi(p); @@ -864,9 +925,9 @@ struct configuration_spec * load_config(void) continue; -/**************************************************************************** +/* ************************************************************************* * forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port]) - ****************************************************************************/ + * *************************************************************************/ case hash_forward_socks4a: vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); @@ -907,7 +968,7 @@ struct configuration_spec * load_config(void) cur_fwd->gateway_host = strdup(p); - if ((p = strchr(cur_fwd->gateway_host, ':'))) + if (NULL != (p = strchr(cur_fwd->gateway_host, ':'))) { *p++ = '\0'; cur_fwd->gateway_port = atoi(p); @@ -924,7 +985,7 @@ struct configuration_spec * load_config(void) { cur_fwd->forward_host = strdup(p); - if ((p = strchr(cur_fwd->forward_host, ':'))) + if (NULL != (p = strchr(cur_fwd->forward_host, ':'))) { *p++ = '\0'; cur_fwd->forward_port = atoi(p); @@ -942,10 +1003,10 @@ struct configuration_spec * load_config(void) continue; -/**************************************************************************** +/* ************************************************************************* * jarfile jar-file-name * In logdir by default - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_COOKIE_JAR case hash_jarfile : freez(config->jarfile); @@ -953,34 +1014,34 @@ struct configuration_spec * load_config(void) continue; #endif /* def FEATURE_COOKIE_JAR */ -/**************************************************************************** +/* ************************************************************************* * listen-address [ip][:port] - ****************************************************************************/ + * *************************************************************************/ case hash_listen_address : freez(config->haddr); config->haddr = strdup(arg); continue; -/**************************************************************************** +/* ************************************************************************* * logdir directory-name - ****************************************************************************/ + * *************************************************************************/ case hash_logdir : freez(config->logdir); config->logdir = make_path(NULL, arg); continue; -/**************************************************************************** +/* ************************************************************************* * logfile log-file-name * In logdir by default - ****************************************************************************/ + * *************************************************************************/ case hash_logfile : freez(config->logfile); - config->logfile = make_path(config->logdir, arg); + config->logfile = no_daemon ? NULL : make_path(config->logdir, arg); continue; -/**************************************************************************** +/* ************************************************************************* * permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]] - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_ACL case hash_permit_access: vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1); @@ -1055,52 +1116,52 @@ struct configuration_spec * load_config(void) continue; #endif /* def FEATURE_ACL */ -/**************************************************************************** +/* ************************************************************************* * proxy-info-url url - ****************************************************************************/ + * *************************************************************************/ case hash_proxy_info_url : freez(config->proxy_info_url); config->proxy_info_url = strdup(arg); continue; -/**************************************************************************** +/* ************************************************************************* * re_filterfile file-name * In confdir by default. - ****************************************************************************/ - case hash_re_filterfile : + * *************************************************************************/ + case hash_filterfile : freez(config->re_filterfile); config->re_filterfile = make_path(config->confdir, arg); continue; -/**************************************************************************** +/* ************************************************************************* * single-threaded - ****************************************************************************/ + * *************************************************************************/ case hash_single_threaded : config->multi_threaded = 0; continue; -/**************************************************************************** +/* ************************************************************************* * toggle (0|1) - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_TOGGLE case hash_toggle : g_bToggleIJB = atoi(arg); continue; #endif /* def FEATURE_TOGGLE */ -/**************************************************************************** +/* ************************************************************************* * trust-info-url url - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_TRUST case hash_trust_info_url : enlist(config->trust_info, arg); continue; #endif /* def FEATURE_TRUST */ -/**************************************************************************** +/* ************************************************************************* * trustfile filename * (In confdir by default.) - ****************************************************************************/ + * *************************************************************************/ #ifdef FEATURE_TRUST case hash_trustfile : freez(config->trustfile); @@ -1109,13 +1170,13 @@ struct configuration_spec * load_config(void) #endif /* def FEATURE_TRUST */ -/**************************************************************************** +/* ************************************************************************* * Win32 Console options: - ****************************************************************************/ + * *************************************************************************/ -/**************************************************************************** +/* ************************************************************************* * hide-console - ****************************************************************************/ + * *************************************************************************/ #ifdef _WIN_CONSOLE case hash_hide_console : hideConsole = 1; @@ -1123,70 +1184,70 @@ struct configuration_spec * load_config(void) #endif /*def _WIN_CONSOLE*/ -/**************************************************************************** +/* ************************************************************************* * Win32 GUI options: - ****************************************************************************/ + * *************************************************************************/ #if defined(_WIN32) && ! defined(_WIN_CONSOLE) -/**************************************************************************** +/* ************************************************************************* * activity-animation (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_activity_animation : g_bShowActivityAnimation = atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * close-button-minimizes (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_close_button_minimizes : g_bCloseHidesWindow = atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * log-buffer-size (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_log_buffer_size : g_bLimitBufferSize = atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * log-font-name fontnane - ****************************************************************************/ + * *************************************************************************/ case hash_log_font_name : strcpy( g_szFontFaceName, arg ); continue; -/**************************************************************************** +/* ************************************************************************* * log-font-size n - ****************************************************************************/ + * *************************************************************************/ case hash_log_font_size : g_nFontSize = atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * log-highlight-messages (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_log_highlight_messages : g_bHighlightMessages = atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * log-max-lines n - ****************************************************************************/ + * *************************************************************************/ case hash_log_max_lines : g_nMaxBufferLines = atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * log-messages (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_log_messages : g_bLogMessages = atoi(arg); continue; -/**************************************************************************** +/* ************************************************************************* * show-on-task-bar (0|1) - ****************************************************************************/ + * *************************************************************************/ case hash_show_on_task_bar : g_bShowOnTaskBar = atoi(arg); continue; @@ -1194,9 +1255,9 @@ struct configuration_spec * load_config(void) #endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */ -/****************************************************************************/ -/* Warnings about unsupported features */ -/****************************************************************************/ +/* ************************************************************************* + * Warnings about unsupported features + * *************************************************************************/ #ifndef FEATURE_ACL case hash_deny_access: #endif /* ndef FEATURE_ACL */ @@ -1237,25 +1298,22 @@ struct configuration_spec * load_config(void) /* log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); */ continue; -/****************************************************************************/ +/* *************************************************************************/ default : -/****************************************************************************/ +/* *************************************************************************/ /* * I decided that I liked this better as a warning than an * error. To change back to an error, just change log level * to LOG_LEVEL_FATAL. */ - log_error(LOG_LEVEL_ERROR, "Unrecognized directive '%s' in line %lu in " - "configuration file (%s).", buf, linenum, configfile); - /* log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%luul) in " - "configuration file: \"%s\"", hash_string( cmd ), buf); - */ + log_error(LOG_LEVEL_ERROR, "Unrecognized directive '%s' (%luul) in line %lu in " + "configuration file (%s).", buf, hash_string(cmd), linenum, configfile); string_append(&config->proxy_args, "
\nWARNING: unrecognized directive : "); string_append(&config->proxy_args, buf); string_append(&config->proxy_args, "

\n"); continue; -/****************************************************************************/ +/* *************************************************************************/ } /* end switch( hash_string(cmd) ) */ } /* end while ( read_config_line(...) ) */ @@ -1304,7 +1362,7 @@ struct configuration_spec * load_config(void) if ( NULL != config->haddr ) { - if ((p = strchr(config->haddr, ':'))) + if (NULL != (p = strchr(config->haddr, ':'))) { *p++ = '\0'; if (*p) @@ -1436,7 +1494,9 @@ static void savearg(char *command, char *argument, struct configuration_spec * c freez(config->proxy_args); return; } - string_append(&buf, ""); string_join (&buf, s);