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

+Sat Mar 14 17:03:08 EET 2009 (edwin)

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

+ * clamd/scanner.c, unit_tests/check_clamd.c: better fix for bb

+ #1446, try not to get confused by half-shut sockets (bb #1441).

+

 Sat Mar 14 16:18:00 EET 2009 (edwin)

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

  * clamconf/, clamdscan/, clamdtop/, libclamav/: fix build on

@@ -88,14 +88,9 @@ int scan_callback(struct stat *sb, char *filename, const char *msg, enum cli_ftw

     int type = scandata->type;

     const struct optstruct *opt;

-    fd_set rfds;

-    struct timeval tv;

-

-    FD_ZERO(&rfds);

-    FD_SET(scandata->conn->sd, &rfds);

-    tv.tv_sec = tv.tv_usec = 0;

-    if (select(scandata->conn->sd+1, &rfds, NULL, NULL, &tv) > 0 &&

-	FD_ISSET(scandata->conn->sd, &rfds)) {

+    /* detect disconnected socket, 

+     * this should NOT detect half-shutdown sockets (SHUT_WR) */

+    if (send(scandata->conn->sd, &ret, 0, 0) == -1 && errno != EINTR) {

 	logg("$Client disconnected while command was active!\n");

 	thrmgr_group_terminate(scandata->conn->group);

 	return CL_BREAK;

@@ -231,7 +231,7 @@ static void test_command(const char *cmd, size_t len, const char *extra, const c

 	rc = send(sockd, extra, strlen(extra), 0);

 	fail_unless_fmt((size_t)rc == strlen(extra), "Unable to send() extra for %s: %s\n", cmd, strerror(errno));

     }

-

+    shutdown(sockd, SHUT_WR);

     recvdata = recvfull(sockd, &len);

     fail_unless_fmt(len == expect_len, "Reply has wrong size: %lu, expected %lu, reply: %s, expected: %s\n",

@@ -240,6 +240,7 @@ static void test_command(const char *cmd, size_t len, const char *extra, const c

     rc = memcmp(recvdata, expect, expect_len);

     fail_unless_fmt(!rc, "Wrong reply for command %s: |%s|, expected: |%s|\n", cmd, recvdata, expect);

     free(recvdata);

+

 }

 #ifdef CHECK_HAVE_LOOPS