X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=e8cdffee19e217f218ba2b4aaff6336263006899;hp=5a048cddc7f73085855ad254d8faf7fa96e1eedd;hb=d2170158936d131cf7ec7ce95795d6347ceb93f9;hpb=fb813d5783ba4d5607b74785ad94813d2eb186c9

diff --git a/loadcfg.c b/loadcfg.c
index 5a048cdd..e8cdffee 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.136 2013/03/01 17:39:05 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.144 2015/12/27 12:50:42 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.136 2013/03/01 17:39:05 fabiankei
  *                routine to load the configuration and the global
  *                variables it writes to.
  *
- * Copyright   :  Written by and Copyright (C) 2001-2009 the
+ * Copyright   :  Written by and Copyright (C) 2001-2016 the
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -157,6 +157,7 @@ static struct file_list *current_configfile = NULL;
 #define hash_split_large_cgi_forms        671658948U /* "split-large-cgi-forms" */
 #define hash_suppress_blocklists         1948693308U /* "suppress-blocklists" */
 #define hash_templdir                      11067889U /* "templdir" */
+#define hash_temporary_directory         1824125181U /* "temporary-directory" */
 #define hash_tolerate_pipelining         1360286620U /* "tolerate-pipelining" */
 #define hash_toggle                          447966U /* "toggle" */
 #define hash_trust_info_url               430331967U /* "trust-info-url" */
@@ -209,7 +210,7 @@ static void unload_configfile (void * data)
    while (cur_fwd != NULL)
    {
       struct forward_spec * next_fwd = cur_fwd->next;
-      free_url_spec(cur_fwd->url);
+      free_pattern_spec(cur_fwd->url);
 
       freez(cur_fwd->gateway_host);
       freez(cur_fwd->forward_host);
@@ -222,6 +223,9 @@ static void unload_configfile (void * data)
    freez(config->logdir);
    freez(config->templdir);
    freez(config->hostname);
+#ifdef FEATURE_EXTERNAL_FILTERS
+   freez(config->temporary_directory);
+#endif
 
    for (i = 0; i < MAX_LISTENING_SOCKETS; i++)
    {
@@ -277,6 +281,47 @@ void unload_current_config_file(void)
 #endif
 
 
+/*********************************************************************
+ *
+ * Function    :  parse_numeric_value
+ *
+ * Description :  Parse the value of a directive that can only have
+ *                a single numeric value. Terminates with a fatal error
+ *                if the value is NULL or not numeric.
+ *
+ * Parameters  :
+ *          1  :  name:  The name of the directive. Used for log messages.
+ *          2  :  value: The value to parse
+ *
+ *
+ * Returns     :  The numerical value as integer
+ *
+ *********************************************************************/
+static int parse_numeric_value(const char *name, const char *value)
+{
+   int number;
+   char *endptr;
+
+   assert(name != NULL);
+   assert(value != NULL);
+
+   if ((value == NULL) || (*value == '\0'))
+   {
+      log_error(LOG_LEVEL_FATAL, "Directive %s used without argument", name);
+   }
+
+   number = (int)strtol(value, &endptr, 0);
+   if (*endptr != '\0')
+   {
+      log_error(LOG_LEVEL_FATAL,
+         "Directive '%s' used with non-numerical value: '%s'", name, value);
+   }
+
+   return number;
+
+}
+
+
 /*********************************************************************
  *
  * Function    :  parse_toggle_value
@@ -619,7 +664,7 @@ struct configuration_spec * load_config(void)
  * buffer-limit n
  * *************************************************************************/
          case hash_buffer_limit :
-            config->buffer_limit = (size_t)(1024 * atoi(arg));
+            config->buffer_limit = (size_t)(1024 * parse_numeric_value(cmd, arg));
             break;
 
 /* *************************************************************************
@@ -643,25 +688,19 @@ struct configuration_spec * load_config(void)
  * *************************************************************************/
 #ifdef FEATURE_COMPRESSION
          case hash_compression_level :
-            if (*arg != '\0')
+         {
+            int compression_level = parse_numeric_value(cmd, arg);
+            if (-1 <= compression_level && compression_level <= 9)
             {
-               int compression_level = atoi(arg);
-               if (-1 <= compression_level && compression_level <= 9)
-               {
-                  config->compression_level = compression_level;;
-               }
-               else
-               {
-                  log_error(LOG_LEVEL_FATAL,
-                     "Invalid compression-level value: %s", arg);
-               }
+               config->compression_level = compression_level;;
             }
             else
             {
                log_error(LOG_LEVEL_FATAL,
-                  "Invalid compression-level directive. Compression value missing");
+                  "Invalid compression-level value: %s", arg);
             }
             break;
+         }
 #endif
 
 /* *************************************************************************
@@ -685,7 +724,7 @@ struct configuration_spec * load_config(void)
  * Specifies debug level, multiple values are ORed together.
  * *************************************************************************/
          case hash_debug :
-            config->debug |= atoi(arg);
+            config->debug |= parse_numeric_value(cmd, arg);
             break;
 
 /* *************************************************************************
@@ -693,20 +732,19 @@ struct configuration_spec * load_config(void)
  * *************************************************************************/
 #ifdef FEATURE_CONNECTION_KEEP_ALIVE
          case hash_default_server_timeout :
-            if (*arg != '\0')
+         {
+            int timeout = parse_numeric_value(cmd, arg);
+            if (0 <= timeout)
             {
-               int timeout = atoi(arg);
-               if (0 <= timeout)
-               {
-                  config->default_server_timeout = (unsigned int)timeout;
-               }
-               else
-               {
-                  log_error(LOG_LEVEL_FATAL,
-                     "Invalid default-server-timeout value: %s", arg);
-               }
+               config->default_server_timeout = (unsigned int)timeout;
+            }
+            else
+            {
+               log_error(LOG_LEVEL_FATAL,
+                  "Invalid default-server-timeout value: %s", arg);
             }
             break;
+         }
 #endif
 
 /* *************************************************************************
@@ -937,13 +975,14 @@ struct configuration_spec * load_config(void)
             cur_fwd->type = SOCKS_NONE;
 
             /* Save the URL pattern */
-            if (create_url_spec(cur_fwd->url, vec[0]))
+            if (create_pattern_spec(cur_fwd->url, vec[0]))
             {
                log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward "
                      "directive in configuration file.");
                string_append(&config->proxy_args,
                   "<br>\nWARNING: Bad URL specifier for "
                   "forward directive in configuration file.");
+               freez(cur_fwd);
                break;
             }
 
