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

+Fri Mar 13 15:50:51 EET 2009 (edwin)

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

+ * clamd/scanner.c, clamd/session.c: stop scanning when client

+ disconnects (bb #1446).

+

 Fri Mar 13 13:21:36 CET 2009 (tk)

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

  * sigtool/sigtool.c: fix quirks with .cdiff generation (bb#1395)

@@ -88,6 +88,19 @@ 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)) {

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

+	thrmgr_group_terminate(scandata->conn->group);

+	return CL_BREAK;

+    }

+

     if (thrmgr_group_need_terminate(scandata->conn->group)) {

 	logg("^Client disconnected while scanjob was active\n");

 	if (reason == visit_file)

@@ -230,29 +230,18 @@ int command(client_conn_t *conn, int *virus)

 	    scandata.group = group = thrmgr_group_new();

 	    break;

 	case COMMAND_MULTISCANFILE:

-	    {

-		fd_set rfds;

-		struct timeval tv;

-

-		FD_ZERO(&rfds);

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

-		tv.tv_sec = tv.tv_usec = 0;

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

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

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

-		    thrmgr_group_terminate(conn->group);

-		    return CL_BREAK;

-		}

-	    }

 	    thrmgr_setactivetask(NULL, "MULTISCANFILE");

 	    scandata.group = NULL;

 	    scandata.type = TYPE_SCAN;

 	    scandata.thr_pool = NULL;

 	    /* TODO: check ret value */

-	    scan_callback(NULL, conn->filename, conn->filename, visit_file, &data);

-	    /* callback freed it */

+	    ret = scan_callback(NULL, conn->filename, conn->filename, visit_file, &data);	    /* callback freed it */

 	    conn->filename = NULL;

 	    *virus = scandata.infected;

+	    if (ret == CL_BREAK) {

+		thrmgr_group_terminate(conn->group);

+		return CL_BREAK;

+	    }

 	    return scandata.errors > 0 ? scandata.errors : 0;

 	case COMMAND_FILDES:

 	    thrmgr_setactivetask(NULL, "FILDES");