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

+Tue Feb 17 01:06:58 CET 2004 (tk)

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

+  * clamd: + integrated new thread manager from Trog

+	   + --debug (enables core dumping)

+  * contrib: Trashscan v0.10 (trashware*gmx.de)

+

 Mon Feb 16 14:19:42 CET 2004 (tk)

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

   V 0.67-1 (increased version number of clamav-milter)

@@ -32,6 +32,8 @@ clamd_SOURCES = \

     localserver.h \

     session.c \

     session.h \

+    thrmgr.c \

+    thrmgr.h \

     server-th.c \

     server.h \

     scanner.c \

@@ -130,6 +130,8 @@ install_sh = @install_sh@

 @BUILD_CLAMD_TRUE@    localserver.h \

 @BUILD_CLAMD_TRUE@    session.c \

 @BUILD_CLAMD_TRUE@    session.h \

+@BUILD_CLAMD_TRUE@    thrmgr.c \

+@BUILD_CLAMD_TRUE@    thrmgr.h \

 @BUILD_CLAMD_TRUE@    server-th.c \

 @BUILD_CLAMD_TRUE@    server.h \

 @BUILD_CLAMD_TRUE@    scanner.c \

@@ -161,9 +163,10 @@ PROGRAMS = $(sbin_PROGRAMS)

 @BUILD_CLAMD_TRUE@am_clamd_OBJECTS = options.$(OBJEXT) cfgfile.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	clamd.$(OBJEXT) tcpserver.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	localserver.$(OBJEXT) session.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	server-th.$(OBJEXT) scanner.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	others.$(OBJEXT) clamuko.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT) tests.$(OBJEXT)

+@BUILD_CLAMD_TRUE@	thrmgr.$(OBJEXT) server-th.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	scanner.$(OBJEXT) others.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	clamuko.$(OBJEXT) dazukoio.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	tests.$(OBJEXT)

 clamd_OBJECTS = $(am_clamd_OBJECTS)

 @BUILD_CLAMD_TRUE@clamd_DEPENDENCIES = ../clamscan/getopt.o

 @BUILD_CLAMD_FALSE@clamd_DEPENDENCIES =

@@ -178,7 +181,8 @@ am__depfiles_maybe = depfiles

 @AMDEP_TRUE@	./$(DEPDIR)/localserver.Po ./$(DEPDIR)/options.Po \

 @AMDEP_TRUE@	./$(DEPDIR)/others.Po ./$(DEPDIR)/scanner.Po \

 @AMDEP_TRUE@	./$(DEPDIR)/server-th.Po ./$(DEPDIR)/session.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/tcpserver.Po ./$(DEPDIR)/tests.Po

+@AMDEP_TRUE@	./$(DEPDIR)/tcpserver.Po ./$(DEPDIR)/tests.Po \

+@AMDEP_TRUE@	./$(DEPDIR)/thrmgr.Po

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \

@@ -249,6 +253,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcpserver.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrmgr.Po@am__quote@

 distclean-depend:

 	-rm -rf ./$(DEPDIR)

@@ -71,6 +71,11 @@ void clamd(struct optstruct *opt)

     	help();

     }

+    if(optl(opt, "debug"))

+	debug_mode = 1;

+    else

+	debug_mode = 0;

+

     /* parse the config file */

     if(optc(opt, 'c'))

 	cfgfile = getargc(opt, 'c');

@@ -246,6 +251,7 @@ void help(void)

     printf("    --help                   -h             Show this help.\n");

     printf("    --version                -V             Show version number.\n");

+    printf("    --debug                                 Enable debug mode.\n");

     printf("    --config-file=FILE       -c FILE        Read configuration from FILE.\n\n");

     exit(0);

@@ -267,7 +273,8 @@ void daemonize(void)

 	dup2(i, 2);

     }

-    chdir("/");

+    if(!debug_mode)

+	chdir("/");

     if(fork())

 	exit(0);

@@ -22,7 +22,7 @@

 #define CL_DEFAULT_CFG CONFDIR"/clamav.conf"

 #define CL_DEFAULT_BACKLOG 15

 #define CL_DEFAULT_MAXTHREADS 5

-#define CL_DEFAULT_SCANTIMEOUT 180

