@@ -1,3 +1,12 @@

+Fri May 27 15:55:00 BST 2005 (njh)

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

+  * clamav-milter:	EXPERIMENTAL

+			When loading a new database when not in external mode,

+				keep scanning with the old one rather than

+				hold up incoming mails while waiting for

+				clamav-milter to become idle then reloading the

+				database

+

 Thu May 26 04:03:31 CEST 2005 (tk)

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

   * clamd/scanner.c: quick recovery of thread resources when clamd clients

@@ -812,6 +812,11 @@ Changes

 			When dying use LOG_CRIT rather than LOG_ERR

 0.85d	25/5/05:	When not in external mode, TEMPFAIL when loading a new

 				database, even when --dont-wait isn't given

+0.85e	27/5/05:	When loading a new database when not in external mode,

+				keep scanning with the old one rather than

+				hold up incoming mails while waiting for

+				clamav-milter to become idle then reloading the

+				database

 4. INTERNATIONALISATION

@@ -22,9 +22,9 @@

  *

  * For installation instructions see the file INSTALL that came with this file

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.205 2005/05/25 19:39:03 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.206 2005/05/27 14:52:58 nigelhorne Exp $";

-#define	CM_VERSION	"0.85d"

+#define	CM_VERSION	"0.85e"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -285,6 +285,7 @@ static	const	char	*progname;	/* our name - usually clamav-milter */

 /* Variables for --external */

 static	int	external = 0;	/* scan messages ourself or use clamd? */

+static	pthread_mutex_t	root_mutex = PTHREAD_MUTEX_INITIALIZER;

 static	struct	cl_node	*root = NULL;

 static	struct	cl_limits	limits;

 static	struct	cl_stat	dbstat;

@@ -371,9 +372,6 @@ static	pthread_mutex_t	n_children_mutex = PTHREAD_MUTEX_INITIALIZER;

 static	pthread_cond_t	n_children_cond = PTHREAD_COND_INITIALIZER;

 static	volatile	unsigned	int	n_children = 0;

 static	unsigned	int	max_children = 0;

-static	pthread_mutex_t	accept_mutex = PTHREAD_MUTEX_INITIALIZER;

-static	pthread_cond_t	accept_cond = PTHREAD_COND_INITIALIZER;

-static	volatile	int	accept_inputs;

 static	int	child_timeout = 0;	/* number of seconds to wait for

 					 * a child to die. Set to 0 to

 					 * wait forever

@@ -1051,11 +1049,9 @@ main(int argc, char **argv)

 		if(cfgopt(copt, "LogVerbose")) {

 			logVerbose = 1;

-#if	0

-#if	SENDMAIL_VERSION > 8.13

+#if	((SENDMAIL_VERSION_A > 8) || ((SENDMAIL_VERSION_A == 8) && (SENDMAIL_VERSION_B >= 13)))

 			smfi_setdbg(6);

 #endif

-#endif

 		}

 		use_syslog = 1;

@@ -1485,7 +1481,6 @@ main(int argc, char **argv)

 				limits.archivememlim = 0;

 		}

 	}

-	accept_inputs = 1;

 #ifdef	SESSION

 	/* FIXME: add localSocket support to watchdog */

@@ -1573,14 +1568,12 @@ main(int argc, char **argv)

 		return EX_UNAVAILABLE;

 	}

-#if	0

-#if	SENDMAIL_VERSION > 8.13

+#if	((SENDMAIL_VERSION_A > 8) || ((SENDMAIL_VERSION_A == 8) && (SENDMAIL_VERSION_B >= 13)))

 	if(smfi_opensocket(1) == MI_FAILURE) {

 		cli_errmsg("Can't open/create %s\n", port);

 		return EX_CONFIG;

 	}

 #endif

-#endif

 	signal(SIGPIPE, SIG_IGN);	/* libmilter probably does this as well */

@@ -1991,34 +1984,10 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 	char ip[INET_ADDRSTRLEN];	/* IPv4 only */

 #endif

 	const char *remoteIP;

-	int accepting;

 	if(quitting)

 		return cl_error;

-	pthread_mutex_lock(&accept_mutex);

-	accepting = accept_inputs;

-	pthread_mutex_unlock(&accept_mutex);

