@@ -1,3 +1,8 @@

+Sun Aug 27 19:48:17 CEST 2006 (tk)

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

+  * freshclam: apply timeout patch from Everton da Silva Marques

+	       <everton*lab.ipaccess.diveo.net.br>

+

 Sun Aug 27 10:52:55 BST 2006 (njh)

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

   * libclamav/blob.c:	Don't use % in filenames on Windows, since cmd.exe

@@ -121,6 +121,16 @@ Default: disabled

 Execute this command after a database update has failed.

 .br 

 Default: disabled

+.TP

+\fBConnectTimeout\fR

+Timeout in seconds when connecting to database server.

+.br 

+Default: 10

+.TP

+\fBReceiveTimeout\fR

+Timeout in seconds when reading from database server.

+.br 

+Default: 30

 .SH "NOTE"

 While not reasonable, any configuration option from clamd.conf(5) may be given.

 .SH "FILES"

@@ -111,3 +111,11 @@ DatabaseMirror database.clamav.net

 # Enable debug messages in libclamav.

 # Default: no

 #Debug yes

+

+# Timeout in seconds when connecting to database server.

+# Default: 10

+#ConnectTimeout 30

+

+# Timeout in seconds when reading from database server.

+# Default: 30

+#ReceiveTimeout 60

@@ -44,7 +44,9 @@ freshclam_SOURCES = \

     dns.c \

     dns.h \

     execute.c \

-    execute.h

+    execute.h \

+    nonblock.c \

+    nonblock.h

 DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -74,7 +74,7 @@ am_freshclam_OBJECTS = output.$(OBJEXT) cfgparser.$(OBJEXT) \

 	getopt.$(OBJEXT) memory.$(OBJEXT) misc.$(OBJEXT) \

 	options.$(OBJEXT) cdiff.$(OBJEXT) freshclam.$(OBJEXT) \

 	manager.$(OBJEXT) notify.$(OBJEXT) dns.$(OBJEXT) \

-	execute.$(OBJEXT)

+	execute.$(OBJEXT) nonblock.$(OBJEXT)

 freshclam_OBJECTS = $(am_freshclam_OBJECTS)

 freshclam_LDADD = $(LDADD)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

@@ -232,7 +232,9 @@ freshclam_SOURCES = \

     dns.c \

     dns.h \

     execute.c \

-    execute.h

+    execute.h \

+    nonblock.c \

+    nonblock.h

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 all: all-am

@@ -315,6 +317,7 @@ distclean-compile:

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

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

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

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

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

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

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

@@ -46,6 +46,7 @@

 #include "notify.h"

 #include "dns.h"

 #include "execute.h"

+#include "nonblock.h"

 #include "shared/options.h"

 #include "shared/cfgparser.h"

@@ -63,7 +64,7 @@

 #endif

-static int wwwconnect(const char *server, const char *proxy, int pport, char *ip, const char *localip)

+static int wwwconnect(const char *server, const char *proxy, int pport, char *ip, const char *localip, int ctimeout)

 {

 	int socketfd = -1, port, i;

 	struct sockaddr_in name;

@@ -195,7 +196,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

 	name.sin_addr = *((struct in_addr *) host->h_addr_list[i]);

 	name.sin_port = htons(port);

-	if(connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in)) == -1) {

+	if(wait_connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in), ctimeout) == -1) {

 	    logg("Can't connect to port %d of host %s (IP: %s)\n", port, hostpt, ipaddr);

 	    continue;

 	} else {

@@ -283,7 +284,7 @@ static char *proxyauth(const char *user, const char *pass)

     return auth;

 }

-static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, int *ims)

