1 files changed, 53 insertions, 13 deletions

diff --git a/src/socket.c b/src/socket.c
index 99e4477..7edbda2 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1,3 +1,6 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -6,25 +9,62 @@
 #include "socket.h"
 
 
-int socket_init_in(psocket *psocket, const char *listen_addr, unsigned int listen_port)
+static int socket_nonblock(psocket *psocket)
 {
-    struct in_addr addr = {0};
+    int flags;
 
-    assert(psocket);
-    if (!inet_aton(listen_addr, &addr))
+    flags = fcntl(psocket->fd, F_GETFL, 0);
+    if (flags < 0)
+        return 1;
+    flags |= O_NONBLOCK;
+    if (fcntl(psocket->fd, F_SETFL, flags) == -1)
         return 1;
+    return 0;
+}
+
+int socket_init_in(psocket *psocket, const char *listen_addr,
+                   const char *listen_port, struct addrinfo **results)
+{
+    struct addrinfo hints = {0};
+
+    assert(psocket);
+    assert(listen_addr || listen_port); /* getaddrinfo wants either node or service */
+    hints.ai_family = AF_UNSPEC; /* IPV4 && IPV6 */
+    hints.ai_socktype = SOCK_STREAM; /* TCP */
+    hints.ai_flags = AI_PASSIVE; /* all interfaces */
+
+    return getaddrinfo(listen_addr, listen_port, &hints, results);
+}
+
+int socket_bind_in(psocket *psocket, struct addrinfo *results)
+{
+    int fd = -1, rv;
+    struct addrinfo *rp = NULL;
+
+    assert(psocket && results);
 
-    psocket->sock.sin_family = AF_INET;
-    psocket->sock.sin_addr = addr;
-    psocket->sock.sin_port = htons(listen_port);
-    psocket->fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
-    return psocket->fd < 0;
+    for (rp = results; rp != NULL; rp = rp->ai_next) {
+        fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+        if (fd < 0)
+            continue;
+        rv = bind(fd, rp->ai_addr, rp->ai_addrlen);
+	if (!rv)
+            break;
+        close(fd);
+    }
+
+    if (!rp)
+        return -1;
+
+    psocket->fd = fd;
+    psocket->addr = *rp;
+    freeaddrinfo(results);
+    return socket_nonblock(psocket);
 }
 
-int socket_bind_listen(psocket *psocket)
+int socket_listen_in(psocket *psocket)
 {
     assert(psocket);
-    if (bind(psocket->fd, &psocket->sock, sizeof(psocket->sock)) < 0)
-        return 1;
-    return listen(psocket->fd, POTD_BACKLOG) < 0;
+
+    return listen(psocket->fd, POTD_BACKLOG);
 }