- added raw addr / hostname lookup support

 - added getaddrinfo, freeaddrinfo, getnameinfo and gai_strerror stub
 - added tests for getaddrinfo and getnameinfo
 - consolidated test_gethostbyname and test_sockets_gethostbyname

4 files changed, 308 insertions, 55 deletions

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/test_sockets.py b/tests/test_sockets.py
index 8f03d6ae..85813447 100644
--- a/tests/test_sockets.py
+++ b/tests/test_sockets.py
@@ -214,49 +214,14 @@ class sockets(BrowserCore):
         "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>
+  def test_getaddrinfo(self):
+    self.do_run(open(path_from_root('tests', 'sockets', 'test_getaddrinfo.c')).read(), 'success')
 
-      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++;
-        }
-      }
+  def test_getnameinfo(self):
+    self.do_run(open(path_from_root('tests', 'sockets', 'test_getnameinfo.c')).read(), 'success')
 
-      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_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')
@@ -300,10 +265,6 @@ localhost : 2 : 4
       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'])
-
   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)