resolver: Support IPv6 name resolution

Tell adns (via ADNS_FEATURE_MANYAF) that we want mixed address
families in the results, and handle any IPv6 addresses we find.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/resolver.c b/resolver.c
index 9f7171630f0ebb18ae02ace2d075b7b2267d26b8..6477777f64c3d4b73aff5cc6f2fbfe2030ef8c5a 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -119,6 +119,15 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
                        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;
                    }

diff --git a/secnet.h b/secnet.h
index 81ffbcb9e6d0bd51431e1390e41b9bda13445f98..6a3f27059c265a403f6d46c480f69cb16624d5cd 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -3,6 +3,8 @@
 #ifndef secnet_h
 #define secnet_h
 
+#define ADNS_FEATURE_MANYAF
+
 #include "config.h"
 #include <stdlib.h>
 #include <stdarg.h>