X-Git-Url: http://www.privoxy.org/gitweb/ijbfaq.html?a=blobdiff_plain;f=loadcfg.c;h=61ba3a7705a0e81caa2c499c54c74cbb36fcdfe6;hb=b0910920969e4466e90dca9ed953dd1c7e5631fd;hp=9d39f442158a28219082e7355ddcbf318e4124fe;hpb=e7f33c16b512f119f65800e85ba0beecfd3a1545;p=privoxy.git
diff --git a/loadcfg.c b/loadcfg.c
index 9d39f442..61ba3a77 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.27 2001/11/07 00:02:13 steudten 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,8 +8,8 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.27 2001/11/07 00:02:13 steudten E
* routine to load the configuration and the global
* variables it writes to.
*
- * Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@ -35,6 +35,266 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.27 2001/11/07 00:02:13 steudten E
*
* 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.
+ *
+ * Revision 1.70 2007/12/15 14:24:05 fabiankeil
+ * Plug memory leak if listen-address only specifies the port.
+ *
+ * Revision 1.69 2007/10/27 13:02:27 fabiankeil
+ * Relocate daemon-mode-related log messages to make sure
+ * they aren't shown again in case of configuration reloads.
+ *
+ * Revision 1.68 2007/10/19 16:32:34 fabiankeil
+ * Plug memory leak introduced with my last commit.
+ *
+ * Revision 1.67 2007/10/14 14:12:41 fabiankeil
+ * When in daemon mode, close stderr after the configuration file has been
+ * parsed the first time. If logfile isn't set, stop logging. Fixes BR#897436.
+ *
+ * Revision 1.66 2007/08/05 14:02:09 fabiankeil
+ * #1763173 from Stefan Huehner: declare unload_configfile() static.
+ *
+ * Revision 1.65 2007/07/21 11:51:36 fabiankeil
+ * As Hal noticed, checking dispatch_cgi() as the last cruncher
+ * looks like a bug if CGI requests are blocked unintentionally,
+ * so don't do it unless the user enabled the new config option
+ * "allow-cgi-request-crunching".
+ *
+ * Revision 1.64 2007/05/21 10:44:08 fabiankeil
+ * - Use strlcpy() instead of strcpy().
+ * - Stop treating actions files special. Expect a complete file name
+ * (with or without path) like it's done for the rest of the files.
+ * Closes FR#588084.
+ * - Remove an unnecessary temporary memory allocation.
+ * - Don't log anything to the console when running as
+ * daemon and no errors occurred.
+ *
+ * Revision 1.63 2007/04/09 18:11:36 fabiankeil
+ * Don't mistake VC++'s _snprintf() for a snprintf() replacement.
+ *
+ * Revision 1.62 2007/03/17 15:20:05 fabiankeil
+ * New config option: enforce-blocks.
+ *
+ * Revision 1.61 2007/03/16 16:47:35 fabiankeil
+ * - Mention other reasons why acl directive loading might have failed.
+ * - Don't log the acl source if the acl destination is to blame.
+ *
+ * Revision 1.60 2007/01/27 13:09:16 fabiankeil
+ * Add new config option "templdir" to
+ * change the templates directory.
+ *
+ * Revision 1.59 2006/12/31 17:56:38 fabiankeil
+ * Added config option accept-intercepted-requests
+ * and disabled it by default.
+ *
+ * Revision 1.58 2006/12/31 14:24:29 fabiankeil
+ * Fix gcc43 compiler warnings.
+ *
+ * Revision 1.57 2006/12/21 12:57:48 fabiankeil
+ * Add config option "split-large-forms"
+ * to work around the browser bug reported
+ * in BR #1570678.
+ *
+ * Revision 1.56 2006/12/17 17:04:51 fabiankeil
+ * Move the
in the generated HTML for the config
+ * options from the beginning of the string to its end.
+ * Keeps the white space in balance.
+ *
+ * Revision 1.55 2006/11/28 15:31:52 fabiankeil
+ * Fix memory leak in case of config file reloads.
+ *
+ * Revision 1.54 2006/10/21 16:04:22 fabiankeil
+ * Modified kludge for win32 to make ming32 menu
+ * "Options/Edit Filters" (sort of) work again.
+ * Same limitations as for the action files apply.
+ * Fixes BR 1567373.
+ *
+ * Revision 1.53 2006/09/06 18:45:03 fabiankeil
+ * Incorporate modified version of Roland Rosenfeld's patch to
+ * optionally access the user-manual via Privoxy. Closes patch 679075.
+ *
+ * Formatting changed to Privoxy style, added call to
+ * cgi_error_no_template if the requested file doesn't
+ * exist and modified check whether or not Privoxy itself
+ * should serve the manual. Should work cross-platform now.
+ *
+ * Revision 1.52 2006/09/06 10:43:32 fabiankeil
+ * Added config option enable-remote-http-toggle
+ * to specify if Privoxy should recognize special
+ * headers (currently only X-Filter) to change its
+ * behaviour. Disabled by default.
+ *
+ * Revision 1.51 2006/09/06 09:23:37 fabiankeil
+ * Make number of retries in case of forwarded-connect problems
+ * a config file option (forwarded-connect-retries) and use 0 as
+ * default.
+ *
+ * Revision 1.50 2006/07/18 14:48:46 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
+ * Revision 1.48.2.7 2006/02/02 17:29:16 david__schmidt
+ * Don't forget to malloc space for the null terminator...
+ *
+ * Revision 1.48.2.6 2006/01/29 23:10:56 david__schmidt
+ * Multiple filter file support
+ *
+ * Revision 1.48.2.5 2003/05/08 15:17:25 oes
+ * Closed two memory leaks; hopefully the last remaining ones
+ * (in the main execution paths, anyway).
+ *
+ * Revision 1.48.2.4 2003/04/11 12:06:14 oes
+ * Addressed bug #719435
+ * - Extraneous filterfile directives now logged as errors
+ * - This and unrecnonised directives now really obvious on status page
+ *
+ * Revision 1.48.2.3 2003/03/11 11:53:59 oes
+ * Cosmetic: Renamed cryptic variable
+ *
+ * Revision 1.48.2.2 2002/11/12 16:28:20 oes
+ * Move unrelated variable declaration out of #ifdef FEATURE_ACL; fixes bug #636655
+ *
+ * Revision 1.48.2.1 2002/08/21 17:58:05 oes
+ * Temp kludge to let user and default action file be edited through win32 GUI (FR 592080)
+ *
+ * Revision 1.48 2002/05/14 21:30:38 oes
+ * savearg now uses own linking code instead of (now special-cased) add_help_link
+ *
+ * Revision 1.47 2002/05/12 21:36:29 jongfoster
+ * Correcting function comments
+ *
+ * Revision 1.46 2002/04/26 12:55:14 oes
+ * - New option "user-manual", defaults to our site
+ * via project.h #define
+ * - savearg now embeds option names in help links
+ *
+ * Revision 1.45 2002/04/24 02:11:54 oes
+ * Jon's multiple AF patch: Allow up to MAX_AF_FILES actionsfile options
+ *
+ * Revision 1.44 2002/04/08 20:37:13 swa
+ * fixed JB spelling
+ *
+ * Revision 1.43 2002/04/08 20:36:50 swa
+ * fixed JB spelling
+ *
+ * Revision 1.42 2002/04/05 15:50:15 oes
+ * fix for invalid HTML proxy_args
+ *
+ * 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()
+ *
+ * Revision 1.29 2002/01/17 21:02:30 jongfoster
+ * Moving all our URL and URL pattern parsing code to urlmatch.c.
+ *
+ * Renaming free_url to free_url_spec, since it frees a struct url_spec.
+ *
+ * Revision 1.28 2001/12/30 14:07:32 steudten
+ * - Add signal handling (unix)
+ * - Add SIGHUP handler (unix)
+ * - Add creation of pidfile (unix)
+ * - Add action 'top' in rc file (RH)
+ * - Add entry 'SIGNALS' to manpage
+ * - Add exit message to logfile (unix)
+ *
* Revision 1.27 2001/11/07 00:02:13 steudten
* Add line number in error output for lineparsing for
* actionsfile and configfile.
@@ -238,9 +498,13 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.27 2001/11/07 00:02:13 steudten E
#include
#include
#include
+#include
#ifdef _WIN32
+# ifndef STRICT
+# define STRICT
+# endif
# include
# include "win32.h"
@@ -248,9 +512,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.27 2001/11/07 00:02:13 steudten E
# include "w32log.h"
# endif /* ndef _WIN_CONSOLE */
-/* VC++ has "_snprintf", not "snprintf" */
-#define snprintf _snprintf
-
#else /* ifndef _WIN32 */
#ifndef __OS2__
@@ -272,6 +533,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.27 2001/11/07 00:02:13 steudten E
#include "errlog.h"
#include "ssplit.h"
#include "encode.h"
+#include "urlmatch.h"
+#include "cgi.h"
+#include "gateway.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
@@ -287,8 +551,8 @@ const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
#define ijb_tolower(__X) tolower((int)(unsigned char)(__X))
#ifdef FEATURE_TOGGLE
-/* by haroon - indicates if ijb is enabled */
-int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */
+/* Privoxy is enabled by default. */
+int global_toggle_state = 1;
#endif /* def FEATURE_TOGGLE */
/* The filename of the configfile */
@@ -316,43 +580,53 @@ static struct file_list *current_configfile = NULL;
* console and GUI specific options last).
*/
-#define hash_actions_file 1196306641ul /* "actionsfile" */
-#define hash_admin_address 4112573064ul /* "admin-address" */
-#define hash_buffer_limit 1881726070ul /* "buffer-limit */
-#define hash_confdir 1978389ul /* "confdir" */
-#define hash_debug 78263ul /* "debug" */
-#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_forward 2029845ul /* "forward" */
-#define hash_forward_socks4 3963965521ul /* "forward-socks4" */
-#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */
-#define hash_jarfile 2046641ul /* "jarfile" */
-#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_re_filterfile 3877522444ul /* "re_filterfile" */
-#define hash_single_threaded 4250084780ul /* "single-threaded" */
-#define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */
-#define hash_toggle 447966ul /* "toggle" */
-#define hash_trust_info_url 430331967ul /* "trust-info-url" */
-#define hash_trustfile 56494766ul /* "trustfile" */
-
-#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" */
-#define hash_log_highlight_messages 4032101240ul /* "log-highlight-messages" */
-#define hash_log_max_lines 2868344173ul /* "log-max-lines" */
-#define hash_log_messages 2291744899ul /* "log-messages" */
-#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
-
-
-static void savearg(char *c, char *o, struct configuration_spec * config);
+#define hash_actions_file 1196306641ul /* "actionsfile" */
+#define hash_accept_intercepted_requests 1513024973ul /* "accept-intercepted-requests" */
+#define hash_admin_address 4112573064ul /* "admin-address" */
+#define hash_allow_cgi_request_crunching 258915987ul /* "allow-cgi-request-crunching" */
+#define hash_buffer_limit 1881726070ul /* "buffer-limit */
+#define hash_confdir 1978389ul /* "confdir" */
+#define hash_debug 78263ul /* "debug" */
+#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_enable_remote_http_toggle 110543988ul /* "enable-remote-http-toggle" */
+#define hash_enforce_blocks 1862427469ul /* "enforce-blocks" */
+#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_forward_socks5 3963965522ul /* "forward-socks5" */
+#define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */
+#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" */
+#define hash_toggle 447966ul /* "toggle" */
+#define hash_trust_info_url 430331967ul /* "trust-info-url" */
+#define hash_trustfile 56494766ul /* "trustfile" */
+#define hash_usermanual 1416668518ul /* "user-manual" */
+#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" */
+#define hash_log_highlight_messages 4032101240ul /* "log-highlight-messages" */
+#define hash_log_max_lines 2868344173ul /* "log-max-lines" */
+#define hash_log_messages 2291744899ul /* "log-messages" */
+#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
+
+
+static void savearg(char *command, char *argument, struct configuration_spec * config);
/*********************************************************************
*
@@ -366,10 +640,12 @@ static void savearg(char *c, char *o, struct configuration_spec * config);
* Returns : N/A
*
*********************************************************************/
-void unload_configfile (void * data)
+static void unload_configfile (void * data)
{
struct configuration_spec * config = (struct configuration_spec *)data;
struct forward_spec *cur_fwd = config->forward;
+ int i;
+
#ifdef FEATURE_ACL
struct access_control_list *cur_acl = config->acl;
@@ -385,7 +661,7 @@ void unload_configfile (void * data)
while (cur_fwd != NULL)
{
struct forward_spec * next_fwd = cur_fwd->next;
- free_url(cur_fwd->url);
+ free_url_spec(cur_fwd->url);
freez(cur_fwd->gateway_host);
freez(cur_fwd->forward_host);
@@ -394,32 +670,63 @@ 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);
- freez(config->actions_file);
+ for (i = 0; i < MAX_AF_FILES; i++)
+ {
+ freez(config->actions_file_short[i]);
+ freez(config->actions_file[i]);
+ freez(config->re_filterfile_short[i]);
+ freez(config->re_filterfile[i]);
+ }
+
freez(config->admin_address);
freez(config->proxy_info_url);
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);
+#endif /* def FEATURE_TRUST */
- freez(config->re_filterfile);
+ for (i = 0; i < MAX_AF_FILES; i++)
+ {
+ freez(config->re_filterfile[i]);
+ }
+ freez(config);
+}
+
+
+#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
/*********************************************************************
@@ -428,11 +735,12 @@ void unload_configfile (void * data)
*
* Description : Load the config file and all parameters.
*
- * Parameters :
- * 1 : csp = Client state (the config member will be
- * filled in by this function).
+ * XXX: more than thousand lines long
+ * and thus in serious need of refactoring.
+ *
+ * Parameters : None
*
- * Returns : 0 => Ok, everything else is an error.
+ * Returns : The configuration_spec, or NULL on error.
*
*********************************************************************/
struct configuration_spec * load_config(void)
@@ -444,8 +752,12 @@ struct configuration_spec * load_config(void)
struct client_state * fake_csp;
struct file_list *fs;
unsigned long linenum = 0;
+ int i;
+ char *logfile = NULL;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+#endif
- DBG(1, ("load_config() entered..\n") );
if ( !check_file_changed(current_configfile, configfile, &fs))
{
/* No need to load */
@@ -457,12 +769,13 @@ struct configuration_spec * load_config(void)
configfile);
}
- /*
- log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile);
- */
+ if (NULL != current_configfile)
+ {
+ log_error(LOG_LEVEL_INFO, "Reloading configuration file '%s'", configfile);
+ }
#ifdef FEATURE_TOGGLE
- g_bToggleIJB = 1;
+ global_toggle_state = 1;
#endif /* def FEATURE_TOGGLE */
fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config));
@@ -489,10 +802,16 @@ struct configuration_spec * load_config(void)
/*
* Set to defaults
*/
-
- config->multi_threaded = 1;
- config->hport = HADDR_PORT;
- config->buffer_limit = 4096 * 1024;
+ config->multi_threaded = 1;
+ config->hport = HADDR_PORT;
+ config->buffer_limit = 4096 * 1024;
+ 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;
if ((configfp = fopen(configfile, "r")) == NULL)
{
@@ -512,8 +831,9 @@ struct configuration_spec * load_config(void)
struct forward_spec *cur_fwd;
int vec_count;
char *vec[3];
+ unsigned long directive_hash;
- strcpy(tmp, buf);
+ strlcpy(tmp, buf, sizeof(tmp));
/* Copy command (i.e. up to space or tab) into cmd */
p = buf;
@@ -531,7 +851,7 @@ struct configuration_spec * load_config(void)
}
/* Copy the argument into arg */
- strcpy(arg, p);
+ strlcpy(arg, p, sizeof(arg));
/* Should never happen, but check this anyway */
if (*cmd == '\0')
@@ -544,59 +864,99 @@ struct configuration_spec * load_config(void)
{
if (ijb_isupper(*p))
{
- *p = ijb_tolower(*p);
+ *p = (char)ijb_tolower(*p);
}
}
/* Save the argument for show-proxy-args */
savearg(cmd, arg, config);
-
- switch( hash_string( cmd ) )
+ directive_hash = hash_string(cmd);
+ switch (directive_hash)
{
-/****************************************************************************
+/* *************************************************************************
* actionsfile actions-file-name
* In confdir by default
- ****************************************************************************/
+ * *************************************************************************/
case hash_actions_file :
- freez(config->actions_file);
- config->actions_file = make_path(config->confdir, arg);
+ i = 0;
+ while ((i < MAX_AF_FILES) && (NULL != config->actions_file[i]))
+ {
+ i++;
+ }
+
+ if (i >= MAX_AF_FILES)
+ {
+ log_error(LOG_LEVEL_FATAL, "Too many 'actionsfile' directives in config file - limit is %d.\n"
+ "(You can increase this limit by changing MAX_AF_FILES in project.h and recompiling).",
+ MAX_AF_FILES);
+ }
+ config->actions_file_short[i] = strdup(arg);
+ config->actions_file[i] = make_path(config->confdir, arg);
+
+ continue;
+/* *************************************************************************
+ * accept-intercepted-requests
+ * *************************************************************************/
+ case hash_accept_intercepted_requests:
+ if ((*arg != '\0') && (0 != atoi(arg)))
+ {
+ config->feature_flags |= RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;
+ }
continue;
-/****************************************************************************
+/* *************************************************************************
* admin-address email-address
- ****************************************************************************/
+ * *************************************************************************/
case hash_admin_address :
freez(config->admin_address);
config->admin_address = strdup(arg);
continue;
-/****************************************************************************
+/* *************************************************************************
+ * allow-cgi-request-crunching
+ * *************************************************************************/
+ case hash_allow_cgi_request_crunching:
+ if ((*arg != '\0') && (0 != atoi(arg)))
+ {
+ config->feature_flags |= RUNTIME_FEATURE_CGI_CRUNCHING;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_CGI_CRUNCHING;
+ }
+ continue;
+
+/* *************************************************************************
* buffer-limit n
- ****************************************************************************/
+ * *************************************************************************/
case hash_buffer_limit :
- config->buffer_limit = (size_t) 1024 * atoi(arg);
+ 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);
@@ -605,7 +965,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 = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"deny-access directive in configuration file.
\n");
continue;
@@ -624,14 +984,14 @@ struct configuration_spec * load_config(void)
if (acl_addr(vec[0], cur_acl->src) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid source IP for deny-access "
- "directive in configuration file: \"%s\"", vec[0]);
- config->proxy_args = strsav( config->proxy_args,
- "
\nWARNING: Invalid source IP for deny-access directive"
- " in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ log_error(LOG_LEVEL_ERROR, "Invalid source address, port or netmask "
+ "for deny-access directive in configuration file: \"%s\"", vec[0]);
+ string_append(&config->proxy_args,
+ "
\nWARNING: Invalid source address, port or netmask "
+ "for deny-access directive in configuration file: \"");
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
continue;
@@ -640,14 +1000,14 @@ struct configuration_spec * load_config(void)
{
if (acl_addr(vec[1], cur_acl->dst) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid destination IP for deny-access "
- "directive in configuration file: \"%s\"", vec[0]);
- config->proxy_args = strsav( config->proxy_args,
- "
\nWARNING: Invalid destination IP for deny-access directive"
- " in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
- vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ log_error(LOG_LEVEL_ERROR, "Invalid destination address, port or netmask "
+ "for deny-access directive in configuration file: \"%s\"", vec[1]);
+ string_append(&config->proxy_args,
+ "
\nWARNING: Invalid destination address, port or netmask "
+ "for deny-access directive in configuration file: \"");
+ string_append(&config->proxy_args,
+ vec[1]);
+ string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
continue;
@@ -669,9 +1029,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)))
@@ -685,10 +1045,10 @@ struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_CGI_EDIT_ACTIONS */
-/****************************************************************************
+/* *************************************************************************
* enable-remote-toggle 0|1
- ****************************************************************************/
-#ifdef FEATURE_CGI_EDIT_ACTIONS
+ * *************************************************************************/
+#ifdef FEATURE_TOGGLE
case hash_enable_remote_toggle:
if ((*arg != '\0') && (0 != atoi(arg)))
{
@@ -699,11 +1059,66 @@ 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
+ * *************************************************************************/
+ case hash_enable_remote_http_toggle:
+ if ((*arg != '\0') && (0 != atoi(arg)))
+ {
+ config->feature_flags |= RUNTIME_FEATURE_HTTP_TOGGLE;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_HTTP_TOGGLE;
+ }
+ continue;
+
+/* *************************************************************************
+ * enforce-blocks 0|1
+ * *************************************************************************/
+ case hash_enforce_blocks:
+#ifdef FEATURE_FORCE_LOAD
+ if ((*arg != '\0') && (0 != atoi(arg)))
+ {
+ config->feature_flags |= RUNTIME_FEATURE_ENFORCE_BLOCKS;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_ENFORCE_BLOCKS;
+ }
+#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
+ * In confdir by default.
+ * *************************************************************************/
+ case hash_filterfile :
+ i = 0;
+ while ((i < MAX_AF_FILES) && (NULL != config->re_filterfile[i]))
+ {
+ i++;
+ }
-/****************************************************************************
+ if (i >= MAX_AF_FILES)
+ {
+ log_error(LOG_LEVEL_FATAL, "Too many 'filterfile' directives in config file - limit is %d.\n"
+ "(You can increase this limit by changing MAX_AF_FILES in project.h and recompiling).",
+ MAX_AF_FILES);
+ }
+ config->re_filterfile_short[i] = strdup(arg);
+ config->re_filterfile[i] = make_path(config->confdir, arg);
+
+ continue;
+
+/* *************************************************************************
* forward url-pattern (.|http-proxy-host[:port])
- ****************************************************************************/
+ * *************************************************************************/
case hash_forward:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
@@ -711,7 +1126,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 = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"forward directive in configuration file.");
continue;
@@ -733,7 +1148,7 @@ struct configuration_spec * load_config(void)
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward "
"directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward directive in configuration file.");
continue;
@@ -746,7 +1161,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);
@@ -764,9 +1179,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);
@@ -774,7 +1189,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 = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"forward-socks4 directive in configuration file.");
continue;
@@ -796,7 +1211,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 = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward-socks4 directive in configuration file.");
continue;
@@ -809,7 +1224,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);
@@ -827,7 +1242,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);
@@ -845,17 +1260,18 @@ struct configuration_spec * load_config(void)
continue;
-/****************************************************************************
+/* *************************************************************************
* forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
- ****************************************************************************/
+ * *************************************************************************/
case hash_forward_socks4a:
+ case hash_forward_socks5:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
if (vec_count != 3)
{
log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
"forward-socks4a directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"forward-socks4a directive in configuration file.");
continue;
@@ -870,14 +1286,21 @@ struct configuration_spec * load_config(void)
continue;
}
- cur_fwd->type = SOCKS_4A;
+ if (directive_hash == hash_forward_socks4a)
+ {
+ cur_fwd->type = SOCKS_4A;
+ }
+ else
+ {
+ cur_fwd->type = SOCKS_5;
+ }
/* Save the URL pattern */
if (create_url_spec(cur_fwd->url, vec[0]))
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4a "
"directive in configuration file.");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward-socks4a directive in configuration file.");
continue;
@@ -888,7 +1311,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);
@@ -905,7 +1328,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);
@@ -923,45 +1346,80 @@ 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);
- config->jarfile = make_path(config->logdir, arg);
+/* *************************************************************************
+ * forwarded-connect-retries n
+ * *************************************************************************/
+ case hash_forwarded_connect_retries :
+ config->forwarded_connect_retries = atoi(arg);
+ continue;
+
+/* *************************************************************************
+ * hostname hostname-to-show-on-cgi-pages
+ * *************************************************************************/
+ 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]
- ****************************************************************************/
+ * *************************************************************************/
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);
+ if (!no_daemon)
+ {
+ logfile = make_path(config->logdir, arg);
+ if (NULL == logfile)
+ {
+ log_error(LOG_LEVEL_FATAL, "Out of memory while creating logfile path");
+ }
+ }
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);
@@ -970,7 +1428,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 = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"permit-access directive in configuration file.
\n");
@@ -990,14 +1448,14 @@ struct configuration_spec * load_config(void)
if (acl_addr(vec[0], cur_acl->src) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid source IP for permit-access "
- "directive in configuration file: \"%s\"", vec[0]);
- config->proxy_args = strsav( config->proxy_args,
- "
\nWARNING: Invalid source IP for permit-access directive"
- " in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ log_error(LOG_LEVEL_ERROR, "Invalid source address, port or netmask "
+ "for permit-access directive in configuration file: \"%s\"", vec[0]);
+ string_append(&config->proxy_args,
+ "
\nWARNING: Invalid source address, port or netmask for "
+ "permit-access directive in configuration file: \"");
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
continue;
@@ -1006,15 +1464,14 @@ struct configuration_spec * load_config(void)
{
if (acl_addr(vec[1], cur_acl->dst) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid destination IP for "
- "permit-access directive in configuration file: \"%s\"",
- vec[0]);
- config->proxy_args = strsav( config->proxy_args,
- "
\nWARNING: Invalid destination IP for permit-access directive"
- " in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
- vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ log_error(LOG_LEVEL_ERROR, "Invalid destination address, port or netmask "
+ "for permit-access directive in configuration file: \"%s\"", vec[1]);
+ string_append(&config->proxy_args,
+ "
\nWARNING: Invalid destination address, port or netmask for "
+ "permit-access directive in configuration file: \"");
+ string_append(&config->proxy_args,
+ vec[1]);
+ string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
continue;
@@ -1036,52 +1493,84 @@ 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 :
- freez(config->re_filterfile);
- config->re_filterfile = make_path(config->confdir, arg);
- continue;
-
-/****************************************************************************
+/* *************************************************************************
* single-threaded
- ****************************************************************************/
+ * *************************************************************************/
case hash_single_threaded :
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
+ * *************************************************************************/
+ case hash_split_large_cgi_forms :
+ if ((*arg != '\0') && (0 != atoi(arg)))
+ {
+ config->feature_flags |= RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
+ }
+ continue;
+
+/* *************************************************************************
+ * templdir directory-name
+ * *************************************************************************/
+ case hash_templdir :
+ freez(config->templdir);
+ config->templdir = make_path(NULL, arg);
+ continue;
+
+/* *************************************************************************
* toggle (0|1)
- ****************************************************************************/
+ * *************************************************************************/
#ifdef FEATURE_TOGGLE
case hash_toggle :
- g_bToggleIJB = atoi(arg);
+ global_toggle_state = 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);
@@ -1089,14 +1578,21 @@ struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_TRUST */
+/* *************************************************************************
+ * usermanual url
+ * *************************************************************************/
+ case hash_usermanual :
+ freez(config->usermanual);
+ config->usermanual = strdup(arg);
+ continue;
-/****************************************************************************
+/* *************************************************************************
* Win32 Console options:
- ****************************************************************************/
+ * *************************************************************************/
-/****************************************************************************
+/* *************************************************************************
* hide-console
- ****************************************************************************/
+ * *************************************************************************/
#ifdef _WIN_CONSOLE
case hash_hide_console :
hideConsole = 1;
@@ -1104,70 +1600,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;
@@ -1175,19 +1671,18 @@ 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 */
#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 */
@@ -1218,40 +1713,78 @@ 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);
- */
- 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");
+ log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu "
+ "in configuration file (%s).", buf, directive_hash, linenum, configfile);
+ string_append(&config->proxy_args,
+ " Warning: ignored unrecognized directive above.
");
continue;
-/****************************************************************************/
+/* *************************************************************************/
} /* end switch( hash_string(cmd) ) */
} /* end while ( read_config_line(...) ) */
fclose(configfp);
- init_error_log(Argv[0], config->logfile, config->debug);
+ set_debug_level(config->debug);
+
+ freez(config->logfile);
+
+ if (!no_daemon)
+ {
+ if (NULL != logfile)
+ {
+ config->logfile = logfile;
+ init_error_log(Argv[0], config->logfile);
+ }
+ else
+ {
+ disable_logging();
+ }
+ }
+
+#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");
+ }
- if (config->actions_file)
+ 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
@@ -1261,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 );
@@ -1280,7 +1801,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)
@@ -1297,7 +1818,11 @@ struct configuration_spec * load_config(void)
}
if (*config->haddr == '\0')
{
- config->haddr = NULL;
+ /*
+ * Only the port specified. We stored it in config->hport
+ * and don't need its text representation anymore.
+ */
+ freez(config->haddr);
}
}
@@ -1320,8 +1845,9 @@ struct configuration_spec * load_config(void)
/* FIXME: this is a kludge for win32 */
#if defined(_WIN32) && !defined (_WIN_CONSOLE)
- g_actions_file = config->actions_file;
- g_re_filterfile = config->re_filterfile;
+ 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 */
#ifdef FEATURE_TRUST
g_trustfile = config->trustfile;
@@ -1372,7 +1898,6 @@ struct configuration_spec * load_config(void)
files->next = fs;
current_configfile = fs;
- MustReload = 0;
return (config);
}
@@ -1383,54 +1908,79 @@ struct configuration_spec * load_config(void)
* Function : savearg
*
* Description : Called from `load_config'. It saves each non-empty
- * and non-comment line from config into a list. This
- * list is used to create the show-proxy-args page.
+ * and non-comment line from config into
+ * config->proxy_args. This is used to create the
+ * show-proxy-args page. On error, frees
+ * config->proxy_args and sets it to NULL
*
* Parameters :
- * 1 : c = config setting that was found
- * 2 : o = the setting's argument (if any)
+ * 1 : command = config setting that was found
+ * 2 : argument = the setting's argument (if any)
+ * 3 : config = Configuration to save into.
*
* Returns : N/A
*
*********************************************************************/
-static void savearg(char *c, char *o, struct configuration_spec * config)
+static void savearg(char *command, char *argument, struct configuration_spec * config)
{
- char buf[BUFFER_SIZE];
+ char * buf;
+ char * s;
- *buf = '\0';
+ assert(command);
+ assert(argument);
- if ( ( NULL != c ) && ( '\0' != *c ) )
+ /*
+ * Add config option name embedded in
+ * link to its section in the user-manual
+ */
+ buf = strdup("\nusermanual, "file://", 7) ||
+ !strncmpic(config->usermanual, "http", 4))
{
- if ((c = html_encode(c)))
- {
- sprintf(buf, "%s ", c, c);
- }
- freez(c);
+ string_append(&buf, config->usermanual);
}
- if ( ( NULL != o ) && ( '\0' != *o ) )
+ else
{
- if ((o = html_encode(o)))
- {
- if (strncmpic(o, "http://", 7) == 0)
- {
- strcat(buf, "");
- strcat(buf, o);
- strcat(buf, "");
- }
- else
- {
- strcat(buf, o);
- }
- }
- freez(o);
+ string_append(&buf, "http://" CGI_SITE_2_HOST "/user-manual/");
}
+ string_append(&buf, CONFIG_HELP_PREFIX);
+ string_join (&buf, string_toupper(command));
+ string_append(&buf, "\">");
+ string_append(&buf, command);
+ string_append(&buf, " ");
- strcat(buf, "
\n");
+ if (NULL == buf)
+ {
+ freez(config->proxy_args);
+ return;
+ }
- config->proxy_args = strsav(config->proxy_args, buf);
+ if ( (NULL != argument) && ('\0' != *argument) )
+ {
+ s = html_encode(argument);
+ if (NULL == s)
+ {
+ freez(buf);
+ freez(config->proxy_args);
+ return;
+ }
+
+ if (strncmpic(argument, "http://", 7) == 0)
+ {
+ string_append(&buf, "");
+ string_join (&buf, s);
+ string_append(&buf, "");
+ }
+ else
+ {
+ string_join (&buf, s);
+ }
+ }
+ string_append(&buf, "
");
+ string_join(&config->proxy_args, buf);
}