X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=f0b1a9785110b59c7e381e85e1297cd420eb7d15;hp=4c218510b9ff474b9653a936e8bfa572bd664784;hb=9577b50e7aaeedaa8e97df6f9ef78122217de524;hpb=6d1554928803b8cceb91a8e82de8ae3418c896f4 diff --git a/loaders.c b/loaders.c index 4c218510..f0b1a978 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.3 2001/05/20 01:21:20 jongfoster Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.13 2001/05/31 21:28:49 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -35,6 +35,69 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.3 2001/05/20 01:21:20 jongfoster * * Revisions : * $Log: loaders.c,v $ + * Revision 1.13 2001/05/31 21:28:49 jongfoster + * Removed all permissionsfile code - it's now called the actions + * file, and (almost) all the code is in actions.c + * + * Revision 1.12 2001/05/31 17:32:31 oes + * + * - Enhanced domain part globbing with infix and prefix asterisk + * matching and optional unanchored operation + * + * Revision 1.11 2001/05/29 23:25:24 oes + * + * - load_config_line() and load_permissions_file() now use chomp() + * + * Revision 1.10 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * Revision 1.9 2001/05/26 17:12:07 jongfoster + * Fatal errors loading configuration files now give better error messages. + * + * Revision 1.8 2001/05/26 00:55:20 jongfoster + * Removing duplicated code. load_forwardfile() now uses create_url_spec() + * + * Revision 1.7 2001/05/26 00:28:36 jongfoster + * Automatic reloading of config file. + * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). + * Most of the global variables have been moved to a new + * struct configuration_spec, accessed through csp->config->globalname + * Most of the globals remaining are used by the Win32 GUI. + * + * Revision 1.6 2001/05/23 12:27:33 oes + * + * Fixed ugly indentation of my last changes + * + * Revision 1.5 2001/05/23 10:39:05 oes + * - Added support for escaping the comment character + * in config files by a backslash + * - Added support for line continuation in config + * files + * - Fixed a buffer overflow bug with long config lines + * + * Revision 1.4 2001/05/22 18:56:28 oes + * CRLF -> LF + * * Revision 1.3 2001/05/20 01:21:20 jongfoster * Version 2.9.4 checkin. * - Merged popupfile and cookiefile, and added control over PCRS @@ -74,6 +137,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.3 2001/05/20 01:21:20 jongfoster #endif #include "project.h" +#include "list.h" #include "loaders.h" #include "encode.h" #include "filters.h" @@ -83,6 +147,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.3 2001/05/20 01:21:20 jongfoster #include "miscutil.h" #include "errlog.h" #include "gateway.h" +#include "actions.h" #ifndef SPLIT_PROXY_ARGS /* For strsav */ @@ -101,26 +166,16 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION; #define ijb_isspace(__X) isspace((int)(unsigned char)(__X)) -#define NLOADERS 8 -static int (*loaders[NLOADERS])(struct client_state *); - - /* * Currently active files. * These are also entered in the main linked list of files. */ -static struct file_list *current_blockfile = NULL; -static struct file_list *current_permissions_file = NULL; static struct file_list *current_forwardfile = NULL; #ifdef ACL_FILES static struct file_list *current_aclfile = NULL; #endif /* def ACL_FILES */ -#ifdef USE_IMAGE_LIST -static struct file_list *current_imagefile = NULL; -#endif /* def USE_IMAGE_LIST */ - #ifdef TRUST_FILES static struct file_list *current_trustfile = NULL; #endif /* def TRUST_FILES */ @@ -130,9 +185,6 @@ static struct file_list *current_re_filterfile = NULL; #endif /* def PCRS */ -static int create_url_spec(struct url_spec * url, char * buf); - - /********************************************************************* * * Function : sweep @@ -174,14 +226,16 @@ void sweep(void) { /* mark this client's files as active */ - if (ncsp->blist) /* block files */ - { - ncsp->blist->active = 1; - } + /* + * Always have a configuration file. + * (Also note the slightly non-standard extra + * indirection here.) + */ + ncsp->config->config_file_list->active = 1; - if (ncsp->permissions_list) /* permissions files */ + if (ncsp->actions_list) /* actions files */ { - ncsp->permissions_list->active = 1; + ncsp->actions_list->active = 1; } if (ncsp->flist) /* forward files */ @@ -196,13 +250,6 @@ void sweep(void) } #endif /* def ACL_FILES */ -#ifdef USE_IMAGE_LIST - if (ncsp->ilist) /* image files */ - { - ncsp->ilist->active = 1; - } -#endif /* def USE_IMAGE_LIST */ - #ifdef PCRS if (ncsp->rlist) /* perl re files */ { @@ -224,9 +271,10 @@ void sweep(void) csp->next = ncsp->next; freez(ncsp->ip_addr_str); +#ifdef TRUST_FILES freez(ncsp->referrer); +#endif /* def TRUST_FILES */ freez(ncsp->x_forwarded); - freez(ncsp->ip_addr_str); freez(ncsp->iob->buf); free_http_request(ncsp->http); @@ -234,6 +282,8 @@ void sweep(void) destroy_list(ncsp->headers); destroy_list(ncsp->cookie_list); + free_current_action(ncsp->action); + #ifdef STATISTICS urls_read++; if (ncsp->rejected) @@ -287,7 +337,7 @@ void sweep(void) * Returns : 0 => Ok, everything else is an error. * *********************************************************************/ -static int create_url_spec(struct url_spec * url, char * buf) +int create_url_spec(struct url_spec * url, char * buf) { char *p; struct url_spec tmp_url[1]; @@ -381,6 +431,7 @@ static int create_url_spec(struct url_spec * url, char * buf) url->dbuf = tmp_url->dbuf; url->dcnt = tmp_url->dcnt; url->dvec = tmp_url->dvec; + url->unanchored = tmp_url->unanchored; return 0; /* OK */ } @@ -388,7 +439,7 @@ static int create_url_spec(struct url_spec * url, char * buf) /********************************************************************* * - * Function : unload_url + * Function : free_url * * Description : Called from the "unloaders". Freez the url * structure elements. @@ -399,7 +450,7 @@ static int create_url_spec(struct url_spec * url, char * buf) * Returns : N/A * *********************************************************************/ -static void unload_url(struct url_spec *url) +void free_url(struct url_spec *url) { if (url == NULL) return; @@ -444,87 +495,6 @@ static void unload_aclfile(void *f) } #endif /* def ACL_FILES */ -/********************************************************************* - * - * Function : unload_blockfile - * - * Description : Unloads a blockfile. - * - * Parameters : - * 1 : f = the data structure associated with the blockfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_blockfile(void *f) -{ - struct block_spec *b = (struct block_spec *)f; - if (b == NULL) return; - - unload_blockfile(b->next); - - unload_url(b->url); - - freez(b); - -} - - -#ifdef USE_IMAGE_LIST -/********************************************************************* - * - * Function : unload_imagefile - * - * Description : Unloads an imagefile. - * - * Parameters : - * 1 : f = the data structure associated with the imagefile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_imagefile(void *f) -{ - struct block_spec *b = (struct block_spec *)f; - if (b == NULL) return; - - unload_imagefile(b->next); - - unload_url(b->url); - - freez(b); - -} -#endif /* def USE_IMAGE_LIST */ - - -/********************************************************************* - * - * Function : unload_permissions_file - * - * Description : Unloads a permissions file. - * - * Parameters : - * 1 : file_data = the data structure associated with the - * permissions file. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_permissions_file(void *file_data) -{ - struct permissions_spec * next; - struct permissions_spec * cur = (struct permissions_spec *)file_data; - while (cur != NULL) - { - next = cur->next; - unload_url(cur->url); - freez(cur); - cur = next; - } - -} - #ifdef TRUST_FILES /********************************************************************* @@ -546,7 +516,7 @@ static void unload_trustfile(void *f) unload_trustfile(b->next); - unload_url(b->url); + free_url(b->url); freez(b); @@ -573,7 +543,7 @@ static void unload_forwardfile(void *f) unload_forwardfile(b->next); - unload_url(b->url); + free_url(b->url); freez(b->gw->gateway_host); freez(b->gw->forward_host); @@ -643,9 +613,9 @@ static void unload_re_filterfile(void *f) * On error: 1 and sets newfl == NULL * *********************************************************************/ -static int check_file_changed(const struct file_list * current, - const char * filename, - struct file_list ** newfl) +int check_file_changed(const struct file_list * current, + const char * filename, + struct file_list ** newfl) { struct file_list *fs; struct stat statbuf[1]; @@ -709,8 +679,9 @@ static int check_file_changed(const struct file_list * current, * Function : read_config_line * * Description : Read a single non-empty line from a file and return - * it. Trims comments, leading and trailing whitespace. - * Also wites the file to fs->proxy_args. + * it. Trims comments, leading and trailing whitespace + * and respects escaping of newline and comment char. + * Also writes the file to fs->proxy_args. * * Parameters : * 1 : buf = Buffer to use. @@ -727,6 +698,9 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs) { char *p, *q; char linebuf[BUFSIZ]; + int contflag = 0; + + *buf = '\0'; while (fgets(linebuf, sizeof(linebuf), fp)) { @@ -743,59 +717,60 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs) } #endif /* ndef SPLIT_PROXY_ARGS */ - /* Trim off newline and any comment */ - if ((p = strpbrk(linebuf, "\r\n#")) != NULL) + /* Trim off newline */ + if ((p = strpbrk(linebuf, "\r\n")) != NULL) { *p = '\0'; } - - /* Trim leading whitespace */ - p = linebuf; - while (*p && ijb_isspace(*p)) + + /* Line continuation? Trim escape and set flag. */ + if ((p != linebuf) && (*--p == '\\')) { - *p++; + contflag = 1; + *p = '\0'; } - if (*p) + /* If there's a comment char.. */ + if ((p = strpbrk(linebuf, "#")) != NULL) { - /* There is something other than whitespace on the line. */ - - /* Move the data to the start of buf */ - if (p != linebuf) + /* ..and it's escaped, left-shift the line over the escape. */ + if ((p != linebuf) && (*(p-1) == '\\')) { - /* strcpy that can cope with overlap. */ - q = linebuf; - while ((*q++ = *p++) != '\0') - { - /* Do nothing */ - } + q = p-1; + while ((*q++ = *p++) != '\0') /* nop */; } - - /* Trim trailing whitespace */ - p = linebuf + strlen(linebuf) - 1; - - /* - * Note: the (p >= linebuf) below is paranoia, it's not really needed. - * When p == linebuf then ijb_isspace(*p) will be false and we'll drop - * out of the loop. - */ - while ((p >= linebuf) && ijb_isspace(*p)) + /* Else, chop off the rest of the line */ + else { - p--; + *p = '\0'; } - p[1] = '\0'; + } - /* More paranoia. This if statement is always true. */ - if (*linebuf) - { - strcpy(buf, linebuf); - return buf; - } + /* Write to the buffer */ + if (*linebuf) + { + strncat(buf, linebuf, buflen - strlen(buf)); + } + + /* Continue? */ + if (contflag) + { + contflag = 0; + continue; + } + + /* Remove leading and trailing whitespace */ + chomp(buf); + + if (*buf) + { + return buf; } } /* EOF */ return NULL; + } @@ -820,7 +795,7 @@ int load_aclfile(struct client_state *csp) struct access_control_list *a, *bl; struct file_list *fs; - if (!check_file_changed(current_aclfile, aclfile, &fs)) + if (!check_file_changed(current_aclfile, csp->config->aclfile, &fs)) { /* No need to load */ if (csp) @@ -842,7 +817,7 @@ int load_aclfile(struct client_state *csp) goto load_aclfile_error; } - fp = fopen(aclfile, "r"); + fp = fopen(csp->config->aclfile, "r"); if (fp == NULL) { @@ -929,454 +904,14 @@ int load_aclfile(struct client_state *csp) return(0); load_aclfile_error: - log_error(LOG_LEVEL_ERROR, "can't load access control list %s: %E", aclfile); + log_error(LOG_LEVEL_FATAL, "can't load access control list %s: %E", + csp->config->aclfile); return(-1); } #endif /* def ACL_FILES */ -/********************************************************************* - * - * Function : load_blockfile - * - * Description : Read and parse a blockfile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_blockfile(struct client_state *csp) -{ - FILE *fp; - - struct block_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int reject; - struct file_list *fs; - - if (!check_file_changed(current_blockfile, blockfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->blist = current_blockfile; - } - return(0); - } - if (!fs) - { - goto load_blockfile_error; - } - - fs->f = bl = (struct block_spec *) zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_blockfile_error; - } - - if ((fp = fopen(blockfile, "r")) == NULL) - { - goto load_blockfile_error; - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - reject = 1; - - if (*buf == '~') - { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } - } - - /* skip lines containing only ~ */ - if (*buf == '\0') - { - continue; - } - - /* allocate a new node */ - if ((b = zalloc(sizeof(*b))) == NULL) - { - fclose(fp); - goto load_blockfile_error; - } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - b->reject = reject; - - /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) - { - fclose(fp); - goto load_blockfile_error; - } - } - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if (current_blockfile) - { - current_blockfile->unloader = unload_blockfile; - } - - fs->next = files->next; - files->next = fs; - current_blockfile = fs; - - if (csp) - { - csp->blist = fs; - } - - return(0); - -load_blockfile_error: - log_error(LOG_LEVEL_ERROR, "can't load blockfile '%s': %E", blockfile); - return(-1); - -} - - -#ifdef USE_IMAGE_LIST -/********************************************************************* - * - * Function : load_imagefile - * - * Description : Read and parse an imagefile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_imagefile(struct client_state *csp) -{ - FILE *fp; - - struct block_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int reject; - struct file_list *fs; - - if (!check_file_changed(current_imagefile, imagefile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->ilist = current_imagefile; - } - return(0); - } - if (!fs) - { - goto load_imagefile_error; - } - - fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_imagefile_error; - } - - if ((fp = fopen(imagefile, "r")) == NULL) - { - goto load_imagefile_error; - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - reject = 1; - - if (*buf == '~') - { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } - } - - /* skip lines containing only ~ */ - if (*buf == '\0') - { - continue; - } - - /* allocate a new node */ - if ((b = zalloc(sizeof(*b))) == NULL) - { - fclose(fp); - goto load_imagefile_error; - } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - b->reject = reject; - - /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) - { - fclose(fp); - goto load_imagefile_error; - } - } - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if (current_imagefile) - { - current_imagefile->unloader = unload_imagefile; - } - - fs->next = files->next; - files->next = fs; - current_imagefile = fs; - - if (csp) - { - csp->ilist = fs; - } - - return(0); - -load_imagefile_error: - log_error(LOG_LEVEL_ERROR, "can't load imagefile '%s': %E", imagefile); - return(-1); - -} -#endif /* def USE_IMAGE_LIST */ - - -/********************************************************************* - * - * Function : load_permissions_file - * - * Description : Read and parse a permissions file and add to files - * list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_permissions_file(struct client_state *csp) -{ - FILE *fp; - - struct permissions_spec *b, *bl; - char buf[BUFSIZ], *p, *q; - int permissions; - struct file_list *fs; - int i; - - if (!check_file_changed(current_permissions_file, permissions_file, &fs)) - { - /* No need to load */ - if (csp) - { - csp->permissions_list = current_permissions_file; - } - return(0); - } - if (!fs) - { - goto load_permissions_error; - } - - fs->f = bl = (struct permissions_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_permissions_error; - } - - if ((fp = fopen(permissions_file, "r")) == NULL) - { - goto load_permissions_error; - } - - - /* - * default_permissions is set in this file. - * - * Reset it to default first. - */ - default_permissions = PERMIT_RE_FILTER; - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - p = buf; - - permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS; - - /* - * FIXME: for() loop is a kludge. Want to loop around until we - * find a non-control character. Assume there will be at most 4 - * characters. - */ - for (i = 0; i < 4; i++) - { - switch ((int)*p) - { - case '>': - /* - * Allow cookies to be read by the server, but do - * not allow them to be set. - */ - permissions = (permissions & ~PERMIT_COOKIE_SET); - p++; - break; - - case '<': - /* - * Allow server to set cookies but do not let the - * server read them. - */ - permissions = (permissions & ~PERMIT_COOKIE_READ); - p++; - break; - - case '^': - /* - * Block popups - */ - permissions = (permissions & ~PERMIT_POPUPS); - p++; - break; - - case '%': - /* - * Permit filtering using PCRS - */ - permissions = (permissions | PERMIT_RE_FILTER); - p++; - break; - - case '~': - /* - * All of the above (maximum filtering). - */ - permissions = PERMIT_RE_FILTER; - p++; - break; - - default: - /* - * FIXME: Should break out of the loop here. - */ - break; - } - } - - /* - * Elide any of the "special" chars from the - * front of the pattern - */ - q = buf; - if (p > q) - { - while ((*q++ = *p++) != '\0') - { - /* nop */ - } - } - - /* a lines containing only "special" chars sets default */ - if (*buf == '\0') - { - default_permissions = permissions; - continue; - } - - /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) - ) - { - fclose(fp); - goto load_permissions_error; - } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - /* Save flags */ - b->permissions = permissions; - - /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) - { - fclose(fp); - goto load_permissions_error; - } - } - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - /* the old one is now obsolete */ - if (current_permissions_file) - { - current_permissions_file->unloader = unload_permissions_file; - } - - fs->next = files->next; - files->next = fs; - current_permissions_file = fs; - - if (csp) - { - csp->permissions_list = fs; - } - - return(0); - -load_permissions_error: - log_error(LOG_LEVEL_ERROR, "can't load permissions file '%s': %E", permissions_file); - return(-1); - -} - - #ifdef TRUST_FILES /********************************************************************* * @@ -1401,7 +936,7 @@ int load_trustfile(struct client_state *csp) int reject, trusted; struct file_list *fs; - if (!check_file_changed(current_trustfile, trustfile, &fs)) + if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs)) { /* No need to load */ if (csp) @@ -1421,12 +956,12 @@ int load_trustfile(struct client_state *csp) goto load_trustfile_error; } - if ((fp = fopen(trustfile, "r")) == NULL) + if ((fp = fopen(csp->config->trustfile, "r")) == NULL) { goto load_trustfile_error; } - tl = trust_list; + tl = csp->config->trust_list; while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) { @@ -1514,7 +1049,8 @@ int load_trustfile(struct client_state *csp) return(0); load_trustfile_error: - log_error(LOG_LEVEL_ERROR, "can't load trustfile '%s': %E", trustfile); + log_error(LOG_LEVEL_FATAL, "can't load trustfile '%s': %E", + csp->config->trustfile); return(-1); } @@ -1538,14 +1074,14 @@ int load_forwardfile(struct client_state *csp) FILE *fp; struct forward_spec *b, *bl; - char buf[BUFSIZ], *p, *q, *tmp; - char *vec[4]; - int port, n, reject; + char buf[BUFSIZ]; + char *p, *tmp; + char *vec[4]; + int n; struct file_list *fs; const struct gateway *gw; - struct url_spec url[1]; - if (!check_file_changed(current_forwardfile, forwardfile, &fs)) + if (!check_file_changed(current_forwardfile, csp->config->forwardfile, &fs)) { /* No need to load */ if (csp) @@ -1566,7 +1102,7 @@ int load_forwardfile(struct client_state *csp) goto load_forwardfile_error; } - if ((fp = fopen(forwardfile, "r")) == NULL) + if ((fp = fopen(csp->config->forwardfile, "r")) == NULL) { goto load_forwardfile_error; } @@ -1589,19 +1125,6 @@ int load_forwardfile(struct client_state *csp) strcpy(buf, vec[0]); - reject = 1; - - if (*buf == '~') - { - reject = 0; - p = buf; - q = p+1; - while ((*p++ = *q++)) - { - /* nop */ - } - } - /* skip lines containing only ~ */ if (*buf == '\0') { @@ -1610,9 +1133,6 @@ int load_forwardfile(struct client_state *csp) /* allocate a new node */ if (((b = zalloc(sizeof(*b))) == NULL) -#ifdef REGEX - || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL) -#endif ) { fclose(fp); @@ -1623,78 +1143,13 @@ int load_forwardfile(struct client_state *csp) b->next = bl->next; bl->next = b; - /* save a copy of the orignal specification */ - if ((b->url->spec = strdup(buf)) == NULL) - { - fclose(fp); - goto load_forwardfile_error; - } - - b->reject = reject; - - if ((p = strchr(buf, '/'))) - { - b->url->path = strdup(p); - b->url->pathlen = strlen(b->url->path); - *p = '\0'; - } - else - { - b->url->path = NULL; - b->url->pathlen = 0; - } -#ifdef REGEX - if (b->url->path) - { - int errcode; - char rebuf[BUFSIZ]; - - sprintf(rebuf, "^(%s)", b->url->path); - - errcode = regcomp(b->url->preg, rebuf, - (REG_EXTENDED|REG_NOSUB|REG_ICASE)); - - if (errcode) - { - size_t errlen = regerror(errcode, b->url->preg, buf, sizeof(buf)); - - buf[errlen] = '\0'; - - log_error(LOG_LEVEL_ERROR, "error compiling %s: %s", - b->url->spec, buf); - fclose(fp); - goto load_forwardfile_error; - } - } - else - { - freez(b->url->preg); - } -#endif - if ((p = strchr(buf, ':')) == NULL) - { - port = 0; - } - else - { - *p++ = '\0'; - port = atoi(p); - } - - b->url->port = port; - - if ((b->url->domain = strdup(buf)) == NULL) + /* Save the URL pattern */ + if (create_url_spec(b->url, buf)) { fclose(fp); goto load_forwardfile_error; } - /* split domain into components */ - *url = dsplit(b->url->domain); - b->url->dbuf = url->dbuf; - b->url->dcnt = url->dcnt; - b->url->dvec = url->dvec; - /* now parse the gateway specs */ p = vec[2]; @@ -1783,7 +1238,8 @@ int load_forwardfile(struct client_state *csp) return(0); load_forwardfile_error: - log_error(LOG_LEVEL_ERROR, "can't load forwardfile '%s': %E", forwardfile); + log_error(LOG_LEVEL_FATAL, "can't load forwardfile '%s': %E", + csp->config->forwardfile); return(-1); } @@ -1815,7 +1271,7 @@ int load_re_filterfile(struct client_state *csp) int error; pcrs_job *dummy; - if (!check_file_changed(current_re_filterfile, re_filterfile, &fs)) + if (!check_file_changed(current_re_filterfile, csp->config->re_filterfile, &fs)) { /* No need to load */ if (csp) @@ -1836,7 +1292,7 @@ int load_re_filterfile(struct client_state *csp) } /* Open the file or fail */ - if ((fp = fopen(re_filterfile, "r")) == NULL) + if ((fp = fopen(csp->config->re_filterfile, "r")) == NULL) { goto load_re_filterfile_error; } @@ -1888,7 +1344,8 @@ int load_re_filterfile(struct client_state *csp) return( 0 ); load_re_filterfile_error: - log_error(LOG_LEVEL_ERROR, "can't load re_filterfile '%s': %E", re_filterfile); + log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E", + csp->config->re_filterfile); return(-1); } @@ -1905,19 +1362,21 @@ load_re_filterfile_error: * Parameters : * 1 : loader = pointer to a function that can parse and load * the appropriate config file. + * 2 : config = The configuration_spec to add the loader to. * * Returns : N/A * *********************************************************************/ -void add_loader(int (*loader)(struct client_state *)) +void add_loader(int (*loader)(struct client_state *), + struct configuration_spec * config) { int i; for (i=0; i < NLOADERS; i++) { - if (loaders[i] == NULL) + if (config->loaders[i] == NULL) { - loaders[i] = loader; + config->loaders[i] = loader; break; } } @@ -1936,6 +1395,8 @@ void add_loader(int (*loader)(struct client_state *)) * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) + * Must be non-null. Reads: "csp->config" + * Writes: various data members. * * Returns : 0 => Ok, everything else is an error. * @@ -1947,34 +1408,17 @@ int run_loader(struct client_state *csp) for (i=0; i < NLOADERS; i++) { - if (loaders[i] == NULL) + if (csp->config->loaders[i] == NULL) { break; } - ret |= (loaders[i])(csp); + ret |= (csp->config->loaders[i])(csp); } return(ret); } -/********************************************************************* - * - * Function : remove_all_loaders - * - * Description : Remove all loaders from the list. - * - * Parameters : N/A - * - * Returns : N/A - * - *********************************************************************/ -void remove_all_loaders(void) -{ - memset( loaders, 0, sizeof( loaders ) ); -} - - /* Local Variables: tab-width: 3