X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=91670bb9d7f6a33b58a0eb03379b14e90e11b559;hp=4ce1d20d3ebace16e3d082f77efbca637ba884fa;hb=c8d8e9808ebf5fce076240436a9f4535c0ceaa30;hpb=d413f089844873c5d88bb1580357124b45fab66c
diff --git a/loadcfg.c b/loadcfg.c
index 4ce1d20d..91670bb9 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,5 +1,5 @@
/* vim:ts=3: */
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.15 2001/06/07 23:13:40 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.16 2001/06/09 10:55:28 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -36,6 +36,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.15 2001/06/07 23:13:40 jongfoster
*
* Revisions :
* $Log: loadcfg.c,v $
+ * 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.
@@ -60,60 +63,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.15 2001/06/07 23:13:40 jongfoster
* 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.
*
@@ -298,9 +247,8 @@ int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */
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;
@@ -320,7 +268,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" */
@@ -332,17 +281,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" */
@@ -352,6 +301,7 @@ static struct file_list *current_configfile = NULL;
#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
+
/*********************************************************************
*
* Function : unload_configfile
@@ -407,6 +357,9 @@ 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
freez((char *)config->jarfile);
@@ -483,8 +436,6 @@ struct configuration_spec * load_config(void)
*/
config->config_file_list = fs;
- init_proxy_args(Argc, Argv, config);
-
/*
* Set to defaults
*/
@@ -553,7 +504,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 :
@@ -561,6 +512,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
****************************************************************************/
@@ -588,7 +547,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;
@@ -609,12 +568,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;
@@ -625,12 +584,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;
@@ -662,7 +621,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;
@@ -684,7 +643,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;
@@ -725,7 +684,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;
@@ -747,7 +706,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;
@@ -806,7 +765,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;
@@ -828,7 +787,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;
@@ -921,7 +880,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");
@@ -943,12 +902,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;
@@ -960,12 +919,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;
@@ -987,6 +946,14 @@ struct configuration_spec * load_config(void)
continue;
#endif /* def ACL_FILES */
+/****************************************************************************
+ * 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.
@@ -1006,7 +973,7 @@ struct configuration_spec * load_config(void)
continue;
/****************************************************************************
- * FIXME: Document this
+ * FIXME: Document this FIXME2: Shouldn't we throw this out? --oes
****************************************************************************/
#ifndef SPLIT_PROXY_ARGS
case hash_suppress_blocklists :
@@ -1034,7 +1001,7 @@ struct configuration_spec * load_config(void)
#endif /* def TOGGLE */
/****************************************************************************
- * FIXME: Please document this!
+ * trust-info-url url
****************************************************************************/
#ifdef TRUST_FILES
case hash_trust_info_url :
@@ -1194,9 +1161,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;
/****************************************************************************/