X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/bc07424dca80830704295cc1cfee04da75479f8c..6c5889e68832bfd96fdd1de7e6df4309e7017372:/resolver.c

diff --git a/resolver.c b/resolver.c
index 2466245..2bc7d06 100644
--- a/resolver.c
+++ b/resolver.c
@@ -75,7 +75,7 @@ static bool_t resolve_request(void *sst, cstring_t name,
 	return True;
     }
 
-    q=safe_malloc(sizeof *q,"resolve_request");
+    NEW(q);
     q->cst=cst;
     q->comm=comm;
     q->port=port;
@@ -134,20 +134,23 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
 		    struct comm_addr *ca=&ca_buf[wslot];
 		    ca->comm=q->comm;
 		    ca->ix=-1;
+		    assert(ra->len <= (int)sizeof(ca->ia));
+		    memcpy(&ca->ia,&ra->addr,ra->len);
 		    switch (ra->addr.sa.sa_family) {
 		    case AF_INET:
 			assert(ra->len == sizeof(ca->ia.sin));
+			ca->ia.sin.sin_port=htons(q->port);
 			break;
 #ifdef CONFIG_IPV6
 		    case AF_INET6:
 			assert(ra->len == sizeof(ca->ia.sin6));
+			ca->ia.sin6.sin6_port=htons(q->port);
 			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->name,0);
@@ -173,7 +176,7 @@ static list_t *adnsresolver_apply(closure_t *self, struct cloc loc,
     item_t *i;
     string_t conf;
 
-    st=safe_malloc(sizeof(*st),"adnsresolver_apply");
+    NEW(st);
     st->cl.description="adns";
     st->cl.type=CL_RESOLVER;
     st->cl.apply=NULL;
@@ -200,7 +203,7 @@ static list_t *adnsresolver_apply(closure_t *self, struct cloc loc,
     }
 
     register_for_poll(st, resolver_beforepoll, resolver_afterpoll,
-		      ADNS_POLLFDS_RECOMMENDED+5,"resolver");
+		      "resolver");
 
     return new_closure(&st->cl);
 }