X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.c;h=61ba3a7705a0e81caa2c499c54c74cbb36fcdfe6;hb=732eaf8bb25c21652790d9c038b2f0bb555be180;hp=44446e42d35676c815db5719d7c2d58f15dd406b;hpb=1a096731122473db56caec3c5170be99fcf8aa06;p=privoxy.git
diff --git a/loadcfg.c b/loadcfg.c
index 44446e42..61ba3a77 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.71 2007/12/23 15:24:56 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.86 2009/02/08 19:18:57 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.71 2007/12/23 15:24:56 fabiankeil
* routine to load the configuration and the global
* variables it writes to.
*
- * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge
+ * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@ -35,6 +35,66 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.71 2007/12/23 15:24:56 fabiankeil
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.86 2009/02/08 19:18:57 fabiankeil
+ * Now that we have the match-all.action file, the other action
+ * files changed their position in config->actions_file[] back
+ * to the way it was before standard.action got removed and the
+ * changes from revision 1.84 have to be reverted.
+ *
+ * Revision 1.85 2009/01/22 12:06:26 fabiankeil
+ * Don't keep connections alive when running single-threaded.
+ *
+ * Revision 1.84 2009/01/14 16:14:36 fabiankeil
+ * Due to the standard.action file removal, the other action
+ * files changed their position in config->actions_file[].
+ * Update mingw32 kludge accordingly.
+ *
+ * Revision 1.83 2008/12/20 14:53:55 fabiankeil
+ * Add config option socket-timeout to control the time
+ * Privoxy waits for data to arrive on a socket. Useful
+ * in case of stale ssh tunnels or when fuzz-testing.
+ *
+ * Revision 1.82 2008/11/16 12:43:49 fabiankeil
+ * Turn keep-alive support into a runtime feature
+ * that is disabled by setting keep-alive-timeout
+ * to a negative value.
+ *
+ * Revision 1.81 2008/11/13 09:08:42 fabiankeil
+ * Add new config option: keep-alive-timeout.
+ *
+ * Revision 1.80 2008/08/31 15:59:03 fabiankeil
+ * There's no reason to let remote toggling support depend
+ * on FEATURE_CGI_EDIT_ACTIONS, so make sure it doesn't.
+ *
+ * Revision 1.79 2008/08/30 12:03:07 fabiankeil
+ * Remove FEATURE_COOKIE_JAR.
+ *
+ * Revision 1.78 2008/08/02 08:23:22 fabiankeil
+ * If the enforce-blocks directive is used with FEATURE_FORCE_LOAD
+ * disabled, log a message that blocks will always be enforced
+ * instead of complaining about an unrecognized directive.
+ * Reported by Pietro Leone.
+ *
+ * Revision 1.77 2008/05/26 16:13:22 fabiankeil
+ * Reuse directive_hash and don't hash the same directive twice.
+ *
+ * Revision 1.76 2008/05/10 09:03:16 fabiankeil
+ * - Merge three string_append() calls.
+ * - Remove useless assertion.
+ *
+ * Revision 1.75 2008/03/30 14:52:05 fabiankeil
+ * Rename load_actions_file() and load_re_filterfile()
+ * as they load multiple files "now".
+ *
+ * Revision 1.74 2008/03/26 18:07:07 fabiankeil
+ * Add hostname directive. Closes PR#1918189.
+ *
+ * Revision 1.73 2008/02/16 16:54:51 fabiankeil
+ * Fix typo.
+ *
+ * Revision 1.72 2008/02/03 13:46:15 fabiankeil
+ * Add SOCKS5 support. Patch #1862863 by Eric M. Hopper with minor changes.
+ *
* Revision 1.71 2007/12/23 15:24:56 fabiankeil
* Reword "unrecognized directive" warning, use better
* mark up and add a
. Fixes parts of #1856559.
@@ -475,6 +535,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.71 2007/12/23 15:24:56 fabiankeil
#include "encode.h"
#include "urlmatch.h"
#include "cgi.h"
+#include "gateway.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
@@ -537,13 +598,15 @@ static struct file_list *current_configfile = NULL;
#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */
#define hash_forward_socks5 3963965522ul /* "forward-socks5" */
#define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */
-#define hash_jarfile 2046641ul /* "jarfile" */
+#define hash_hostname 10308071ul /* "hostname" */
+#define hash_keep_alive_timeout 3878599515ul /* "keep-alive-timeout" */
#define hash_listen_address 1255650842ul /* "listen-address" */
#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_single_threaded 4250084780ul /* "single-threaded" */
+#define hash_socket_timeout 1809001761ul /* "socket-timeout" */
#define hash_split_large_cgi_forms 671658948ul /* "split-large-cgi-forms" */
#define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */
#define hash_templdir 11067889ul /* "templdir" */
@@ -607,17 +670,10 @@ static void unload_configfile (void * data)
}
config->forward = NULL;
-#ifdef FEATURE_COOKIE_JAR
- if ( NULL != config->jar )
- {
- fclose( config->jar );
- config->jar = NULL;
- }
-#endif /* def FEATURE_COOKIE_JAR */
-
freez(config->confdir);
freez(config->logdir);
freez(config->templdir);
+ freez(config->hostname);
freez(config->haddr);
freez(config->logfile);
@@ -635,10 +691,6 @@ static void unload_configfile (void * data)
freez(config->proxy_args);
freez(config->usermanual);
-#ifdef FEATURE_COOKIE_JAR
- freez(config->jarfile);
-#endif /* def FEATURE_COOKIE_JAR */
-
#ifdef FEATURE_TRUST
freez(config->trustfile);
list_remove_all(config->trust_info);
@@ -702,6 +754,9 @@ struct configuration_spec * load_config(void)
unsigned long linenum = 0;
int i;
char *logfile = NULL;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+#endif
if ( !check_file_changed(current_configfile, configfile, &fs))
{
@@ -753,6 +808,7 @@ struct configuration_spec * load_config(void)
config->usermanual = strdup(USER_MANUAL_URL);
config->proxy_args = strdup("");
config->forwarded_connect_retries = 0;
+ config->socket_timeout = 300; /* XXX: Should be a macro. */
config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE;
config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;
@@ -992,7 +1048,7 @@ struct configuration_spec * load_config(void)
/* *************************************************************************
* enable-remote-toggle 0|1
* *************************************************************************/
-#ifdef FEATURE_CGI_EDIT_ACTIONS
+#ifdef FEATURE_TOGGLE
case hash_enable_remote_toggle:
if ((*arg != '\0') && (0 != atoi(arg)))
{
@@ -1003,7 +1059,7 @@ struct configuration_spec * load_config(void)
config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE;
}
continue;
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
+#endif /* def FEATURE_TOGGLE */
/* *************************************************************************
* enable-remote-http-toggle 0|1
@@ -1020,10 +1076,10 @@ struct configuration_spec * load_config(void)
continue;
/* *************************************************************************
- * hash_enforce_blocks 0|1
+ * enforce-blocks 0|1
* *************************************************************************/
-#ifdef FEATURE_FORCE_LOAD
case hash_enforce_blocks:
+#ifdef FEATURE_FORCE_LOAD
if ((*arg != '\0') && (0 != atoi(arg)))
{
config->feature_flags |= RUNTIME_FEATURE_ENFORCE_BLOCKS;
@@ -1032,8 +1088,11 @@ struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_ENFORCE_BLOCKS;
}
- continue;
+#else
+ log_error(LOG_LEVEL_ERROR, "Ignoring directive 'enforce-blocks'. "
+ "FEATURE_FORCE_LOAD is disabled, blocks will always be enforced.");
#endif /* def FEATURE_FORCE_LOAD */
+ continue;
/* *************************************************************************
* filterfile file-name
@@ -1295,15 +1354,37 @@ struct configuration_spec * load_config(void)
continue;
/* *************************************************************************
- * jarfile jar-file-name
- * In logdir by default
+ * hostname hostname-to-show-on-cgi-pages
* *************************************************************************/
-#ifdef FEATURE_COOKIE_JAR
- case hash_jarfile :
- freez(config->jarfile);
- config->jarfile = make_path(config->logdir, arg);
+ case hash_hostname :
+ freez(config->hostname);
+ config->hostname = strdup(arg);
+ if (NULL == config->hostname)
+ {
+ log_error(LOG_LEVEL_FATAL, "Out of memory saving hostname.");
+ }
+ continue;
+
+/* *************************************************************************
+ * keep-alive-timeout timeout
+ * *************************************************************************/
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ case hash_keep_alive_timeout :
+ if (*arg != '\0')
+ {
+ int timeout = atoi(arg);
+ if (0 <= timeout)
+ {
+ config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ keep_alive_timeout = timeout;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ }
+ }
continue;
-#endif /* def FEATURE_COOKIE_JAR */
+#endif
/* *************************************************************************
* listen-address [ip][:port]
@@ -1427,6 +1508,25 @@ struct configuration_spec * load_config(void)
config->multi_threaded = 0;
continue;
+/* *************************************************************************
+ * socket-timeout numer_of_seconds
+ * *************************************************************************/
+ case hash_socket_timeout :
+ if (*arg != '\0')
+ {
+ int socket_timeout = atoi(arg);
+ if (0 < socket_timeout)
+ {
+ config->socket_timeout = socket_timeout;
+ }
+ else
+ {
+ log_error(LOG_LEVEL_FATAL,
+ "Invalid socket-timeout: '%s'", arg);
+ }
+ }
+ continue;
+
/* *************************************************************************
* split-large-cgi-forms
* *************************************************************************/
@@ -1579,11 +1679,10 @@ struct configuration_spec * load_config(void)
#endif /* ndef FEATURE_ACL */
#ifndef FEATURE_CGI_EDIT_ACTIONS
case hash_enable_edit_actions:
+#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */
+#ifndef FEATURE_TOGGLE
case hash_enable_remote_toggle:
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
-#ifndef FEATURE_COOKIE_JAR
- case hash_jarfile :
-#endif /* ndef FEATURE_COOKIE_JAR */
+#endif /* ndef FEATURE_TOGGLE */
#ifndef FEATURE_ACL
case hash_permit_access:
#endif /* ndef FEATURE_ACL */
@@ -1623,7 +1722,7 @@ struct configuration_spec * load_config(void)
* to LOG_LEVEL_FATAL.
*/
log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu "
- "in configuration file (%s).", buf, hash_string(cmd), linenum, configfile);
+ "in configuration file (%s).", buf, directive_hash, linenum, configfile);
string_append(&config->proxy_args,
" Warning: ignored unrecognized directive above.
");
continue;
@@ -1651,6 +1750,28 @@ struct configuration_spec * load_config(void)
}
}
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
+ {
+ if (config->multi_threaded)
+ {
+ set_keep_alive_timeout(keep_alive_timeout);
+ }
+ else
+ {
+ /*
+ * While we could use keep-alive without multiple threads
+ * if we didn't bother with enforcing the connection timeout,
+ * that might make Tor users sad, even though they shouldn't
+ * enable the single-threaded option anyway.
+ */
+ config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ log_error(LOG_LEVEL_ERROR,
+ "Config option single-threaded disables connection keep-alive.");
+ }
+ }
+#endif
+
if (NULL == config->proxy_args)
{
log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
@@ -1658,12 +1779,12 @@ struct configuration_spec * load_config(void)
if (config->actions_file[0])
{
- add_loader(load_actions_file, config);
+ add_loader(load_action_files, config);
}
- if (config->re_filterfile)
+ if (config->re_filterfile[0])
{
- add_loader(load_re_filterfile, config);
+ add_loader(load_re_filterfiles, config);
}
#ifdef FEATURE_TRUST
@@ -1673,18 +1794,6 @@ struct configuration_spec * load_config(void)
}
#endif /* def FEATURE_TRUST */
-#ifdef FEATURE_COOKIE_JAR
- if ( NULL != config->jarfile )
- {
- if ( NULL == (config->jar = fopen(config->jarfile, "a")) )
- {
- log_error(LOG_LEVEL_FATAL, "can't open jarfile '%s': %E", config->jarfile);
- /* Never get here - LOG_LEVEL_FATAL causes program exit */
- }
- setbuf(config->jar, NULL);
- }
-#endif /* def FEATURE_COOKIE_JAR */
-
if ( NULL == config->haddr )
{
config->haddr = strdup( HADDR_DEFAULT );
@@ -1736,7 +1845,7 @@ struct configuration_spec * load_config(void)
/* FIXME: this is a kludge for win32 */
#if defined(_WIN32) && !defined (_WIN_CONSOLE)
- g_default_actions_file = config->actions_file[1]; /* FIXME Hope this is default.action */
+ g_default_actions_file = config->actions_file[1]; /* FIXME Hope this is default.action */
g_user_actions_file = config->actions_file[2]; /* FIXME Hope this is user.action */
g_re_filterfile = config->re_filterfile[0]; /* FIXME Hope this is default.filter */
@@ -1818,12 +1927,11 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
char * s;
assert(command);
- assert(*command);
assert(argument);
/*
* Add config option name embedded in
- * link to it's section in the user-manual
+ * link to its section in the user-manual
*/
buf = strdup("\nusermanual, "file://", 7) ||
@@ -1833,9 +1941,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
}
else
{
- string_append(&buf, "http://");
- string_append(&buf, CGI_SITE_2_HOST);
- string_append(&buf, "/user-manual/");
+ string_append(&buf, "http://" CGI_SITE_2_HOST "/user-manual/");
}
string_append(&buf, CONFIG_HELP_PREFIX);
string_join (&buf, string_toupper(command));