-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.18 2001/07/13 14:01:14 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
- * Revision 1.20 2001/07/30 22:08:36 jongfoster
- * Tidying up #defines:
- * - All feature #defines are now of the form FEATURE_xxx
- * - Permanently turned off WIN_GUI_EDIT
- * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
- *
- * Revision 1.19 2001/07/15 17:45:16 jongfoster
- * Removing some unused #includes
- *
* Revision 1.18 2001/07/13 14:01:14 oes
* - Removed all #ifdef PCRS
* - Removed vim-settings
#include "jcc.h"
#include "filters.h"
#include "loaders.h"
+#include "showargs.h"
+#include "parsers.h"
+#include "killpopup.h"
#include "miscutil.h"
#include "errlog.h"
+#include "jbsockets.h"
+#include "gateway.h"
#include "ssplit.h"
-#include "encode.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
#define ijb_isupper(__X) isupper((int)(unsigned char)(__X))
#define ijb_tolower(__X) tolower((int)(unsigned char)(__X))
-#ifdef FEATURE_TOGGLE
+#ifdef TOGGLE
/* by haroon - indicates if ijb is enabled */
int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */
-#endif /* def FEATURE_TOGGLE */
+#endif
/* The filename of the configfile */
const char *configfile = NULL;
#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
-static void savearg(char *c, char *o, struct configuration_spec * config);
-
/*********************************************************************
*
{
struct configuration_spec * config = (struct configuration_spec *)data;
struct forward_spec *cur_fwd = config->forward;
-#ifdef FEATURE_ACL
+#ifdef ACL_FILES
struct access_control_list *cur_acl = config->acl;
while (cur_acl != NULL)
cur_acl = next_acl;
}
config->acl = NULL;
-#endif /* def FEATURE_ACL */
+#endif /* def ACL_FILES */
while (cur_fwd != NULL)
{
}
config->forward = NULL;
-#ifdef FEATURE_COOKIE_JAR
+#ifdef JAR_FILES
if ( NULL != config->jar )
{
fclose( config->jar );
config->jar = NULL;
}
-#endif /* def FEATURE_COOKIE_JAR */
+#endif /* def JAR_FILES */
freez((char *)config->confdir);
freez((char *)config->logdir);
freez((char *)config->proxy_info_url);
freez((char *)config->proxy_args);
-#ifdef FEATURE_COOKIE_JAR
+#ifdef JAR_FILES
freez((char *)config->jarfile);
-#endif /* def FEATURE_COOKIE_JAR */
+#endif /* def JAR_FILES */
+
+#ifndef SPLIT_PROXY_ARGS
+ freez((char *)config->suppress_message);
+#endif /* ndef SPLIT_PROXY_ARGS */
freez((char *)config->re_filterfile);
log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile);
-#ifdef FEATURE_TOGGLE
+#ifdef TOGGLE
g_bToggleIJB = 1;
-#endif /* def FEATURE_TOGGLE */
+#endif
fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config));
char cmd[BUFFER_SIZE];
char arg[BUFFER_SIZE];
char tmp[BUFFER_SIZE];
-#ifdef FEATURE_ACL
+#ifdef ACL_FILES
struct access_control_list *cur_acl;
-#endif /* def FEATURE_ACL */
+#endif /* def ACL_FILES */
struct forward_spec *cur_fwd;
int vec_count;
char *vec[3];
/****************************************************************************
* deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
****************************************************************************/
-#ifdef FEATURE_ACL
+#ifdef ACL_FILES
case hash_deny_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
config->acl = cur_acl;
continue;
-#endif /* def FEATURE_ACL */
+#endif /* def ACL_FILES */
/****************************************************************************
* forward url-pattern (.|http-proxy-host[:port])
* jarfile jar-file-name
* In logdir by default
****************************************************************************/
-#ifdef FEATURE_COOKIE_JAR
+#ifdef JAR_FILES
case hash_jarfile :
freez((char *)config->jarfile);
config->jarfile = make_path(config->logdir, arg);
continue;
-#endif /* def FEATURE_COOKIE_JAR */
+#endif /* def JAR_FILES */
/****************************************************************************
* listen-address [ip][:port]
/****************************************************************************
* permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
****************************************************************************/
-#ifdef FEATURE_ACL
+#ifdef ACL_FILES
case hash_permit_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
config->acl = cur_acl;
continue;
-#endif /* def FEATURE_ACL */
+#endif /* def ACL_FILES */
/****************************************************************************
* proxy-info-url url
config->multi_threaded = 0;
continue;
+/****************************************************************************
+ * FIXME: Document this FIXME2: Shouldn't we throw this out? --oes
+ ****************************************************************************/
+#ifndef SPLIT_PROXY_ARGS
+ case hash_suppress_blocklists :
+ if (arg[0] != '\0')
+ {
+ config->suppress_message = strdup(arg);
+ }
+ else
+ {
+ /* There will be NO reference in proxy-args. */
+ config->suppress_message = NULL;
+ }
+
+ config->suppress_blocklists = 1;
+ continue;
+#endif /* ndef SPLIT_PROXY_ARGS */
+
/****************************************************************************
* toggle (0|1)
****************************************************************************/
-#ifdef FEATURE_TOGGLE
+#ifdef TOGGLE
case hash_toggle :
g_bToggleIJB = atoi(arg);
continue;
-#endif /* def FEATURE_TOGGLE */
+#endif /* def TOGGLE */
/****************************************************************************
* trust-info-url url
****************************************************************************/
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
case hash_trust_info_url :
enlist(config->trust_info, arg);
continue;
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
/****************************************************************************
* trustfile filename
* (In confdir by default.)
****************************************************************************/
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
case hash_trustfile :
freez((char *)config->trustfile);
config->trustfile = make_path(config->confdir, arg);
continue;
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
/****************************************************************************
/****************************************************************************/
/* Warnings about unsupported features */
/****************************************************************************/
-#ifndef FEATURE_ACL
+#ifndef ACL_FILES
case hash_deny_access:
-#endif /* ndef FEATURE_ACL */
-#ifndef FEATURE_COOKIE_JAR
+#endif /* ndef ACL_FILES */
+#ifndef JAR_FILES
case hash_jarfile :
-#endif /* ndef FEATURE_COOKIE_JAR */
-#ifndef FEATURE_ACL
+#endif /* ndef JAR_FILES */
+#ifndef ACL_FILES
case hash_permit_access:
-#endif /* ndef FEATURE_ACL */
-#ifndef FEATURE_TOGGLE
+#endif /* ndef ACL_FILES */
+#ifdef SPLIT_PROXY_ARGS
+ case hash_suppress_blocklists :
+#endif /* def SPLIT_PROXY_ARGS */
+#ifndef TOGGLE
case hash_toggle :
-#endif /* ndef FEATURE_TOGGLE */
-#ifndef FEATURE_TRUST
+#endif /* ndef TOGGLE */
+#ifndef TRUST_FILES
case hash_trustfile :
case hash_trust_info_url :
-#endif /* ndef FEATURE_TRUST */
+#endif /* ndef TRUST_FILES */
#ifndef _WIN_CONSOLE
case hash_hide_console :
add_loader(load_re_filterfile, config);
}
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
if (config->trustfile)
{
add_loader(load_trustfile, config);
}
-#endif /* def FEATURE_TRUST */
+#endif
-#ifdef FEATURE_COOKIE_JAR
+#ifdef JAR_FILES
if ( NULL != config->jarfile )
{
if ( NULL == (config->jar = fopen(config->jarfile, "a")) )
}
setbuf(config->jar, NULL);
}
-#endif /* def FEATURE_COOKIE_JAR */
+#endif /* def JAR_FILES */
if ( NULL == config->haddr )
{
}
freez(fake_csp);
+#ifndef SPLIT_PROXY_ARGS
+ if (!suppress_blocklists)
+ {
+ fs->proxy_args = strsav(fs->proxy_args, "</pre>");
+ }
+#endif /* ndef SPLIT_PROXY_ARGS */
+
/* 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;
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
g_trustfile = config->trustfile;
-#endif /* def FEATURE_TRUST */
+#endif
#endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */
}
-/*********************************************************************
- *
- * 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.
- *
- * Parameters :
- * 1 : c = config setting that was found
- * 2 : o = the setting's argument (if any)
- *
- * Returns : N/A
- *
- *********************************************************************/
-static void savearg(char *c, char *o, struct configuration_spec * config)
-{
- char buf[BUFFER_SIZE];
-
- *buf = '\0';
-
- if ( ( NULL != c ) && ( '\0' != *c ) )
- {
- if ((c = html_encode(c)))
- {
- sprintf(buf, "<a href=\"" REDIRECT_URL "option#%s\">%s</a> ", c, c);
- }
- freez(c);
- }
- if ( ( NULL != o ) && ( '\0' != *o ) )
- {
- if ((o = html_encode(o)))
- {
- 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(o);
- }
-
- strcat(buf, "<br>\n");
-
- config->proxy_args = strsav(config->proxy_args, buf);
-
-}
-
-
/*
Local Variables:
tab-width: 3
projects / privoxy.git / blobdiff