X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=resolver.c;h=f2023fa0589289eb67d2ee192aa086c152f943c1;hp=8ffdc28f96b1fb8daeabb351ff056f4174ba67d3;hb=2f541b16b1fab22c46b9d172d0199d62ca0fe76f;hpb=4f5e39ecfaa49376b0a5c3a4c384e91a828c1105

diff --git a/resolver.c b/resolver.c
index 8ffdc28..f2023fa 100644
--- a/resolver.c
+++ b/resolver.c
@@ -2,10 +2,13 @@
 
 #include <errno.h>
 #include "secnet.h"
+#include "util.h"
 #ifndef HAVE_LIBADNS
 #error secnet requires ADNS version 1.0 or above
 #endif
 #include <adns.h>
+#include <arpa/inet.h>
+#include <string.h>
 
 
 struct adns {
@@ -17,36 +20,66 @@ struct adns {
 
 struct query {
     void *cst;
+    int port;
+    struct comm_if *comm;
     resolve_answer_fn *answer;
     adns_query query;
 };
 
-static bool_t resolve_request(void *sst, string_t name,
+static resolve_request_fn resolve_request;
+static bool_t resolve_request(void *sst, cstring_t name,
+			      int port, struct comm_if *comm,
 			      resolve_answer_fn *cb, void *cst)
 {
     struct adns *st=sst;
     struct query *q;
     int rv;
+    const int maxlitlen=50;
+
+    ssize_t l=strlen(name);
+    if (name[0]=='[' && l<maxlitlen && l>2 && name[l-1]==']') {
+	char trimmed[maxlitlen+1];
+	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,0);
+	else
+	    cb(cst,0,0,"invalid IP address");
+	return True;
+    }
 
     q=safe_malloc(sizeof *q,"resolve_request");
     q->cst=cst;
+    q->comm=comm;
+    q->port=port;
     q->answer=cb;
 
-    rv=adns_submit(st->ast, name, adns_r_a, 0, q, &q->query);
+    rv=adns_submit(st->ast, name, adns_r_addr, 0, q, &q->query);
+    if (rv) {
+        Message(M_WARNING,
+		"resolver: failed to submit lookup for %s: %s",name,
+		adns_strerror(rv));
+	free(q);
+	return False;
+    }
 
-    return rv==0;
+    return True;
 }
 
 static int resolver_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
-			       int *timeout_io, const struct timeval *tv_now,
-			       uint64_t *now)
+			       int *timeout_io)
 {
     struct adns *st=sst;
     return adns_beforepoll(st->ast, fds, nfds_io, timeout_io, tv_now);
 }
 
-static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds,
-			       const struct timeval *tv_now, uint64_t *now)
+static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
 {
     struct adns *st=sst;
     adns_query aq;
@@ -63,11 +96,43 @@ 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); /* Failure */
+		q->answer(q->cst,NULL,0,adns_strerror(ans->status));
 		free(q);
 		free(ans);
 	    } else {
-		q->answer(q->cst,ans->rrs.inaddr);
+		int rslot, wslot;
+		int ca_len=MIN(ans->nrrs,MAX_PEER_ADDRS);
+		struct comm_addr ca_buf[ca_len];
+		FILLZERO(ca_buf);
+		for (rslot=0, wslot=0;
+		     rslot<ans->nrrs && wslot<ca_len;
+		     rslot++) {
+		    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->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;
+#ifdef CONFIG_IPV6
+		    case AF_INET6:
+			assert(ra->len == sizeof(ca->ia.sin6));
+			ca->ia.sin6.sin6_family=ra->addr.inet6.sin6_family;
+			ca->ia.sin6.sin6_addr=  ra->addr.inet6.sin6_addr;
+			ca->ia.sin6.sin6_port=  htons(q->port);
+			wslot++;
+			break;
+#endif /*CONFIG_IPV6*/
+		    default:
+			break;
+		    }
+		}
+		q->answer(q->cst,ca_buf,wslot,0);
 		free(q);
 		free(ans);
 	    }
@@ -122,7 +187,6 @@ static list_t *adnsresolver_apply(closure_t *self, struct cloc loc,
     return new_closure(&st->cl);
 }
 
-init_module resolver_module;
 void resolver_module(dict_t *dict)
 {
     add_closure(dict,"adns",adnsresolver_apply);