Don't keep the client connection alive if any configuration file changed since the...

[privoxy.git] / loaders.c

diff --git a/loaders.c b/loaders.c
index ee76718..d196f64 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.72 2009/04/24 15:29:43 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.76 2010/07/21 14:35:09 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -8,7 +8,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.72 2009/04/24 15:29:43 fabiankeil
  *                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-2010 the
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -114,7 +114,8 @@ static struct file_list *current_re_filterfile[MAX_AF_FILES]  = {
 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;
 
@@ -125,10 +126,11 @@ unsigned int sweep(void)
    }
 
    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 */
@@ -174,15 +176,15 @@ unsigned int sweep(void)
 
          active_threads++;
 
-         last_active = csp;
-         csp = csp->next;
+         last_active = client_list;
+         client_list = client_list->next;
       }
       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->iob->buf);
@@ -208,9 +210,9 @@ unsigned int sweep(void)
          }
 #endif /* def FEATURE_STATISTICS */
 
-         freez(csp);
+         freez(client_list);
          
-         csp = last_active->next;
+         client_list = last_active->next;
       }
    }
 
@@ -760,10 +762,14 @@ char *read_config_line(char *buf, size_t buflen, FILE *fp, unsigned long *linenu
    else
    {
       assert(buf2);
-      assert(strlen(buf2) + 1U < buflen);
-      strncpy(buf, buf2, buflen - 1);
+      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);
-      buf[buflen - 1] = '\0';
       return buf;
    }
 }
@@ -873,6 +879,7 @@ int load_trustfile(struct client_state *csp)
    {
       goto load_trustfile_error;
    }
+   log_error(LOG_LEVEL_INFO, "Loading trust file: %s", csp->config->trustfile);
 
    tl = csp->config->trust_list;
 
@@ -1156,6 +1163,8 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
       goto load_re_filterfile_error;
    }
 
+   log_error(LOG_LEVEL_INFO, "Loading filter file: %s", csp->config->re_filterfile[fileid]);
+
    /* 
     * Read line by line
     */
@@ -1413,6 +1422,67 @@ int run_loader(struct client_state *csp)
 
 }
 
+/*********************************************************************
+ *
+ * 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 file_list *files_to_check)
+{
+   const struct file_list *file_to_check = files_to_check;
+
+   while (file_to_check != NULL)
+   {
+      if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
+      {
+         log_error(LOG_LEVEL_INFO, "%s has been changed", file_to_check->filename);
+         return TRUE;
+      }
+      file_to_check = file_to_check->next;
+   }
+   return FALSE;
+}
+
 
 /*
   Local Variables: