@@ -76,6 +76,7 @@ Jens Elkner <elkner*linofee.org>

 Jason Englander <jason*englanders.cc>

 Tony Finch <dot*dotat.at>

 David Ford <david+cert*blue-labs.org>

+Piotr Gackiewicz <gacek*intertele.pl>

 Dean Gaudet <dean-clamav*arctic.org>

 Michel Gaudet <Michel.Gaudet*ehess.fr>

 Philippe Gay <ph.gay*free.fr>

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

+Thu Jul  1 03:18:04 CEST 2004 (tk)

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

+  * clamdscan: fix bug (introduced in -20040622) in stream scanning in TCP

+	       mode. Patch by Piotr Gackiewicz <gacek*intertele.pl>.

+

 Wed Jun 30 20:49:46 BST 2004 (njh)

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

   * libclamav/mbox.c:	Some TR.Happy99.SKA were getting through

@@ -95,6 +95,8 @@ int dsstream(int sockd)

 {

 	int wsockd, loopw = 60, bread, port, infected = 0;

 	struct sockaddr_in server;

+	struct sockaddr_in peer;

+	int peer_size;

 	char buff[4096], *pt;

     if(write(sockd, "STREAM", 6) <= 0) {

@@ -129,6 +131,15 @@ int dsstream(int sockd)

     server.sin_family = AF_INET;

     server.sin_port = htons(port);

+    peer_size = sizeof(peer);

+    if(getpeername(sockd, (struct sockaddr *) &peer, &peer_size) < 0) {

+	perror("getpeername()");

+	mprintf("@Can't get socket peer name.\n");

+	return -1;

+    }

+

+    server.sin_addr.s_addr = peer.sin_addr.s_addr;

+

     if(connect(wsockd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) < 0) {

 	close(wsockd);

 	perror("connect()");