Merge pull request #1557 from inolen/sockfs

getaddrinfo, freeaddrinfo, getnameinfo support and sockfs

8 files changed, 503 insertions, 236 deletions

diff --git a/tests/runner.py b/tests/runner.py
index bbbc23e5..f0e61c4e 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -63,6 +63,10 @@ class RunnerCore(unittest.TestCase):
     self.working_dir = dirname
     os.chdir(dirname)
 
+    # Use emscripten root for node module lookup
+    scriptdir = os.path.dirname(os.path.abspath(__file__))
+    os.environ['NODE_PATH'] = os.path.join(scriptdir, '..', 'node_modules')
+
     if not self.save_dir:
       self.has_prev_ll = False
       for temp_file in os.listdir(TEMP_DIR):
diff --git a/tests/sockets/test_getaddrinfo.c b/tests/sockets/test_getaddrinfo.c
new file mode 100644
index 00000000..717a9ae7
--- /dev/null
+++ b/tests/sockets/test_getaddrinfo.c
@@ -0,0 +1,197 @@
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <assert.h>
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#if EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
+int main() {
+  struct addrinfo hints;
+  struct addrinfo *servinfo;
+  struct sockaddr_in *sa4;
+  struct sockaddr_in6 *sa6;
+  int err;
+
+  // no name or service
+  err = getaddrinfo(NULL, NULL, NULL, &servinfo);
+  assert(err == EAI_NONAME);
+
+  // invalid socket type
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = 9999;
+  err = getaddrinfo("www.mozilla.org", "80", &hints, &servinfo);
+#ifdef __APPLE__
+  assert(err == EAI_BADHINTS);
+#else
+  assert(err == EAI_SOCKTYPE);
+#endif
+
+  // invalid family
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNIX;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("www.mozilla.org", "80", &hints, &servinfo);
+  assert(err == EAI_FAMILY);
+
+  // invalid service
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("www.mozilla.org", "foobar", &hints, &servinfo);
+#ifdef __APPLE__
+  assert(err == EAI_NONAME);
+#else
+  assert(err == EAI_SERVICE);
+#endif
+
+  // test loopback resolution (ipv4)
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo(NULL, "80", &hints, &servinfo);
+  assert(!err);
+  sa4 = ((struct sockaddr_in*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET);
+  assert(servinfo->ai_socktype == SOCK_STREAM);
+  assert(*(uint32_t*)&(sa4->sin_addr) == ntohl(INADDR_LOOPBACK));
+  assert(sa4->sin_port == ntohs(80));
+  freeaddrinfo(servinfo);
+
+  // test loopback resolution (ipv6)
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET6;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo(NULL, "81", &hints, &servinfo);
+  assert(!err);
+  sa6 = ((struct sockaddr_in6*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET6);
+  assert(servinfo->ai_socktype == SOCK_STREAM);
+  memcmp(&sa6->sin6_addr, &in6addr_loopback, sizeof(in6addr_loopback));
+  assert(sa6->sin6_port == ntohs(81));
+  freeaddrinfo(servinfo);
+
+  // test bind preparation
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_flags = AI_PASSIVE;
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo(NULL, "82", &hints, &servinfo);
+  assert(!err);
+  sa4 = ((struct sockaddr_in*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET);
+  assert(servinfo->ai_socktype == SOCK_STREAM);
+  assert(*(uint32_t*)&(sa4->sin_addr) == 0);
+  assert(sa4->sin_port == ntohs(82));
+  freeaddrinfo(servinfo);
+
+  // test numeric address (ipv4)
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_DGRAM;
+  err = getaddrinfo("1.2.3.4", "83", &hints, &servinfo);
+  assert(!err);
+  sa4 = ((struct sockaddr_in*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET);
+  assert(servinfo->ai_socktype == SOCK_DGRAM);
+  assert(*(uint32_t*)&(sa4->sin_addr) == 67305985);
+  assert(sa4->sin_port == ntohs(83));
+  freeaddrinfo(servinfo);
+
+  // test numeric address (ipv4 address specified as ipv6 with AI_V4MAPPED)
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_flags = AI_V4MAPPED;
+  hints.ai_family = AF_INET6;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("1.2.3.4", "84", &hints, &servinfo);
+  assert(!err);
+  sa6 = ((struct sockaddr_in6*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET6);
+  assert(servinfo->ai_socktype == SOCK_STREAM);
+  assert(*((uint32_t*)&(sa6->sin6_addr)+2) == htonl(0xffff));
+  assert(*((uint32_t*)&(sa6->sin6_addr)+3) == 67305985);
+  assert(sa6->sin6_port == ntohs(84));
+  freeaddrinfo(servinfo);
+
+  // test numeric address (ipv4 address specified as ipv6 without AI_V4MAPPED)
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET6;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("1.2.3.4", "85", &hints, &servinfo);
+#ifdef __linux__
+  assert(err == -9 /* EAI_ADDRFAMILY */);
+#else
+  assert(err == EAI_NONAME);
+#endif
+
+  // test numeric address (ipv6)
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET6;
+  hints.ai_socktype = SOCK_DGRAM;
+  err = getaddrinfo("2001:0db8:85a3:0042:1000:8a2e:0370:7334", "86", &hints, &servinfo);
+  assert(!err);
+  sa6 = ((struct sockaddr_in6*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET6);
+  assert(servinfo->ai_socktype == SOCK_DGRAM);
+  assert(*((uint32_t*)&(sa6->sin6_addr)+0) == -1207107296);
+  assert(*((uint32_t*)&(sa6->sin6_addr)+1) == 1107338117);
+  assert(*((uint32_t*)&(sa6->sin6_addr)+2) == 780795920);
+  assert(*((uint32_t*)&(sa6->sin6_addr)+3) == 879980547);
+  assert(sa6->sin6_port == ntohs(86));
+  freeaddrinfo(servinfo);
+
+  // test numeric address (ipv6 address specified as ipv4)
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("2001:0db8:85a3:0042:1000:8a2e:0370:7334", "87", &hints, &servinfo);
+#ifdef __linux__
+  assert(err == -9 /* EAI_ADDRFAMILY */);
+#else
+  assert(err == EAI_NONAME);
+#endif
+
+  // test non-numeric host with AI_NUMERICHOST
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_flags = AI_NUMERICHOST;
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("www.mozilla.org", "88", &hints, &servinfo);
+  assert(err == EAI_NONAME);
+
+  // test non-numeric host with AF_INET
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("www.mozilla.org", "89", &hints, &servinfo);
+  assert(!err);
+  sa4 = ((struct sockaddr_in*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET);
+  assert(servinfo->ai_socktype == SOCK_STREAM);
+  assert(sa4->sin_port == ntohs(89));
+
+  // test non-numeric host with AF_INET6
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET6;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("www.mozilla.org", "90", &hints, &servinfo);
+  assert(!err);
+  sa6 = ((struct sockaddr_in6*)servinfo->ai_addr);
+  assert(servinfo->ai_family == AF_INET6);
+  assert(servinfo->ai_socktype == SOCK_STREAM);
+  assert(*((uint32_t*)&(sa6->sin6_addr)+0) != 0 ||
+         *((uint32_t*)&(sa6->sin6_addr)+1) != 0 ||
+         *((uint32_t*)&(sa6->sin6_addr)+2) != 0 ||
+         *((uint32_t*)&(sa6->sin6_addr)+3) != 0);
+  assert(sa6->sin6_port == ntohs(90));
+
+  puts("success");
+
+  return EXIT_SUCCESS;
+}
+
diff --git a/tests/sockets/test_sockets_gethostbyname.c b/tests/sockets/test_gethostbyname.c
index 12fc6d9d..de7da706 100644
--- a/tests/sockets/test_sockets_gethostbyname.c
+++ b/tests/sockets/test_gethostbyname.c
@@ -11,16 +11,6 @@
 #include <emscripten.h>
 #endif
 
-int sockfd;
-
-void finish(int result) {
-  close(sockfd);
-#if EMSCRIPTEN
-  REPORT_RESULT();
-#endif
-  exit(result);
-}
-
 int main() {
   char str[INET_ADDRSTRLEN];
   struct in_addr addr;
@@ -29,6 +19,8 @@ int main() {
   
   // resolve the hostname ot an actual address
   struct hostent *host = gethostbyname("slashdot.org");
+  assert(host->h_addrtype == AF_INET);
+  assert(host->h_length == sizeof(uint32_t));
 
   // convert the raw address to a string
   char **raw_addr_list = host->h_addr_list;
@@ -44,6 +36,8 @@ int main() {
   struct hostent *host1 = gethostbyaddr(&addr, sizeof(addr), host->h_addrtype);
   assert(strstr(host1->h_name, "slashdot.org"));
 
+  puts("success");
+
   return EXIT_SUCCESS;
 }
 
diff --git a/tests/sockets/test_getnameinfo.c b/tests/sockets/test_getnameinfo.c
new file mode 100644
index 00000000..c3fec6b4
--- /dev/null
+++ b/tests/sockets/test_getnameinfo.c
@@ -0,0 +1,101 @@
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <assert.h>
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#if EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
+int main() {
+  struct addrinfo hints;
+  struct addrinfo *servinfo;
+  struct sockaddr_in sa4;
+  struct sockaddr_in6 sa6;
+  char node[256];
+  char serv[256];
+  int flags;
+  int err;
+
+#ifndef __APPLE__
+  // incorrect sockaddr size
+  memset(&sa4, 0, sizeof(sa4));
+  sa4.sin_family = AF_INET;
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4)-1, NULL, 0, NULL, 0, 0);
+  assert(err == EAI_FAMILY);
+
+  memset(&sa6, 0, sizeof(sa6));
+  sa6.sin6_family = AF_INET6;
+  err = getnameinfo((struct sockaddr*)&sa6, sizeof(sa6)-1, NULL, 0, NULL, 0, 0);
+  assert(err == EAI_FAMILY);
+
+  // invalid family
+  memset(&sa4, 0, sizeof(sa4));
+  sa4.sin_family = 9999;
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4), NULL, 0, NULL, 0, 0);
+  assert(err == EAI_FAMILY);
+#endif
+
+  // NI_NUMERICHOST and NI_NAMEREQD conflict
+  memset(&sa4, 0, sizeof(sa4));
+  sa4.sin_family = AF_INET;
+  flags = NI_NUMERICHOST | NI_NAMEREQD;
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4), node, sizeof(node), serv, sizeof(serv), flags);
+  assert(err == EAI_NONAME);
+
+  // too small of buffer
+  memset(&sa4, 0, sizeof(sa4));
+  sa4.sin_family = AF_INET;
+  *(uint32_t*)&sa4.sin_addr = 67305985;
+  sa4.sin_port = htons(54321);
+  flags = NI_NUMERICHOST;
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4), node, 1, serv, sizeof(serv), flags);
+  assert(err == EAI_OVERFLOW);
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4), node, sizeof(node), serv, 1, flags);
+  assert(err == EAI_OVERFLOW);
+
+  // NI_NAMEREQD and lookup failed
+  memset(&sa4, 0, sizeof(sa4));
+  sa4.sin_family = AF_INET;
+  *(uint32_t*)&sa4.sin_addr = 67305985;
+  flags = NI_NAMEREQD;
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4), node, sizeof(node), serv, sizeof(serv), flags);
+  assert(err == EAI_NONAME);
+
+  // lookup failed
+  memset(&sa4, 0, sizeof(sa4));
+  sa4.sin_family = AF_INET;
+  *(uint32_t*)&sa4.sin_addr = 67305985;
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4), node, sizeof(node), serv, sizeof(serv), flags);
+  assert(err == EAI_NONAME);
+
+  // no lookup
+  memset(&sa4, 0, sizeof(sa4));
+  sa4.sin_family = AF_INET;
+  *(uint32_t*)&sa4.sin_addr = 67305985;
+  sa4.sin_port = htons(54321);
+  flags = NI_NUMERICHOST;
+  err = getnameinfo((struct sockaddr*)&sa4, sizeof(sa4), node, sizeof(node), serv, sizeof(serv), flags);
+  assert(!err);
+  assert(!strcmp(node, "1.2.3.4"));
+  assert(!strcmp(serv, "54321"));
+
+  // lookup
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+  err = getaddrinfo("www.mozilla.org", "54321", &hints, &servinfo);
+  assert(!err);
+  flags = NI_NAMEREQD;
+  err = getnameinfo(servinfo->ai_addr, servinfo->ai_addrlen, node, sizeof(node), serv, sizeof(serv), flags);
+  assert(!err);
+  assert(strstr(node, "mozilla"));
+  assert(!strcmp(serv, "54321"));
+
+  puts("success");
+
+  return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/tests/sockets/test_sockets_msg.h b/tests/sockets/test_sockets_msg.h
index 30094d65..b60b056a 100644
--- a/tests/sockets/test_sockets_msg.h
+++ b/tests/sockets/test_sockets_msg.h
@@ -52,6 +52,7 @@ int do_msg_write(int sockfd, msg_t *msg, int offset, int length, struct sockaddr
       assert(errno == EAGAIN);
       return res;
     }
+    printf("do_msg_write: sending message header for %d bytes\n", msg->length);
     assert(res == sizeof(int));
   }
 
diff --git a/tests/sockets/test_sockets_select_server_down_client.c b/tests/sockets/test_sockets_select_server_down_client.c
index e05bd4c8..27e200e0 100644
--- a/tests/sockets/test_sockets_select_server_down_client.c
+++ b/tests/sockets/test_sockets_select_server_down_client.c
@@ -48,7 +48,7 @@ void iter(void *arg) {
     char buffer[1024];
     int n = recv(sockfd, buffer, sizeof(buffer), 0);
     if (n == -1 && retries++ > 10) {
-      perror("revv failed");
+      perror("recv failed");
       finish(EXIT_FAILURE);
     } else if (!n) {
       perror("Connection to websocket server failed as expected.");
diff --git a/tests/test_core.py b/tests/test_core.py
index 491db66c..bd6d9a03 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -7437,168 +7437,6 @@ def process(filename):
     '''
     self.do_run(src, re.sub('(^|\n)\s+', '\\1', expected))
 
-  def test_inet(self):
-    src = r'''
-      #include <stdio.h>
-      #include <arpa/inet.h>
-
-      int main() {
-        printf("*%x,%x,%x,%x,%x,%x*\n", htonl(0xa1b2c3d4), htonl(0xfe3572e0), htonl(0x07abcdf0), htons(0xabcd), ntohl(0x43211234), ntohs(0xbeaf));
-        in_addr_t i = inet_addr("190.180.10.78");
-        printf("%x\n", i);
-        return 0;
-      }
-    '''
-    self.do_run(src, '*d4c3b2a1,e07235fe,f0cdab07,cdab,34122143,afbe*\n4e0ab4be\n')
-
-  def test_inet2(self):
-    src = r'''
-      #include <stdio.h>
-      #include <arpa/inet.h>
-
-      int main() {
-        struct in_addr x, x2;
-        int *y = (int*)&x;
-        *y = 0x12345678;
-        printf("%s\n", inet_ntoa(x));
-        int r = inet_aton(inet_ntoa(x), &x2);
-        printf("%s\n", inet_ntoa(x2));
-        return 0;
-      }
-    '''
-    self.do_run(src, '120.86.52.18\n120.86.52.18\n')
-
-  def test_inet3(self):
-    src = r'''
-      #include <stdio.h>
-      #include <arpa/inet.h>
-      #include <sys/socket.h>
-      int main() {
-        char dst[64];
-        struct in_addr x, x2;
-        int *y = (int*)&x;
-        *y = 0x12345678;
-        printf("%s\n", inet_ntop(AF_INET,&x,dst,sizeof dst));
-        int r = inet_aton(inet_ntoa(x), &x2);
-        printf("%s\n", inet_ntop(AF_INET,&x2,dst,sizeof dst));
-        return 0;
-      }
-    '''
-    self.do_run(src, '120.86.52.18\n120.86.52.18\n')
-
-  def test_inet4(self):
-    if Settings.USE_TYPED_ARRAYS != 2: return self.skip('requires ta2')
-
-    src = r'''
-      #include <stdio.h>
-      #include <arpa/inet.h>
-      #include <sys/socket.h>
-
-      void test(char *test_addr){
-          char str[40];
-          struct in6_addr addr;
-          unsigned char *p = (unsigned char*)&addr;
-          int ret;
-          ret = inet_pton(AF_INET6,test_addr,&addr);
-          if(ret == -1) return;
-          if(ret == 0) return;
-          if(inet_ntop(AF_INET6,&addr,str,sizeof(str)) == NULL ) return;
-          printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x - %s\n",
-               p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7],p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15],str);
-      }
-      int main(){
-          test("::");
-          test("::1");
-          test("::1.2.3.4");
-          test("::17.18.19.20");
-          test("::ffff:1.2.3.4");
-          test("1::ffff");
-          test("::255.255.255.255");
-          test("0:ff00:1::");
-          test("0:ff::");
-          test("abcd::");
-          test("ffff::a");
-          test("ffff::a:b");
-          test("ffff::a:b:c");
-          test("ffff::a:b:c:d");
-          test("ffff::a:b:c:d:e");
-          test("::1:2:0:0:0");
-          test("0:0:1:2:3::");
-          test("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
-          test("1::255.255.255.255");
-
-          //below should fail and not produce results..
-          test("1.2.3.4");
-          test("");
-          test("-");
-      }
-    '''
-    self.do_run(src,
-        "0000:0000:0000:0000:0000:0000:0000:0000 - ::\n"
-        "0000:0000:0000:0000:0000:0000:0000:0001 - ::1\n"
-        "0000:0000:0000:0000:0000:0000:0102:0304 - ::1.2.3.4\n"
-        "0000:0000:0000:0000:0000:0000:1112:1314 - ::17.18.19.20\n"
-        "0000:0000:0000:0000:0000:ffff:0102:0304 - ::ffff:1.2.3.4\n"
-        "0001:0000:0000:0000:0000:0000:0000:ffff - 1::ffff\n"
-        "0000:0000:0000:0000:0000:0000:ffff:ffff - ::255.255.255.255\n"
-        "0000:ff00:0001:0000:0000:0000:0000:0000 - 0:ff00:1::\n"
-        "0000:00ff:0000:0000:0000:0000:0000:0000 - 0:ff::\n"
-        "abcd:0000:0000:0000:0000:0000:0000:0000 - abcd::\n"
-        "ffff:0000:0000:0000:0000:0000:0000:000a - ffff::a\n"
-        "ffff:0000:0000:0000:0000:0000:000a:000b - ffff::a:b\n"
-        "ffff:0000:0000:0000:0000:000a:000b:000c - ffff::a:b:c\n"
-        "ffff:0000:0000:0000:000a:000b:000c:000d - ffff::a:b:c:d\n"
-        "ffff:0000:0000:000a:000b:000c:000d:000e - ffff::a:b:c:d:e\n"
-        "0000:0000:0000:0001:0002:0000:0000:0000 - ::1:2:0:0:0\n"
-        "0000:0000:0001:0002:0003:0000:0000:0000 - 0:0:1:2:3::\n"
-        "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff - ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\n"
-        "0001:0000:0000:0000:0000:0000:ffff:ffff - 1::ffff:ffff\n"
-    )
-
-  def test_gethostbyname(self):
-    if Settings.USE_TYPED_ARRAYS != 2: return self.skip("assume t2 in gethostbyname")
-
-    src = r'''
-      #include <netdb.h>
-      #include <stdio.h>
-
-      void test(char *hostname) {
-        hostent *host = gethostbyname(hostname);
-        if (!host) {
-          printf("no such thing\n");
-          return;
-        }
-        printf("%s : %d : %d\n", host->h_name, host->h_addrtype, host->h_length);
-        char **name = host->h_aliases;
-        while (*name) {
-          printf("- %s\n", *name);
-          name++;
-        }
-        name = host->h_addr_list;
-        while (name && *name) {
-          printf("* ");
-          for (int i = 0; i < host->h_length; i++)
-            printf("%d.", (*name)[i]);
-          printf("\n");
-          name++;
-        }
-      }
-
-      int main() {
-        test("www.cheezburger.com");
-        test("fail.on.this.never.work"); // we will "work" on this - because we are just making aliases of names to ips
-        test("localhost");
-        return 0;
-      }
-    '''
-    self.do_run(src, '''www.cheezburger.com : 2 : 4
-* -84.29.1.0.
-fail.on.this.never.work : 2 : 4
-* -84.29.2.0.
-localhost : 2 : 4
-* -84.29.3.0.
-''')
-
   def test_799(self):
     src = open(path_from_root('tests', '799.cpp'), 'r').read()
     self.do_run(src, '''Set PORT family: 0, port: 3979
diff --git a/tests/test_sockets.py b/tests/test_sockets.py
index 82ddc6fe..b2116e21 100644
--- a/tests/test_sockets.py
+++ b/tests/test_sockets.py
@@ -34,11 +34,11 @@ def make_relay_server(port1, port2):
   return proc
 
 class WebsockifyServerHarness:
-  def __init__(self, filename, args, listen_port, target_port):
+  def __init__(self, filename, args, listen_port):
     self.pids = []
     self.filename = filename
-    self.target_port = target_port
     self.listen_port = listen_port
+    self.target_port = listen_port-1
     self.args = args or []
 
   def __enter__(self):
@@ -48,7 +48,7 @@ class WebsockifyServerHarness:
     # NOTE empty filename support is a hack to support
     # the current test_enet
     if self.filename:
-      Popen([CLANG_CC, path_from_root('tests', self.filename), '-o', 'server'] + self.args).communicate()
+      Popen([CLANG_CC, path_from_root('tests', self.filename), '-o', 'server', '-DSOCKK=%d' % self.target_port] + self.args).communicate()
       process = Popen([os.path.abspath('server')])
       self.pids.append(process.pid)
 
@@ -71,16 +71,21 @@ class WebsockifyServerHarness:
 
 
 class CompiledServerHarness:
-  def __init__(self, filename, args):
+  def __init__(self, filename, args, listen_port):
     self.pids = []
     self.filename = filename
+    self.listen_port = listen_port
     self.args = args or []
 
   def __enter__(self):
-    import socket, websockify
+    # assuming this is only used for WebSocket tests at the moment, validate that
+    # the ws module is installed
+    child = Popen([NODE_JS, '-e', 'require("ws");'])
+    child.communicate()
+    assert child.returncode == 0, 'ws module for Node.js not installed. Please run \'npm install\' from %s' % EMSCRIPTEN_ROOT
 
     # compile the server
-    Popen([PYTHON, EMCC, path_from_root('tests', self.filename), '-o', 'server.js'] + self.args).communicate()
+    Popen([PYTHON, EMCC, path_from_root('tests', self.filename), '-o', 'server.js', '-DSOCKK=%d' % self.listen_port] + self.args).communicate()
     process = Popen([NODE_JS, 'server.js'])
     self.pids.append(process.pid)
 
@@ -96,72 +101,196 @@ class CompiledServerHarness:
     # proper listen server support.
 
 class sockets(BrowserCore):
+  def test_inet(self):
+    src = r'''
+      #include <stdio.h>
+      #include <arpa/inet.h>
+
+      int main() {
+        printf("*%x,%x,%x,%x,%x,%x*\n", htonl(0xa1b2c3d4), htonl(0xfe3572e0), htonl(0x07abcdf0), htons(0xabcd), ntohl(0x43211234), ntohs(0xbeaf));
+        in_addr_t i = inet_addr("190.180.10.78");
+        printf("%x\n", i);
+        return 0;
+      }
+    '''
+    self.do_run(src, '*d4c3b2a1,e07235fe,f0cdab07,cdab,34122143,afbe*\n4e0ab4be\n')
+
+  def test_inet2(self):
+    src = r'''
+      #include <stdio.h>
+      #include <arpa/inet.h>
+
+      int main() {
+        struct in_addr x, x2;
+        int *y = (int*)&x;
+        *y = 0x12345678;
+        printf("%s\n", inet_ntoa(x));
+        int r = inet_aton(inet_ntoa(x), &x2);
+        printf("%s\n", inet_ntoa(x2));
+        return 0;
+      }
+    '''
+    self.do_run(src, '120.86.52.18\n120.86.52.18\n')
+
+  def test_inet3(self):
+    src = r'''
+      #include <stdio.h>
+      #include <arpa/inet.h>
+      #include <sys/socket.h>
+      int main() {
+        char dst[64];
+        struct in_addr x, x2;
+        int *y = (int*)&x;
+        *y = 0x12345678;
+        printf("%s\n", inet_ntop(AF_INET,&x,dst,sizeof dst));
+        int r = inet_aton(inet_ntoa(x), &x2);
+        printf("%s\n", inet_ntop(AF_INET,&x2,dst,sizeof dst));
+        return 0;
+      }
+    '''
+    self.do_run(src, '120.86.52.18\n120.86.52.18\n')
+
+  def test_inet4(self):
+    if Settings.USE_TYPED_ARRAYS != 2: return self.skip('requires ta2')
+
+    src = r'''
+      #include <stdio.h>
+      #include <arpa/inet.h>
+      #include <sys/socket.h>
+
+      void test(char *test_addr){
+          char str[40];
+          struct in6_addr addr;
+          unsigned char *p = (unsigned char*)&addr;
+          int ret;
+          ret = inet_pton(AF_INET6,test_addr,&addr);
+          if(ret == -1) return;
+          if(ret == 0) return;
+          if(inet_ntop(AF_INET6,&addr,str,sizeof(str)) == NULL ) return;
+          printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x - %s\n",
+               p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7],p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15],str);
+      }
+      int main(){
+          test("::");
+          test("::1");
+          test("::1.2.3.4");
+          test("::17.18.19.20");
+          test("::ffff:1.2.3.4");
+          test("1::ffff");
+          test("::255.255.255.255");
+          test("0:ff00:1::");
+          test("0:ff::");
+          test("abcd::");
+          test("ffff::a");
+          test("ffff::a:b");
+          test("ffff::a:b:c");
+          test("ffff::a:b:c:d");
+          test("ffff::a:b:c:d:e");
+          test("::1:2:0:0:0");
+          test("0:0:1:2:3::");
+          test("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
+          test("1::255.255.255.255");
+
+          //below should fail and not produce results..
+          test("1.2.3.4");
+          test("");
+          test("-");
+      }
+    '''
+    self.do_run(src,
+        "0000:0000:0000:0000:0000:0000:0000:0000 - ::\n"
+        "0000:0000:0000:0000:0000:0000:0000:0001 - ::1\n"
+        "0000:0000:0000:0000:0000:0000:0102:0304 - ::1.2.3.4\n"
+        "0000:0000:0000:0000:0000:0000:1112:1314 - ::17.18.19.20\n"
+        "0000:0000:0000:0000:0000:ffff:0102:0304 - ::ffff:1.2.3.4\n"
+        "0001:0000:0000:0000:0000:0000:0000:ffff - 1::ffff\n"
+        "0000:0000:0000:0000:0000:0000:ffff:ffff - ::255.255.255.255\n"
+        "0000:ff00:0001:0000:0000:0000:0000:0000 - 0:ff00:1::\n"
+        "0000:00ff:0000:0000:0000:0000:0000:0000 - 0:ff::\n"
+        "abcd:0000:0000:0000:0000:0000:0000:0000 - abcd::\n"
+        "ffff:0000:0000:0000:0000:0000:0000:000a - ffff::a\n"
+        "ffff:0000:0000:0000:0000:0000:000a:000b - ffff::a:b\n"
+        "ffff:0000:0000:0000:0000:000a:000b:000c - ffff::a:b:c\n"
+        "ffff:0000:0000:0000:000a:000b:000c:000d - ffff::a:b:c:d\n"
+        "ffff:0000:0000:000a:000b:000c:000d:000e - ffff::a:b:c:d:e\n"
+        "0000:0000:0000:0001:0002:0000:0000:0000 - ::1:2:0:0:0\n"
+        "0000:0000:0001:0002:0003:0000:0000:0000 - 0:0:1:2:3::\n"
+        "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff - ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\n"
+        "0001:0000:0000:0000:0000:0000:ffff:ffff - 1::ffff:ffff\n"
+    )
+
+  def test_getaddrinfo(self):
+    self.do_run(open(path_from_root('tests', 'sockets', 'test_getaddrinfo.c')).read(), 'success')
+
+  def test_getnameinfo(self):
+    self.do_run(open(path_from_root('tests', 'sockets', 'test_getnameinfo.c')).read(), 'success')
+
+  def test_gethostbyname(self):
+    self.do_run(open(path_from_root('tests', 'sockets', 'test_gethostbyname.c')).read(), 'success')
+
   def test_sockets_echo(self):
     sockets_include = '-I'+path_from_root('tests', 'sockets')
 
-    for datagram in [0]:
-      dgram_define = '-DTEST_DGRAM=%d' % datagram
+    # Websockify-proxied servers can't run dgram tests
+    harnesses = [
+      (WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include], 49160), 0),
+      (CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include, '-DTEST_DGRAM=0'], 49161), 0),
+      (CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include, '-DTEST_DGRAM=1'], 49162), 1)
+    ]
 
-      for harness in [
-        WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), ['-DSOCKK=8990', dgram_define, sockets_include], 8991, 8990)
-        # CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), ['-DSOCKK=8990', dgram_define, sockets_include])
-      ]:
-        with harness:
-          self.btest(os.path.join('sockets', 'test_sockets_echo_client.c'), expected='0', args=['-DSOCKK=8991', dgram_define, sockets_include])
+    for harness, datagram in harnesses:
+      with harness:
+        self.btest(os.path.join('sockets', 'test_sockets_echo_client.c'), expected='0', args=['-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram, sockets_include])
 
   def test_sockets_echo_bigdata(self):
     sockets_include = '-I'+path_from_root('tests', 'sockets')
 
-    for datagram in [0]:
-      dgram_define = '-DTEST_DGRAM=%d' % datagram
+    # generate a large string literal to use as our message
+    message = ''
+    for i in range(256*256*2):
+        message += str(unichr(ord('a') + (i % 26)))
 
-      # generate a large string literal to use as our message
-      message = ''
-      for i in range(256*256*2):
-          message += str(unichr(ord('a') + (i % 26)))
+    # re-write the client test with this literal (it's too big to pass via command line)
+    input_filename = path_from_root('tests', 'sockets', 'test_sockets_echo_client.c')
+    input = open(input_filename).read()
+    output = input.replace('#define MESSAGE "pingtothepong"', '#define MESSAGE "%s"' % message)
 
-      # re-write the client test with this literal (it's too big to pass via command line)
-      input_filename = path_from_root('tests', 'sockets', 'test_sockets_echo_client.c')
-      input = open(input_filename).read()
-      output = input.replace('#define MESSAGE "pingtothepong"', '#define MESSAGE "%s"' % message)
+    harnesses = [
+      (WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include], 49170), 0),
+      (CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include, '-DTEST_DGRAM=0'], 49171), 0),
+      (CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include, '-DTEST_DGRAM=1'], 49172), 1)
+    ]
 
