@@ -1,3 +1,7 @@

+Tue Sep  5 22:43:26 CEST 2006 (tk)

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

+  * clamd: code cleanup

+

 Tue Sep  5 00:23:26 CEST 2006 (tk)

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

   * clamd: all commands can be now prefixed with the letter 'n' (eg. nSCAN) to

@@ -32,7 +32,6 @@

 #include <time.h>

 #include <pwd.h>

 #include <grp.h>

-#include <clamav.h>

 #if defined(USE_SYSLOG) && !defined(C_AIX)

 #include <syslog.h>

@@ -42,26 +41,40 @@

 #include <sys/resource.h>

 #endif

-#include "options.h"

-#include "cfgparser.h"

-#include "others.h"

-/* Fixes gcc warning */

-#include "../libclamav/others.h"

+#include "target.h"

+

+#include "libclamav/clamav.h"

+#include "libclamav/others.h"

+

+#include "shared/memory.h"

+#include "shared/output.h"

+#include "shared/options.h"

+#include "shared/cfgparser.h"

+#include "shared/misc.h"

+

+#include "server.h"

 #include "tcpserver.h"

 #include "localserver.h"

 #include "others.h"

-#include "memory.h"

-#include "output.h"

 #include "shared.h"

-#include "target.h"

-#include "misc.h"

-void help(void);

 short debug_mode = 0, logok = 0;

-

 short foreground = 0;

+void help(void)

+{

+    printf("\n");

+    printf("                      Clam AntiVirus Daemon "VERSION"\n");

+    printf("    (C) 2002 - 2005 ClamAV Team - http://www.clamav.net/team.html\n\n");

+

+    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");

+

+}

+

 int main(int argc, char **argv)

 {

 	struct cfgstruct *copt, *cpt;

@@ -69,7 +82,8 @@ int main(int argc, char **argv)

 	time_t currtime;

 	struct cl_node *root = NULL;

 	const char *dbdir, *cfgfile;

-	int ret, virnum = 0, tcpsock = 0, localsock = 0;

+	int ret, tcpsock = 0, localsock = 0;

+	unsigned int sigs = 0;

 	int lsockets[2], nlsockets = 0;

 	unsigned int dboptions = 0;

 #ifdef C_LINUX

@@ -95,11 +109,14 @@ int main(int argc, char **argv)

     if(opt_check(opt, "version")) {

 	print_version();

-	exit(0);

+	opt_free(opt);

+	return 0;

     }

     if(opt_check(opt, "help")) {

     	help();

+	opt_free(opt);

+	return 0;

     }

     if(opt_check(opt, "debug")) {

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

 	    perror("setrlimit");

 #endif

 	debug_mode = 1;

-

     }

     /* parse the config file */

@@ -123,8 +139,10 @@ int main(int argc, char **argv)

     if((copt = getcfg(cfgfile, 1)) == NULL) {

 	fprintf(stderr, "ERROR: Can't open/parse the config file %s\n", cfgfile);

-	exit(1);

+	opt_free(opt);

+	return 1;

     }

+    opt_free(opt);

     umask(0);

@@ -134,7 +152,9 @@ int main(int argc, char **argv)

 	if((user = getpwnam(cpt->strarg)) == NULL) {

 	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", cpt->strarg);

 	    logg("!Can't get information about user %s.\n", cpt->strarg);

-	    exit(1);

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

 	}

 	if(cfgopt(copt, "AllowSupplementaryGroups")->enabled) {

@@ -142,7 +162,9 @@ int main(int argc, char **argv)

 	    if(initgroups(cpt->strarg, user->pw_gid)) {

 		fprintf(stderr, "ERROR: initgroups() failed.\n");

 		logg("!initgroups() failed.\n");

-		exit(1);

+		logg_close();

+		freecfg(copt);

+		return 1;

 	    }

 #else

 	    logg("AllowSupplementaryGroups: initgroups() not supported.\n");

@@ -152,7 +174,9 @@ int main(int argc, char **argv)

 	    if(setgroups(1, &user->pw_gid)) {

 		fprintf(stderr, "ERROR: setgroups() failed.\n");

 		logg("!setgroups() failed.\n");

-		exit(1);

+		logg_close();

+		freecfg(copt);

+		return 1;

 	    }

 #endif

 	}

@@ -160,13 +184,17 @@ int main(int argc, char **argv)

 	if(setgid(user->pw_gid)) {

 	    fprintf(stderr, "ERROR: setgid(%d) failed.\n", (int) user->pw_gid);

 	    logg("!setgid(%d) failed.\n", (int) user->pw_gid);

-	    exit(1);

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

 	}

 	if(setuid(user->pw_uid)) {

 	    fprintf(stderr, "ERROR: setuid(%d) failed.\n", (int) user->pw_uid);

 	    logg("!setuid(%d) failed.\n", (int) user->pw_uid);

-	    exit(1);

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

 	}

 	logg("Running as user %s (UID %d, GID %d)\n", user->pw_name, user->pw_uid, user->pw_gid);

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

 #endif

     /* initialize logger */

-

     logg_lock = cfgopt(copt, "LogFileUnlock")->enabled;

     logg_time = cfgopt(copt, "LogTime")->enabled;

     logok = cfgopt(copt, "LogClean")->enabled;

@@ -188,12 +215,16 @@ int main(int argc, char **argv)

 	logg_file = cpt->strarg;

 	if(strlen(logg_file) < 2 || (logg_file[0] != '/' && logg_file[0] != '\\' && logg_file[1] != ':')) {

 	    fprintf(stderr, "ERROR: LogFile requires full path.\n");

-	    exit(1);

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

 	}

 	time(&currtime);

-	if(logg("+++ Started at %s", ctime(&currtime))) {

+	if(logg("#+++ Started at %s", ctime(&currtime))) {

 	    fprintf(stderr, "ERROR: Problem with internal logger. Please check the permissions on the %s file.\n", logg_file);

-	    exit(1);

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

 	}

     } else

 	logg_file = NULL;

@@ -204,8 +235,10 @@ int main(int argc, char **argv)

 	cpt = cfgopt(copt, "LogFacility");

 	if((fac = logg_facility(cpt->strarg)) == -1) {

-	    fprintf(stderr, "ERROR: LogFacility: %s: No such facility.\n", cpt->strarg);

-	    exit(1);

+	    logg("!LogFacility: %s: No such facility.\n", cpt->strarg);

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

 	}

 	openlog("clamd", LOG_PID, fac);

@@ -213,14 +246,12 @@ int main(int argc, char **argv)

     }

 #endif

