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

+Tue Mar 23 15:39:09 GMT 2004 (trog)

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

+  * clamd: stop scanning if the client disconnects

+

 Tue Mar 23 11:09:30 GMT 2004 (njh)

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

   * libclamav/blob.c:	More restrictive about which characters can be used

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

 #include <sys/stat.h>

 #include <errno.h>

 #include <sys/time.h>

+#include <sys/socket.h>

 #if HAVE_SYS_TYPES_H

 #include <sys/types.h>

 #endif

@@ -332,3 +333,45 @@ int poll_fd(int fd, int timeout_sec)

     return -1;

 }

+

+int is_fd_connected(int fd)

+{

+#ifdef HAVE_POLL

+	struct pollfd poll_data[1];

+

+    poll_data[0].fd = fd;

+    poll_data[0].events = POLLIN;

+    poll_data[0].revents = 0;

+

+    if (poll(poll_data, 1, 0) == -1) {

+	return 1;

+    }

+    if (poll_data[0].revents & POLLHUP) {

+	return 0;

+    }

+    return 1;

+

+#else

+	fd_set rfds;

+	struct timeval tv;

+	char buff[1];

+

+    if (fd >= DEFAULT_FD_SETSIZE) {

+        return 1;

+    }

+

+    FD_ZERO(&rfds);

+    FD_SET(fd, &rfds);

+    tv.tv_sec = 0;

+    tv.tv_usec = 0;

+    if (select(fd+1, &rfds, NULL, NULL, &tv) <= 0) {

+	return 1;

+    }

+    if (FD_ISSET(fd, &rfds)) {

+	if (recv(fd, buff, 1, MSG_PEEK) != 1) {

+	    return 0;

+	}

+    }

+    return 1;

+#endif

+}

@@ -38,6 +38,7 @@ const char *logfile;

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

 void logg_close(void);

 int poll_fd(int fd, int timeout_sec);

+int is_fd_connected(int fd);

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

 short use_syslog;

@@ -78,6 +78,11 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

     if((dd = opendir(dirname)) != NULL) {

 	while((dent = readdir(dd))) {

+	    if (!is_fd_connected(odesc)) {

+		logg("Client disconnected\n");

+		closedir(dd);

+		return 1;

+	    }

 	    if(dent->d_ino) {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */