@@ -64,17 +64,10 @@

 #include "client.h"

 #include "proto.h"

-#ifndef INADDR_LOOPBACK

-#define INADDR_LOOPBACK 0x7f000001

-#endif

-

-struct sockaddr *mainsa = NULL;

-int mainsasz;

 unsigned long int maxstream;

 #ifndef _WIN32

 static struct sockaddr_un nixsock;

 #endif

-static struct sockaddr_in tcpsock;

 extern struct optstruct *clamdopts;

 /* Inits the communication layer

@@ -83,7 +76,9 @@ static int isremote(const struct optstruct *opts) {

     int s, ret;

     const struct optstruct *opt;

     static struct sockaddr_in testsock;

-    char *ipaddr;

+    char *ipaddr, port[10];

+    struct addrinfo hints, *info, *p;

+    int res;

 #ifndef _WIN32

     if((opt = optget(clamdopts, "LocalSocket"))->enabled) {

@@ -91,43 +86,55 @@ static int isremote(const struct optstruct *opts) {

         nixsock.sun_family = AF_UNIX;

         strncpy(nixsock.sun_path, opt->strarg, sizeof(nixsock.sun_path));

         nixsock.sun_path[sizeof(nixsock.sun_path)-1]='\0';

-        mainsa = (struct sockaddr *)&nixsock;

-        mainsasz = sizeof(nixsock);

         return 0;

     }

 #endif

     if(!(opt = optget(clamdopts, "TCPSocket"))->enabled)

         return 0;

-    mainsa = (struct sockaddr *)&tcpsock;

-    mainsasz = sizeof(tcpsock);

+    snprintf(port, sizeof(port), "%lld", optget(clamdopts, "TCPSocket")->numarg);

     opt = optget(clamdopts, "TCPAddr");

     while (opt) {

-        ipaddr = (!strcmp(opt->strarg, "any") ? NULL : opt->strarg);

-

-        if (cfg_tcpsock(ipaddr, clamdopts, &tcpsock, INADDR_LOOPBACK) == -1) {

-            logg("!Can't lookup clamd hostname: %s.\n", strerror(errno));

-            mainsa = NULL;

-            return 0;

+        if (opt->enabled)

+            ipaddr = (!strcmp(opt->strarg, "any") ? NULL : opt->strarg);

+        else

+            ipaddr = NULL;

+

+        memset(&hints, 0x00, sizeof(struct addrinfo));

+        hints.ai_family = AF_UNSPEC;

+        hints.ai_socktype = SOCK_STREAM;

+        hints.ai_flags = AI_PASSIVE;

+

+        if ((res = getaddrinfo(ipaddr, port, &hints, &info))) {

+            logg("!Can't lookup clamd hostname: %s\n", gai_strerror(res));

+            continue;

         }

-        memcpy((void *)&testsock, (void *)&tcpsock, sizeof(testsock));

-        testsock.sin_port = htons(INADDR_ANY);

-        if((s = socket(testsock.sin_family, SOCK_STREAM, 0)) < 0) {

-            logg("isremote: socket() returning: %s.\n", strerror(errno));

-            mainsa = NULL;

-            return 0;

+        for (p = info; p != NULL; p = p->ai_next) {

+            if((s = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) < 0) {

+                logg("isremote: socket() returning: %s.\n", strerror(errno));

+                continue;

+            }

+

+            ret = (bind(s, (struct sockaddr *)&testsock, (socklen_t)sizeof(testsock)) != 0);

+            closesocket(s);

+            if (ret) {

+                /* 

+                 * If we can't bind, then either we're attempting to listen on an IP that isn't

+                 * ours or that clamd is already listening on.

+                 */

+                freeaddrinfo(info);

+                return 1;

+            }

         }

-        ret = (bind(s, (struct sockaddr *)&testsock, (socklen_t)sizeof(testsock)) != 0);

-        closesocket(s);

-        if (ret)

-            return ret;

+        freeaddrinfo(info);

         opt = opt->nextarg;

     }

-    return ret;

+

+    return 1;

 }

@@ -186,7 +193,6 @@ int get_clamd_version(const struct optstruct *opts)

 	struct RCVLN rcv;

     isremote(opts);

-    if(!mainsa) return 2;

     if((sockd = dconnect()) < 0) return 2;

     recvlninit(&rcv, sockd);

@@ -214,7 +220,6 @@ int reload_clamd_database(const struct optstruct *opts)

 	struct RCVLN rcv;

     isremote(opts);

-    if(!mainsa) return 2;

     if((sockd = dconnect()) < 0) return 2;

     recvlninit(&rcv, sockd);

@@ -261,11 +266,6 @@ int client(const struct optstruct *opts, int *infected, int *err)

 	flags |= CLI_FTW_FOLLOW_FILE_SYMLINK;

     flags |= CLI_FTW_TRIM_SLASHES;

-    if(!mainsa) {

-	logg("!Clamd is not configured properly.\n");

-	return 2;

-    }

-

     *infected = 0;

     if(scandash) {

@@ -52,8 +52,6 @@

 #include "proto.h"

 #include "client.h"

-extern struct sockaddr *mainsa;

-extern int mainsasz;

 extern unsigned long int maxstream;

 int printinfected;

 extern struct optstruct *clamdopts;

@@ -63,19 +61,45 @@ static const char *scancmd[] = { "CONTSCAN", "MULTISCAN", "INSTREAM", "FILDES",

 /* Connects to clamd 

  * Returns a FD or -1 on error */

 int dconnect() {

-    int sockd;

-

-    if((sockd = socket(mainsa->sa_family, SOCK_STREAM, 0)) < 0) {

-	logg("!Can't create the socket: %s\n", strerror(errno));

-	return -1;

+    int sockd, res;

+    const struct optstruct *opt;

+    struct addrinfo hints, *info, *p;

+    char port[10];

+

+    snprintf(port, sizeof(port), "%lld", optget(clamdopts, "TCPSocket")->numarg);

+

+    opt = optget(clamdopts, "TCPAddr");

+    while (opt) {

+        memset(&hints, 0x00, sizeof(struct addrinfo));

+        hints.ai_family = AF_UNSPEC;

+        hints.ai_socktype = SOCK_STREAM;

+        hints.ai_flags = AI_PASSIVE;

+

+        if ((res = getaddrinfo(opt->strarg, port, &hints, &info))) {

+            continue;

+        }

+

+        for (p = info; p != NULL; p = p->ai_next) {

+            if((sockd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) < 0) {

+                logg("!Can't create the socket: %s\n", strerror(errno));

+                continue;

+            }

+

+            if(connect(sockd, p->ai_addr, p->ai_addrlen) < 0) {

+                closesocket(sockd);

+                continue;

+            }

+

+            freeaddrinfo(info);

+            return sockd;

+        }

+

+        freeaddrinfo(info);

+

+        opt = opt->nextarg;

     }

-    if(connect(sockd, (struct sockaddr *)mainsa, mainsasz) < 0) {

-	closesocket(sockd);

-	logg("!Can't connect to clamd: %s\n", strerror(errno));

-	return -1;

-    }

-    return sockd;

+    return -1;

 }

 /* Issues an INSTREAM command to clamd and streams the given file