@@ -992,13 +1031,14 @@ struct configuration_spec * load_config(void)
             cur_fwd->type = SOCKS_4;
 
             /* Save the URL pattern */
-            if (create_url_spec(cur_fwd->url, vec[0]))
+            if (create_pattern_spec(cur_fwd->url, vec[0]))
             {
                log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4 "
                      "directive in configuration file.");
                string_append(&config->proxy_args,
                   "<br>\nWARNING: Bad URL specifier for "
                   "forward-socks4 directive in configuration file.");
+               freez(cur_fwd);
                break;
             }
 
@@ -1040,11 +1080,14 @@ struct configuration_spec * load_config(void)
 
             if (vec_count != 3)
             {
-               log_error(LOG_LEVEL_ERROR, "Wrong number of parameters for "
-                     "forward-socks4a directive in configuration file.");
+               log_error(LOG_LEVEL_ERROR,
+                  "Wrong number of parameters for %s in configuration file.",
+                  cmd);
                string_append(&config->proxy_args,
-                  "<br>\nWARNING: Wrong number of parameters for "
-                  "forward-socks4a directive in configuration file.");
+                  "<br>\nWARNING: Wrong number of parameters for ");
+               string_append(&config->proxy_args, cmd);
+               string_append(&config->proxy_args,
+                  "directive in configuration file.");
                break;
             }
 
@@ -1072,13 +1115,17 @@ struct configuration_spec * load_config(void)
             }
 
             /* Save the URL pattern */
-            if (create_url_spec(cur_fwd->url, vec[0]))
+            if (create_pattern_spec(cur_fwd->url, vec[0]))
             {
-               log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4a "
-                     "directive in configuration file.");
+               log_error(LOG_LEVEL_ERROR,
+                  "Bad URL specifier for %s in configuration file.",
+                  cmd);
                string_append(&config->proxy_args,
-                  "<br>\nWARNING: Bad URL specifier for "
-                  "forward-socks4a directive in configuration file.");
+                  "<br>\nWARNING: Bad URL specifier for ");
+               string_append(&config->proxy_args, cmd);
+               string_append(&config->proxy_args,
+                  "directive in configuration file.");
+               freez(cur_fwd);
                break;
             }
 
