dns: treat names rejected by res_mkquery as nonexistent rather than error

[musl] / src / network / getaddrinfo.c

diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index ba26847..9df045f 100644 (file)
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -16,13 +16,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
        char canon[256], *outcanon;
        int nservs, naddrs, nais, canon_len, i, j, k;
        int family = AF_UNSPEC, flags = 0, proto = 0, socktype = 0;
-       struct aibuf {
-               struct addrinfo ai;
-               union sa {
-                       struct sockaddr_in sin;
-                       struct sockaddr_in6 sin6;
-               } sa;
-       } *out;
+       struct aibuf *out;
 
        if (!host && !serv) return EAI_NONAME;
 
@@ -72,11 +66,22 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
                                pthread_setcancelstate(
                                        PTHREAD_CANCEL_DISABLE, &cs);
                                int r = connect(s, ta[i], tl[i]);
+                               int saved_errno = errno;
                                pthread_setcancelstate(cs, 0);
                                close(s);
                                if (!r) continue;
+                               errno = saved_errno;
+                       }
+                       switch (errno) {
+                       case EADDRNOTAVAIL:
+                       case EAFNOSUPPORT:
+                       case EHOSTUNREACH:
+                       case ENETDOWN:
+                       case ENETUNREACH:
+                               break;
+                       default:
+                               return EAI_SYSTEM;
                        }
-                       if (errno != EAFNOSUPPORT) return EAI_SYSTEM;
                        if (family == tf[i]) return EAI_NONAME;
                        family = tf[1-i];
                }
@@ -101,6 +106,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
        }
 
        for (k=i=0; i<naddrs; i++) for (j=0; j<nservs; j++, k++) {
+               out[k].slot = k;
                out[k].ai = (struct addrinfo){
                        .ai_family = addrs[i].family,
                        .ai_socktype = ports[j].socktype,
@@ -109,8 +115,8 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
                                ? sizeof(struct sockaddr_in)
                                : sizeof(struct sockaddr_in6),
                        .ai_addr = (void *)&out[k].sa,
-                       .ai_canonname = outcanon,
-                       .ai_next = &out[k+1].ai };
+                       .ai_canonname = outcanon };
+               if (k) out[k-1].ai.ai_next = &out[k].ai;
                switch (addrs[i].family) {
                case AF_INET:
                        out[k].sa.sin.sin_family = AF_INET;
@@ -125,7 +131,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
                        break;                  
                }
        }
-       out[nais-1].ai.ai_next = 0;
+       out[0].ref = nais;
        *res = &out->ai;
        return 0;
 }