-    logg("clamd daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

+    logg("#clamd daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

     if(logg_size)

-	logg("Log file size limited to %d bytes.\n", logg_size);

+	logg("#Log file size limited to %d bytes.\n", logg_size);

     else

-	logg("Log file size limit disabled.\n");

-

-    logg("*Verbose logging activated.\n");

+	logg("#Log file size limit disabled.\n");

 #ifdef C_LINUX

     procdev = 0;

@@ -237,9 +268,10 @@ int main(int argc, char **argv)

 	localsock = 1;

     if(!tcpsock && !localsock) {

-	fprintf(stderr, "ERROR: You must select server type (local/tcp).\n");

-	logg("!Please select server type (local/TCP).\n");

-	exit(1);

+	logg("!Please define server type (local and/or TCP).\n");

+	logg_close();

+	freecfg(copt);

+	return 1;

     }

     /* set the temporary dir */

@@ -251,30 +283,33 @@ int main(int argc, char **argv)

     /* load the database(s) */

     dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

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

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

     if(!cfgopt(copt, "DetectPhishing")->enabled) {

 	dboptions |= CL_DB_NOPHISHING;

 	logg("Not loading phishing signatures.\n");

     }

-    if((ret = cl_load(dbdir, &root, &virnum, dboptions))) {

-	fprintf(stderr, "ERROR: %s\n", cl_strerror(ret));

+    if((ret = cl_load(dbdir, &root, &sigs, dboptions))) {

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

-	exit(1);

+	logg_close();

+	freecfg(copt);

+	return 1;

     }

     if(!root) {

-	fprintf(stderr, "ERROR: Database initialization error.\n");

 	logg("!Database initialization error.\n");

-	exit(1);

+	logg_close();

+	freecfg(copt);

+	return 1;

     }

-    logg("Protecting against %d viruses.\n", virnum);

+    logg("#Loaded %d signatures.\n", sigs);

     if((ret = cl_build(root)) != 0) {

-	fprintf(stderr, "ERROR: Database initialization error: %s\n", cl_strerror(ret));;

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

-	exit(1);

+	logg_close();

+	freecfg(copt);

+	return 1;

     }

     /* fork into background */

@@ -285,31 +320,32 @@ int main(int argc, char **argv)

     } else

         foreground = 1;

-    if(tcpsock)

-	lsockets[nlsockets++] = tcpserver(copt, root);

+    if(tcpsock) {

+	lsockets[nlsockets] = tcpserver(copt);

+	if(lsockets[nlsockets] == -1) {

+	    logg_close();

+	    freecfg(copt);

+	    return 1;

+	}

+	nlsockets++;

+    }

-    if(localsock)

-	lsockets[nlsockets++] = localserver(copt, root);

+    if(localsock) {

+	lsockets[nlsockets] = localserver(copt);

+	if(lsockets[nlsockets] == -1) {

+	    logg_close();

+	    freecfg(copt);

+	    if(tcpsock)

+		close(lsockets[0]);

+	    return 1;

+	}

+	nlsockets++;

+    }

     ret = acceptloop_th(lsockets, nlsockets, root, copt);

     logg_close();

     freecfg(copt);

-    return ret;

-}

-

-void help(void)

-{

-

-    printf("\n");

-    printf("                      Clam AntiVirus Daemon "VERSION"\n");

-    printf("    (C) 2002 - 2005 ClamAV Team - http://www.clamav.net/team.html\n\n");

-

-    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);

+    return ret;

 }

