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

+Mon Mar  8 10:01:01 GMT 2004 (trog)

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

+  * clamd: wrap select()/poll()

+

 Mon Mar  8 01:24:37 CET 2004 (tk)

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

   * applied comments cleanup (C89) patch (global) from Jesper Juhl

@@ -30,6 +30,20 @@

 #include <fcntl.h>

 #include <time.h>

 #include <sys/stat.h>

+#include <errno.h>

+

+#undef HAVE_POLL

+

+#if HAVE_POLL

+#if HAVE_POLL_H

+#include <poll.h>

+#else /* HAVE_POLL_H */

+#undef HAVE_POLL

+#if HAVE_SYS_SELECT_H

+#include <sys/select.h>

+#endif /* HAVE_SYS_SELECT_H */

+#endif /* HAVE_POLL_H */

+#endif /* HAVE_POLL */

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

 #include <syslog.h>

@@ -267,3 +281,52 @@ void virusaction(const char *filename, const char *virname, const struct cfgstru

     free(cmd);

 }

+

+int poll_fd(int fd, int timeout_sec)

+{

+	int retval;

+#ifdef HAVE_POLL

+	struct pollfd poll_data[1];

+

+    poll_data[0].fd = fd;

+    poll_data[0].events = POLLIN;

+    poll_data[0].revents = 0;

+

+    while (1) {

+    	retval = poll(poll_data, 1, timeout_sec*1000);

+	if (retval == -1) {

+   	    if (errno == EINTR) {

+		continue;

+	    }

+	    return -1;

+	}

+	return retval;

+    }

+

+#else

+	fd_set rfds;

+	struct timeval tv;

+

+    if (fd >= DEFAULT_FD_SETSIZE) {

+	return -1;

+    }

+

+    while (1) {

+	FD_ZERO(&rfds);

+	FD_SET(fd, &rfds);

+	tv.tv_sec = timeout_sec;

+	tv.tv_usec = 0;

+

+	retval = select(fd+1, &rfds, NULL, NULL, &tv);

+	if (retval == -1) {

+	    if (errno == EINTR) {

+		continue;

+	    }

+	    return -1;

+	}

+	return retval;

+    }

+#endif

+

+    return -1;

+}

@@ -33,6 +33,7 @@ int logsize;

 const char *logfile;

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

 void logg_close(void);

+int poll_fd(int fd, int timeout_sec);

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

 short use_syslog;

@@ -35,10 +35,6 @@

 #include <errno.h>

 #include <clamav.h>

-#if HAVE_SYS_SELECT_H

-#include <sys/select.h>

-#endif

-

 #include "cfgfile.h"

 #include "others.h"

 #include "scanner.h"

@@ -197,8 +193,6 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	struct sockaddr_in server;

 	struct cfgstruct *cpt;

 	FILE *tmp = NULL;

-	fd_set rfds;

-	struct timeval tv;

     while(!bound && portscan--) {

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

@@ -228,27 +222,16 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

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

     }

-    while (1) {

-	FD_ZERO(&rfds);

-	FD_SET(sockfd, &rfds);

-	tv.tv_sec = CL_DEFAULT_SCANTIMEOUT;

-	tv.tv_usec = 0;	

-

-	retval = select(sockfd+1, &rfds, NULL, NULL, &tv);

-	switch (retval) {

-	case 0: /* timeout */

-	    mdprintf(sockfd, "ERROR\n");

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

-	    return -1;

-	case -1:

-	    if (errno == EINTR) {

-		continue;

-	    }

-	    mdprintf(sockfd, "ERROR\n");

-	    logg("!ScanStream: select failed.\n");

-	    return -1;

-	}

-	break;

+    retval = poll_fd(sockfd, CL_DEFAULT_SCANTIMEOUT);

+    switch (retval) {

+    case 0: /* timeout */

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

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

+	return -1;

+    case -1:

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

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

+	return -1;

     }

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

@@ -261,11 +244,6 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

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

-    FD_ZERO(&rfds);

-    FD_SET(acceptd, &rfds);

-    tv.tv_sec = CL_DEFAULT_SCANTIMEOUT;

-    tv.tv_usec = 0;

-    

     /* StreamSaveToDisk is enforced, to ensure timeoute */

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

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

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

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

 	    maxsize = cpt->numarg;

-	while((retval = select(acceptd+1, &rfds, NULL, NULL, &tv)) == 1) {

-	    FD_ZERO(&rfds);

-	    FD_SET(acceptd, &rfds);

-	    tv.tv_sec = CL_DEFAULT_SCANTIMEOUT;

-	    tv.tv_usec = 0;

-	    

+	while((retval = poll_fd(acceptd, CL_DEFAULT_SCANTIMEOUT)) == 1) {

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

 	    if (bread <= 0) {

 		break;

@@ -32,10 +32,6 @@

 #include <signal.h>

 #include <errno.h>

-#if HAVE_SYS_SELECT_H

-#include <sys/select.h>

-#endif

-

 #include "cfgfile.h"

 #include "others.h"

 #include "defaults.h"

@@ -62,30 +58,17 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits

 {

 	char buff[1025];

 	int bread, opt, ret, retval;

-	fd_set rfds;

-	struct timeval tv;

-

-    while (1) {

-	FD_ZERO(&rfds);

-	FD_SET(desc, &rfds);

-	tv.tv_sec = CL_DEFAULT_SCANTIMEOUT;

-	tv.tv_usec = 0;

-

-	retval = select(desc+1, &rfds, NULL, NULL, &tv);

-	switch (retval) {

-	case 0: /* timeout */

-	    mdprintf(desc, "ERROR\n");

-	    logg("!Command: command timeout.\n");

-	    return -1;

-	case -1:

-	    if (errno == EINTR) {

-		continue;

-	    }

-	    mdprintf(desc, "ERROR\n");

-	    logg("!Command: select failed.\n");

-	    return -1;

-	}

-	break;

+

+    retval = poll_fd(desc, CL_DEFAULT_SCANTIMEOUT);

+    switch (retval) {

+    case 0: /* timeout */

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

+	logg("!Command: command timeout.\n");

+	return -1;

+    case -1:

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

+	logg("!Command: poll_fd failed.\n");

+	return -1;

     }

     if((bread = read(desc, buff, 1024)) == -1) {