resolver: Support IPv6 name resolution

[secnet.git] / resolver.c

diff --git a/resolver.c b/resolver.c
index b8a7a34289aa13b99e635f829e6e898ebfcb2cb7..d203a9683b76e4f5d044a6f120a1b6382368b15e 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -42,8 +42,8 @@ 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))
@@ -102,7 +102,6 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
                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,18 +110,22 @@ 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);
                free(q);