-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.31 2002/03/03 15:07:20 oes Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.39 2002/03/24 13:25:43 swa Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
* 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
*
* Revisions :
* $Log: loadcfg.c,v $
+ * 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
*
#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" */
#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" */
}
+#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
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 */
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);
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)))
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)))
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);
{
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);
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);
{
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);
{
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);
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);
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);
{
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);
continue;
-/****************************************************************************
+/* *************************************************************************
* jarfile jar-file-name
* In logdir by default
- ****************************************************************************/
+ * *************************************************************************/
#ifdef FEATURE_COOKIE_JAR
case hash_jarfile :
freez(config->jarfile);
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);
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);
#endif /* def FEATURE_TRUST */
-/****************************************************************************
+/* *************************************************************************
* Win32 Console options:
- ****************************************************************************/
+ * *************************************************************************/
-/****************************************************************************
+/* *************************************************************************
* hide-console
- ****************************************************************************/
+ * *************************************************************************/
#ifdef _WIN_CONSOLE
case hash_hide_console :
hideConsole = 1;
#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;
#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 */
/* 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
string_append(&config->proxy_args, "<br><br>\n");
continue;
-/****************************************************************************/
+/* *************************************************************************/
} /* end switch( hash_string(cmd) ) */
} /* end while ( read_config_line(...) ) */
if ( NULL != config->haddr )
{
- if ((p = strchr(config->haddr, ':')))
+ if (NULL != (p = strchr(config->haddr, ':')))
{
*p++ = '\0';
if (*p)