+#define CL_DEFAULT_SCANTIMEOUT 60

 #define CL_DEFAULT_LOGSIZE 1048576

 #define CL_DEFAULT_CLAMUKOMAXFILESIZE 5 * 1048576

 #define CL_DEFAULT_SELFCHECK 3600

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

 	    {"help", 0, 0, 'h'},

 	    {"config-file", 1, 0, 'c'},

 	    {"version", 0, 0, 'V'},

+	    {"debug", 0, 0, 0},

 	    {0, 0, 0, 0}

     	};

@@ -28,7 +28,7 @@ void *mmalloc(size_t size);

 void *mcalloc(size_t nmemb, size_t size);

 void chomp(char *string);

-short int logverbose, logcompressed, loglock, logtime, sighup, logok;

+short int logverbose, logcompressed, loglock, logtime, sighup, logok, debug_mode;

 int logsize;

 const char *logfile;

 int logg(const char *str, ...);

@@ -31,7 +31,9 @@

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

+#include <errno.h>

 #include <clamav.h>

+#include <sys/poll.h>

 #include "cfgfile.h"

 #include "others.h"

@@ -184,14 +186,14 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt)

 {

-	int ret, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd, tmpd, bread;

+	int ret, flags, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd, tmpd, bread, count;

 	long int size = 0, maxsize = 0;

 	short bound = 0;

 	char *virname, buff[32768];

 	struct sockaddr_in server;

 	struct cfgstruct *cpt;

 	FILE *tmp = NULL;

-

+	struct pollfd poll_data[1];

     while(!bound && portscan--) {

 	if((port = cl_rndnum(60000)) < 1024)

@@ -221,6 +223,25 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	mdprintf(odesc, "PORT %d\n", port);

     }

+    poll_data[0].fd = sockfd;

+    poll_data[0].events = POLLIN;

+    poll_data[0].revents = 0;

+

+    while (1) {

+	count = poll(poll_data, 1, CL_DEFAULT_SCANTIMEOUT*1000); /* wait for timeout */

+	if (count != 1) {

+		if ((count == -1) && (errno == EINTR)) {

+			continue;

+		}

+		close(sockfd);

+		mdprintf(odesc, "ERROR\n");

+		logg("!ScanStream: accept timeout.\n");

+		return -1;

+	} else {

+		break;

+	}

+    }

+

     if((acceptd = accept(sockfd, NULL, NULL)) == -1) {

 	close(sockfd);

 	mdprintf(odesc, "accept() ERROR\n");

@@ -231,7 +252,12 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

     logg("*Accepted connection on port %d, fd %d\n", port, acceptd);

-    if(cfgopt(copt, "StreamSaveToDisk")) {

+    poll_data[0].fd = acceptd;

+    poll_data[0].events = POLLIN;

+    poll_data[0].revents = 0;

+

+    /* StreamSaveToDisk is enforced, to ensure timeoute */

+    /*if(cfgopt(copt, "StreamSaveToDisk")) {	*/

 	if((tmp = tmpfile()) == NULL) {

 	    shutdown(sockfd, 2);

 	    close(sockfd);

@@ -245,7 +271,11 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	if((cpt = cfgopt(copt, "StreamMaxLength")))

 	    maxsize = cpt->numarg;

-	while((bread = read(acceptd, buff, sizeof(buff))) > 0) {

+	while((count = poll(poll_data, 1, CL_DEFAULT_SCANTIMEOUT*1000)) == 1) {

+	    bread = read(acceptd, buff, sizeof(buff));

+	    if (bread <= 0) {

+		break;

+	    }

 	    size += bread;

 	    if(maxsize && (size + sizeof(buff)) > maxsize) {

@@ -277,8 +307,9 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	if(tmp)

 	    fclose(tmp);

-    } else

+    /* } else

 	ret = cl_scandesc(acceptd, &virname, scanned, root, limits, 0);

+	*/

     close(acceptd);

     close(sockfd);

@@ -1,5 +1,6 @@

 /*

  *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

+ *			      Trog <trog@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -16,378 +17,190 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <unistd.h>

-#include <sys/types.h>

-#include <sys/socket.h>

 #include <pthread.h>

-#include <time.h>

+#include <errno.h>

 #include <signal.h>

+#include <stdio.h>

+#include <time.h>

-#include "cfgfile.h"

-#include "others.h"

-#include "defaults.h"

-#include "scanner.h"

 #include "server.h"

-#include "clamuko.h"

-#include "tests.h"

+#include "thrmgr.h"

 #include "session.h"

-#include "../target.h"

+#include "defaults.h"

+#include "clamuko.h"

+#include "others.h"

-#ifdef CLAMUKO

-pthread_t clamukoid;

-#endif

+#define BUFFSIZE 1024

+#define FALSE (0)

+#define TRUE (1)

-#ifdef TARGET_OS_DARWIN5_5

-#define	pthread_sigmask(A, B, C)    sigprocmask((A), (B), (C))

-#define	pthread_kill(A, B)	{ }

-#endif

+int progexit = 0;

+pthread_mutex_t exit_mutex;

+int reload = 0;

+pthread_mutex_t reload_mutex;

+typedef struct client_conn_tag {

+    int sd;

+    int options;

+    const struct cfgstruct *copt;

+    const struct cl_node *root;

+    const struct cl_limits *limits;

+} client_conn_t;

-void *threadscanner(void *arg)

+void scanner_thread(void *arg)

 {

-	struct thrarg *tharg = (struct thrarg *) arg;

+	client_conn_t *conn = (client_conn_t *) arg;

 	sigset_t sigset;

 	int ret;

+

     /* ignore all signals */

     sigfillset(&sigset);

     pthread_sigmask(SIG_SETMASK, &sigset, NULL);

-    ret = command(ths[tharg->sid].desc, tharg->root, tharg->limits, tharg->options, tharg->copt);

+    ret = command(conn->sd, conn->root, conn->limits, conn->options, conn->copt);

     switch(ret) {

 	case COMMAND_QUIT:

+	    pthread_mutex_lock(&exit_mutex);

 	    progexit = 1;

+	    pthread_mutex_unlock(&exit_mutex);

 	    break;

 	case COMMAND_RELOAD:

+	    pthread_mutex_lock(&reload_mutex);

 	    reload = 1;

+	    pthread_mutex_unlock(&reload_mutex);

 	    break;

-    }

+	}

-    close(ths[tharg->sid].desc);

-    ths[tharg->sid].active = 0;

-    /* this mutex is rather useless */

-    /* pthread_mutex_unlock(&ths[tharg->sid].mutex); */

-    free(tharg);

-    return NULL;

+    close(conn->sd);

+    free(conn);

+    return;

 }

-/* this function takes care for threads, exit and various checks */

-

-void *threadwatcher(void *arg)

+void sighandler_th(int sig)

 {

-	struct thrwarg *thwarg = (struct thrwarg *) arg;

-	struct cfgstruct *cpt;

-	sigset_t sigset;

-	int i, j, ret, virnum;

-	unsigned long int timer = 0;

-	unsigned int timeout, threads, selfchk;

-	short int need_wait = 0, do_loop = 0, db_problem = 0;

-	const char *dbdir;

-	struct cl_stat dbstat;

-#ifdef CLAMUKO

-	struct thrarg *tharg;

-	pthread_attr_t thattr;

-	int maxwait;

-#endif

-

-

-    /* ignore all signals (except for SIGSEGV) */

-    sigfillset(&sigset);

-    sigdelset(&sigset, SIGSEGV);

-    pthread_sigmask(SIG_SETMASK, &sigset, NULL);

-

-#ifdef C_LINUX

-    logg("*ThreadWatcher: Started in process %d\n", getpid());

-#endif

-

-    if((cpt = cfgopt(thwarg->copt, "MaxThreads")))

-	threads = cpt->numarg;

-    else

-	threads = CL_DEFAULT_MAXTHREADS;

-

-    if((cpt = cfgopt(thwarg->copt, "SelfCheck")))

-	selfchk = cpt->numarg;

-    else

-	selfchk = CL_DEFAULT_SELFCHECK;

-

-    if(!selfchk) {

-	logg("^Self checking disabled.\n");

-    } else

-	logg("Self checking every %d seconds.\n", selfchk);

-

-    if((cpt = cfgopt(thwarg->copt, "ThreadTimeout")))

-	timeout = cpt->numarg;

-    else

-	timeout = CL_DEFAULT_SCANTIMEOUT;

-

-    if(!timeout) {

-	logg("^Timeout disabled.\n");

-    } else

-	logg("Timeout set to %d seconds.\n", timeout);

-

-    if((cpt = cfgopt(thwarg->copt, "DatabaseDirectory")) || (cpt = cfgopt(thwarg->copt, "DataDirectory")))

-	dbdir = cpt->strarg;

-    else

-	dbdir = cl_retdbdir();

-

-    memset(&dbstat, 0, sizeof(struct cl_stat));

-    cl_statinidir(dbdir, &dbstat);

-

-    for(i = 0; ; i++) {

-

-        if(i == threads)

-	    i = 0;

+	time_t currtime;

+	int maxwait = CL_DEFAULT_MAXWHILEWAIT * 5;

+	int i;

-	/* check time */

-        if(timeout && ths[i].active) /* races are harmless here (timeout is re-set) */

-	    if(time(NULL) - ths[i].start > timeout) {

-		pthread_cancel(ths[i].id);

-		mdprintf(ths[i].desc, "Session(%d): Time out ERROR\n", i);

-		close(ths[i].desc);

-		logg("Session %d stopped due to timeout.\n", i);

-		ths[i].active = 0;

-		/* pthread_mutex_unlock(&ths[i].mutex); */

-	    }

+    switch(sig) {

+	case SIGINT:

+	case SIGTERM:

+	    progexit = 1;

+	    logg("*Signal %d caught -> exiting.\n", sig);

+	    time(&currtime);

+	    logg("--- Stopped at %s", ctime(&currtime));

+	    exit(0);

+	    break; /* not reached */

-	/* cancel all threads in case of quit */

-	if(progexit == 1) {

-#ifdef CLAMUKO

-	    /* stop clamuko */

-	    if(clamuko_running) {

-		logg("Stopping Clamuko...\n");

-		pthread_kill(clamukoid, SIGUSR1);

-		/* we must wait for Dazuko unregistration */

-		maxwait = CL_DEFAULT_MAXWHILEWAIT * 5;

-		while(clamuko_running && maxwait--)

-		    usleep(200000);

-

-		if(!maxwait && clamuko_running)

-		    logg("!Critical error: Can't stop Clamuko.\n");

-	    }

-#endif

+	    case SIGSEGV:

+		logg("Segmentation fault :-( Bye..\n");

+		exit(11); /* probably not reached at all */

+		break; /* not reached */

-	    for(j = 0; j < threads; j++)

-		if(ths[j].active) {

-		    pthread_cancel(ths[j].id);

-		    mdprintf(ths[j].desc, "Session(%d): Stopped (exiting)\n", j);

-		    close(ths[j].desc);

-		    logg("Session %d stopped (exiting).\n", j);

-		    /* pthread_mutex_unlock(&ths[j].mutex); */

-		}

-#ifndef C_BSD

-	    logg("*Freeing trie structure.\n");

-	    cl_freetrie(*thwarg->root);

-#endif

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

-	    shutdown(thwarg->socketd, 2);

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

-	    close(thwarg->socketd);

-	    if((cpt = cfgopt(thwarg->copt, "LocalSocket"))) {

-		if(unlink(cpt->strarg) == -1)

-		    logg("!Can't unlink the socket file %s\n", cpt->strarg);

-		else

-		    logg("Socket file removed.\n");

-	    }

+	    case SIGHUP:

+		/* sighup = 1;

+		logg("SIGHUP catched: log file re-opened.\n"); */

+		break;

+    }

+}

-	    if((cpt = cfgopt(thwarg->copt, "PidFile"))) {

-		if(unlink(cpt->strarg) == -1)

-		    logg("!Can't unlink the pid file %s\n", cpt->strarg);

-		else

-		    logg("Pid file removed.\n");

-	    }

+static struct cl_node *reload_db(struct cl_node *root, const struct cfgstruct *copt, int do_check)

+{

+	char *dbdir;

+	int virnum=0, retval;

+	struct cfgstruct *cpt;

+	static struct cl_stat *dbstat=NULL;

-	    logg("*Freeing stat structure.\n");

-            cl_statfree(&dbstat);

-	    progexit = 2;

-	    logg("*Exit level %d, ThreadWatcher termination.\n", progexit);

-	    return NULL;

+    if(do_check) {

+	if(dbstat == NULL) {

+	    logg("No stats for Database check - forcing reload\n");

+	    return root;

 	}

-

-	/* do self checks */

-	if(selfchk && (db_problem || !(timer % selfchk))) {

-	    /* check the integrity of the database */

-	    if(!reload) {

-

-		if(cl_statchkdir(&dbstat) == 1) {

-		    logg("SelfCheck: Database modification detected. Forcing reload.\n");

-		    reload = 1;

-		    cl_statfree(&dbstat);

-		    cl_statinidir(dbdir, &dbstat);

-		} else

-		    logg("SelfCheck: Database status OK.\n");

-

-		if(!testsignature(*thwarg->root)) {

-		    if(db_problem) {

-			logg("!SelfCheck: Unable to repair internal structure. Exiting.\n");

-			kill(progpid, SIGTERM);

-			continue;

-		    }

-		    /* oops */

-		    logg("!SelfCheck: Unable to detect test signature, forcing database reload.\n");

-		    db_problem = 1;

-		    reload = 1;

-		} else {

-		    logg("*SelfCheck: Integrity OK\n");

-		    db_problem = 0;

-		}

-	    }

+	if(cl_statchkdir(dbstat) == 1) {

+	    logg("SelfCheck: Database modification detected. Forcing reload.\n");

+	    return root;

+	} else {

+	    logg("SelfCheck: Database status OK.\n");

+	    return NULL;

 	}

+    }

-	timer++;

-

-	/* reload the database */

-	if(reload) {

-

-	    /* make sure the main thread doesn't start new threads */

-	    do {

-		usleep(200000);

-	    } while(!main_accept && !main_reload);

-

-	    /* wait until all working threads are finished */

-	    do {

-		need_wait = 0;

-		for(j = 0; j < threads; j++)

-		    if(ths[j].active) {

-			if(timeout && (time(NULL) - ths[j].start > timeout)) {

-			    do_loop = 1;

-			    break;

-			} else need_wait = 1;

-		    }

-

-#ifdef CLAMUKO

-		if(clamuko_running) {

-		    logg("Stopping Clamuko...\n");

-		    pthread_kill(clamukoid, SIGUSR1);

-		    /* we must wait for Dazuko unregistration */

-		    maxwait = CL_DEFAULT_MAXWHILEWAIT * 5;

-		    while(clamuko_running && maxwait--)

-			usleep(200000);

-

-		    if(!maxwait && clamuko_running)

-			logg("!Critical error: Can't stop Clamuko.\n");

-		    /* should we stop here ? */

-		}

-#endif

-		if(need_wait)

-		    usleep(200000);

-

-		if(progexit == 1)

-		    break;

-

-	    } while(need_wait);

-

-	    if(progexit == 1) {

-		reload = 0;

-		continue;

-	    }

-

-	    if(do_loop) {

-		/* some threads must be stopped in the next iteration,

-		 * reload is still == 1

-		 */

-		logg("Database reload: some threads must be stopped in the next iteration.\n");

-		do_loop = 0;

-		continue;

-	    }

-

-	    /* relase old structure */

-	    cl_freetrie(*thwarg->root);

-	    *thwarg->root = NULL;

-

-	    /* reload */

-

-	    logg("Reading databases from %s\n", dbdir);

-

-	    cl_statfree(&dbstat);

-	    cl_statinidir(dbdir, &dbstat);

-	    virnum = 0;

-	    if((ret = cl_loaddbdir(dbdir, &*thwarg->root, &virnum))) {

-		logg("!%s\n", cl_strerror(ret));

-		kill(progpid, SIGTERM);

-		/* we stay in reload == 1, so all threads are waiting */

-		continue;

-	    }

-

-	    if(! *thwarg->root) {

-		logg("!Database initialization problem.\n");

-		kill(progpid, SIGTERM);

-	    } else {

-		if((ret = cl_buildtrie(*thwarg->root)) != 0) {

-		    logg("!Database initialization error: can't build the trie: %s\n", cl_strerror(ret));

-		    kill(progpid, SIGTERM);

-		}

-		/* check integrity */

-		if(!testsignature(*thwarg->root)) {

-		    logg("!Unable to detect test signature.\n");

-		    kill(progpid, SIGTERM);

-		}

+    /* release old structure */

+    if(root) {

+	cl_freetrie(root);

+	root = NULL;

+    }

-		logg("Database correctly reloaded (%d viruses)\n", virnum);

-	    }

+    if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory"))) {

+	dbdir = cpt->strarg;

+    } else {

+	dbdir = cl_retdbdir();

+    }

+    logg("Reading databases from %s\n", dbdir);

-	    /* start clamuko */

-#ifdef CLAMUKO

+    if(dbstat == NULL) {

+	dbstat = (struct cl_stat *) mmalloc(sizeof(struct cl_stat));

+    } else {

+	cl_statfree(dbstat);

+    }

-	    if(cfgopt(thwarg->copt, "ClamukoScanOnLine")) {

-		logg("Starting Clamuko...\n");

-		tharg = (struct thrarg *) mcalloc(1, sizeof(struct thrarg));

-		tharg->copt = thwarg->copt;

-		tharg->root = *thwarg->root;

-		tharg->limits = thwarg->limits;

-		tharg->options = thwarg->options;

-

-		pthread_attr_init(&thattr);

-		pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);

-		pthread_create(&clamukoid, &thattr, clamukoth, tharg);

-		pthread_attr_destroy(&thattr);

-	    }

-#endif

+    memset(dbstat, 0, sizeof(struct cl_stat));

+    cl_statinidir(dbdir, dbstat);

+    if((retval = cl_loaddbdir(dbdir, &root, &virnum))) {

+	logg("!reload db failed: %s\n", cl_strerror(retval));

+	exit(-1);

+    }

-	    reload = 0;

-	}

+    if(!root) {

+	logg("!load db failed: %s\n", cl_strerror(retval));

+	exit(-1);

+    }

-	sleep(1);

+    if((retval = cl_buildtrie(root)) != 0) {

+	logg("!Database initialization error: can't build the trie: %s\n",

+	cl_strerror(retval));

+	exit(-1);

     }

+    logg("Database correctly reloaded (%d viruses)\n", virnum);

-    return NULL;

+    return root;

 }

-int threads;

-pthread_t watcherid;

-

 int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *copt)

 {

-	int acceptd, i, options = 0, maxwait;

-	struct cfgstruct *cpt;

-	struct thrarg *tharg;

-	struct thrwarg thwarg;

+	int new_sd, max_threads, options=0;

+	thrmgr_t thrmgr;

+	struct sigaction sigact;

+	mode_t old_umask;

 	struct cl_limits limits;

 	pthread_attr_t thattr;

-	struct sigaction sigact;

 	sigset_t sigset;

-	mode_t old_umask;

-

+	client_conn_t *client_conn;

+	struct cfgstruct *cpt;

+	char *buff[BUFFSIZE+1];

+	unsigned int selfchk;

+	time_t start_time, current_time;

+	

 #if defined(C_BIGSTACK) || defined(C_BSD)

-	size_t stacksize;

+        size_t stacksize;

 #endif

-    memset (&sigact, 0, sizeof(struct sigaction));

+#ifdef CLAMUKO

+	pthread_t clamuko_pid;

+	pthread_attr_t clamuko_attr;

+	struct thrarg *tharg;

+#endif

+	memset(&sigact, 0, sizeof(struct sigaction));

     /* save the PID */

     if((cpt = cfgopt(copt, "PidFile"))) {

 	    FILE *fd;

-	    old_umask = umask(0006);

+	old_umask = umask(0006);

 	if((fd = fopen(cpt->strarg, "w")) == NULL) {

 	    logg("!Can't save PID in file %s\n", cpt->strarg);

 	} else {

@@ -398,20 +211,11 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     }

     logg("*Listening daemon: PID: %d\n", getpid());

-

-    if((cpt = cfgopt(copt, "MaxThreads")))

-	threads = cpt->numarg;

-    else

-	threads = CL_DEFAULT_MAXTHREADS;

-

-    logg("Maximal number of threads: %d\n", threads);

-

-    ths = (struct thrsession *) mcalloc(threads, sizeof(struct thrsession));

- 

-    /*

-    for(i = 0; i < threads; i++)

-	pthread_mutex_init(&ths[i].mutex, NULL);

-    */

+    if((cpt = cfgopt(copt, "MaxThreads"))) {

+	max_threads = cpt->numarg;

+    } else {

+	max_threads = CL_DEFAULT_MAXTHREADS;

+    }

     if(cfgopt(copt, "ScanArchive") || cfgopt(copt, "ClamukoScanArchive")) {

@@ -419,40 +223,44 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	memset(&limits, 0, sizeof(struct cl_limits));

 	if((cpt = cfgopt(copt, "ArchiveMaxFileSize"))) {

-	    if((limits.maxfilesize = cpt->numarg))

+	    if((limits.maxfilesize = cpt->numarg)) {

 		logg("Archive: Archived file size limit set to %d bytes.\n", limits.maxfilesize);

-	    else

+	    } else {

 		logg("^Archive: File size limit protection disabled.\n");

+	    }

 	} else {

 	    limits.maxfilesize = 10485760;

 	    logg("^USING HARDCODED LIMIT: Archive: Archived file size limit set to %d bytes.\n", limits.maxfilesize);

 	}

 	if((cpt = cfgopt(copt, "ArchiveMaxRecursion"))) {

-	    if((limits.maxreclevel = cpt->numarg))

+	    if((limits.maxreclevel = cpt->numarg)) {

 		logg("Archive: Recursion level limit set to %d.\n", limits.maxreclevel);

-	    else

+	    } else {

 		logg("^Archive: Recursion level limit protection disabled.\n");

+	    }

 	} else {

 	    limits.maxreclevel = 5;

 	    logg("^USING HARDCODED LIMIT: Archive: Recursion level set to %d.\n", limits.maxreclevel);

 	}

 	if((cpt = cfgopt(copt, "ArchiveMaxFiles"))) {

-	    if((limits.maxfiles = cpt->numarg))

+	    if((limits.maxfiles = cpt->numarg)) {

 		logg("Archive: Files limit set to %d.\n", limits.maxfiles);

-	    else

+	    } else {

 		logg("^Archive: Files limit protection disabled.\n");

+	    }

 	} else {

 	    limits.maxfiles = 1000;

 	    logg("^USING HARDCODED LIMIT: Archive: Files limit set to %d.\n", limits.maxfiles);

 	}

 	if((cpt = cfgopt(copt, "ArchiveMaxCompressionRatio"))) {

-	    if((limits.maxratio = cpt->numarg))

+	    if((limits.maxratio = cpt->numarg)) {

 		logg("Archive: Compression ratio limit set to %d.\n", limits.maxratio);

-	    else

+	    } else {

 		logg("^Archive: Compression ratio limit disabled.\n");

+	    }

 	} else {

 	    limits.maxratio = 200;

 	    logg("^USING HARDCODED LIMIT: Archive: Compression ratio limit set to %d.\n", limits.maxratio);

@@ -461,11 +269,12 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

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

 	    limits.archivememlim = 1;

 	    logg("Archive: Limited memory usage.\n");

-	} else

+	} else {

 	    limits.archivememlim = 0;

+	}

     }

-    if(cfgopt(copt, "ScanArchive")) { 

+    if(cfgopt(copt, "ScanArchive")) {

 	logg("Archive support enabled.\n");

 	options |= CL_ARCHIVE;

@@ -479,64 +288,58 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	logg("Archive support disabled.\n");

     }

-    if(cfgopt(copt, "ScanMail")) { 

+    if(cfgopt(copt, "ScanMail")) {

 	logg("Mail files support enabled.\n");

 	options |= CL_MAIL;

     } else {

 	logg("Mail files support disabled.\n");

     }

-    if(cfgopt(copt, "ScanOLE2")) { 

+    if(cfgopt(copt, "ScanOLE2")) {

 	logg("OLE2 support enabled.\n");

 	options |= CL_OLE2;

     } else {

 	logg("OLE2 support disabled.\n");

     }

-    /* initialize important global variables */

-    progexit = 0;

-    progpid = 0;

-    reload = 0;

-#ifdef CLAMUKO

-    clamuko_running = 0;

-#endif

+    if((cpt = cfgopt(copt, "SelfCheck"))) {

+	selfchk = cpt->numarg;

+    } else {

+	selfchk = CL_DEFAULT_SELFCHECK;

+    }

+

+    if(!selfchk) {

+	logg("Self checking disabled.\n");

+    } else {

+	logg("Self checking every %d seconds.\n", selfchk);

+    }

     pthread_attr_init(&thattr);

     pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);

-    /* run clamuko */

-    if(cfgopt(copt, "ClamukoScanOnLine"))

 #ifdef CLAMUKO

-    {

-	tharg = (struct thrarg *) mcalloc(1, sizeof(struct thrarg));

-	tharg->copt = copt;

-	tharg->root = root;

-	tharg->limits = &limits;

-	tharg->options = options;

-

-	pthread_create(&clamukoid, &thattr, clamukoth, tharg);

-    }

+    pthread_attr_init(&clamuko_attr);

+    pthread_attr_setdetachstate(&clamuko_attr, PTHREAD_CREATE_JOINABLE);

+

+    tharg = (struct thrarg *) mmalloc(sizeof(struct thrarg));

+    tharg->copt = copt;

+    tharg->root = root;

+    tharg->limits = &limits;

+    tharg->options = options;

+

+    pthread_create(&clamuko_pid, &clamuko_attr, clamukoth, tharg);

 #else