@@ -93,6 +93,7 @@ Philippe Gay <ph.gay*free.fr>

 Luca 'NERvOus' Gibelli <nervous*clamav.net>

 Scott Gifford <sgifford*suspectclass.com>

 Stephen Gran <steve*lobefin.net>

+Marek Gutkowski <hobbit*core.segfault.pl>

 Nigel Horne <njh*smsltd.demon.co.uk>

 Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>

 Robert Hogan <robert*roberthogan.net>

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

+Sun Aug 15 02:19:54 CEST 2004 (tk)

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

+  * freshclam: try all IP addresses provided by gethostbyname() in single

+	       attempt, if needed (patch by Marek Gutkowski

+	       <hobbit*core.segfault.pl>)

+

 Sat Aug 14 14:44:39 CEST 2004 (tk)

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

   * configure: fix detection of inet_ntop on Solaris (patch by David Champion

@@ -356,7 +356,7 @@ int download(const struct cfgstruct *copt, const struct optstruct *opt)

 	    ret = downloadmanager(copt, opt, cpt->strarg);

 	    alarm(0);

-	    if(ret == 52 || ret == 54) {

+	    if(ret == 54) {

 		if(try < maxattempts - 1) {

 		    mprintf("Trying again...\n");

 		    logg("Trying again...\n");

@@ -155,7 +155,7 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 	hostfd = wwwconnect(hostname, proxy, port, ipaddr);

     if(hostfd < 0) {

-	mprintf("@Connection with %s (IP: %s) failed.\n", hostname, ipaddr);

+	mprintf("@Connection with %s failed.\n", hostname);

 	return 52;

     } else

 	mprintf("*Connected to %s (%s).\n", hostname, ipaddr);

@@ -278,7 +278,7 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 /* proxy support finshed by njh@bandsman.co.uk */

 int wwwconnect(const char *server, const char *proxy, int pport, char *ip)

 {

-	int socketfd, port;

+	int socketfd, port, i;

 	struct sockaddr_in name;

 	struct hostent *host;

 	char ipaddr[16];

@@ -326,23 +326,31 @@ int wwwconnect(const char *server, const char *proxy, int pport, char *ip)

 	return -1;

     }

-    /* this dirty hack comes from pink - Nosuid TCP/IP ping 1.6 */

-    ia = (unsigned char *) host->h_addr;

-    sprintf(ipaddr, "%u.%u.%u.%u", ia[0], ia[1], ia[2], ia[3]);

+    for(i = 0; host->h_addr_list[i] != 0; i++) {

+	/* this dirty hack comes from pink - Nosuid TCP/IP ping 1.6 */

+	ia = (unsigned char *) host->h_addr_list[i];

+	sprintf(ipaddr, "%u.%u.%u.%u", ia[0], ia[1], ia[2], ia[3]);

-    if(ip)

-	strcpy(ip, ipaddr);

+	if(ip)

+	    strcpy(ip, ipaddr);

+

+	if(i > 0)

+	    mprintf("Trying host %s (%s)...\n", hostpt, ipaddr);

-    name.sin_addr = *((struct in_addr *) host->h_addr);

-    name.sin_port = htons(port);

+	name.sin_addr = *((struct in_addr *) host->h_addr_list[i]);

+	name.sin_port = htons(port);

+

+	if(connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in)) == -1) {

+	    mprintf("@Can't connect to port %d of host %s (%s)\n", port, hostpt, ipaddr);

+	    continue;

+	}

-    if(connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in)) == -1) {

-	mprintf("@Can't connect to port %d of host %s (%s)\n", port, hostpt, ipaddr);

-	close(socketfd);

-	return -2;

+	return socketfd;

     }

-    return socketfd;

+    close(socketfd);

+    mprintf("@No servers could be reached. Giving up\n");

+    return -2;

 }

 /* njh@bandsman.co.uk: added proxy support */