comm etc.: Provide comm_addr_equal

[secnet.git] / resolver.c

diff --git a/resolver.c b/resolver.c
index c1206acc27cb075f9835c834ce55744a449180f8..d6bc61901085d78d3492bfa411f99c32957d9b56 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -42,11 +42,10 @@ 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.sin.sin_family=AF_INET;
-       ca.sin.sin_port=htons(port);
-       if (inet_aton(trimmed,&ca.sin.sin_addr))
+       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);
        else
            cb(cst,0,0,0);
@@ -102,7 +101,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 +109,16 @@ 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: */
                    switch (ra->addr.sa.sa_family) {
                    case AF_INET:
-                       assert(ra->len == sizeof(ca->sin));
-                       ca->sin.sin_family=ra->addr.inet.sin_family;
-                       ca->sin.sin_addr=  ra->addr.inet.sin_addr;
-                       ca->sin.sin_port=  htons(q->port);
-                       wslot++;
+                       assert(ra->len == sizeof(ca->ia.sin));
                        break;
                    default:
-                       break;
+                       /* 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);