-

@@ -29,14 +29,16 @@

 #include <sys/stat.h>

 #include <signal.h>

 #include <pthread.h>

-#include <clamav.h>

+

+#include "libclamav/clamav.h"

+

+#include "shared/cfgparser.h"

+#include "shared/output.h"

 #include "server.h"

 #include "others.h"

-#include "cfgparser.h"

 #include "dazukoio.h"

 #include "clamuko.h"

-#include "output.h"

 struct dazuko_access *acc;

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

 #ifndef __CLAMUKO_H

 #define __CLAMUKO_H

-/* short int clamuko_running, clamuko_scanning; */

 short int clamuko_scanning;

 void *clamukoth(void *arg);

@@ -27,20 +27,21 @@

 #include <sys/socket.h>

 #include <sys/stat.h>

 #include <sys/un.h>

-#include <clamav.h>

 #include <errno.h>

-#include "options.h"

-#include "cfgparser.h"

+#include "libclamav/clamav.h"

+

+#include "shared/options.h"

+#include "shared/cfgparser.h"

+

 #include "others.h"

 #include "server.h"

 #include "output.h"

-int localserver(const struct cfgstruct *copt, struct cl_node *root)

+int localserver(const struct cfgstruct *copt)

 {

 	struct sockaddr_un server;

 	int sockfd, backlog;

-	struct cfgstruct *cpt;

 	struct stat foo;

 	char *estr;

@@ -50,40 +51,41 @@ int localserver(const struct cfgstruct *copt, struct cl_node *root)

     if((sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

-	/* 

-	fprintf(stderr, "ERROR: socket() error: %s\n", estr);

-	*/

 	logg("!Socket allocation error: %s\n", estr);

-	exit(1);

+	return -1;

     }

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) == -1) {

 	if(errno == EADDRINUSE) {

 	    if(connect(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) >= 0) {

-		close(sockfd);

 		logg("!Socket file %s is in use by another process.\n", server.sun_path);

-		exit(1);

+		close(sockfd);

+		return -1;

 	    }

 	    if(cfgopt(copt, "FixStaleSocket")->enabled) {

 		logg("^Socket file %s exists. Unclean shutdown? Removing...\n", server.sun_path);

 		if(unlink(server.sun_path) == -1) {

 		    estr = strerror(errno);

 		    logg("!Socket file %s could not be removed: %s\n", server.sun_path, estr);

-		    exit(1);

+		    close(sockfd);

+		    return -1;

 		}

 		if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) == -1) {

 		    estr = strerror(errno);

 		    logg("!Socket file %s could not be bound: %s (unlink tried)\n", server.sun_path, estr);

-		    exit(1);

+		    close(sockfd);

+		    return -1;

 		}

 	    } else if(stat(server.sun_path, &foo) != -1) {

 		logg("!Socket file %s exists. Either remove it, or configure a different one.\n", server.sun_path);

-		exit(1);

+		close(sockfd);

+		return -1;

 	    }

 	} else {

 	    estr = strerror(errno);

 	    logg("!Socket file %s could not be bound: %s\n", server.sun_path, estr);

-	    exit(1);

+	    close(sockfd);

+	    return -1;

 	}

     }

