fix for previous incorrect fix of cancellation in dns lookups

[musl] / src / network / __dns.c

diff --git a/src/network/__dns.c b/src/network/__dns.c
index 8cd7d5d..786c054 100644 (file)
--- a/src/network/__dns.c
+++ b/src/network/__dns.c
@@ -82,8 +82,9 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
        }
        if (f) __fclose_ca(f);
        if (!nns) {
-               ns[0].sin.sin_family = AF_INET;
+               ns[0].sin.sin_family = family = AF_INET;
                ns[0].sin.sin_port = htons(53);
+               ns[0].sin.sin_addr.s_addr = htonl(0x7f000001);
                nns=1;
                sl = sizeof sa.sin;
        }
@@ -91,6 +92,10 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
        /* Get local address and open/bind a socket */
        sa.sin.sin_family = family;
        fd = socket(family, SOCK_DGRAM, 0);
+
+       pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
+       pthread_setcancelstate(cs, 0);
+
        if (bind(fd, (void *)&sa, sl) < 0) {
                errcode = EAI_SYSTEM;
                goto out;
@@ -101,9 +106,6 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
        pfd.fd = fd;
        pfd.events = POLLIN;
 
-       pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
-       pthread_setcancelstate(cs, 0);
-
        /* Loop until we timeout; break early on success */
        for (; time(0)-t0 < TIMEOUT; ) {