macOS addrinfo/dns fix for ip6

Author: TheTechsTech

README.md

@@ -149,8 +149,8 @@ int uv_main(int argc, char **argv) {
                                   kv(ai_socktype, SOCK_STREAM),
                                   kv(ai_protocol, IPPROTO_TCP));
 
-    fprintf(stderr, "%s\033[0K\n", dns->ip_addr);
-    uv_stream_t *server = stream_connect_ex(UV_TCP, dns->ip_addr, 6667);
+    fprintf(stderr, "%s\033[0K\n", addrinfo_ip(dns));
+    uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), 6667);
     while (text = stream_read(server))
         fprintf(stderr, "\033[0K%s", text);
 

docs/index.md

@@ -149,8 +149,8 @@ int uv_main(int argc, char **argv) {
                                   kv(ai_socktype, SOCK_STREAM),
                                   kv(ai_protocol, IPPROTO_TCP));
 
-    fprintf(stderr, "%s\033[0K\n", dns->ip_addr);
-    uv_stream_t *server = stream_connect_ex(UV_TCP, dns->ip_addr, 6667);
+    fprintf(stderr, "%s\033[0K\n", addrinfo_ip(dns));
+    uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), 6667);
     while (text = stream_read(server))
         fprintf(stderr, "\033[0K%s", text);
 

examples/dns.c

@@ -8,8 +8,8 @@ int uv_main(int argc, char **argv) {
                                   kv(ai_socktype, SOCK_STREAM),
                                   kv(ai_protocol, IPPROTO_TCP));
 
-    fprintf(stderr, "%s\033[0K\n", dns->ip_addr);
-    uv_stream_t *server = stream_connect_ex(UV_TCP, dns->ip_addr, 6667);
+    fprintf(stderr, "%s\033[0K\n", addrinfo_ip(dns));
+    uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), 6667);
     while (text = stream_read(server))
         fprintf(stderr, "\033[0K%s", text);
 

include/uv_coro.h

@@ -182,6 +182,7 @@ typedef struct scandir_s {
 
 typedef struct dnsinfo_s {
     uv_coro_types type;
+    bool is_ip6;
     size_t count;
     string ip_addr, ip6_addr, ip_name;
     addrinfo_t *addr, original[1];
@@ -363,6 +364,7 @@ C_API bool fs_watch_stop(void);
 
 C_API dnsinfo_t *get_addrinfo(string_t address, string_t service, u32 numhints_pair, ...);
 C_API addrinfo_t *addrinfo_next(dnsinfo_t *);
+C_API string_t addrinfo_ip(dnsinfo_t *);
 C_API nameinfo_t *get_nameinfo(string_t addr, int port, int flags);
 
 C_API uv_pipe_t *pipe_create_ex(bool is_ipc, bool autofree);

src/uv_coro.c

@@ -1383,6 +1383,13 @@ dnsinfo_t *get_addrinfo(string_t address, string_t service, u32 numhints_pair, .
     return (dnsinfo_t *)uv_start(uv_args, UV_GETADDRINFO, count, true).object;
 }
 
+RAII_INLINE string_t addrinfo_ip(dnsinfo_t *dns) {
+    if (is_addrinfo(dns))
+        return (string_t)(dns->is_ip6 ? dns->ip6_addr : dns->ip_addr);
+
+    return nullptr;
+}
+
 addrinfo_t *addrinfo_next(dnsinfo_t *dns) {
     if (is_addrinfo(dns) && !is_empty(dns->addr)) {
         addrinfo_t *dir = dns->addr;
@@ -1392,9 +1399,11 @@ addrinfo_t *addrinfo_next(dnsinfo_t *dns) {
             dns->ip_name = dir->ai_canonname;
 
         if (dir->ai_family == AF_INET) {
+            dns->is_ip6 = false;
             if (is_zero(ip = uv_ip4_name((const struct sockaddr_in *)dir->ai_addr, dns->ip, INET_ADDRSTRLEN)))
                 dns->ip_addr = dns->ip;
         } else if (dir->ai_family == AF_INET6) {
+            dns->is_ip6 = true;
             if (is_zero(ip = uv_ip6_name((const struct sockaddr_in6 *)dir->ai_addr, dns->ip, INET6_ADDRSTRLEN)))
                 dns->ip6_addr = dns->ip;
         }

tests/test-dns.c

@@ -12,6 +12,7 @@ void_t worker_misc(params_t args) {
 
 TEST(get_addrinfo) {
     dnsinfo_t *dns = nullptr;
+    string ip = nullptr;
     rid_t res = go(worker_misc, 3, 1000, "addrinfo", "finish");
     ASSERT_TRUE(is_addrinfo(dns = get_addrinfo(gai, "http", 1, kv(ai_flags, AI_CANONNAME | AI_PASSIVE | AF_INET))));
     ASSERT_FALSE(result_is_ready(res));
@@ -21,10 +22,11 @@ TEST(get_addrinfo) {
     ASSERT_TRUE(result_is_ready(res));
     ASSERT_STR(result_for(res).char_ptr, "finish");
     ASSERT_STR(gai, dns->ip_name);
-    if (dns->addr->ai_family == AF_INET6)
-        ASSERT_TRUE((is_str_in(dns->ip6_addr, "8844")));
+    ASSERT_NOTNULL((ip = (string)addrinfo_ip(dns)));
+    if (dns->is_ip6)
+        ASSERT_TRUE((is_str_in(ip, "8844")));
     else
-        ASSERT_TRUE((is_str_in(dns->ip_addr, "8.8")));
+        ASSERT_TRUE((is_str_in(ip, "8.8")));
 
     ASSERT_TRUE((dns->count > 2));