bugfix #769: Add support for :: in an IPv6 address

Thanks Hajimu UMEMOTO

diff --git a/Changelog b/Changelog
index a39aef9336ae113aa5f190da8269f683aa3ce212..6256aff055501022bb67fcb0622bd867792d0342 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -79,6 +79,8 @@ TBD
          Thanks Christoph Egger
        * bugfix #796 - #792: Fix miscellaneous compiler warning issues.
          Thanks Ngie Cooper
+       * bugfix #769: Add support for :: in an IPv6 address
+         Thanks Hajimu UMEMOTO
 
 1.6.17 2014-01-10
        * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a

diff --git a/drill/drill.c b/drill/drill.c
index d59c6743a2efd7fa02300ccc41ffd8d855ae048e..6b190d9fe942f38593d8811e218410092610a05e 100644 (file)
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -166,6 +166,9 @@ main(int argc, char *argv[])
 
        int             result = 0;
 
+       struct in6_addr s6addr;
+       char canon_addr[INET6_ADDRSTRLEN], *p;
+
 #ifdef USE_WINSOCK
        int r;
        WSADATA wsa_data;
@@ -740,6 +743,15 @@ main(int argc, char *argv[])
                                if (strchr(name, '.')) {
                                        error("Syntax error: both '.' and ':' seen in address\n");
                                }
+                               if (inet_pton(AF_INET6, name, &s6addr) == 1) {
+                                       p = canon_addr;
+                                       for (i = 0; i < 16; i += 2) {
+                                               if (i > 0)
+                                                       *p++ = ':';
+                                               p += sprintf(p, "%02x%02x", s6addr.s6_addr[i], s6addr.s6_addr[i + 1]);
+                                       }
+                                       name = canon_addr;
+                               }
                                name2 = malloc(IP6_ARPA_MAX_LEN + 20);
                                c = 0;
                                for (i=0; i<(int)strlen(name); i++) {