-      for harness in [
-        WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), ['-DSOCKK=8992', dgram_define, sockets_include], 8993, 8992)
-      ]:
-        with harness:
-          self.btest(output, expected='0', args=['-DSOCKK=8993', dgram_define, sockets_include], force_c=True)
+    for harness, datagram in harnesses:
+      with harness:
+        self.btest(output, expected='0', args=[sockets_include, '-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram], force_c=True)
 
   def test_sockets_partial(self):
     for harness in [
-      WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_partial_server.c'), ['-DSOCKK=8994'], 8995, 8994)
+      WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_partial_server.c'), [], 49180),
+      CompiledServerHarness(os.path.join('sockets', 'test_sockets_partial_server.c'), [], 49181)
     ]:
       with harness:
-        self.btest(os.path.join('sockets', 'test_sockets_partial_client.c'), expected='165', args=['-DSOCKK=8995'])
-
-  # TODO add support for gethostbyaddr to re-enable this test
-  # def test_sockets_gethostbyname(self):
-  #   self.btest(os.path.join('sockets', 'test_sockets_gethostbyname.c'), expected='0', args=['-O2', '-DSOCKK=8997'])
+        self.btest(os.path.join('sockets', 'test_sockets_partial_client.c'), expected='165', args=['-DSOCKK=%d' % harness.listen_port])
 
   def test_sockets_select_server_down(self):
     for harness in [
-      WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_select_server_down_server.c'), ['-DSOCKK=9002'], 9003, 9002)
+      WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_select_server_down_server.c'), [], 49190),
+      CompiledServerHarness(os.path.join('sockets', 'test_sockets_select_server_down_server.c'), [], 49191)
     ]:
       with harness:
-        self.btest(os.path.join('sockets', 'test_sockets_select_server_down_client.c'), expected='266', args=['-DSOCKK=9003'])
+        self.btest(os.path.join('sockets', 'test_sockets_select_server_down_client.c'), expected='266', args=['-DSOCKK=%d' % harness.listen_port])
 
   def test_sockets_select_server_closes_connection_rw(self):
     sockets_include = '-I'+path_from_root('tests', 'sockets')
 
     for harness in [
-      WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), ['-DSOCKK=9004', sockets_include], 9005, 9004)
+      WebsockifyServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include], 49200),
+      CompiledServerHarness(os.path.join('sockets', 'test_sockets_echo_server.c'), [sockets_include], 49201)
     ]:
       with harness:
-        self.btest(os.path.join('sockets', 'test_sockets_select_server_closes_connection_client_rw.c'), expected='266', args=['-DSOCKK=9005', sockets_include])
+        self.btest(os.path.join('sockets', 'test_sockets_select_server_closes_connection_client_rw.c'), expected='266', args=[sockets_include, '-DSOCKK=%d' % harness.listen_port])
 
-  # TODO remove this once we have proper listen server support built into emscripten.
-  # being that enet uses datagram sockets, we can't proxy to a native server with
-  # websockify, so we're emulating the listen server in the browser and relaying
-  # between two TCP servers.
   def test_enet(self):
     try_delete(self.in_dir('enet'))
     shutil.copytree(path_from_root('tests', 'enet'), self.in_dir('enet'))
@@ -171,20 +300,18 @@ class sockets(BrowserCore):
     Popen([PYTHON, path_from_root('emmake'), 'make']).communicate()
     enet = [self.in_dir('enet', '.libs', 'libenet.a'), '-I'+path_from_root('tests', 'enet', 'include')]
     os.chdir(pwd)
-    Popen([PYTHON, EMCC, path_from_root('tests', 'sockets', 'test_enet_server.c'), '-o', 'server.html', '-DSOCKK=2235'] + enet).communicate()
-
-    with WebsockifyServerHarness('', [], 2235, 2234):
-      with WebsockifyServerHarness('', [], 2237, 2236):
-        pids = []
-        try:
-          proc = make_relay_server(2234, 2236)
-          pids.append(proc.pid)
-          self.btest(os.path.join('sockets', 'test_enet_client.c'), expected='0', args=['-DSOCKK=2237', '-DUSE_IFRAME'] + enet)
-        finally:
-          clean_pids(pids);
-
-  # TODO use this once we have listen server support
-  # def test_enet(self):
+
+    for harness in [
+      CompiledServerHarness(os.path.join('sockets', 'test_enet_server.c'), enet, 49210)
+    ]:
+      with harness:
+        self.btest(os.path.join('sockets', 'test_enet_client.c'), expected='0', args=enet + ['-DSOCKK=%d' % harness.listen_port])
+
+  # This test is no longer in use for WebSockets as we can't truly emulate
+  # a server in the browser (in the past, there were some hacks to make it
+  # somewhat work, but those have been removed). However, with WebRTC it
+  # should be able to resurect this test.
+  # def test_enet_in_browser(self):
   #   try_delete(self.in_dir('enet'))
   #   shutil.copytree(path_from_root('tests', 'enet'), self.in_dir('enet'))
   #   pwd = os.getcwd()
@@ -193,12 +320,17 @@ class sockets(BrowserCore):
   #   Popen([PYTHON, path_from_root('emmake'), 'make']).communicate()
   #   enet = [self.in_dir('enet', '.libs', 'libenet.a'), '-I'+path_from_root('tests', 'enet', 'include')]
   #   os.chdir(pwd)