-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.34 2002/03/06 23:14:35 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * 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.
#include <fcntl.h>
#include <errno.h>
#include <ctype.h>
+#include <assert.h>
#ifdef _WIN32
#include "errlog.h"
#include "ssplit.h"
#include "encode.h"
+#include "urlmatch.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
-static void savearg(char *c, char *o, struct configuration_spec * config);
+static void savearg(char *command, char *argument, struct configuration_spec * config);
/*********************************************************************
*
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);
struct file_list *fs;
unsigned long linenum = 0;
- DBG(1, ("load_config() entered..\n") );
if ( !check_file_changed(current_configfile, configfile, &fs))
{
/* No need to load */
configfile);
}
- /*
log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile);
- */
#ifdef FEATURE_TOGGLE
g_bToggleIJB = 1;
config->multi_threaded = 1;
config->hport = HADDR_PORT;
config->buffer_limit = 4096 * 1024;
+ config->proxy_args = strdup("");
if ((configfp = fopen(configfile, "r")) == NULL)
{
switch( hash_string( cmd ) )
{
-/****************************************************************************
+/* *************************************************************************
* actionsfile actions-file-name
* In confdir by default
- ****************************************************************************/
+ * *************************************************************************/
case hash_actions_file :
freez(config->actions_file);
config->actions_file = make_path(config->confdir, arg);
continue;
-/****************************************************************************
+/* *************************************************************************
* admin-address email-address
- ****************************************************************************/
+ * *************************************************************************/
case hash_admin_address :
freez(config->admin_address);
config->admin_address = strdup(arg);
continue;
-/****************************************************************************
+/* *************************************************************************
* buffer-limit n
- ****************************************************************************/
+ * *************************************************************************/
case hash_buffer_limit :
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);
{
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,
"<br>\nWARNING: Wrong number of parameters for "
"deny-access directive in configuration file.<br><br>\n");
continue;
{
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,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid source IP for deny-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
{
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,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid destination IP for deny-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
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)))
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)))
continue;
#endif /* def FEATURE_CGI_EDIT_ACTIONS */
-/****************************************************************************
+/* *************************************************************************
* forward url-pattern (.|http-proxy-host[:port])
- ****************************************************************************/
+ * *************************************************************************/
case hash_forward:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
{
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,
"<br>\nWARNING: Wrong number of parameters for "
"forward directive in configuration file.");
continue;
{
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,
"<br>\nWARNING: Bad URL specifier for "
"forward directive in configuration file.");
continue;
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);
{
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,
"<br>\nWARNING: Wrong number of parameters for "
"forward-socks4 directive in configuration file.");
continue;
{
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,
"<br>\nWARNING: Bad URL specifier for "
"forward-socks4 directive in configuration file.");
continue;
continue;
-/****************************************************************************
+/* *************************************************************************
* forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
- ****************************************************************************/
+ * *************************************************************************/
case hash_forward_socks4a:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
{
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,
"<br>\nWARNING: Wrong number of parameters for "
"forward-socks4a directive in configuration file.");
continue;
{
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,
"<br>\nWARNING: Bad URL specifier for "
"forward-socks4a directive in configuration file.");
continue;
continue;
-/****************************************************************************
+/* *************************************************************************
* jarfile jar-file-name
* In logdir by default
- ****************************************************************************/
+ * *************************************************************************/
#ifdef FEATURE_COOKIE_JAR
case hash_jarfile :
freez(config->jarfile);
continue;
#endif /* def FEATURE_COOKIE_JAR */
-/****************************************************************************
+/* *************************************************************************
* 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);
+ config->logfile = no_daemon ? NULL : make_path(config->logdir, arg);
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);
{
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,
"<br>\nWARNING: Wrong number of parameters for "
"permit-access directive in configuration file.<br><br>\n");
{
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,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid source IP for permit-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
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,
+ string_append(&config->proxy_args,
"<br>\nWARNING: Invalid destination IP for permit-access directive"
" in configuration file: \"");
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
vec[0]);
- config->proxy_args = strsav( config->proxy_args,
+ string_append(&config->proxy_args,
"\"<br><br>\n");
freez(cur_acl);
continue;
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;
-/****************************************************************************
+/* *************************************************************************
* toggle (0|1)
- ****************************************************************************/
+ * *************************************************************************/
#ifdef FEATURE_TOGGLE
case hash_toggle :
g_bToggleIJB = 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);
#endif /* def FEATURE_TRUST */
-/****************************************************************************
+/* *************************************************************************
* Win32 Console options:
- ****************************************************************************/
+ * *************************************************************************/
-/****************************************************************************
+/* *************************************************************************
* hide-console
- ****************************************************************************/
+ * *************************************************************************/
#ifdef _WIN_CONSOLE
case hash_hide_console :
hideConsole = 1;
#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;
#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 */
/* 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, "<br>\nWARNING: unrecognized directive : ");
- config->proxy_args = strsav( config->proxy_args, buf);
- config->proxy_args = strsav( config->proxy_args, "<br><br>\n");
+ log_error(LOG_LEVEL_ERROR, "Unrecognized directive '%s' (%luul) in line %lu in "
+ "configuration file (%s).", buf, hash_string(cmd), linenum, configfile);
+ string_append(&config->proxy_args, "<br>\nWARNING: unrecognized directive : ");
+ string_append(&config->proxy_args, buf);
+ string_append(&config->proxy_args, "<br><br>\n");
continue;
-/****************************************************************************/
+/* *************************************************************************/
} /* end switch( hash_string(cmd) ) */
} /* end while ( read_config_line(...) ) */
fclose(configfp);
+ if (NULL == config->proxy_args)
+ {
+ log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
+ }
+
init_error_log(Argv[0], config->logfile, config->debug);
if (config->actions_file)
files->next = fs;
current_configfile = fs;
- MustReload = 0;
return (config);
}
* 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)
*
* 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;
+
+ assert(command);
+ assert(*command);
+ assert(argument);
- *buf = '\0';
+ buf = strdup("");
- if ( ( NULL != c ) && ( '\0' != *c ) )
+ s = html_encode(command);
+ if (NULL == s)
{
- if ((c = html_encode(c)))
- {
- sprintf(buf, "<a href=\"" REDIRECT_URL "option#%s\">%s</a> ", c, c);
- }
- freez(c);
+ freez(buf);
+ freez(config->proxy_args);
+ return;
}
- if ( ( NULL != o ) && ( '\0' != *o ) )
+ string_append(&buf, "<a href=\"" REDIRECT_URL "option#");
+ string_append(&buf, s);
+ string_append(&buf, "\">");
+ string_join (&buf, s);
+ string_append(&buf, "</a> ");
+
+ if ( (NULL != argument) && ('\0' != *argument) )
{
- if ((o = html_encode(o)))
+ s = html_encode(argument);
+ if (NULL == s)
{
- if (strncmpic(o, "http://", 7) == 0)
- {
- strcat(buf, "<a href=\"");
- strcat(buf, o);
- strcat(buf, "\">");
- strcat(buf, o);
- strcat(buf, "</a>");
- }
- else
- {
- strcat(buf, o);
- }
+ freez(buf);
+ freez(config->proxy_args);
+ return;
}
- freez(o);
- }
- strcat(buf, "<br>\n");
+ if (strncmpic(argument, "http://", 7) == 0)
+ {
+ string_append(&buf, "<a href=\"");
+ string_append(&buf, s);
+ string_append(&buf, "\">");
+ string_join (&buf, s);
+ string_append(&buf, "</a>");
+ }
+ else
+ {
+ string_join (&buf, s);
+ }
+ }
- config->proxy_args = strsav(config->proxy_args, buf);
+ string_append(&buf, "<br>\n");
+ string_join(&config->proxy_args, buf);
}
projects / privoxy.git / blobdiff