@@ -1,3 +1,9 @@

+Sat Feb 14 18:43:10 EET 2009 (edwin)

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

+ * clamd/session.c, contrib/clamdtop/Makefile,

+ contrib/clamdtop/clamdtop.c: make clamdtop use IDSESSION, and enable

+ VERSION/STATS inside IDSESSION.

+

 Sat Feb 14 18:04:55 EET 2009 (edwin)

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

  * libclamav/scanners.c: fix type 7 signature matching (bb #1368).

@@ -253,6 +253,8 @@ int command(client_conn_t *conn, int *virus)

 #endif

 	case COMMAND_STATS:

 	    thrmgr_setactivetask(NULL, "STATS");

+	    if (conn->group)

+		mdprintf(desc, "%u: ", conn->id);

 	    thrmgr_printstats(desc);

 	    return 0;

 	case COMMAND_STREAM:

@@ -389,6 +391,8 @@ int execute_or_dispatch_command(client_conn_t *conn, enum commands cmd, const ch

 	    case COMMAND_END:

 	    case COMMAND_INSTREAM:

 	    case COMMAND_INSTREAMSCAN:

+	    case COMMAND_VERSION:

+	    case COMMAND_STATS:

 		/* These commands are accepted inside IDSESSION */

 		break;

 	    default:

@@ -421,6 +425,8 @@ int execute_or_dispatch_command(client_conn_t *conn, enum commands cmd, const ch

 	    {

 		uint32_t ver;

 		cl_engine_get(engine, CL_ENGINE_DB_VERSION, &ver);

+		if (conn->group)

+		    mdprintf(desc, "%u: ", conn->id);

 		if(ver) {

 		    char timestr[32];

 		    const char *tstr;

@@ -433,17 +439,10 @@ int execute_or_dispatch_command(client_conn_t *conn, enum commands cmd, const ch

 		} else {

 		    mdprintf(desc, "ClamAV %s%c", get_version(), conn->term);

 		}

-		return 1;

+		return conn->group ? 0 : 1;

 	    }

 	case COMMAND_INSTREAM:

 	    {

-#if 0

-		if (!conn->group) {

-		    /* only valid inside IDSESSION */

-		    conn_reply_single(conn, NULL, "UNKNOWN COMMAND");

-		    return 1;

-		}

-#endif

 		int rc = cli_gentempfd(NULL, &conn->filename, &conn->scanfd);

 		if (rc != CL_SUCCESS)

 		    return rc;

@@ -1,4 +1,4 @@

-CFLAGS=-g -Wall -W -Wshadow -Wformat=2 -O2 

+CFLAGS=-g -Wall -W -Wshadow -Wformat=2 

 CC=gcc

 OBJS=clamdtop.o

 CPPFLAGS=-D_FORTIFY_SOURCE=2

@@ -388,7 +388,7 @@ static void cleanup(void)

 	curses_inited = 0;

 	for (i=0;i<global.num_clamd;i++) {

 		if (global.conn[i].sd && global.conn[i].sd != -1) {

-			send_string_noreconn(&global.conn[i], "END\n");

+			send_string_noreconn(&global.conn[i], "nEND\n");

 			close(global.conn[i].sd);

 		}

 		free(global.conn[i].version);

@@ -540,7 +540,7 @@ static int make_connection(const char *soname, conn_t *conn)

 	tv.tv_sec = 4;

 	tv.tv_usec = 0;

 	setsockopt(conn->sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));

-	send_string(conn, "SESSION\nVERSION\n");

+	send_string(conn, "nIDSESSION\nnVERSION\n");

 	free(conn->version);

 	conn->version = NULL;

 	read_version(conn);

@@ -591,7 +591,7 @@ static int recv_line(conn_t *conn, char *buf, size_t len)

 		if (nread  <= 0) {

 			print_con_info(conn, "%s: %s", conn->remote, strerror(errno));

 			/* it could be a timeout, be nice and send an END */

-			send_string_noreconn(conn, "END\n");

+			send_string_noreconn(conn, "nEND\n");

 			close(conn->sd);

 			conn->sd = -1;

 			return 0;

@@ -873,7 +873,7 @@ static void parse_stats(conn_t *conn, struct stats *stats, unsigned idx)

 	struct timeval tv;

 	unsigned conn_dt;

 	int primary = 0;

-	const char *pstart, *p;

+	const char *pstart, *p, *vstart;

 	if (conn->tcp)

 		stats->remote = conn->remote;

@@ -884,7 +884,11 @@ static void parse_stats(conn_t *conn, struct stats *stats, unsigned idx)

 		stats->engine_version = "???";

 		return;

 	}

-	p = pstart = conn->version;

+	p = pstart = vstart = strchr(conn->version, ' ');

+	if (!vstart) {

+	    stats->engine_version = "???";

+	    return;

+	}

 	/* find digit in version */

 	while (*p && !isdigit(*p))

 		p++;

@@ -924,7 +928,7 @@ static void parse_stats(conn_t *conn, struct stats *stats, unsigned idx)

 		stats->db_version[maxx-61] = '\0';

 	}

-	stats->version = conn->version; /* for details view */

+	stats->version = vstart; /* for details view */

 	gettimeofday(&tv, NULL);

 	tv.tv_sec -= conn->tv_conn.tv_sec;

 	tv.tv_usec -= conn->tv_conn.tv_usec;

@@ -1184,7 +1188,7 @@ int main(int argc, char *argv[])

 				unsigned biggest_q;

 				struct stats *stats = &global.all_stats[i];

 				if (global.conn[i].sd != -1)

-					send_string(&global.conn[i], "STATS\n");

+					send_string(&global.conn[i], "nSTATS\n");

 				biggest_q = stats->biggest_queue;

 				memset(stats, 0, sizeof(*stats));

 				stats->biggest_queue = biggest_q;