anet.c: Allow creation of TCP listening sockets bound to N addresses.

2 files changed, 16 insertions, 9 deletions

diff --git a/src/anet.c b/src/anet.c
index 963b6688e..7a6b7d4bf 100644
--- a/src/anet.c
+++ b/src/anet.c
@@ -331,9 +331,9 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) {
     return ANET_OK;
 }
 
-int anetTcpServer(char *err, int port, char *bindaddr)
+int anetTcpServer(char *err, int port, char **bindaddr, int bindaddr_count)
 {
-    int s;
+    int s, j;
     struct sockaddr_in sa;
 
     if ((s = anetCreateSocket(err,AF_INET)) == ANET_ERR)
@@ -343,13 +343,20 @@ int anetTcpServer(char *err, int port, char *bindaddr)
     sa.sin_family = AF_INET;
     sa.sin_port = htons(port);
     sa.sin_addr.s_addr = htonl(INADDR_ANY);
-    if (bindaddr && inet_aton(bindaddr, &sa.sin_addr) == 0) {
-        anetSetError(err, "invalid bind address");
-        close(s);
-        return ANET_ERR;
+    if (bindaddr_count) {
+        for (j = 0; j < bindaddr_count; j++) {
+            if (inet_aton(bindaddr[j], &sa.sin_addr) == 0) {
+                anetSetError(err, "invalid bind address");
+                close(s);
+                return ANET_ERR;
+            }
+            if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR)
+                return ANET_ERR;
+        }
+    } else {
+        if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR)
+            return ANET_ERR;
     }
-    if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR)
-        return ANET_ERR;
     return s;
 }
 
diff --git a/src/anet.h b/src/anet.h
index 696c2c225..bf76dd24d 100644
--- a/src/anet.h
+++ b/src/anet.h
@@ -45,7 +45,7 @@ int anetUnixConnect(char *err, char *path);
 int anetUnixNonBlockConnect(char *err, char *path);
 int anetRead(int fd, char *buf, int count);
 int anetResolve(char *err, char *host, char *ipbuf);
-int anetTcpServer(char *err, int port, char *bindaddr);
+int anetTcpServer(char *err, int port, char **bindaddr, int bindaddr_count);
 int anetUnixServer(char *err, char *path, mode_t perm);
 int anetTcpAccept(char *err, int serversock, char *ip, int *port);
 int anetUnixAccept(char *err, int serversock);