testing for ip6 addr printen. Everything is ok

diff --git a/host2str.c b/host2str.c
index 0b55ffb31601c4a77d60e669dfe8dac252253560..82b94ff3d1b5fc590bf6657a56c9aacaf95052fd 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -190,7 +190,7 @@ ldns_rdf2buffer_str_a(ldns_buffer *output, ldns_rdf *rdf)
 ldns_status
 ldns_rdf2buffer_str_aaaa(ldns_buffer *output, ldns_rdf *rdf)
 {
-       char str[INET6_ADDRSTRLEN + 1];
+       char str[INET6_ADDRSTRLEN];
 
        if (inet_ntop(AF_INET6, ldns_rdf_data(rdf), str, INET6_ADDRSTRLEN)) {
                ldns_buffer_printf(output, "%s", str);

diff --git a/run-test19.c b/run-test19.c
index 09bf81e2dce9721db7e4b200b4292d3619fc531e..c51de3096dee81dd8be37923b8bc422bdfe6ba08 100644 (file)
--- a/run-test19.c
+++ b/run-test19.c
@@ -26,14 +26,43 @@ main()
                printf("something wrong?\n");
        }
 
+       printf("::0\n");
        aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "::0");
        ldns_rdf_print(stdout, aaaa);
        printf("\n\n");
-       ldns_resolver_print(stdout, r);
+       printf("0::1\n");
+       aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "0::1");
+       ldns_rdf_print(stdout, aaaa);
+       printf("\n\n");
+       printf("0::0\n");
+       aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "0::0");
+       ldns_rdf_print(stdout, aaaa);
+       printf("\n\n");
+       printf("ff:192.168.1.1\n");
+       aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "ff:192.168.1.1");
+       ldns_rdf_print(stdout, aaaa);
+       printf("\n\n");
+       printf("::A0\n");
+       aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "::A0");
+       ldns_rdf_print(stdout, aaaa);
+       printf("\n\n");
+       printf("FF:0:0:0:0::1\n");
+       aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "FF:0:0:0:0::1");
+       ldns_rdf_print(stdout, aaaa);
+       printf("\n\n");
+       printf("FF:0:0:0:1::0\n");
+       aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "FF:0:0:0:1::0");
+       ldns_rdf_print(stdout, aaaa);
+       printf("\n\n");
+       printf("FF:0:0:0:1::0:1\n");
+       aaaa = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_AAAA, "FF:0:0:0:1::0:1");
+       ldns_rdf_print(stdout, aaaa);
+       printf("\n\n");
 
+       /*
        hosts = ldns_get_rr_list_hosts_frm_file(NULL);
-
        ldns_rr_list_print(stdout, hosts);
+       */
        
        return 0;
 }

diff --git a/str2host.c b/str2host.c
index 14e497e963151d724ddc943044f96579253ba141..f55a47fed9bbe5365bd4b8e363fb454812317971 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -260,8 +260,6 @@ ldns_str2rdf_aaaa(ldns_rdf **rd, const char *str)
        if (inet_pton(AF_INET6, (char*)str, address) != 1) {
                return LDNS_STATUS_INVALID_IP6;
        } else {
-               /* MIEK */
-               printf("str2rdf aaaa str [%s] %d\n", str, (int)sizeof(address));
                *rd = ldns_rdf_new_frm_data(
                        LDNS_RDF_TYPE_AAAA, sizeof(address), &address);
        }