@@ -94,11 +96,9 @@ int localserver(const struct cfgstruct *copt, struct cl_node *root)

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

-	/*

-	fprintf(stderr, "ERROR: listen() error: %s\n", estr);

-	*/

 	logg("!listen() error: %s\n", estr);

-	exit(1);

+	close(sockfd);

+	return -1;

     }

     return sockfd;

@@ -20,6 +20,8 @@

 #ifndef __LOCALSERVER_H

 #define __LOCALSERVER_H

-int localserver(const struct cfgstruct *copt, struct cl_node *root);

+#include "shared/cfgparser.h"

+

+int localserver(const struct cfgstruct *copt);

 #endif

@@ -33,7 +33,6 @@

 #include <sys/time.h>

 #include <sys/wait.h>

-

 #if HAVE_SYS_PARAM_H

 #include <sys/param.h>

 #endif

@@ -68,11 +67,12 @@

 #endif /* HAVE_POLL_H */

 #endif /* HAVE_POLL */

-#include "memory.h"

-#include "cfgparser.h"

+#include "shared/memory.h"

+#include "shared/cfgparser.h"

+#include "shared/output.h"

+

 #include "session.h"

 #include "others.h"

-#include "output.h"

 #define ENV_FILE  "CLAM_VIRUSEVENT_FILENAME"

 #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME"

@@ -139,8 +139,14 @@ int poll_fds(int *fds, int nfds, int timeout_sec)

 	struct pollfd poll_1[1];

 	struct pollfd *poll_data = poll_1;

-    if (nfds>1)

-	poll_data = malloc(nfds*sizeof(*poll_data));

+    if (nfds>1) {

+	poll_data = mmalloc(nfds*sizeof(*poll_data));

+	if(!poll_data) {

+	    logg("!poll_fds: Can't allocate memory for poll_data\n");

+	    return -1;

+	}

+    }

+

     for (i=0; i<nfds; i++) {

 	poll_data[i].fd = fds[i];

 	poll_data[i].events = POLLIN;

@@ -392,7 +398,7 @@ int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeou

 	    if(fd < 0)

 		return -1;

 	    n = snprintf(buf, size, "FD %d", fd);

-	    if(n >= size)

+	    if((size_t) n >= size)

 		return -1;

 	    return n;

 	}

@@ -25,7 +25,7 @@

 #endif

 #include <stdlib.h>

-#include "cfgparser.h"

+#include "shared/cfgparser.h"

 int poll_fds(int *fds, int nfds, int timeout_sec);

 int poll_fd(int fd, int timeout_sec);

@@ -36,7 +36,6 @@

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <netdb.h>

-#include <clamav.h>

 #include <pthread.h>

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

@@ -44,16 +43,18 @@

 #include <stddef.h>

 #endif

-#include "cfgparser.h"

+#include "libclamav/clamav.h"

+#include "libclamav/others.h"

+

+#include "shared/cfgparser.h"

+#include "shared/memory.h"

+#include "shared/output.h"

+

 #include "others.h"

 #include "scanner.h"

-#include "memory.h"

 #include "shared.h"

-#include "output.h"

 #include "network.h"

-#include "../libclamav/others.h"

-

 #ifdef C_LINUX

 dev_t procdev; /* /proc device */

 #endif

@@ -97,9 +98,9 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 	} result;

 #endif

 	struct stat statbuf;

