X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=e6edc55dadb3466b723254ccb9eab1fa0832107b;hp=a00b36d4ef8a8445d4d4f3e447f820fb7920a22f;hb=3c89d88c18040c3eb92412b2ad6ce901c5c3e44d;hpb=2935a01f7fffce53f81e235557f3ae5459e200e6 diff --git a/loaders.c b/loaders.c index a00b36d4..e6edc55d 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.11 2001/05/29 23:25:24 oes Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.15 2001/06/07 23:14:14 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -35,6 +35,24 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.11 2001/05/29 23:25:24 oes Exp $" * * Revisions : * $Log: loaders.c,v $ + * Revision 1.15 2001/06/07 23:14:14 jongfoster + * Removing ACL and forward file loaders - these + * files have been merged into the config file. + * Cosmetic: Moving unloader funcs next to their + * respective loader funcs + * + * Revision 1.14 2001/06/01 03:27:04 oes + * Fixed line continuation problem + * + * 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() @@ -128,6 +146,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.11 2001/05/29 23:25:24 oes Exp $" #endif #include "project.h" +#include "list.h" #include "loaders.h" #include "encode.h" #include "filters.h" @@ -137,6 +156,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.11 2001/05/29 23:25:24 oes Exp $" #include "miscutil.h" #include "errlog.h" #include "gateway.h" +#include "actions.h" #ifndef SPLIT_PROXY_ARGS /* For strsav */ @@ -159,12 +179,6 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION; * Currently active files. * These are also entered in the main linked list of files. */ -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 TRUST_FILES static struct file_list *current_trustfile = NULL; @@ -175,9 +189,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 @@ -226,22 +237,10 @@ void sweep(void) */ ncsp->config->config_file_list->active = 1; - if (ncsp->permissions_list) /* permissions files */ - { - ncsp->permissions_list->active = 1; - } - - if (ncsp->flist) /* forward files */ - { - ncsp->flist->active = 1; - } - -#ifdef ACL_FILES - if (ncsp->alist) /* acl files */ + if (ncsp->actions_list) /* actions files */ { - ncsp->alist->active = 1; + ncsp->actions_list->active = 1; } -#endif /* def ACL_FILES */ #ifdef PCRS if (ncsp->rlist) /* perl re files */ @@ -275,6 +274,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) @@ -328,7 +329,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]; @@ -364,7 +365,7 @@ static int create_url_spec(struct url_spec * url, char * buf) if (url->path) { int errcode; - char rebuf[BUFSIZ]; + char rebuf[BUFFER_SIZE]; if (NULL == (url->preg = zalloc(sizeof(*url->preg)))) { @@ -430,7 +431,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. @@ -441,7 +442,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; @@ -461,148 +462,6 @@ static void unload_url(struct url_spec *url) } -#ifdef ACL_FILES -/********************************************************************* - * - * Function : unload_aclfile - * - * Description : Unloads an aclfile. - * - * Parameters : - * 1 : f = the data structure associated with the aclfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_aclfile(void *f) -{ - struct access_control_list *b = (struct access_control_list *)f; - if (b == NULL) return; - - unload_aclfile(b->next); - - freez(b); - -} -#endif /* def ACL_FILES */ - - -/********************************************************************* - * - * 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 -/********************************************************************* - * - * Function : unload_trustfile - * - * Description : Unloads a trustfile. - * - * Parameters : - * 1 : f = the data structure associated with the trustfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_trustfile(void *f) -{ - struct block_spec *b = (struct block_spec *)f; - if (b == NULL) return; - - unload_trustfile(b->next); - - unload_url(b->url); - - freez(b); - -} -#endif /* def TRUST_FILES */ - - -/********************************************************************* - * - * Function : unload_forwardfile - * - * Description : Unloads a forwardfile. - * - * Parameters : - * 1 : f = the data structure associated with the forwardfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_forwardfile(void *f) -{ - struct forward_spec *b = (struct forward_spec *)f; - if (b == NULL) return; - - unload_forwardfile(b->next); - - unload_url(b->url); - - freez(b->gw->gateway_host); - freez(b->gw->forward_host); - - freez(b); - -} - - -#ifdef PCRS -/********************************************************************* - * - * Function : unload_re_filterfile - * - * Description : Unload the re_filter list. - * - * Parameters : - * 1 : f = the data structure associated with the filterfile. - * - * Returns : N/A - * - *********************************************************************/ -static void unload_re_filterfile(void *f) -{ - pcrs_job *joblist; - struct re_filterfile_spec *b = (struct re_filterfile_spec *)f; - - if (b == NULL) return; - - destroy_list(b->patterns); - - joblist = b->joblist; - while ( NULL != (joblist = pcrs_free_job(joblist)) ) {} - - freez(b); - -} -#endif /* def PCRS */ - - /********************************************************************* * * Function : check_file_changed @@ -716,7 +575,7 @@ int check_file_changed(const struct file_list * current, char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs) { char *p, *q; - char linebuf[BUFSIZ]; + char linebuf[BUFFER_SIZE]; int contflag = 0; *buf = '\0'; @@ -764,616 +623,62 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs) *p = '\0'; } } - - /* Remove leading and trailing whitespace */ - chomp(linebuf); + /* Write to the buffer */ if (*linebuf) { strncat(buf, linebuf, buflen - strlen(buf)); - if (contflag) - { - contflag = 0; - continue; - } - else - { - return buf; - } } - } - /* EOF */ - return NULL; - -} - -#ifdef ACL_FILES -/********************************************************************* - * - * Function : load_aclfile - * - * Description : Read and parse an aclfile and add to files list. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : 0 => Ok, everything else is an error. - * - *********************************************************************/ -int load_aclfile(struct client_state *csp) -{ - FILE *fp; - char buf[BUFSIZ], *v[3], *p; - int i; - struct access_control_list *a, *bl; - struct file_list *fs; - - if (!check_file_changed(current_aclfile, csp->config->aclfile, &fs)) - { - /* No need to load */ - if (csp) + /* Continue? */ + if (contflag) { - csp->alist = current_aclfile; + contflag = 0; + continue; } - return(0); - } - if (!fs) - { - goto load_aclfile_error; - } - fs->f = bl = (struct access_control_list *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - freez(fs->filename); - freez(fs); - goto load_aclfile_error; - } + /* Remove leading and trailing whitespace */ + chomp(buf); - fp = fopen(csp->config->aclfile, "r"); - - if (fp == NULL) - { - goto load_aclfile_error; - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - i = ssplit(buf, " \t", v, SZ(v), 1, 1); - - /* allocate a new node */ - a = (struct access_control_list *) zalloc(sizeof(*a)); - - if (a == NULL) + if (*buf) { - fclose(fp); - freez(fs->f); - freez(fs->filename); - freez(fs); - goto load_aclfile_error; + return buf; } - - /* add it to the list */ - a->next = bl->next; - bl->next = a; - - switch (i) - { - case 3: - if (acl_addr(v[2], a->dst) < 0) - { - goto load_aclfile_error; - } - /* no break */ - - case 2: - if (acl_addr(v[1], a->src) < 0) - { - goto load_aclfile_error; - } - - p = v[0]; - if (strcmpic(p, "permit") == 0) - { - a->action = ACL_PERMIT; - break; - } - - if (strcmpic(p, "deny") == 0) - { - a->action = ACL_DENY; - break; - } - /* no break */ - - default: - goto load_aclfile_error; - } - } - - fclose(fp); - -#ifndef SPLIT_PROXY_ARGS - if (!suppress_blocklists) - { - fs->proxy_args = strsav(fs->proxy_args, ""); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - if (current_aclfile) - { - current_aclfile->unloader = unload_aclfile; } - fs->next = files->next; - files->next = fs; - current_aclfile = fs; - - if (csp) - { - csp->alist = fs; - } - - return(0); - -load_aclfile_error: - log_error(LOG_LEVEL_FATAL, "can't load access control list %s: %E", - csp->config->aclfile); - return(-1); + /* EOF */ + return NULL; } -#endif /* def ACL_FILES */ - - -struct permission_alias -{ - const char * name; - unsigned mask; /* a bit set to "0" = remove permission */ - unsigned add; /* a bit set to "1" = add permission */ - struct permission_alias * next; -}; - - -/* - * Note: this is special-cased in the code so we don't need to - * fill in the ->next fields. - */ -static const struct permission_alias standard_aliases[] = -{ - { "+block", PERMIT_MASK_ALL, PERMIT_BLOCK }, -/* { "+cookies", PERMIT_MASK_ALL, PERMIT_COOKIE_SET | PERMIT_COOKIE_READ }, */ - { "+cookies-read", PERMIT_MASK_ALL, PERMIT_COOKIE_READ }, - { "+cookies-set", PERMIT_MASK_ALL, PERMIT_COOKIE_SET }, - { "+fast-redirects", PERMIT_MASK_ALL, PERMIT_FAST_REDIRECTS }, - { "+filter", PERMIT_MASK_ALL, PERMIT_RE_FILTER }, - { "+image", PERMIT_MASK_ALL, PERMIT_IMAGE }, - { "+popup", PERMIT_MASK_ALL, PERMIT_POPUPS }, - { "+popups", PERMIT_MASK_ALL, PERMIT_POPUPS }, - { "+referer", PERMIT_MASK_ALL, PERMIT_REFERER }, - { "+referrer", PERMIT_MASK_ALL, PERMIT_REFERER }, - { "-block", ~PERMIT_BLOCK, 0 }, -/* { "-cookies", ~(PERMIT_COOKIE_SET | PERMIT_COOKIE_READ), 0 }, */ - { "-cookies-read", ~PERMIT_COOKIE_READ, 0 }, - { "-cookies-set", ~PERMIT_COOKIE_SET, 0 }, - { "-fast-redirects", ~PERMIT_FAST_REDIRECTS, 0 }, - { "-filter", ~PERMIT_RE_FILTER, 0 }, - { "-image", ~PERMIT_IMAGE, 0 }, - { "-popup", ~PERMIT_POPUPS, 0 }, - { "-popups", ~PERMIT_POPUPS, 0 }, - { "-referer", ~PERMIT_REFERER, 0 }, - { "-referrer", ~PERMIT_REFERER, 0 }, - { NULL, 0, 0 } /* End marker */ -}; +#ifdef TRUST_FILES /********************************************************************* * - * Function : load_permissions_file + * Function : unload_trustfile * - * Description : Read and parse a permissions file and add to files - * list. + * Description : Unloads a trustfile. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) + * 1 : f = the data structure associated with the trustfile. * - * Returns : 0 => Ok, everything else is an error. + * Returns : N/A * *********************************************************************/ -int load_permissions_file(struct client_state *csp) +static void unload_trustfile(void *f) { - FILE *fp; - - struct permissions_spec *last_perm; - struct permissions_spec *perm; - char buf[BUFSIZ]; - struct file_list *fs; -#define MODE_START_OF_FILE 1 -#define MODE_PERMISSIONS 2 -#define MODE_ALIAS 3 - int mode = MODE_START_OF_FILE; - unsigned curmask = PERMIT_MASK_ALL; - unsigned curadd = 0; - struct permission_alias * alias_list = NULL; - - if (!check_file_changed(current_permissions_file, csp->config->permissions_file, &fs)) - { - /* No need to load */ - if (csp) - { - csp->permissions_list = current_permissions_file; - } - return 0; - } - if (!fs) - { - log_error(LOG_LEVEL_FATAL, "can't load permissions file '%s': error finding file: %E", - csp->config->permissions_file); - return 1; /* never get here */ - } - - fs->f = last_perm = (struct permissions_spec *)zalloc(sizeof(*last_perm)); - if (last_perm == NULL) - { - log_error(LOG_LEVEL_FATAL, "can't load permissions file '%s': out of memory!", - csp->config->permissions_file); - return 1; /* never get here */ - } - - if ((fp = fopen(csp->config->permissions_file, "r")) == NULL) - { - log_error(LOG_LEVEL_FATAL, "can't load permissions file '%s': error opening file: %E", - csp->config->permissions_file); - return 1; /* never get here */ - } - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - if (*buf == '{') - { - /* It's a header block */ - if (buf[1] == '{') - { - /* It's {{settings}} or {{alias}} */ - int len = strlen(buf); - char * start = buf + 2; - char * end = buf + len - 1; - if ((len < 5) || (*end-- != '}') || (*end-- != '}')) - { - /* too short */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid line: %s", - csp->config->permissions_file, buf); - return 1; /* never get here */ - } - - /* Trim leading and trailing whitespace. */ - end[1] = '\0'; - chomp(start); - - if (*start == '\0') - { - /* too short */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid line: {{ }}", - csp->config->permissions_file); - return 1; /* never get here */ - } - - if (0 == strcmpic(start, "alias")) - { - /* it's an {{alias}} block */ - - mode = MODE_ALIAS; - } - else - { - /* invalid {{something}} block */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid line: {{%s}}", - csp->config->permissions_file, start); - return 1; /* never get here */ - } - } - else - { - /* It's a permissions block */ - - int more = 1; - - int len = strlen(buf); - char * start = buf + 1; - char * end = buf + len - 1; - - if ((len < 3) || (*end-- != '}')) - { - /* too short */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid line: %s", - csp->config->permissions_file, buf); - return 1; /* never get here */ - } - - end[1] = '\0'; - chomp(start); - - if (*start == '\0') - { - /* too short */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid line: { }", - csp->config->permissions_file); - return 1; /* never get here */ - } - - mode = MODE_PERMISSIONS; - - curmask = PERMIT_MASK_ALL; - curadd = 0; - - while (more) - { - const struct permission_alias * alias = standard_aliases; - char * option = start; - while ((*start != '\0') && (*start != ' ') && (*start != '\t')) - { - start++; - } - - more = (*start != 0); - if (more) - { - *start++ = '\0'; - - /* Eat all the whitespace between the options */ - while ((*start == ' ') || (*start == '\t')) - { - start++; - } - } - - /* handle option in 'option' */ - - /* Check for standard permission name */ - while ( (alias->name != NULL) && (0 != strcmpic(alias->name, option)) ) - { - alias++; - } - if (alias->name == NULL) - { - /* try user aliases. */ - alias = alias_list; - while ( (alias != NULL) && (0 != strcmpic(alias->name, option)) ) - { - alias = alias->next; - } - } - if (alias == NULL) - { - /* Bad permission name */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid permission name: %s", - csp->config->permissions_file, option); - return 1; /* never get here */ - } - curmask &= alias->mask; - curadd &= alias->mask; - curadd |= alias->add; - } - } - } - else if (mode == MODE_ALIAS) - { - /* define an alias */ - struct permission_alias * new_alias; - int more = 1; - - char * start = strchr(buf, '='); - char * end = start; - - if ((start == NULL) || (start == buf)) - { - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid alias line: %s", - csp->config->permissions_file, buf); - return 1; /* never get here */ - } - - if ((new_alias = zalloc(sizeof(*new_alias))) == NULL) - { - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': out of memory!", - csp->config->permissions_file); - return 1; /* never get here */ - } - - /* Eat any the whitespace after the '=' */ - start++; - while ((*start == ' ') || (*start == '\t')) - { - start++; - } - if (*start == '\0') - { - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid alias line: %s", - csp->config->permissions_file, buf); - return 1; /* never get here */ - } - - /* Eat any the whitespace before the '=' */ - end--; - while ((*end == ' ') || (*end == '\t')) - { - /* - * we already know we must have at least 1 non-ws char - * at start of buf - no need to check - */ - end--; - } - end[1] = '\0'; - - new_alias->name = strdup(buf); - - curmask = PERMIT_MASK_ALL; - curadd = 0; - - while (more) - { - const struct permission_alias * alias = standard_aliases; - char * option = start; - while ((*start != '\0') && (*start != ' ') && (*start != '\t')) - { - start++; - } - - more = (*start != 0); - if (more) - { - *start++ = '\0'; - - /* Eat all the whitespace between the options */ - while ((*start == ' ') || (*start == '\t')) - { - start++; - } - } - - /* handle option in 'option' */ - - /* Check for standard permission name */ - while ( (alias->name != NULL) && (0 != strcmpic(alias->name, option)) ) - { - alias++; - } - if (alias->name == NULL) - { - /* try user aliases. */ - alias = alias_list; - while ( (alias != NULL) && (0 != strcmpic(alias->name, option)) ) - { - alias = alias->next; - } - } - if (alias == NULL) - { - /* Bad permission name */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': invalid permission name: %s", - csp->config->permissions_file, option); - return 1; /* never get here */ - } - curmask &= alias->mask; - curadd &= alias->mask; - curadd |= alias->add; - } - - /* save alias permissions */ - new_alias->mask = curmask; - new_alias->add = curadd; - - /* add to list */ - new_alias->next = alias_list; - alias_list = new_alias; - } - else if (mode == MODE_PERMISSIONS) - { - /* it's a URL pattern */ - - /* allocate a new node */ - if ((perm = zalloc(sizeof(*perm))) == NULL) - { - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': out of memory!", - csp->config->permissions_file); - return 1; /* never get here */ - } - - /* Save flags */ - perm->mask = curmask; - perm->add = curadd; - - /* Save the URL pattern */ - if (create_url_spec(perm->url, buf)) - { - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': cannot create URL permission from: %s", - csp->config->permissions_file, buf); - return 1; /* never get here */ - } - - /* add it to the list */ - last_perm->next = perm; - last_perm = perm; - } - else if (mode == MODE_START_OF_FILE) - { - /* oops - please have a {} line as 1st line in file. */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': first line is invalid: %s", - csp->config->permissions_file, buf); - return 1; /* never get here */ - } - else - { - /* How did we get here? This is impossible! */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load permissions file '%s': INTERNAL ERROR - mode = %d", - csp->config->permissions_file, mode); - return 1; /* never get here */ - } - } - - fclose(fp); - - while (alias_list != NULL) - { - struct permission_alias * next = alias_list->next; - freez((char *)alias_list->name); - free(alias_list); - alias_list = next; - } - -#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; - } + struct block_spec *b = (struct block_spec *)f; + if (b == NULL) return; - fs->next = files->next; - files->next = fs; - current_permissions_file = fs; + unload_trustfile(b->next); - if (csp) - { - csp->permissions_list = fs; - } + free_url(b->url); - return(0); + freez(b); } -#ifdef TRUST_FILES /********************************************************************* * * Function : load_trustfile @@ -1393,7 +698,7 @@ int load_trustfile(struct client_state *csp) struct block_spec *b, *bl; struct url_spec **tl; - char buf[BUFSIZ], *p, *q; + char buf[BUFFER_SIZE], *p, *q; int reject, trusted; struct file_list *fs; @@ -1518,195 +823,35 @@ load_trustfile_error: #endif /* def TRUST_FILES */ +#ifdef PCRS /********************************************************************* * - * Function : load_forwardfile + * Function : unload_re_filterfile * - * Description : Read and parse a forwardfile and add to files list. + * Description : Unload the re_filter list. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) + * 1 : f = the data structure associated with the filterfile. * - * Returns : 0 => Ok, everything else is an error. + * Returns : N/A * *********************************************************************/ -int load_forwardfile(struct client_state *csp) +static void unload_re_filterfile(void *f) { - FILE *fp; - - struct forward_spec *b, *bl; - char buf[BUFSIZ]; - char *p, *tmp; - char *vec[4]; - int n; - struct file_list *fs; - const struct gateway *gw; - - if (!check_file_changed(current_forwardfile, csp->config->forwardfile, &fs)) - { - /* No need to load */ - if (csp) - { - csp->flist = current_forwardfile; - } - return(0); - } - if (!fs) - { - goto load_forwardfile_error; - } - - fs->f = bl = (struct forward_spec *)zalloc(sizeof(*bl)); - - if ((fs == NULL) || (bl == NULL)) - { - goto load_forwardfile_error; - } - - if ((fp = fopen(csp->config->forwardfile, "r")) == NULL) - { - goto load_forwardfile_error; - } - - tmp = NULL; - - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) - { - freez(tmp); - - tmp = strdup(buf); - - n = ssplit(tmp, " \t", vec, SZ(vec), 1, 1); - - if (n != 4) - { - log_error(LOG_LEVEL_ERROR, "error in forwardfile: %s", buf); - continue; - } - - strcpy(buf, vec[0]); - - /* skip lines containing only ~ */ - if (*buf == '\0') - { - continue; - } - - /* allocate a new node */ - if (((b = zalloc(sizeof(*b))) == NULL) - ) - { - fclose(fp); - goto load_forwardfile_error; - } - - /* add it to the list */ - b->next = bl->next; - bl->next = b; - - /* Save the URL pattern */ - if (create_url_spec(b->url, buf)) - { - fclose(fp); - goto load_forwardfile_error; - } - - /* now parse the gateway specs */ - - p = vec[2]; - - for (gw = gateways; gw->name; gw++) - { - if (strcmp(gw->name, p) == 0) - { - break; - } - } - - if (gw->name == NULL) - { - goto load_forwardfile_error; - } - - /* save this as the gateway type */ - *b->gw = *gw; - - /* now parse the gateway host[:port] spec */ - p = vec[3]; - - if (strcmp(p, ".") != 0) - { - b->gw->gateway_host = strdup(p); - - if ((p = strchr(b->gw->gateway_host, ':'))) - { - *p++ = '\0'; - b->gw->gateway_port = atoi(p); - } - - if (b->gw->gateway_port <= 0) - { - goto load_forwardfile_error; - } - } - - /* now parse the forwarding spec */ - p = vec[1]; - - if (strcmp(p, ".") != 0) - { - b->gw->forward_host = strdup(p); - - if ((p = strchr(b->gw->forward_host, ':'))) - { - *p++ = '\0'; - b->gw->forward_port = atoi(p); - } - - if (b->gw->forward_port <= 0) - { - b->gw->forward_port = 8000; - } - } - } - - freez(tmp); - - 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_forwardfile) - { - current_forwardfile->unloader = unload_forwardfile; - } + pcrs_job *joblist; + struct re_filterfile_spec *b = (struct re_filterfile_spec *)f; - fs->next = files->next; - files->next = fs; - current_forwardfile = fs; + if (b == NULL) return; - if (csp) - { - csp->flist = fs; - } + destroy_list(b->patterns); - return(0); + joblist = b->joblist; + while ( NULL != (joblist = pcrs_free_job(joblist)) ) {} -load_forwardfile_error: - log_error(LOG_LEVEL_FATAL, "can't load forwardfile '%s': %E", - csp->config->forwardfile); - return(-1); + freez(b); } - -#ifdef PCRS /********************************************************************* * * Function : load_re_filterfile @@ -1728,7 +873,7 @@ int load_re_filterfile(struct client_state *csp) struct re_filterfile_spec *bl; struct file_list *fs; - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; int error; pcrs_job *dummy;