resolver: Log reason for DNS resolution failure

[secnet.git] / resolver.c

diff --git a/resolver.c b/resolver.c
index b8a7a34289aa13b99e635f829e6e898ebfcb2cb7..83afd2f50654b9ca037a6ee8e579dddad6e9d6dc 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -42,14 +42,14 @@ static bool_t resolve_request(void *sst, cstring_t name,
        memcpy(trimmed,name+1,l-2);
        trimmed[l-2]=0;
        struct comm_addr ca;
-       FILLZERO(ca);
        ca.comm=comm;
+       ca.ix=-1;
        ca.ia.sin.sin_family=AF_INET;
        ca.ia.sin.sin_port=htons(port);
        if (inet_aton(trimmed,&ca.ia.sin.sin_addr))
-           cb(cst,&ca,1,1);
+           cb(cst,&ca,1,1,0);
        else
-           cb(cst,0,0,0);
+           cb(cst,0,0,0,"invalid IP address");
        return True;
     }
 
@@ -95,14 +95,13 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
        if (rv==0) {
            q=qp;
            if (ans->status!=adns_s_ok) {
-               q->answer(q->cst,NULL,0,0); /* Failure */
+               q->answer(q->cst,NULL,0,0,adns_strerror(ans->status));
                free(q);
                free(ans);
            } else {
                int rslot, wslot, total;
                int ca_len=MIN(ans->nrrs,MAX_PEER_ADDRS);
                struct comm_addr ca_buf[ca_len];
-               FILLZERO(ca_buf);
                for (rslot=0, wslot=0, total=0;
                     rslot<ans->nrrs;
                     rslot++) {
@@ -111,20 +110,24 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
                    adns_rr_addr *ra=&ans->rrs.addr[rslot];
                    struct comm_addr *ca=&ca_buf[wslot];
                    ca->comm=q->comm;
-                   /* copy fields individually so we leave holes zeroed: */
+                   ca->ix=-1;
                    switch (ra->addr.sa.sa_family) {
                    case AF_INET:
                        assert(ra->len == sizeof(ca->ia.sin));
-                       ca->ia.sin.sin_family=ra->addr.inet.sin_family;
-                       ca->ia.sin.sin_addr=  ra->addr.inet.sin_addr;
-                       ca->ia.sin.sin_port=  htons(q->port);
-                       wslot++;
                        break;
-                   default:
+#ifdef CONFIG_IPV6
+                   case AF_INET6:
+                       assert(ra->len == sizeof(ca->ia.sin6));
                        break;
+#endif /*CONFIG_IPV6*/
+                   default:
+                       /* silently skip unexpected AFs from adns */
+                       continue;
                    }
+                   memcpy(&ca->ia,&ra->addr,ra->len);
+                   wslot++;
                }
-               q->answer(q->cst,ca_buf,wslot,total);
+               q->answer(q->cst,ca_buf,wslot,total,0);
                free(q);
                free(ans);
            }