@@ -1109,7 +1156,7 @@ struct configuration_spec * load_config(void)
  * forwarded-connect-retries n
  * *************************************************************************/
          case hash_forwarded_connect_retries :
-            config->forwarded_connect_retries = atoi(arg);
+            config->forwarded_connect_retries = parse_numeric_value(cmd, arg);
             break;
 
 /* *************************************************************************
@@ -1149,20 +1196,19 @@ struct configuration_spec * load_config(void)
  * *************************************************************************/
 #ifdef FEATURE_CONNECTION_KEEP_ALIVE
          case hash_keep_alive_timeout :
-            if (*arg != '\0')
+         {
+            int timeout = parse_numeric_value(cmd, arg);
+            if (0 < timeout)
             {
-               int timeout = atoi(arg);
-               if (0 < timeout)
-               {
-                  config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
-                  config->keep_alive_timeout = (unsigned int)timeout;
-               }
-               else
-               {
-                  config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
-               }
+               config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+               config->keep_alive_timeout = (unsigned int)timeout;
+            }
+            else
+            {
+               config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
             }
             break;
+         }
 #endif
 
 /* *************************************************************************
@@ -1215,15 +1261,15 @@ struct configuration_spec * load_config(void)
  * max-client-connections number
  * *************************************************************************/
          case hash_max_client_connections :
-            if (*arg != '\0')
+         {
+            int max_client_connections = parse_numeric_value(cmd, arg);
+            if (0 <= max_client_connections)
             {
-               int max_client_connections = atoi(arg);
-               if (0 <= max_client_connections)
-               {
-                  config->max_client_connections = max_client_connections;
-               }
+               /* XXX: log error */
+               config->max_client_connections = max_client_connections;
             }
             break;
+         }
 
 /* *************************************************************************
  * permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
@@ -1317,30 +1363,28 @@ struct configuration_spec * load_config(void)
             break;
 
 /* *************************************************************************
- * single-threaded
+ * single-threaded 0|1
  * *************************************************************************/
          case hash_single_threaded :
-            config->multi_threaded = 0;
+            config->multi_threaded =  0 == parse_toggle_state(cmd, arg);
             break;
 
 /* *************************************************************************
  * socket-timeout numer_of_seconds
  * *************************************************************************/
          case hash_socket_timeout :
-            if (*arg != '\0')
+         {
+            int socket_timeout = parse_numeric_value(cmd, arg);
+            if (0 <= socket_timeout)
             {
-               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);
-               }
+               config->socket_timeout = socket_timeout;
+            }
+            else
+            {
+               log_error(LOG_LEVEL_FATAL, "Invalid socket-timeout: '%s'", arg);
             }
             break;
+         }
 
 /* *************************************************************************
  * split-large-cgi-forms
@@ -1364,6 +1408,16 @@ struct configuration_spec * load_config(void)
             config->templdir = make_path(NULL, arg);
             break;
 
+#ifdef FEATURE_EXTERNAL_FILTERS
+/* *************************************************************************
+ * temporary-directory directory-name
+ * *************************************************************************/
+         case hash_temporary_directory :
+            freez(config->temporary_directory);
+            config->temporary_directory = make_path(NULL, arg);
+            break;
+#endif
+
 /* *************************************************************************
  * tolerate-pipelining (0|1)
  * *************************************************************************/
@@ -1477,7 +1531,7 @@ struct configuration_spec * load_config(void)
  * log-font-size n
  * *************************************************************************/
          case hash_log_font_size :
-            g_nFontSize = atoi(arg);
+            g_nFontSize = parse_numeric_value(cmd, arg);
             break;
 
 /* *************************************************************************
@@ -1491,7 +1545,7 @@ struct configuration_spec * load_config(void)
  * log-max-lines n
  * *************************************************************************/
          case hash_log_max_lines :
-            g_nMaxBufferLines = atoi(arg);
+            g_nMaxBufferLines = parse_numeric_value(cmd, arg);
             break;
 
 /* *************************************************************************