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 d104c363f775de7dcb3e40e1829de2e54c42ce46..d203a9683b76e4f5d044a6f120a1b6382368b15e 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -115,6 +115,11 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
                    case AF_INET:
                        assert(ra->len == sizeof(ca->ia.sin));
                        break;
                    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;
                    default:
                        /* silently skip unexpected AFs from adns */
                        continue;

diff --git a/secnet.h b/secnet.h
index ead74716e3fd7e18a2c51cac78278350534cc74f..ad4d91cce83bac3db2a2a67ca4e51407d2f4b7e3 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -3,6 +3,8 @@
 #ifndef secnet_h
 #define secnet_h
 
 #ifndef secnet_h
 #define secnet_h
 

+#define ADNS_FEATURE_MANYAF
+

 #include "config.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "config.h"
 #include <stdlib.h>
 #include <stdarg.h>