+static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, int *ims, int ctimeout, int rtimeout)

 {

 	char cmd[512], head[513], buffer[FILEBUFF], ipaddr[16], *ch, *tmp;

 	int bread, cnt, sd;

@@ -343,9 +344,9 @@ static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, cha

     memset(ipaddr, 0, sizeof(ipaddr));

     if(ip[0]) /* use ip to connect */

-	sd = wwwconnect(ip, proxy, port, ipaddr, localip);

+	sd = wwwconnect(ip, proxy, port, ipaddr, localip, ctimeout);

     else

-	sd = wwwconnect(hostname, proxy, port, ipaddr, localip);

+	sd = wwwconnect(hostname, proxy, port, ipaddr, localip, ctimeout);

     if(sd < 0) {

 	return NULL;

@@ -365,7 +366,7 @@ static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, cha

     tmp = buffer;

     cnt = FILEBUFF;

-    while((bread = recv(sd, tmp, cnt, 0)) > 0) {

+    while((bread = wait_recv(sd, tmp, cnt, 0, rtimeout)) > 0) {

 	tmp += bread;

 	cnt -= bread;

 	if(cnt <= 0)

@@ -433,7 +434,7 @@ static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, cha

     return cvd;

 }

-static int getfile(const char *srcfile, const char *destfile, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas)

+static int getfile(const char *srcfile, const char *destfile, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, int ctimeout, int rtimeout)

 {

 	char cmd[512], buffer[FILEBUFF], *ch;

 	int bread, fd, totalsize = 0,  rot = 0, totaldownloaded = 0,

@@ -476,9 +477,9 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     memset(ipaddr, 0, sizeof(ipaddr));

     if(ip[0]) /* use ip to connect */

-	sd = wwwconnect(ip, proxy, port, ipaddr, localip);

+	sd = wwwconnect(ip, proxy, port, ipaddr, localip, ctimeout);

     else

-	sd = wwwconnect(hostname, proxy, port, ipaddr, localip);

+	sd = wwwconnect(hostname, proxy, port, ipaddr, localip, ctimeout);

     if(sd < 0) {

 	return 52;

@@ -505,7 +506,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     i = 0;

     while(1) {

 	/* recv one byte at a time, until we reach \r\n\r\n */

-	if((i >= sizeof(buffer) - 1) || recv(sd, buffer + i, 1, 0) == -1) {

+	if((i >= sizeof(buffer) - 1) || wait_recv(sd, buffer + i, 1, 0, rtimeout) == -1) {

 	    logg("!getfile: Error while reading database from %s\n", hostname);

 	    return 52;

 	}

@@ -556,7 +557,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

 	return 57;

     }

-    while((bread = read(sd, buffer, FILEBUFF))) {

+    while((bread = wait_recv(sd, buffer, FILEBUFF, 0, rtimeout)) > 0) {

         if(write(fd, buffer, bread) != bread) {

 	    logg("getfile: Can't write %d bytes to %s\n", bread, destfile);

 	    unlink(destfile);

@@ -589,7 +590,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     return 0;

 }

-static int getcvd(const char *dbfile, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, int nodb, int newver)

+static int getcvd(const char *dbfile, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, int nodb, int newver, int ctimeout, int rtimeout)

 {

 	char *tempname;

 	struct cl_cvd *cvd;

@@ -599,7 +600,7 @@ static int getcvd(const char *dbfile, const char *hostname, char *ip, const char

     tempname = cli_gentemp(".");

     logg("*Retrieving http://%s/%s\n", hostname, dbfile);

-    if((ret = getfile(dbfile, tempname, hostname, ip, localip, proxy, port, user, pass, uas))) {

+    if((ret = getfile(dbfile, tempname, hostname, ip, localip, proxy, port, user, pass, uas, ctimeout, rtimeout))) {

         logg("!Can't download %s from %s (IP: %s)\n", dbfile, hostname, ip);

         unlink(tempname);

         free(tempname);

@@ -679,7 +680,7 @@ static int chdir_inc(const char *dbname)

     return 0;

 }

-static int getpatch(const char *dbname, int version, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas)

+static int getpatch(const char *dbname, int version, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, int ctimeout, int rtimeout)

 {

 	char *tempname, patch[32], olddir[512];

 	int ret, fd;

@@ -697,7 +698,7 @@ static int getpatch(const char *dbname, int version, const char *hostname, char

     snprintf(patch, sizeof(patch), "%s-%d.cdiff", dbname, version);

     logg("*Retrieving http://%s/%s\n", hostname, patch);

-    if((ret = getfile(patch, tempname, hostname, ip, localip, proxy, port, user, pass, uas))) {

+    if((ret = getfile(patch, tempname, hostname, ip, localip, proxy, port, user, pass, uas, ctimeout, rtimeout))) {

         logg("!getpatch: Can't download %s from %s (IP: %s)\n", patch, hostname, ip);

         unlink(tempname);

         free(tempname);

@@ -758,6 +759,7 @@ int updatedb(const char *dbname, const char *hostname, char *ip, int *signo, con

 	const char *proxy = NULL, *user = NULL, *pass = NULL, *uas = NULL;

 	int flevel = cl_retflevel();

 	struct stat sb;

+	int ctimeout, rtimeout;

     snprintf(dbfile, sizeof(dbfile), "%s.cvd", dbname);

@@ -835,10 +837,12 @@ int updatedb(const char *dbname, const char *hostname, char *ip, int *signo, con

     if((cpt = cfgopt(copt, "HTTPUserAgent"))->enabled)

 	uas = cpt->strarg;

+    ctimeout = cfgopt(copt, "ConnectTimeout")->numarg;

+    rtimeout = cfgopt(copt, "ReceiveTimeout")->numarg;

     if(!nodb && newver == -1) {

-	remote = remote_cvdhead(dbfile, hostname, ip, localip, proxy, port, user, pass, uas, &ims);

+	remote = remote_cvdhead(dbfile, hostname, ip, localip, proxy, port, user, pass, uas, &ims, ctimeout, rtimeout);

 	if(!nodb && !ims) {

 	    logg("%s is up to date (version: %d, sigs: %d, f-level: %d, builder: %s)\n", dbfile, current->version, current->sigs, current->fl, current->builder);

@@ -897,7 +901,7 @@ int updatedb(const char *dbname, const char *hostname, char *ip, int *signo, con

     */

     if(nodb) {

-	ret = getcvd(dbfile, hostname, ip, localip, proxy, port, user, pass, uas, nodb, newver);

+	ret = getcvd(dbfile, hostname, ip, localip, proxy, port, user, pass, uas, nodb, newver, ctimeout, rtimeout);

 	if(ret)

 	    return ret;

@@ -905,7 +909,7 @@ int updatedb(const char *dbname, const char *hostname, char *ip, int *signo, con

 	ret = 0;

 	for(i = currver + 1; i <= newver; i++) {

-	    ret = getpatch(dbname, i, hostname, ip, localip, proxy, port, user, pass, uas);

+	    ret = getpatch(dbname, i, hostname, ip, localip, proxy, port, user, pass, uas, ctimeout, rtimeout);

 	    if(ret) {

 		logg("^Removing incremental directory %s\n", dbinc);

 		rmdirs(dbinc);

@@ -916,7 +920,7 @@ int updatedb(const char *dbname, const char *hostname, char *ip, int *signo, con

 	if(ret) {

 	    logg("^Incremental update failed, downloading complete database\n");

-	    ret = getcvd(dbfile, hostname, ip, localip, proxy, port, user, pass, uas, 1, newver);

+	    ret = getcvd(dbfile, hostname, ip, localip, proxy, port, user, pass, uas, 1, newver, ctimeout, rtimeout);

 	    if(ret)

 		return ret;

 	} else {

new file mode 100644

@@ -0,0 +1,302 @@

+/*

+ *  Copyright 2006 Everton da Silva Marques <everton.marques@gmail.com>

+ *

+ *  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

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

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

+ */

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <unistd.h>

+#include <string.h>

+#include <ctype.h>

+#include <netinet/in.h>

+#include <netdb.h>

+#include <sys/types.h>

+#include <sys/socket.h>

+#include <sys/time.h>

+#include <time.h>

+#include <fcntl.h>

+#include <sys/stat.h>

+#include <clamav.h>

+#include <errno.h>

+

+#include "nonblock.h"

+#include "output.h"

+

+#ifndef timercmp

+# define timercmp(a, b, cmp)          \

+  (((a)->tv_sec == (b)->tv_sec) ?     \

+   ((a)->tv_usec cmp (b)->tv_usec) :  \

+   ((a)->tv_sec cmp (b)->tv_sec))

+#endif /* timercmp */

+

+#ifndef timersub

+# define timersub(a, b, result)                       \

+  do {                                                \

+    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;     \

+    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;  \

+    if ((result)->tv_usec < 0) {                      \

+      --(result)->tv_sec;                             \

+      (result)->tv_usec += 1000000;                   \

+    }                                                 \

+  } while (0)

+#endif /* timersub */

+

+#define NONBLOCK_SELECT_MAX_FAILURES 3

+#define NONBLOCK_MAX_BOGUS_LOOPS     10

+#undef  NONBLOCK_DEBUG

+

+static int connect_error(int sock)

+{

+	int optval;

+	int optlen;

+

+	optlen = sizeof(optval);

+	getsockopt(sock, SOL_SOCKET, SO_ERROR, &optval, &optlen);

+

+	if (optval) {

+		logg("%s %s: getsockopt(SO_ERROR): fd=%d error=%d: %s\n",

+		     __FILE__, __PRETTY_FUNCTION__,

+		     sock, optval, strerror(optval));

+	}

+

+	return optval ? -1 : 0;

+}

+

+static int nonblock_connect(int sock, const struct sockaddr *addr, socklen_t addrlen, int secs)

+{

+	/* Max. of unexpected select() failures */

+	int select_failures = NONBLOCK_SELECT_MAX_FAILURES;

+	/* Max. of useless loops */

+	int bogus_loops = NONBLOCK_MAX_BOGUS_LOOPS;

+	struct timeval timeout;  /* When we should time out */

+	int numfd;               /* Highest fdset fd plus 1 */

+

+	/* Calculate into 'timeout' when we should time out */

+	gettimeofday(&timeout, 0);

+	timeout.tv_sec += secs;

+

+	/* Launch (possibly) non-blocking connect() request */

+	if (connect(sock, addr, addrlen)) {

+		int e = errno;

+#ifdef NONBLOCK_DEBUG

+		logg("DEBUG %s %s: connect(): fd=%d errno=%d: %s\n",

+		     __FILE__, __PRETTY_FUNCTION__,

+		     sock, e, strerror(e));

+#endif

+		switch (e) {

+		case EALREADY:

+		case EINPROGRESS:

+			break; /* wait for connection */

+		case EISCONN:

+			return 0; /* connected */

+		default:

+			logg("%s %s: connect(): fd=%d errno=%d: %s\n",

+			     __FILE__, __PRETTY_FUNCTION__,

+			     sock, e, strerror(e));

+			return -1; /* failed */

+		}

+	}

+	else {

+		return connect_error(sock);

+	}

+

+	numfd = sock + 1; /* Highest fdset fd plus 1 */

+

+	for (;;) {

+		fd_set fds;

+		struct timeval now;

+		struct timeval wait;

+		int n;

+

+		/* Force timeout if we ran out of time */

+		gettimeofday(&now, 0);

+		if (timercmp(&now, &timeout, >)) {

+			logg("%s %s: connect timing out (%d secs)\n",

+			     __FILE__, __PRETTY_FUNCTION__,

+			     secs);

+			break; /* failed */

+		}

+

+		/* Calculate into 'wait' how long to wait */

+		timersub(&timeout, &now, &wait); /* wait = timeout - now */

+

+		/* Init fds with 'sock' as the only fd */

+		FD_ZERO(&fds);

+		FD_SET(sock, &fds);

+

+		n = select(numfd, 0, &fds, 0, &wait);

+		if (n < 0) {

+			logg("%s %s: select() failure %d: errno=%d: %s\n",

+			     __FILE__, __PRETTY_FUNCTION__,

+			     select_failures, errno, strerror(errno));

+			if (--select_failures >= 0)

+				continue; /* keep waiting */

+			break; /* failed */

+		}

+

+#ifdef NONBLOCK_DEBUG

+		logg("DEBUG %s %s: select = %d\n",

+		     __FILE__, __PRETTY_FUNCTION__,

+		     n);

+#endif

+

+		if (n) {

+			return connect_error(sock);

+		}

+

+		/* Select returned, but there is no work to do... */

+		if (--bogus_loops < 0) {

+			logg("%s %s: giving up due to excessive bogus loops\n",

+			     __FILE__, __PRETTY_FUNCTION__);

+			break; /* failed */

+		}

+

+	} /* for loop: keep waiting */

+

+	return -1; /* failed */

+}

+

+static ssize_t nonblock_recv(int sock, void *buf, size_t len, int flags, int secs)

+{

+	/* Max. of unexpected select() failures */

+	int select_failures = NONBLOCK_SELECT_MAX_FAILURES;

+	/* Max. of useless loops */

+	int bogus_loops = NONBLOCK_MAX_BOGUS_LOOPS;

+	struct timeval timeout;  /* When we should time out */

+	int numfd;               /* Highest fdset fd plus 1 */

+

+	/* Calculate into 'timeout' when we should time out */

+	gettimeofday(&timeout, 0);

+	timeout.tv_sec += secs;

+

+	numfd = sock + 1; /* Highest fdset fd plus 1 */

+

+	for (;;) {

+		fd_set fds;

+		struct timeval now;

+		struct timeval wait;

+		int n;

+

+		/* Force timeout if we ran out of time */

+		gettimeofday(&now, 0);

+		if (timercmp(&now, &timeout, >)) {

+			logg("%s %s: recv timing out (%d secs)\n",

+			     __FILE__, __PRETTY_FUNCTION__,

+			     secs);

+			break; /* failed */

+		}

+

+		/* Calculate into 'wait' how long to wait */

+		timersub(&timeout, &now, &wait); /* wait = timeout - now */

+

+		/* Init fds with 'sock' as the only fd */

+		FD_ZERO(&fds);

+		FD_SET(sock, &fds);

+

+		n = select(numfd, &fds, 0, 0, &wait);

+		if (n < 0) {

+			logg("%s %s: select() failure %d: errno=%d: %s\n",

+			     __FILE__, __PRETTY_FUNCTION__,

+			     select_failures, errno, strerror(errno));

+			if (--select_failures >= 0)

+				continue; /* keep waiting */

+			break; /* failed */

+		}

+

+		if (n) {

+			return recv(sock, buf, len, flags);

+		}

+

+		/* Select returned, but there is no work to do... */

+		if (--bogus_loops < 0) {

+			logg("%s %s: giving up due to excessive bogus loops\n",

+			     __FILE__, __PRETTY_FUNCTION__);

+			break; /* failed */

+		}

+

+	} /* for loop: keep waiting */

+

+	return -1; /* failed */

+}

+

+static long nonblock_fcntl(int sock)

+{

+	long fcntl_flags; /* Save fcntl() flags */

+

+	fcntl_flags = fcntl(sock, F_GETFL, 0);

+	if (fcntl_flags == -1) {

+		logg("%s %s: saving: fcntl(%d, F_GETFL): errno=%d: %s\n",

+		     __FILE__, __PRETTY_FUNCTION__,

+		     sock, errno, strerror(errno));

+	}

+	else if (fcntl(sock, F_SETFL, fcntl_flags | O_NONBLOCK)) {

+		logg("%s %s: fcntl(%d, F_SETFL, O_NONBLOCK): errno=%d: %s\n",

+		     __FILE__, __PRETTY_FUNCTION__,

+		     sock, errno, strerror(errno));

+	}

+

+	return fcntl_flags;

+}

+

+static void restore_fcntl(int sock, long fcntl_flags)

+{

+	if (fcntl_flags != -1) {

+		if (fcntl(sock, F_SETFL, fcntl_flags)) {

+			logg("%s %s: restoring: fcntl(%d, F_SETFL): errno=%d: %s\n",

+			     __FILE__, __PRETTY_FUNCTION__,

+			     sock, errno, strerror(errno));

+		}

+	}

+}

+

+/*

+	wait_connect(): wrapper for connect(), with explicit 'secs' timeout

+*/

+int wait_connect(int sock, const struct sockaddr *addr, socklen_t addrlen, int secs)

+{

+	long fcntl_flags; /* Save fcntl() flags */

+	int ret;

+

+	/* Temporarily set socket to non-blocking mode */

+	fcntl_flags = nonblock_fcntl(sock);

+

+	ret = nonblock_connect(sock, addr, addrlen, secs);

+

+	/* Restore socket's default blocking mode */

+	restore_fcntl(sock, fcntl_flags);

+

+	return ret;

+}

+

+/*

+	wait_recv(): wrapper for recv(), with explicit 'secs' timeout

+*/

+ssize_t wait_recv(int sock, void *buf, size_t len, int flags, int secs)

+{

+	long fcntl_flags; /* Save fcntl() flags */

+	int ret;

+

+	/* Temporarily set socket to non-blocking mode */

+	fcntl_flags = nonblock_fcntl(sock);

+

+	ret = nonblock_recv(sock, buf, len, flags, secs);

+

+	/* Restore socket's default blocking mode */

+	restore_fcntl(sock, fcntl_flags);

+

+	return ret;

+}

+

new file mode 100644

@@ -0,0 +1,32 @@

+/*

+ *  Copyright 2006 Everton da Silva Marques <everton.marques@gmail.com>

+ *

+ *  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

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

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

+ */

+

+#ifndef __NONBLOCK_H

+#define __NONBLOCK_H

+

+/*

+	wait_connect(): wrapper for connect(), with explicit 'secs' timeout

+*/

+int wait_connect(int sock, const struct sockaddr *addr, socklen_t addrlen, int secs);

+

+/*

+        wait_recv(): wrapper for recv(), with explicit 'secs' timeout

+*/

+ssize_t wait_recv(int sock, void *buf, size_t len, int flags, int secs);

+

+#endif /* NONBLOCK_H */

@@ -106,6 +106,8 @@ struct cfgoption cfg_options[] = {

     {"OnErrorExecute", OPT_FULLSTR, -1, NULL, 0, OPT_FRESHCLAM},

     {"OnOutdatedExecute", OPT_FULLSTR, -1, NULL, 0, OPT_FRESHCLAM},

     {"LocalIPAddress", OPT_STR, -1, NULL, 0, OPT_FRESHCLAM},

+    {"ConnectTimeout", OPT_NUM, 10, NULL, 0, OPT_FRESHCLAM},

+    {"ReceiveTimeout", OPT_NUM, 30, NULL, 0, OPT_FRESHCLAM},

     {NULL, 0, 0, NULL, 0, 0}

 };