-const char loaders_rcs[] = "$Id: loaders.c,v 1.82 2011/04/19 13:00:47 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.94 2012/12/07 12:43:05 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
* 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
NULL, NULL, NULL, NULL, NULL
};
-/*
- * Pseudo filter type for load_one_re_filterfile
- */
-#define NO_NEW_FILTER -1
-
/*********************************************************************
*
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;
}
*/
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;
}
*/
for (i = 0; i < MAX_AF_FILES; i++)
{
- if (csp->rlist[i])
+ if (csp->rlist[i])
{
csp->rlist[i]->active = 1;
}
last_active = client_list;
client_list = client_list->next;
}
- else
+ else
/*
* This client is not active. Free its resources.
*/
last_active->next = client_list->next;
freez(csp->ip_addr_str);
+ freez(csp->client_iob->buf);
freez(csp->iob->buf);
freez(csp->error_message);
#endif /* def FEATURE_STATISTICS */
freez(client_list);
-
+
client_list = last_active->next;
}
}
while (fl != NULL)
{
- if ( ( 0 == fl->active ) && ( NULL != fl->unloader ) )
+ if ((0 == fl->active) && (NULL != fl->unloader))
{
nfl->next = fl->next;
/* 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)
{
*/
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.
fs->next = files->next;
files->next = fs;
current_trustfile = fs;
+ csp->tlist = fs;
- if (csp)
- {
- csp->tlist = fs;
- }
return(0);
load_trustfile_error:
*
* 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.
*
*
* 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.
*
* 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.
goto load_re_filterfile_error;
}
- /*
+ /*
* Open the file or fail
*/
if ((fp = fopen(csp->config->re_filterfile[fileid], "r")) == NULL)
log_error(LOG_LEVEL_INFO, "Loading filter file: %s", csp->config->re_filterfile[fileid]);
- /*
+ /*
* Read line by line
*/
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)
{
* 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)
}
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)
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)
{
log_error(LOG_LEVEL_RE_FILTER,
"Adding dynamic re_filter job \'%s\' to filter %s succeeded.", buf, bl->name);
freez(buf);
- continue;
+ continue;
}
else if (bl->dynamic)
{
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;
}
current_re_filterfile[fileid] = fs;
csp->rlist[fileid] = fs;
- return( 0 );
+ return(0);
load_re_filterfile_error:
log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E",
{
int i;
- for (i=0; i < NLOADERS; i++)
+ for (i = 0; i < NLOADERS; i++)
{
if (config->loaders[i] == NULL)
{
int ret = 0;
int i;
- for (i=0; i < NLOADERS; i++)
+ for (i = 0; i < NLOADERS; i++)
{
if (csp->config->loaders[i] == NULL)
{
* 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;
+ }
- while (file_to_check != NULL)
+ 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;
+ }
+ }
+ }
+
+ 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])
+ {
+ file_to_check = csp->rlist[i];
+ if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
+ {
+ return TRUE;
+ }
+ }
+ }
+
+#ifdef FEATURE_TRUST
+ if (csp->tlist)
+ {
+ if (file_has_been_modified(csp->tlist->filename, csp->tlist->lastmodified))
{
- log_error(LOG_LEVEL_INFO,
- "File modification detected: %s", file_to_check->filename);
return TRUE;
}
- file_to_check = file_to_check->next;
}
+#endif /* def FEATURE_TRUST */
+
return FALSE;
}