X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=resolver.c;h=a39e9fcde510dea5e96bf81dcf05aad079ea982d;hb=9c44ef13ed639445ee2e8a4037f7b3c5fcc11aa2;hp=d203a9683b76e4f5d044a6f120a1b6382368b15e;hpb=0e646750a699f6dac806c7752c81d160c4f78987;p=secnet.git

diff --git a/resolver.c b/resolver.c
index d203a96..a39e9fc 100644
--- a/resolver.c
+++ b/resolver.c
@@ -20,6 +20,7 @@ struct adns {
 
 struct query {
     void *cst;
+    const char *name;
     int port;
     struct comm_if *comm;
     resolve_answer_fn *answer;
@@ -34,8 +35,13 @@ static bool_t resolve_request(void *sst, cstring_t name,
     struct adns *st=sst;
     struct query *q;
     int rv;
-    const int maxlitlen=50;
-
+    const int maxlitlen=
+#ifdef CONFIG_IPV6
+	ADNS_ADDR2TEXT_BUFLEN*2
+#else
+	50
+#endif
+	;
     ssize_t l=strlen(name);
     if (name[0]=='[' && l<maxlitlen && l>2 && name[l-1]==']') {
 	char trimmed[maxlitlen+1];
@@ -44,12 +50,28 @@ static bool_t resolve_request(void *sst, cstring_t name,
 	struct comm_addr ca;
 	ca.comm=comm;
 	ca.ix=-1;
+#ifdef CONFIG_IPV6
+	socklen_t salen=sizeof(ca.ia);
+	rv=adns_text2addr(trimmed, port, adns_qf_addrlit_ipv4_quadonly,
+			  &ca.ia.sa, &salen);
+	assert(rv!=ENOSPC);
+	if (rv) {
+	    char msg[250];
+	    snprintf(msg,sizeof(msg),"invalid address literal: %s",
+		     strerror(rv));
+	    msg[sizeof(msg)-1]=0;
+	    cb(cst,0,0,0,name,msg);
+	} else {
+	    cb(cst,&ca,1,1,name,0);
+	}
+#else
 	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,name,0);
 	else
-	    cb(cst,0,0,0);
+	    cb(cst,0,0,0,name,"invalid IP address");
+#endif
 	return True;
     }
 
@@ -57,6 +79,7 @@ static bool_t resolve_request(void *sst, cstring_t name,
     q->cst=cst;
     q->comm=comm;
     q->port=port;
+    q->name=name;
     q->answer=cb;
 
     rv=adns_submit(st->ast, name, adns_r_addr, 0, q, &q->query);
@@ -95,7 +118,7 @@ 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,q->name,adns_strerror(ans->status));
 		free(q);
 		free(ans);
 	    } else {
@@ -127,7 +150,7 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
 		    memcpy(&ca->ia,&ra->addr,ra->len);
 		    wslot++;
 		}
-		q->answer(q->cst,ca_buf,wslot,total);
+		q->answer(q->cst,ca_buf,wslot,total,q->name,0);
 		free(q);
 		free(ans);
 	    }
@@ -177,7 +200,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);
 }