X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.c;h=d92dbecad4ff31a7da056882d52ad8b1096395e8;hb=9fac7e2943b479bde2b2836be885d600fbfcd7f8;hp=fbd50d7e8c4a426af940d07854e61877437306bc;hpb=5e22ac978f3ba54ff685b0282bf43945b3b1f5fa;p=privoxy.git diff --git a/loadcfg.c b/loadcfg.c index fbd50d7e..d92dbeca 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,10 +1,10 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.20 2001/07/30 22:08:36 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.24 2001/10/23 21:40:30 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ * * Purpose : Loads settings from the configuration file into - * global variables. This file contains both the + * global variables. This file contains both the * routine to load the configuration and the global * variables it writes to. * @@ -12,10 +12,10 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.20 2001/07/30 22:08:36 jongfoster * IJBSWA team. http://ijbswa.sourceforge.net * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -35,6 +35,20 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.20 2001/07/30 22:08:36 jongfoster * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.24 2001/10/23 21:40:30 jongfoster + * Added support for enable-edit-actions and enable-remote-toggle config + * file options. + * + * Revision 1.23 2001/10/07 15:36:00 oes + * Introduced new config option "buffer-limit" + * + * Revision 1.22 2001/09/22 16:36:59 jongfoster + * Removing unused parameter fs from read_config_line() + * + * Revision 1.21 2001/09/16 17:10:43 jongfoster + * Moving function savearg() here, since it was the only thing left in + * showargs.c. + * * Revision 1.20 2001/07/30 22:08:36 jongfoster * Tidying up #defines: * - All feature #defines are now of the form FEATURE_xxx @@ -219,9 +233,11 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.20 2001/07/30 22:08:36 jongfoster #else /* ifndef _WIN32 */ +#ifndef __OS2__ # include -# include # include +#endif +# include # include # include @@ -282,9 +298,12 @@ static struct file_list *current_configfile = NULL; #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" */ @@ -355,7 +374,7 @@ void unload_configfile (void * data) cur_fwd = next_fwd; } config->forward = NULL; - + #ifdef FEATURE_COOKIE_JAR if ( NULL != config->jar ) { @@ -364,22 +383,22 @@ void unload_configfile (void * data) } #endif /* def FEATURE_COOKIE_JAR */ - freez((char *)config->confdir); - freez((char *)config->logdir); + freez(config->confdir); + freez(config->logdir); - freez((char *)config->haddr); - freez((char *)config->logfile); + freez(config->haddr); + freez(config->logfile); - freez((char *)config->actions_file); - freez((char *)config->admin_address); - freez((char *)config->proxy_info_url); - freez((char *)config->proxy_args); + freez(config->actions_file); + freez(config->admin_address); + freez(config->proxy_info_url); + freez(config->proxy_args); #ifdef FEATURE_COOKIE_JAR - freez((char *)config->jarfile); + freez(config->jarfile); #endif /* def FEATURE_COOKIE_JAR */ - freez((char *)config->re_filterfile); + freez(config->re_filterfile); } @@ -391,7 +410,7 @@ void unload_configfile (void * data) * Description : Load the config file and all parameters. * * Parameters : - * 1 : csp = Client state (the config member will be + * 1 : csp = Client state (the config member will be * filled in by this function). * * Returns : 0 => Ok, everything else is an error. @@ -435,9 +454,9 @@ struct configuration_spec * load_config(void) /* * This is backwards from how it's usually done. - * Following the usual pattern, "fs" would be stored in a member + * Following the usual pattern, "fs" would be stored in a member * variable in "csp", and then we'd access "config" from "fs->f", - * using a cast. However, "config" is used so often that a + * using a cast. However, "config" is used so often that a * cast each time would be very ugly, and the extra indirection * would waste CPU cycles. Therefore we store "config" in * "csp->config", and "fs" in "csp->config->config_file_list". @@ -450,6 +469,7 @@ struct configuration_spec * load_config(void) config->multi_threaded = 1; config->hport = HADDR_PORT; + config->buffer_limit = 4096 * 1024; if ((configfp = fopen(configfile, "r")) == NULL) { @@ -458,7 +478,7 @@ struct configuration_spec * load_config(void) /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL) + while (read_config_line(buf, sizeof(buf), configfp) != NULL) { char cmd[BUFFER_SIZE]; char arg[BUFFER_SIZE]; @@ -516,7 +536,7 @@ struct configuration_spec * load_config(void) * In confdir by default ****************************************************************************/ case hash_actions_file : - freez((char *)config->actions_file); + freez(config->actions_file); config->actions_file = make_path(config->confdir, arg); continue; @@ -524,17 +544,24 @@ struct configuration_spec * load_config(void) * admin-address email-address ****************************************************************************/ case hash_admin_address : - freez((char *)config->admin_address); + freez(config->admin_address); config->admin_address = strdup(arg); - continue; + continue; + +/**************************************************************************** + * buffer-limit n + ****************************************************************************/ + case hash_buffer_limit : + config->buffer_limit = (size_t) 1024 * atoi(arg); + continue; /**************************************************************************** * confdir directory-name ****************************************************************************/ case hash_confdir : - freez((char *)config->confdir); + freez(config->confdir); config->confdir = strdup(arg); - continue; + continue; /**************************************************************************** * debug n @@ -610,7 +637,7 @@ struct configuration_spec * load_config(void) * actions file, the last match wins. However, the internal * implementations are different: The actions file is stored * in the same order as the file, and scanned completely. - * With the ACL, we reverse the order as we load it, then + * With the ACL, we reverse the order as we load it, then * when we scan it we stop as soon as we get a match. */ cur_acl->next = config->acl; @@ -619,6 +646,38 @@ 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))) + { + config->feature_flags |= RUNTIME_FEATURE_CGI_EDIT_ACTIONS; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS; + } + continue; +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ + +/**************************************************************************** + * enable-remote-toggle 0|1 + ****************************************************************************/ +#ifdef FEATURE_CGI_EDIT_ACTIONS + case hash_enable_remote_toggle: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_CGI_TOGGLE; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE; + } + continue; +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ + /**************************************************************************** * forward url-pattern (.|http-proxy-host[:port]) ****************************************************************************/ @@ -760,7 +819,7 @@ struct configuration_spec * load_config(void) /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - + continue; /**************************************************************************** @@ -838,7 +897,7 @@ struct configuration_spec * load_config(void) /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - + continue; /**************************************************************************** @@ -847,7 +906,7 @@ struct configuration_spec * load_config(void) ****************************************************************************/ #ifdef FEATURE_COOKIE_JAR case hash_jarfile : - freez((char *)config->jarfile); + freez(config->jarfile); config->jarfile = make_path(config->logdir, arg); continue; #endif /* def FEATURE_COOKIE_JAR */ @@ -856,7 +915,7 @@ struct configuration_spec * load_config(void) * listen-address [ip][:port] ****************************************************************************/ case hash_listen_address : - freez((char *)config->haddr); + freez(config->haddr); config->haddr = strdup(arg); continue; @@ -864,16 +923,16 @@ struct configuration_spec * load_config(void) * logdir directory-name ****************************************************************************/ case hash_logdir : - freez((char *)config->logdir); + freez(config->logdir); config->logdir = strdup(arg); - continue; + continue; /**************************************************************************** * logfile log-file-name * In logdir by default ****************************************************************************/ case hash_logfile : - freez((char *)config->logfile); + freez(config->logfile); config->logfile = make_path(config->logdir, arg); continue; @@ -945,7 +1004,7 @@ struct configuration_spec * load_config(void) * actions file, the last match wins. However, the internal * implementations are different: The actions file is stored * in the same order as the file, and scanned completely. - * With the ACL, we reverse the order as we load it, then + * With the ACL, we reverse the order as we load it, then * when we scan it we stop as soon as we get a match. */ cur_acl->next = config->acl; @@ -958,7 +1017,7 @@ struct configuration_spec * load_config(void) * proxy-info-url url ****************************************************************************/ case hash_proxy_info_url : - freez((char *)config->proxy_info_url); + freez(config->proxy_info_url); config->proxy_info_url = strdup(arg); continue; @@ -967,7 +1026,7 @@ struct configuration_spec * load_config(void) * In confdir by default. ****************************************************************************/ case hash_re_filterfile : - freez((char *)config->re_filterfile); + freez(config->re_filterfile); config->re_filterfile = make_path(config->confdir, arg); continue; @@ -1002,7 +1061,7 @@ struct configuration_spec * load_config(void) ****************************************************************************/ #ifdef FEATURE_TRUST case hash_trustfile : - freez((char *)config->trustfile); + freez(config->trustfile); config->trustfile = make_path(config->confdir, arg); continue; #endif /* def FEATURE_TRUST */ @@ -1099,6 +1158,10 @@ struct configuration_spec * load_config(void) #ifndef FEATURE_ACL case hash_deny_access: #endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_CGI_EDIT_ACTIONS + case hash_enable_edit_actions: + case hash_enable_remote_toggle: +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ #ifndef FEATURE_COOKIE_JAR case hash_jarfile : #endif /* ndef FEATURE_COOKIE_JAR */ @@ -1237,7 +1300,7 @@ struct configuration_spec * load_config(void) #ifdef FEATURE_TRUST g_trustfile = config->trustfile; #endif /* def FEATURE_TRUST */ - + #endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */ /* FIXME: end kludge */