@@ -1,3 +1,9 @@

+Mon Mar  7 01:28:44 CET 2005 (tk)

+---------------------------------

+  * libclamav, clamd: add reference counter to cl_node and improve database

+		      reload method in clamd (patch by Mark Pizzolato

+		      <clamav-devel*subscriptions.pizzolato.net>)

+

 Mon Mar  7 00:37:34 CET 2005 (tk)

 ---------------------------------

   * libclamav: add MD5 based false positive eliminator

@@ -48,6 +48,7 @@

 int progexit = 0;

 pthread_mutex_t exit_mutex;

 int reload = 0;

+time_t reloaded_time = 0;

 pthread_mutex_t reload_mutex;

 int sighup = 0;

@@ -55,7 +56,8 @@ typedef struct client_conn_tag {

     int sd;

     int options;

     const struct cfgstruct *copt;

-    const struct cl_node *root;

+    struct cl_node *root;

+    time_t root_timestamp;

     const struct cl_limits *limits;

     pid_t mainpid;

 } client_conn_t;

@@ -117,7 +119,7 @@ void scanner_thread(void *arg)

 	    }

 	    pthread_mutex_unlock(&exit_mutex);

 	    pthread_mutex_lock(&reload_mutex);

-	    if(reload) {

+	    if (conn->root_timestamp != reloaded_time) {

 		session = FALSE;

 	    }

 	    pthread_mutex_unlock(&reload_mutex);

@@ -125,6 +127,7 @@ void scanner_thread(void *arg)

     } while (session);

     close(conn->sd);

+    cl_free(conn->root);

     free(conn);

     return;

 }

@@ -517,7 +520,8 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 		client_conn->sd = new_sd;

 		client_conn->options = options;

 		client_conn->copt = copt;

-		client_conn->root = root;

+		client_conn->root = cl_dup(root);

+		client_conn->root_timestamp = reloaded_time;

 		client_conn->limits = &limits;

 		client_conn->mainpid = mainpid;

 		if (!thrmgr_dispatch(thr_pool, client_conn)) {

@@ -552,18 +556,10 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	pthread_mutex_lock(&reload_mutex);

 	if(reload) {

 	    pthread_mutex_unlock(&reload_mutex);

-	    /* Destroy the thread manager.

-	     * This waits for all current tasks to end

-	     */

-	    thrmgr_destroy(thr_pool);

 	    root = reload_db(root, copt, FALSE);

-	    if((thr_pool=thrmgr_new(max_threads, idletimeout, scanner_thread)) == NULL) {

-		logg("!thrmgr_new failed\n");

-		pthread_mutex_unlock(&reload_mutex);

-		exit(-1);

-	    }

 	    pthread_mutex_lock(&reload_mutex);

 	    reload = 0;

+	    time(&reloaded_time);

 	    pthread_mutex_unlock(&reload_mutex);

 #ifdef CLAMUKO

 	    if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess")) {

@@ -579,6 +575,10 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	}

     }

+    /* Destroy the thread manager.

+     * This waits for all current tasks to end

+     */

+    thrmgr_destroy(thr_pool);

 #ifdef CLAMUKO

     if(cfgopt(copt, "ClamukoScanOnLine") || cfgopt(copt, "ClamukoScanOnAccess")) {

 	logg("Stopping Clamuko.\n");

@@ -586,6 +586,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	pthread_join(clamuko_pid, NULL);

     }

 #endif

+    cl_free(root);

     logg("*Shutting down the main socket.\n");

     shutdown(socketd, 2);

     logg("*Closing the main socket.\n");

@@ -128,6 +128,7 @@ struct cli_zip_node {

 };

 struct cl_node {

+    unsigned int refcount;

     unsigned int maxpatlen; /* maximal length of pattern in db */

     /* Extended Boyer-Moore */

@@ -190,6 +191,7 @@ extern const char *cl_retver(void);

 extern int cl_loaddb(const char *filename, struct cl_node **root, unsigned int *signo);

 extern int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo);

 extern const char *cl_retdbdir(void);

+extern struct cl_node *cl_dup(struct cl_node *root);

 /* CVD */

 extern struct cl_cvd *cl_cvdhead(const char *file);

@@ -43,6 +43,11 @@ static int targettab[TARGET_TABLE_SIZE] = { 0, CL_TYPE_MSEXE, CL_TYPE_MSOLE2, CL

 extern short cli_debug_flag;

+#ifdef CL_THREAD_SAFE

+#  include <pthread.h>

+pthread_mutex_t cli_ref_mutex = PTHREAD_MUTEX_INITIALIZER;

+#endif

+

 int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root, unsigned short ftype)

 {

 	int ret, *partcnt;

@@ -361,6 +366,26 @@ int cl_build(struct cl_node *root)

     return cli_ac_buildtrie(root);

 }

+struct cl_node *cl_dup(struct cl_node *root)

+{

+    if(!root) {

+	cli_errmsg("cl_dup: root == NULL\n");

+	return NULL;

+    }

+

+#ifdef CL_THREAD_SAFE

+    pthread_mutex_lock(&cli_ref_mutex);

+#endif

+

+    root->refcount++;

+    

+#ifdef CL_THREAD_SAFE

+    pthread_mutex_unlock(&cli_ref_mutex);

+#endif

+

+    return root;

+}

+

 void cl_free(struct cl_node *root)

 {

 	int i;

@@ -372,6 +397,22 @@ void cl_free(struct cl_node *root)

 	return;

     }

+#ifdef CL_THREAD_SAFE

+    pthread_mutex_lock(&cli_ref_mutex);

+#endif

+

+    root->refcount--;

+    if (root->refcount) {

+#ifdef CL_THREAD_SAFE

+	pthread_mutex_unlock(&cli_ref_mutex);

+#endif

+	return;

+    }

+    

+#ifdef CL_THREAD_SAFE

+    pthread_mutex_unlock(&cli_ref_mutex);

+#endif

+

     cli_ac_free(root);

     cli_bm_free(root);

@@ -433,6 +433,7 @@ static int cli_loaddb(FILE *fd, struct cl_node **root, unsigned int *signo)

 	*root = (struct cl_node *) cli_calloc(1, sizeof(struct cl_node));

 	if(!*root)

 	    return CL_EMEM;

+	(*root)->refcount = 1;

     }

     if(!(*root)->ac_root) {

@@ -506,6 +507,7 @@ static int cli_loadndb(FILE *fd, struct cl_node **root, unsigned int *signo)

 	*root = (struct cl_node *) cli_calloc(1, sizeof(struct cl_node));

 	if(!*root)

 	    return CL_EMEM;

+	(*root)->refcount = 1;

     }

     if(!(*root)->ac_root) {

@@ -624,6 +626,7 @@ static int cli_loadhdb(FILE *fd, struct cl_node **root, unsigned int *signo, uns

 	*root = (struct cl_node *) cli_calloc(1, sizeof(struct cl_node));

 	if(!*root)

 	    return CL_EMEM;

+	(*root)->refcount = 1;

     }

     while(fgets(buffer, FILEBUFF, fd)) {