-	struct cfgstruct *cpt;

 	char *fname;

-	int ret = 0, scanret = 0, maxdirrec = 0;

+	int ret = 0, scanret = 0;

+	unsigned int maxdirrec = 0;

     maxdirrec = cfgopt(copt, "MaxDirectoryRecursion")->numarg;

@@ -196,7 +197,8 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 int scan(const char *filename, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc, short contscan)

 {

 	struct stat sb;

-	int ret = 0, reclev = 0;

+	int ret = 0;

+	unsigned int reclev = 0;

 	const char *virname;

@@ -257,7 +259,7 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

     return ret;

 }

-int scanfd(const int fd, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc, short contscan)

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

 {

 	int ret;

 	const char *virname;

@@ -20,15 +20,14 @@

 #ifndef __SCANNER_H

 #define __SCANNER_H

-#include <clamav.h>

-#include "cfgparser.h"

-

+#include "libclamav/clamav.h"

+#include "shared/cfgparser.h"

 int dirscan(const char *dirname, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc, unsigned int *reclev, short contscan);

 int scan(const char *filename, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc, short contscan);

-int scanfd(const int fd, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc, short contscan);

+int scanfd(const int fd, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc);

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

@@ -31,16 +31,18 @@

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <unistd.h>

-#include <clamav.h>

+

+#include "libclamav/clamav.h"

+

+#include "shared/memory.h"

+#include "shared/output.h"

 #include "server.h"

 #include "thrmgr.h"

 #include "session.h"

 #include "clamuko.h"

 #include "others.h"

-#include "memory.h"

 #include "shared.h"

-#include "output.h"

 #define BUFFSIZE 1024

 #define FALSE (0)

@@ -69,7 +71,6 @@ void scanner_thread(void *arg)

 	client_conn_t *conn = (client_conn_t *) arg;

 	sigset_t sigset;

 	int ret, timeout, i, session=FALSE;

-	struct cfgstruct *cpt;

     /* ignore all signals */

@@ -160,8 +161,8 @@ void sighandler_th(int sig)

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

 {

 	const char *dbdir;

-	int virnum=0, retval;

-	struct cfgstruct *cpt;

+	int retval;

+	unsigned int sigs = 0;

 	static struct cl_stat *dbstat=NULL;

 	unsigned int dboptions = 0;

@@ -203,7 +204,7 @@ static struct cl_node *reload_db(struct cl_node *root, const struct cfgstruct *c

 	logg("Not loading phishing signatures.\n");

     }

-    if((retval = cl_load(dbdir, &root, &virnum, dboptions))) {

+    if((retval = cl_load(dbdir, &root, &sigs, dboptions))) {

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

 	exit(-1);

     }

@@ -218,7 +219,7 @@ static struct cl_node *reload_db(struct cl_node *root, const struct cfgstruct *c

 	cl_strerror(retval));

 	exit(-1);

     }

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

+    logg("Database correctly reloaded (%d signatures)\n", sigs);

     return root;

 }

@@ -21,9 +21,11 @@

 #define __SERVER_H

 #include <time.h>

-#include <clamav.h>

 #include <pthread.h>

+#include "libclamav/clamav.h"

+#include "shared/cfgparser.h"

+

 struct thrarg {

     int sid;

     int options;

@@ -33,24 +33,25 @@

 #include <signal.h>

 #include <errno.h>

-#include "cfgparser.h"

+#include "libclamav/clamav.h"

+#include "libclamav/str.h"

+

+#include "shared/cfgparser.h"

+#include "shared/memory.h"

+#include "shared/output.h"

+

 #include "others.h"

 #include "scanner.h"

 #include "server.h"

 #include "clamuko.h"

 #include "session.h"

-#include "str.h" /* libclamav */

-#include "clamav.h"

-#include "output.h"

-#include "memory.h"

 static pthread_mutex_t ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

 int command(int desc, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int timeout)

 {

 	char buff[1025];

-	int bread, opt, retval;

-	struct cfgstruct *cpt;

+	int bread, opt;

     bread = readsock(desc, buff, sizeof(buff)-1, '\n', timeout, 0, 1);

@@ -135,7 +136,7 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits

     } else if(!strncmp(buff, CMD12, strlen(CMD12))) { /* FD */

 	    int fd = atoi(buff + strlen(CMD12) + 1);

-	scanfd(fd, NULL, root, limits, options, copt, desc, 0);

+	scanfd(fd, NULL, root, limits, options, copt, desc);

 	close(fd); /* FIXME: should we close it here? */

     } else {

@@ -38,8 +38,8 @@

 #define CMD11 "SHUTDOWN"

 #define CMD12 "FD"

-#include <clamav.h>

-#include "cfgparser.h"

+#include "libclamav/clamav.h"

+#include "shared/cfgparser.h"

 int command(int desc, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int timeout);

@@ -27,21 +27,23 @@

 #include <sys/socket.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

-#include <clamav.h>

 #include <errno.h>

 #include <netdb.h>

-#include "options.h"

-#include "cfgparser.h"

+#include "libclamav/clamav.h"

+

+#include "shared/options.h"

+#include "shared/cfgparser.h"

+#include "shared/output.h"

+#include "shared/network.h"

+

 #include "others.h"

 #include "server.h"

-#include "output.h"

-int tcpserver(const struct cfgstruct *copt, struct cl_node *root)

+int tcpserver(const struct cfgstruct *copt)

 {

 	struct sockaddr_in server;

 	int sockfd, backlog;

-	struct cfgstruct *cpt;

 	struct cfgstruct *taddr;

 	struct hostent he;

 	char *estr, buf[1024];

@@ -54,7 +56,7 @@ int tcpserver(const struct cfgstruct *copt, struct cl_node *root)

     if((taddr = cfgopt(copt, "TCPAddr"))->enabled) {

 	if(r_gethostbyname(taddr->strarg, &he, buf, sizeof(buf)) == -1) {

 	    logg("!r_gethostbyname(%s) error: %s\n", taddr->strarg, strerror(errno));

-	    exit(1);

+	    return -1;

 	}

 	server.sin_addr = *(struct in_addr *) he.h_addr_list[0];

     } else

@@ -64,7 +66,7 @@ int tcpserver(const struct cfgstruct *copt, struct cl_node *root)

     if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

 	logg("!socket() error: %s\n", estr);

-	exit(1);

+	return -1;

     }

     if(setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void *) &true, sizeof(true)) == -1) {

@@ -74,7 +76,8 @@ int tcpserver(const struct cfgstruct *copt, struct cl_node *root)

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

 	estr = strerror(errno);

 	logg("!bind() error: %s\n", estr);

-	exit(1);

+	close(sockfd);

+	return -1;

     } else {

 	if(taddr->enabled)

 	    logg("Bound to address %s on tcp port %d\n", taddr->strarg, cfgopt(copt, "TCPSocket")->numarg);

@@ -88,7 +91,8 @@ int tcpserver(const struct cfgstruct *copt, struct cl_node *root)

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

 	logg("!listen() error: %s\n", estr);

-	exit(1);

+	close(sockfd);

+	return -1;

     }

     return sockfd;

@@ -20,9 +20,8 @@

 #ifndef __TCPSERVER_H

 #define __TCPSERVER_H

-#include "options.h"

-#include "cfgparser.h"

+#include "shared/cfgparser.h"

-int tcpserver(const struct cfgstruct *copt, struct cl_node *root);

+int tcpserver(const struct cfgstruct *copt);

 #endif

@@ -17,15 +17,16 @@

  *  MA 02110-1301, USA.

  */

+#include <stdio.h>

 #include <pthread.h>

 #include <time.h>

 #include <errno.h>

-#include "thrmgr.h"

+#include "shared/memory.h"

+#include "shared/output.h"

+#include "thrmgr.h"

 #include "others.h"

-#include "memory.h"

-#include "output.h"

 #define FALSE (0)

 #define TRUE (1)

@@ -38,7 +38,7 @@ typedef struct work_queue_tag {

 typedef enum {

 	POOL_INVALID,

 	POOL_VALID,

-	POOL_EXIT,

+	POOL_EXIT

 } pool_state_t;

 typedef struct threadpool_tag {