X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=ae4f9c0c5630dc6569556c75f63c0e0e783ba7e7;hp=47dc61d0a93c80bbb2e1beae88707c71af642d69;hb=0ffb274ecaed186a6f58031a4627135516605963;hpb=52cf256c05896e5e82b9cac9afbaee41c9c597ab diff --git a/loaders.c b/loaders.c index 47dc61d0..ae4f9c0c 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.79 2011/01/14 19:47:16 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.93 2012/10/21 12:53:33 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -8,7 +8,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.79 2011/01/14 19:47:16 fabiankeil * the list of active loaders, and to automatically * unload files that are no longer in use. * - * Copyright : Written by and Copyright (C) 2001-2010 the + * Copyright : Written by and Copyright (C) 2001-2012 the * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -81,11 +81,6 @@ static struct file_list *current_re_filterfile[MAX_AF_FILES] = { NULL, NULL, NULL, NULL, NULL }; -/* - * Pseudo filter type for load_one_re_filterfile - */ -#define NO_NEW_FILTER -1 - /********************************************************************* * @@ -120,7 +115,7 @@ unsigned int sweep(void) unsigned int active_threads = 0; /* clear all of the file's active flags */ - for ( fl = files->next; NULL != fl; fl = fl->next ) + for (fl = files->next; NULL != fl; fl = fl->next) { fl->active = 0; } @@ -142,12 +137,12 @@ unsigned int sweep(void) */ csp->config->config_file_list->active = 1; - /* + /* * Actions files */ for (i = 0; i < MAX_AF_FILES; i++) { - if (csp->actions_list[i]) + if (csp->actions_list[i]) { csp->actions_list[i]->active = 1; } @@ -158,7 +153,7 @@ unsigned int sweep(void) */ for (i = 0; i < MAX_AF_FILES; i++) { - if (csp->rlist[i]) + if (csp->rlist[i]) { csp->rlist[i]->active = 1; } @@ -179,7 +174,7 @@ unsigned int sweep(void) last_active = client_list; client_list = client_list->next; } - else + else /* * This client is not active. Free its resources. */ @@ -187,6 +182,7 @@ unsigned int sweep(void) last_active->next = client_list->next; freez(csp->ip_addr_str); + freez(csp->client_iob->buf); freez(csp->iob->buf); freez(csp->error_message); @@ -211,7 +207,7 @@ unsigned int sweep(void) #endif /* def FEATURE_STATISTICS */ freez(client_list); - + client_list = last_active->next; } } @@ -221,7 +217,7 @@ unsigned int sweep(void) while (fl != NULL) { - if ( ( 0 == fl->active ) && ( NULL != fl->unloader ) ) + if ((0 == fl->active) && (NULL != fl->unloader)) { nfl->next = fl->next; @@ -359,7 +355,7 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline) p = buf; /* - * Character codes. If you have a wierd compiler and the following are + * Character codes. If you have a weird compiler and the following are * incorrect, you also need to fix NEWLINE() in loaders.h */ #define CHAR_CR '\r' /* ASCII 13 */ @@ -569,8 +565,8 @@ jb_err edit_read_line(FILE *fp, /* Main loop. Loop while we need more data & it's not EOF. */ - while ( (contflag || is_empty) - && (JB_ERR_OK == (rval = simple_read_line(fp, &linebuf, newline)))) + while ((contflag || is_empty) + && (JB_ERR_OK == (rval = simple_read_line(fp, &linebuf, newline)))) { if (line_number) { @@ -737,41 +733,27 @@ jb_err edit_read_line(FILE *fp, * and respects escaping of newline and comment char. * * Parameters : - * 1 : buf = Buffer to use. - * 2 : buflen = Size of buffer in bytes. - * 3 : fp = File to read from - * 4 : linenum = linenumber in file + * 1 : fp = File to read from + * 2 : linenum = linenumber in file + * 3 : buf = Pointer to a pointer to set to the data buffer. * * Returns : NULL on EOF or error * Otherwise, returns buf. * *********************************************************************/ -char *read_config_line(char *buf, size_t buflen, FILE *fp, unsigned long *linenum) +char *read_config_line(FILE *fp, unsigned long *linenum, char **buf) { jb_err err; - char *buf2 = NULL; - err = edit_read_line(fp, NULL, NULL, &buf2, NULL, linenum); + err = edit_read_line(fp, NULL, NULL, buf, NULL, linenum); if (err) { if (err == JB_ERR_MEMORY) { log_error(LOG_LEVEL_FATAL, "Out of memory loading a config file"); } - return NULL; - } - else - { - assert(buf2); - if (strlen(buf2) + 1U > buflen) - { - log_error(LOG_LEVEL_FATAL, - "Max line limit reached. Linenumber: %u. Length: %u. Max length: %u.", - *linenum, strlen(buf2), buflen-1); - } - strlcpy(buf, buf2, buflen); - free(buf2); - return buf; + *buf = NULL; } + return *buf; } @@ -849,7 +831,7 @@ int load_trustfile(struct client_state *csp) struct block_spec *b, *bl; struct url_spec **tl; - char buf[BUFFER_SIZE], *p, *q; + char *buf = NULL; int reject, trusted; struct file_list *fs; unsigned long linenum = 0; @@ -880,7 +862,7 @@ int load_trustfile(struct client_state *csp) tl = csp->config->trust_list; - while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL) + while (read_config_line(fp, &linenum, &buf) != NULL) { trusted = 0; reject = 1; @@ -893,6 +875,9 @@ int load_trustfile(struct client_state *csp) if (*buf == '~') { + char *p; + char *q; + reject = 0; p = buf; q = p+1; @@ -905,6 +890,7 @@ int load_trustfile(struct client_state *csp) /* skip blank lines */ if (*buf == '\0') { + freez(buf); continue; } @@ -933,14 +919,15 @@ int load_trustfile(struct client_state *csp) */ if (trusted) { - if(++trusted_referrers < MAX_TRUSTED_REFERRERS) + if (++trusted_referrers < MAX_TRUSTED_REFERRERS) { *tl++ = b->url; } } + freez(buf); } - if(trusted_referrers >= MAX_TRUSTED_REFERRERS) + if (trusted_referrers >= MAX_TRUSTED_REFERRERS) { /* * FIXME: ... after Privoxy 3.0.4 is out. @@ -964,17 +951,14 @@ int load_trustfile(struct client_state *csp) fs->next = files->next; files->next = fs; current_trustfile = fs; - - if (csp) - { - csp->tlist = fs; - } + csp->tlist = fs; return(0); load_trustfile_error: log_error(LOG_LEVEL_FATAL, "can't load trustfile '%s': %E", - csp->config->trustfile); + csp->config->trustfile); + freez(buf); return(-1); } @@ -1018,7 +1002,7 @@ static void unload_re_filterfile(void *f) * * Function : unload_forward_spec * - * Description : Unload the forward spec settings by freeing all + * Description : Unload the forward spec settings by freeing all * memory referenced by members and the memory for * the spec itself. * @@ -1072,7 +1056,7 @@ void unload_current_re_filterfile(void) * * Function : load_re_filterfiles * - * Description : Loads all the filterfiles. + * Description : Loads all the filterfiles. * Generate a chained list of re_filterfile_spec's from * the "FILTER: " blocks, compiling all their substitutions * into chained lists of pcrs_job structs. @@ -1113,7 +1097,7 @@ int load_re_filterfiles(struct client_state *csp) * * Function : load_one_re_filterfile * - * Description : Load a re_filterfile. + * Description : Load a re_filterfile. * Generate a chained list of re_filterfile_spec's from * the "FILTER: " blocks, compiling all their substitutions * into chained lists of pcrs_job structs. @@ -1131,7 +1115,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) struct re_filterfile_spec *new_bl, *bl = NULL; struct file_list *fs; - char buf[BUFFER_SIZE]; + char *buf = NULL; int error; unsigned long linenum = 0; pcrs_job *dummy, *lastjob = NULL; @@ -1141,10 +1125,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) */ if (!check_file_changed(current_re_filterfile[fileid], csp->config->re_filterfile[fileid], &fs)) { - if (csp) - { - csp->rlist[fileid] = current_re_filterfile[fileid]; - } + csp->rlist[fileid] = current_re_filterfile[fileid]; return(0); } if (!fs) @@ -1152,7 +1133,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) goto load_re_filterfile_error; } - /* + /* * Open the file or fail */ if ((fp = fopen(csp->config->re_filterfile[fileid], "r")) == NULL) @@ -1162,12 +1143,12 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) log_error(LOG_LEVEL_INFO, "Loading filter file: %s", csp->config->re_filterfile[fileid]); - /* + /* * Read line by line */ - while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL) + while (read_config_line(fp, &linenum, &buf) != NULL) { - int new_filter = NO_NEW_FILTER; + enum filter_type new_filter = FT_INVALID_FILTER; if (strncmp(buf, "FILTER:", 7) == 0) { @@ -1194,7 +1175,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) * If this is the head of a new filter block, make it a * re_filterfile spec of its own and chain it to the list: */ - if (new_filter != NO_NEW_FILTER) + if (new_filter != FT_INVALID_FILTER) { new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl)); if (new_bl == NULL) @@ -1230,7 +1211,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) } new_bl->name = strdup(chomp(new_bl->name)); - + /* * If this is the first filter block, chain it * to the file_list rather than its (nonexistant) @@ -1249,12 +1230,13 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) log_error(LOG_LEVEL_RE_FILTER, "Reading in filter \"%s\" (\"%s\")", bl->name, bl->description); + freez(buf); continue; } - /* + /* * Else, save the expression, make it a pcrs_job - * and chain it into the current filter's joblist + * and chain it into the current filter's joblist */ if (bl != NULL) { @@ -1280,7 +1262,8 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) bl->dynamic = 1; log_error(LOG_LEVEL_RE_FILTER, "Adding dynamic re_filter job \'%s\' to filter %s succeeded.", buf, bl->name); - continue; + freez(buf); + continue; } else if (bl->dynamic) { @@ -1291,6 +1274,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) */ log_error(LOG_LEVEL_RE_FILTER, "Adding static re_filter job \'%s\' to dynamic filter %s succeeded.", buf, bl->name); + freez(buf); continue; } @@ -1298,6 +1282,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) { log_error(LOG_LEVEL_ERROR, "Adding re_filter job \'%s\' to filter %s failed with error %d.", buf, bl->name, error); + freez(buf); continue; } else @@ -1319,14 +1304,15 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", buf, csp->config->re_filterfile[fileid], linenum); } + freez(buf); } fclose(fp); - /* + /* * Schedule the now-obsolete old data for unloading */ - if ( NULL != current_re_filterfile[fileid] ) + if (NULL != current_re_filterfile[fileid]) { current_re_filterfile[fileid]->unloader = unload_re_filterfile; } @@ -1337,13 +1323,9 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) fs->next = files->next; files->next = fs; current_re_filterfile[fileid] = fs; + csp->rlist[fileid] = fs; - if (csp) - { - csp->rlist[fileid] = fs; - } - - return( 0 ); + return(0); load_re_filterfile_error: log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E", @@ -1373,7 +1355,7 @@ void add_loader(int (*loader)(struct client_state *), { int i; - for (i=0; i < NLOADERS; i++) + for (i = 0; i < NLOADERS; i++) { if (config->loaders[i] == NULL) { @@ -1407,7 +1389,7 @@ int run_loader(struct client_state *csp) int ret = 0; int i; - for (i=0; i < NLOADERS; i++) + for (i = 0; i < NLOADERS; i++) { if (csp->config->loaders[i] == NULL) { @@ -1464,20 +1446,40 @@ static int file_has_been_modified(const char *filename, time_t last_know_modific * FALSE otherwise. * *********************************************************************/ -int any_loaded_file_changed(const struct file_list *files_to_check) +int any_loaded_file_changed(const struct client_state *csp) { - const struct file_list *file_to_check = files_to_check; + const struct file_list *file_to_check = csp->config->config_file_list; + int i; + + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + + for (i = 0; i < MAX_AF_FILES; i++) + { + if (csp->actions_list[i]) + { + file_to_check = csp->actions_list[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + } + } - while (file_to_check != NULL) + for (i = 0; i < MAX_AF_FILES; i++) { - if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + if (csp->rlist[i]) { - log_error(LOG_LEVEL_INFO, - "File modification detected: %s", file_to_check->filename); - return TRUE; + file_to_check = csp->rlist[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } } - file_to_check = file_to_check->next; } + return FALSE; }