X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/08b62a6c691fe0e772c74de9d60803afcb7d2aa9..e250348a36edbf9b92d548770b03aad364c29dce:/resolver.c

diff --git a/resolver.c b/resolver.c
index d104c36..6088c56 100644
--- a/resolver.c
+++ b/resolver.c
@@ -34,8 +34,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 +49,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,msg);
+	} else {
+	    cb(cst,&ca,1,1,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,0);
 	else
-	    cb(cst,0,0,0);
+	    cb(cst,0,0,0,"invalid IP address");
+#endif
 	return True;
     }
 
@@ -95,7 +116,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,adns_strerror(ans->status));
 		free(q);
 		free(ans);
 	    } else {
@@ -115,6 +136,11 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
 		    case AF_INET:
 			assert(ra->len == sizeof(ca->ia.sin));
 			break;
+#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;
@@ -122,7 +148,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,0);
 		free(q);
 		free(ans);
 	    }