-	if(!accepting) {

-		cli_warnmsg("Not accepting inputs at the moment\n");

-#if	0

-		/*

-		 * We must refuse here even if dont_wait isn't set, since

-		 * it could take some time, and sendmail could time us out

-		 * and refuse to have anything more to do with us until

-		 * the program is restarted

-		 */

-		if(dont_wait)

-			return SMFIS_TEMPFAIL;

-		pthread_mutex_lock(&accept_mutex);

-		while(!accept_inputs)

-			pthread_cond_wait(&accept_cond, &accept_mutex);

-		pthread_mutex_unlock(&accept_mutex);

-		cli_warnmsg("Accepting inputs again\n");

-#endif

-		return SMFIS_TEMPFAIL;

-	}

-

 	if(ctx == NULL) {

 		if(use_syslog)

 			syslog(LOG_ERR, _("clamfi_connect: ctx is null"));

@@ -2604,12 +2573,21 @@ clamfi_eom(SMFICTX *ctx)

 	if(!external) {

 		const char *virname;

 		unsigned long int scanned = 0L;

+		struct cl_node *scanning_root;

 		/*

 		 * TODO: consider using cl_scandesc and not using a temporary

 		 *	file from the mail being read in

 		 */

-		switch(cl_scanfile(privdata->filename, &virname, &scanned, root, &limits, options)) {

+		pthread_mutex_lock(&root_mutex);

+		scanning_root = cl_dup(root);

+		pthread_mutex_unlock(&root_mutex);

+		if(scanning_root == NULL) {

+			cli_errmsg("scanning_root == NULL\n");

+			clamfi_cleanup(ctx);

+			return cl_error;

+		}

+		switch(cl_scanfile(privdata->filename, &virname, &scanned, scanning_root, &limits, options)) {

 			case CL_CLEAN:

 				strcpy(mess, "OK");

 				break;

@@ -2622,6 +2600,7 @@ clamfi_eom(SMFICTX *ctx)

 				logger(mess);

 				break;

 		}

+		cl_free(scanning_root);

 #ifdef	SESSION

 		session = NULL;

@@ -4426,71 +4405,29 @@ watchdog(void *a)

 		pthread_mutex_unlock(&watchdog_mutex);

 		if(!external) {

-			int dbstatus = cl_statchkdir(&dbstat);

-

 			/*

-			 * Re-load the database if the server's not busy.

-			 * TODO: If a reload is needed go into a mode when

-			 *	new scans aren't accepted, to force the number

-			 *	of children to 0 so that we can reload,

-			 *	otherwise a reload may not occur on overloaded

-			 *	servers

+			 * Re-load the database if needed

 			 */

-			pthread_mutex_lock(&n_children_mutex);

-			if((n_children == 0) && (dbstatus == 1)) {

-				pthread_mutex_lock(&accept_mutex);

-				accept_inputs = 0;

-				pthread_mutex_unlock(&accept_mutex);

-				cli_dbgmsg("Database has changed\n");

-				cl_statfree(&dbstat);

-				/* check for race condition */

-				while(n_children > 0)

-					pthread_cond_wait(&n_children_cond, &n_children_mutex);

-				if(use_syslog)

-					syslog(LOG_WARNING, _("Loading new database"));

-				if(loadDatabase() != 0) {

-					pthread_mutex_unlock(&n_children_mutex);

-					smfi_stop();

-					cli_errmsg("Failed to load updated database\n");

-					return NULL;

-				}

-				pthread_mutex_lock(&accept_mutex);

-				accept_inputs = 1;

-				pthread_cond_broadcast(&accept_cond);

-				pthread_mutex_unlock(&accept_mutex);

-			} else if(dbstatus == 0)

-				cli_dbgmsg("Database has not changed\n");

-			else if(dbstatus == 1) {

-				cli_warnmsg("Not reloading database until idle - waiting for %d children\n", n_children);

-				pthread_mutex_lock(&accept_mutex);

-				accept_inputs = 0;

-				pthread_mutex_unlock(&accept_mutex);

-

-				while(n_children > 0) {

-					pthread_cond_wait(&n_children_cond, &n_children_mutex);

-					cli_warnmsg("Waiting for %d children until database reload\n", n_children);

-				}

-

-				cl_statfree(&dbstat);

-				if(use_syslog)

-					syslog(LOG_WARNING, _("Loading new database"));

-				if(loadDatabase() != 0) {

-					pthread_mutex_unlock(&n_children_mutex);

+			switch(cl_statchkdir(&dbstat)) {

+				case 1:

+					cli_dbgmsg("Database has changed\n");

+					cl_statfree(&dbstat);

+					if(use_syslog)

+						syslog(LOG_WARNING, _("Loading new database"));

+					if(loadDatabase() != 0) {

+						smfi_stop();

+						cli_errmsg("Failed to load updated database\n");

+						return NULL;

+					}

+					break;

+				case 0:

+					cli_dbgmsg("Database has not changed\n");

+					break;

+				default:

 					smfi_stop();

-					cli_errmsg("Failed to load updated database\n");

+					cli_errmsg("Database error - %s is stopping\n", progname);

 					return NULL;

-				}

-				pthread_mutex_lock(&accept_mutex);

-				accept_inputs = 1;

-				pthread_cond_broadcast(&accept_cond);

-				pthread_mutex_unlock(&accept_mutex);

-			} else {

-				smfi_stop();

-				cli_errmsg("Database error - %s is stopping\n", progname);

-				pthread_mutex_unlock(&n_children_mutex);

-				return NULL;

 			}

-			pthread_mutex_unlock(&n_children_mutex);

 			continue;

 		}

 		i = 0;

@@ -4597,7 +4534,6 @@ watchdog(void *a)

 	while(!quitting) {

 		struct timespec ts;

 		struct timeval tp;

-		int dbstatus;

 		gettimeofday(&tp, NULL);

@@ -4621,69 +4557,29 @@ watchdog(void *a)

 		pthread_mutex_unlock(&watchdog_mutex);

 		/*

-		 * Re-load the database if the server's not busy.

-		 * TODO: If a reload is needed go into a mode when

-		 *	new scans aren't accepted, to force the number

-		 *	of children to 0 so that we can reload,

-		 *	otherwise a reload may not occur on overloaded

-		 *	servers

+		 * Re-load the database.

 		 */

-		dbstatus = cl_statchkdir(&dbstat);

-		pthread_mutex_lock(&n_children_mutex);

-		if((n_children == 0) && (dbstatus == 1)) {

-			pthread_mutex_lock(&accept_mutex);

-			accept_inputs = 0;

-			pthread_mutex_unlock(&accept_mutex);

-			cli_dbgmsg("Database has changed\n");

-			cl_statfree(&dbstat);

-			/* check for race condition */

-			while(n_children > 0)

-				pthread_cond_wait(&n_children_cond, &n_children_mutex);

-			if(use_syslog)

-				syslog(LOG_WARNING, _("Loading new database"));

-			if(loadDatabase() != 0) {

-				pthread_mutex_unlock(&n_children_mutex);

-				smfi_stop();

-				cli_errmsg("Failed to load updated database\n");

-				return NULL;

-			}

-			pthread_mutex_lock(&accept_mutex);

-			accept_inputs = 1;

-			pthread_cond_broadcast(&accept_cond);

-			pthread_mutex_unlock(&accept_mutex);

-		} else if(dbstatus == 0)

-			cli_dbgmsg("Database has not changed\n");

-		else if(dbstatus == 1) {

-			cli_warnmsg("Not reloading database until idle - waiting for %d children\n", n_children);

-			pthread_mutex_lock(&accept_mutex);

-			accept_inputs = 0;

-			pthread_mutex_unlock(&accept_mutex);

-

-			while(n_children > 0) {

-				pthread_cond_wait(&n_children_cond, &n_children_mutex);

-				cli_warnmsg("Waiting for %d children until database reload\n", n_children);

-			}

-			cl_statfree(&dbstat);

-			if(use_syslog)

-				syslog(LOG_WARNING, _("Loading new database"));

-			if(loadDatabase() != 0) {

-				pthread_mutex_unlock(&n_children_mutex);

+		switch(cl_statchkdir(&dbstat)) {

+			case 1:

+				cli_dbgmsg("Database has changed\n");

+				cl_statfree(&dbstat);

+				if(use_syslog)

+					syslog(LOG_WARNING, _("Loading new database"));

+				if(loadDatabase() != 0) {

+					smfi_stop();

+					cli_errmsg("Failed to load updated database\n");

+					return NULL;

+				}

+				break;

+			case 0:

+				cli_dbgmsg("Database has not changed\n");

+				break;

+			default:

 				smfi_stop();

-				cli_errmsg("Failed to load updated database\n");

+				cli_errmsg("Database error - %s is stopping\n", progname);

 				return NULL;

-			}

-			pthread_mutex_lock(&accept_mutex);

-			accept_inputs = 1;

-			if(pthread_cond_broadcast(&accept_cond) < 0)

-				perror("pthread_cond_broadcast");

-			pthread_mutex_unlock(&accept_mutex);

-		} else {

-			smfi_stop();

-			cli_errmsg("Database error - %s is stopping\n", progname);

-			pthread_mutex_unlock(&n_children_mutex);

-			return NULL;

 		}

-		pthread_mutex_unlock(&n_children_mutex);

+		continue;

 	}

 	cli_dbgmsg("watchdog quits\n");

 	return NULL;

@@ -4779,10 +4675,6 @@ quit(void)

 	quitting++;

-	pthread_mutex_lock(&accept_mutex);

-	accept_inputs = 0;

-	pthread_mutex_unlock(&accept_mutex);

-

 #ifdef	SESSION

 	pthread_mutex_lock(&version_mutex);

 #endif

@@ -4793,10 +4685,12 @@ quit(void)

 #endif

 	if(!external) {

+		pthread_mutex_lock(&root_mutex);

 		if(root) {

 			cl_free(root);

 			root = NULL;

 		}

+		pthread_mutex_unlock(&root_mutex);

 	} else {

 #ifdef	SESSION

 		int i = 0;

@@ -4862,8 +4756,7 @@ broadcast(const char *mess)

 }

 /*

- * Load a new database into the internal scanner - it is up to the caller to

- * ensure that no threads are currently scanning

+ * Load a new database into the internal scanner

  */

 static int

 loadDatabase(void)

@@ -4875,6 +4768,7 @@ loadDatabase(void)

 	char *daily, *ptr;

 	struct cl_cvd *d;

 	const struct cfgstruct *cpt;

+	struct cl_node *newroot, *oldroot;

 	static const char *dbdir;

 	assert(!external);

@@ -4933,30 +4827,30 @@ loadDatabase(void)

 	if((ptr = strchr(clamav_version, '\n')) != NULL)

 		*ptr = '\0';

-	if(root) {

-		cl_free(root);

-		root = NULL;

-	}

 	signatures = 0;

-	ret = cl_loaddbdir(dbdir, &root, &signatures);

+	newroot = NULL;

+	ret = cl_loaddbdir(dbdir, &newroot, &signatures);

 	if(ret != 0) {

 		cli_errmsg("%s\n", cl_strerror(ret));

 		return -1;

 	}

-	if(root == NULL) {

+	if(newroot == NULL) {

 		cli_errmsg("Can't initialize the virus database.\n");

 		return -1;

 	}

-	ret = cl_build(root);

+	ret = cl_build(newroot);

 	if(ret != 0) {

 		cli_errmsg("Database initialization error: %s\n", cl_strerror(ret));

+		cl_free(newroot);

 		return -1;

 	}

-	cli_dbgmsg("Database updated\n");

-	if(use_syslog) {

-		syslog(LOG_INFO, _("ClamAV: Protecting against %u viruses"), signatures);

+	pthread_mutex_lock(&root_mutex);

+	oldroot = root;

+	root = newroot;

+	pthread_mutex_unlock(&root_mutex);

+	if(use_syslog) {

 #ifdef	SESSION

 		pthread_mutex_lock(&version_mutex);

 #endif

@@ -4964,7 +4858,13 @@ loadDatabase(void)

 #ifdef	SESSION

 		pthread_mutex_unlock(&version_mutex);

 #endif

+		syslog(LOG_INFO, _("ClamAV: Protecting against %u viruses"), signatures);

 	}

+	if(oldroot) {

+		cli_dbgmsg("Database updated\n");

+		cl_free(oldroot);

+	} else

+		cli_dbgmsg("Database loaded\n");

 	return cl_statinidir(dbdir, &dbstat);

 }