@@ -1,3 +1,10 @@

+Tue Feb 17 20:06:02 EET 2009 (edwin)

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

+ * clamd/others.c, libclamunrar_iface/unrar_iface.h, shared/misc.c,

+ unit_tests/check_clamd.c, unit_tests/check_clamd.sh: fix use of

+ uninitialized value.  add test for STREAM.  fix missing closing

+ pragmas.

+

 Tue Feb 17 18:38:30 EET 2009 (edwin)

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

  * unit_tests/check_clamd.c: another warning

@@ -436,11 +436,11 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals)

 	data->buf[i].got_newdata = 0;

     }

+    time(&now);

     if (timeout > 0)

 	closest_timeout = now + timeout;

     else

 	closest_timeout = 0;

-    time(&now);

     for (i=0;i < data->nfds; i++) {

 	time_t timeout_at = data->buf[i].timeout_at;

 	if (timeout_at && timeout_at < now) {

@@ -114,6 +114,14 @@ typedef struct unrar_state_tag {

     char filename[1024];

 } unrar_state_t;

+#ifdef HAVE_PRAGMA_PACK

+#pragma pack()

+#endif

+

+#ifdef HAVE_PRAGMA_PATCH_HPPA

+#pragma pack

+#endif

+

 int unrar_open(int fd, const char *dirname, unrar_state_t *state);

 int unrar_extract_next_prepare(unrar_state_t *state, const char *dirname);

 int unrar_extract_next(unrar_state_t *state, const char *dirname);

@@ -31,6 +31,7 @@

 #include <time.h>

 #include <sys/types.h>

 #include <sys/stat.h>

+#include <sys/socket.h>

 #ifndef	C_WINDOWS

 #include <dirent.h>

 #endif

@@ -50,6 +50,23 @@ static void conn_setup(void)

     signal(SIGPIPE, SIG_IGN);

 }

+static int conn_tcp(int port)

+{

+    struct sockaddr_in server;

+    int rc;

+    int sd = socket(AF_INET, SOCK_STREAM, 0);

+    fail_unless_fmt(sd != -1, "Unable to create socket: %s\n", strerror(errno));

+

+    memset(&server, 0, sizeof(server));

+    server.sin_family = AF_INET;

+    server.sin_port = htons(port);

+    server.sin_addr.s_addr = inet_addr("127.0.0.1");

+

+    rc = connect(sd, (struct sockaddr *)&server, sizeof(server));

+    fail_unless_fmt(rc != -1, "Unable to connect(): %s\n", strerror(errno));

+    return sd;

+}

+

 static void conn_teardown(void)

 {

     if (sockd != -1)

@@ -579,7 +596,6 @@ START_TEST (test_connections)

 		}

 	    }

 	}

-	printf("exited\n");

 	free(sock);

 	exit(0);

     } else {

@@ -597,6 +613,47 @@ START_TEST (test_connections)

 }

 END_TEST

+START_TEST (test_stream)

+{

+    char buf[BUFSIZ];

+    char *recvdata;

+    size_t len;

+    unsigned port;

+    int streamsd, infd, nread;

+

+    infd = open(SCANFILE, O_RDONLY);

+

+    fail_unless_fmt(infd != -1, "open failed: %s\n", strerror(errno));

+    conn_setup();

+    fail_unless_fmt(

+	send(sockd, "zSTREAM", sizeof("zSTREAM"), 0) == sizeof("zSTREAM"),

+	"send failed: %s\n", strerror(errno));

+    recvdata = recvpartial(sockd, &len, 1);

+    fail_unless_fmt (sscanf(recvdata, "PORT %u\n", &port) == 1,

+		     "Wrong stream reply: %s\n", recvdata);

+

+    free(recvdata);

+    streamsd = conn_tcp(port);

+

+    do {

+	nread = read(infd, buf, sizeof(buf));

+	if (nread > 0)

+	    fail_unless_fmt(send(streamsd, buf, nread, 0) == nread,

+			    "send failed: %s\n", strerror(errno));

+    } while (nread > 0 || (nread == -1 && errno == EINTR));

+    fail_unless_fmt(nread != -1, "read failed: %s\n", strerror(errno));

+    close(infd);

+    close(streamsd);

+

+    recvdata = recvfull(sockd, &len);

+    fail_unless_fmt(!strcmp(recvdata,"stream: ClamAV-Test-File.UNOFFICIAL FOUND"),

+		    "Wrong reply: %s\n", recvdata);

+    free(recvdata);

+

+    conn_teardown();

+}

+END_TEST

+

 static Suite *test_clamd_suite(void)

 {

     Suite *s = suite_create("clamd");

@@ -609,13 +666,13 @@ static Suite *test_clamd_suite(void)

     tcase_add_loop_test(tc_commands, test_fildes, 0, 4*sizeof(fildes_cmds)/sizeof(fildes_cmds[0]));

     tcase_add_test(tc_commands, test_stats);

     tcase_add_test(tc_commands, test_instream);

+    tcase_add_test(tc_commands, test_stream);

     tc_stress = tcase_create("clamd stress test");

     suite_add_tcase(s, tc_stress);

     tcase_add_test(tc_stress, test_fildes_many);

     tcase_add_test(tc_stress, test_idsession_stress);

     tcase_add_test(tc_stress, test_connections);

     tcase_add_test(tc_stress, test_fildes_unwanted);

-

     return s;

 }

@@ -84,13 +84,25 @@ run_clamdscan() {

 	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* --fdpass --log=clamdscan-fdpass.log

 	if test $? = 2; then 

 		error "Failed to run clamdscan (fdpass)!"

-		cat clamdscan-multiscan.log

+		cat clamdscan-fdpass.log

 		die 1

 	fi

 	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* -m --fdpass --log=clamdscan-multiscan-fdpass.log

 	if test $? = 2; then 

 		error "Failed to run clamdscan (fdpass + multiscan)!"

-		cat clamdscan-multiscan.log

+		cat clamdscan-multiscan-fdpass.log

+		die 1

+	fi

+	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* --stream --log=clamdscan-stream.log

+	if test $? = 2; then 

+		error "Failed to run clamdscan (instream)!"

+		cat clamdscan-stream.log

+		die 1

+	fi

+	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* -m --stream --log=clamdscan-multiscan-stream.log

+	if test $? = 2; then 

+		error "Failed to run clamdscan (instream + multiscan)!"

+		cat clamdscan-multiscan-stream.log

 		die 1

 	fi

 }

@@ -185,6 +197,8 @@ NINFECTED=`grep "Infected files" clamdscan.log | cut -f2 -d:|sed -e 's/ //g'`

 NINFECTED_MULTI=`grep "Infected files" clamdscan-multiscan.log | cut -f2 -d:|sed -e 's/ //g'`

 NINFECTED_FDPASS=`grep "Infected files" clamdscan-fdpass.log | cut -f2 -d:|sed -e 's/ //g'`

 NINFECTED_MULTI_FDPASS=`grep "Infected files" clamdscan-multiscan-fdpass.log | cut -f2 -d:|sed -e 's/ //g'`

+NINFECTED_STREAM=`grep "Infected files" clamdscan-stream.log | cut -f2 -d:|sed -e 's/ //g'`

+NINFECTED_MULTI_STREAM=`grep "Infected files" clamdscan-multiscan-stream.log | cut -f2 -d:|sed -e 's/ //g'`

 if test "$NFILES" -ne "0$NINFECTED"; then

 	grep OK clamdscan.log

 	scan_failed clamdscan.log "clamd did not detect all testfiles correctly!"