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

+Thu Feb 22 10:31:23 CET 2007 (acab)

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

+  * clamd: handle signals while polling the sockets in the main loop (bb#320)

+

 Thu Feb 22 09:00:31 GMT 2007 (njh)

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

   * clamav-milter/clamav-milter.c:	Better recovery when a remote clamd

@@ -151,7 +151,7 @@ void virusaction(const char *filename, const char *virname, const struct cfgstru

 }

 #endif /* C_WINDOWS */

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

+int poll_fds(int *fds, int nfds, int timeout_sec, int check_signals)

 {

 	int retval;

 	int i;

@@ -179,7 +179,7 @@ int poll_fds(int *fds, int nfds, int timeout_sec)

     while (1) {

     	retval = poll(poll_data, nfds, timeout_sec);

 	if (retval == -1) {

-   	    if (errno == EINTR) {

+	    if (errno == EINTR && !check_signals) {

 		continue;

 	    }

 	    if (nfds>1)

@@ -245,9 +245,9 @@ int poll_fds(int *fds, int nfds, int timeout_sec)

     return -1;

 }

-int poll_fd(int fd, int timeout_sec)

+int poll_fd(int fd, int timeout_sec, int check_signals)

 {

-    return poll_fds(&fd, 1, timeout_sec);

+    return poll_fds(&fd, 1, timeout_sec, check_signals);

 }

 int is_fd_connected(int fd)

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

     time(&starttime);

     while(1) {

 	time(&timenow);

-	switch(poll_fd(sockfd, (timeout_sec && ((timeout_sec-(timenow-starttime)) > 0)) ? timeout_sec-(timenow-starttime) : 0)) {

+	switch(poll_fd(sockfd, (timeout_sec && ((timeout_sec-(timenow-starttime)) > 0)) ? timeout_sec-(timenow-starttime) : 0, 0)) {

 	    case 0: /* timeout */

 		return -2;

 	    case -1:

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

 	}

 	while(1) {

 	    time(&timenow);

-	    switch(poll_fd(sockfd, ((timeout_sec-(timenow-starttime)) > 0) ? timeout_sec-(timenow-starttime) : 0)) {

+	    switch(poll_fd(sockfd, ((timeout_sec-(timenow-starttime)) > 0) ? timeout_sec-(timenow-starttime) : 0, 0)) {

 		case 0: /* timeout */

 		    return -2;

 		case -1:

@@ -27,8 +27,8 @@

 #include <stdlib.h>

 #include "shared/cfgparser.h"

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

-int poll_fd(int fd, int timeout_sec);

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

+int poll_fd(int fd, int timeout_sec, int check_signals);

 int is_fd_connected(int fd);

 void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt);

 int writen(int fd, void *buff, unsigned int count);

@@ -484,7 +484,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

 	}

     }

-    switch(retval = poll_fd(sockfd, timeout)) {

+    switch(retval = poll_fd(sockfd, timeout, 0)) {

 	case 0: /* timeout */

 	    mdprintf(odesc, "Accept timeout. ERROR\n");

 	    logg("!ScanStream %d: accept timeout.\n", port);

@@ -519,7 +519,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     btread = sizeof(buff);

-    while((retval = poll_fd(acceptd, timeout)) == 1) {

+    while((retval = poll_fd(acceptd, timeout, 0)) == 1) {

 	bread = recv(acceptd, buff, btread, 0);

 	if(bread <= 0)

 	    break;

@@ -251,7 +251,7 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

 int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigned int dboptions, const struct cfgstruct *copt)

 {

-	int new_sd, max_threads, i, ret = 0;

+	int max_threads, i, ret = 0;

 	unsigned int options = 0;

 	threadpool_t *thr_pool;

 #ifndef	C_WINDOWS

@@ -520,16 +520,18 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	    struct stat st_buf;

 #endif

     	int socketd = socketds[0];

+	int new_sd = 0;

+

     	if(nsockets > 1) {

-    	    int pollret = poll_fds(socketds, nsockets, -1);

+	    int pollret = poll_fds(socketds, nsockets, -1, 1);

     	    if(pollret > 0) {

     		socketd = socketds[pollret - 1];

     	    } else {

-    		socketd = socketds[0]; /* on a poll error use the first socket */

+		new_sd = -1;

     	    }

     	}

 #if !defined(C_WINDOWS) && !defined(C_BEOS)

-	if(fstat(socketd, &st_buf) == -1) {

+	if(new_sd != -1 && fstat(socketd, &st_buf) == -1) {

 	    logg("!fstat(): socket descriptor gone\n");

 	    memmove(socketds, socketds + 1, sizeof(socketds[0]) * nsockets);

 	    nsockets--;

@@ -539,7 +541,8 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	    }

 	}

 #endif

-	new_sd = accept(socketd, NULL, NULL);

+	if (new_sd != -1)

+	    new_sd = accept(socketd, NULL, NULL);

 	if((new_sd == -1) && (errno != EINTR)) {

 	    if(progexit) {

 	    	break;