Python IP addresses: Remove sys.path hacking from test script

[secnet.git] / resolver.c

diff --git a/resolver.c b/resolver.c
index 5360966a056e348dc11cc543cc8432e78ae58964..f2c620b70994a8010ef372dcb60080fb66838d4b 100644 (file)
--- 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,29 @@ static bool_t resolve_request(void *sst, cstring_t name,
        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))
-           cb(cst,&ca,1);
+       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,msg);
+       } else {
+           cb(cst,&ca,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,0);
        else
-           cb(cst,0,0);
+           cb(cst,0,0,"invalid IP address");
+#endif
        return True;
     }
 
@@ -95,7 +117,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); /* Failure */
+               q->answer(q->cst,NULL,0,adns_strerror(ans->status));
                free(q);
                free(ans);
            } else {
@@ -112,17 +134,26 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
                    /* 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);
+                       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);
+               q->answer(q->cst,ca_buf,wslot,0);
                free(q);
                free(ans);
            }