-const char loaders_rcs[] = "$Id: loaders.c,v 1.74 2009/09/26 13:29:57 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-2009 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 sweep(void)
{
struct file_list *fl, *nfl;
- struct client_state *csp, *last_active;
+ struct client_state *csp;
+ struct client_states *last_active, *client_list;
int i;
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;
}
last_active = clients;
- csp = clients->next;
+ client_list = clients->next;
- while (NULL != csp)
+ while (NULL != client_list)
{
+ csp = &client_list->csp;
if (csp->flags & CSP_FLAG_ACTIVE)
{
/* Mark this client's files as active */
*/
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;
}
active_threads++;
- last_active = csp;
- csp = csp->next;
+ last_active = client_list;
+ client_list = client_list->next;
}
- else
+ else
/*
* This client is not active. Free its resources.
*/
{
- last_active->next = csp->next;
+ 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(csp);
-
- csp = last_active->next;
+ 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;
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 */
/* 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)
{
* 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. Lenght: %u. Max lenght: %u.",
- *linenum, strlen(buf2), buflen-1);
- }
- strlcpy(buf, buf2, buflen);
- free(buf2);
- return buf;
+ *buf = NULL;
}
+ return *buf;
}
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;
if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs))
{
/* No need to load */
- if (csp)
- {
- csp->tlist = current_trustfile;
- }
+ csp->tlist = current_trustfile;
return(0);
}
if (!fs)
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;
if (*buf == '~')
{
+ char *p;
+ char *q;
+
reject = 0;
p = buf;
q = p+1;
/* skip blank lines */
if (*buf == '\0')
{
+ freez(buf);
continue;
}
*/
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;
-
- 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);
}
*
* 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.
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;
*/
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)
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(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)
{
* 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)
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)
{
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)
{
*/
log_error(LOG_LEVEL_RE_FILTER,
"Adding static re_filter job \'%s\' to dynamic filter %s succeeded.", buf, bl->name);
+ freez(buf);
continue;
}
{
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
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;
}
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",
{
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)
{
}
+/*********************************************************************
+ *
+ * Function : file_has_been_modified
+ *
+ * Description : Helper function to check if a file has been changed
+ *
+ * Parameters :
+ * 1 : filename = The name of the file to check
+ * 2 : last_known_modification = The time of the last known
+ * modification
+ *
+ * Returns : TRUE if the file has been changed,
+ * FALSE otherwise.
+ *
+ *********************************************************************/
+static int file_has_been_modified(const char *filename, time_t last_know_modification)
+{
+ struct stat statbuf[1];
+
+ if (stat(filename, statbuf) < 0)
+ {
+ /* Error, probably file not found which counts as change. */
+ return 1;
+ }
+
+ return (last_know_modification != statbuf->st_mtime);
+}
+
+
+/*********************************************************************
+ *
+ * Function : any_loaded_file_changed
+ *
+ * Description : Helper function to check if any loaded file has been
+ * changed since the time it has been loaded.
+ *
+ * XXX: Should we cache the return value for x seconds?
+ *
+ * Parameters :
+ * 1 : files_to_check = List of files to check
+ *
+ * Returns : TRUE if any file has been changed,
+ * FALSE otherwise.
+ *
+ *********************************************************************/
+int any_loaded_file_changed(const struct client_state *csp)
+{
+ 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;
+ }
+ }
+ }
+
+ for (i = 0; i < MAX_AF_FILES; i++)
+ {
+ 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))
+ {
+ return TRUE;
+ }
+ }
+#endif /* def FEATURE_TRUST */
+
+ return FALSE;
+}
+
/*
Local Variables: