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

+Sun Mar 19 21:49:19 CET 2006 (tk)

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

+  * freshclam: fix support for LocalIPAddress (patch by Anton Yuzhaninov

+	       <citrin*citrin.ru>)

+

 Tue Mar 14 11:40:49 GMT 2006 (njh)

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

   * libclamav/tnef.c:	Check fseeks will work before calling fseek

@@ -136,8 +136,8 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

     }

 #endif /* HAVE_RESOLV_H */

-    if(optl(opt, "localip")) {

-        localip = getargl(opt, "localip");

+    if(optl(opt, "local-address")) {

+        localip = getargl(opt, "local-address");

     } else if((cpt = cfgopt(copt, "LocalIPAddress"))->enabled) {

 	localip = cpt->strarg;

     }

@@ -468,6 +468,17 @@ int wwwconnect(const char *server, const char *proxy, int pport, char *ip, char

     name.sin_family = AF_INET;

+#ifdef PF_INET

+    socketfd = socket(PF_INET, SOCK_STREAM, 0);

+#else

+    socketfd = socket(AF_INET, SOCK_STREAM, 0);

+#endif

+

+    if(socketfd < 0) {

+	logg("!Can't create new socket\n");

+	return -1;

+    }

+

     if (localip) {

 	if ((he = gethostbyname(localip)) == NULL) {

 	    char *herr;

@@ -556,6 +567,7 @@ int wwwconnect(const char *server, const char *proxy, int pport, char *ip, char

 		break;

 	}

         logg("^Can't get information about %s: %s\n", hostpt, herr);

+	close(socketfd);

 	return -1;

     }

@@ -573,12 +585,6 @@ int wwwconnect(const char *server, const char *proxy, int pport, char *ip, char

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

 	name.sin_port = htons(port);

-#ifdef PF_INET

-	socketfd = socket(PF_INET, SOCK_STREAM, 0);

-#else

-	socketfd = socket(AF_INET, SOCK_STREAM, 0);

-#endif

-

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

 	    logg("Can't connect to port %d of host %s (IP: %s)\n", port, hostpt, ipaddr);

 	    close(socketfd);

@@ -60,7 +60,7 @@ int main(int argc, char **argv)

 	    {"no-dns", 0, 0, 0},

 	    {"checks", 1, 0, 'c'},

 	    {"http-proxy", 1, 0, 0},

-	    {"client-address", 1, 0, 'a'},

+	    {"local-address", 1, 0, 'a'},

 	    {"proxy-user", 1, 0, 0},

 	    {"daemon-notify", 2, 0, 0},

 	    {"on-update-execute", 1, 0, 0},