more debugging shit

run-test10 does NOT crash although it prnts

diff --git a/Makefile.in b/Makefile.in
index c412fb7eb95ab5f956cda71fa727385e15ef7e6e..f523b8cb8ff18d2f637632879535d8cb924ca1b8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,8 @@ TESTS         =       run-test0               \
                        run-test6               \
                        run-test7               \
                        run-test8               \
-                       run-test9
+                       run-test9               \
+                       run-test10              
 
 COMPILE                = $(CC) $(CPPFLAGS) $(CFLAGS)
 COMP_LIB       = $(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS)
@@ -96,6 +97,8 @@ run-test8:    run-test8.o $(LIBDNS_OBJECTS) $(LIBOBJS)
                $(LINK) ${LIBS} -o $@ $+
 run-test9:     run-test9.o $(LIBDNS_OBJECTS) $(LIBOBJS)
                $(LINK) ${LIBS} -o $@ $+
+run-test10:    run-test10.o $(LIBDNS_OBJECTS) $(LIBOBJS)
+               $(LINK) ${LIBS} -o $@ $+
 
 run-test-trace:        run-test-trace.o $(LIBDNS_OBJECTS) $(LIBOBJS)
                $(LINK) ${LIBS} -o $@ $+
@@ -107,7 +110,6 @@ clean:
        rm -f *.o *.d
        rm -f $(TESTS)
        rm -rf autom4te.cache/
-       rm -f aclocal.m4
        rm -f config.status
        rm -f config.log
 
@@ -146,8 +148,12 @@ test7: run-test7
        ./run-test7
 test8: run-test8
        ./run-test8
+test9: run-test9
+       ./run-test9
+test10: run-test10
+       ./run-test10
 
-test: test0 test1 test2 test3 test4 test5 test6 test7 test8
+test: test0 test1 test2 test3 test4 test5 test6 test7 test8 test9 test10
 
 ## No need for changes here
 

diff --git a/host2str.c b/host2str.c
index 76c6e5b46561ecf001a665b3c67f6e492182d1be..2a2b5adea19aa28a244a13249350196988cd3d8a 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -687,7 +687,7 @@ ldns_rdf2buffer_str(ldns_buffer *buffer, ldns_rdf *rdf)
                case LDNS_RDF_TYPE_NONE:
                        break;
                case LDNS_RDF_TYPE_DNAME:
-                       res = ldns_rdf2buffer_str_dname(buffer, rdf);
+                       res = ldns_rdf2buffer_str_dname(buffer, rdf); 
                        break;
                case LDNS_RDF_TYPE_INT8:
                        res = ldns_rdf2buffer_str_int8(buffer, rdf);
@@ -757,7 +757,6 @@ ldns_rdf2buffer_str(ldns_buffer *buffer, ldns_rdf *rdf)
                        break;
                }
        }
-
        return LDNS_STATUS_OK;
 }
 
@@ -771,7 +770,7 @@ ldns_rr2buffer_str(ldns_buffer *output, ldns_rr *rr)
        const ldns_rr_descriptor *descriptor;
        
        if (ldns_rr_owner(rr)) {
-               status = ldns_rdf2buffer_str_dname(output, ldns_rr_owner(rr));  
+               status = ldns_rdf2buffer_str_dname(output, ldns_rr_owner(rr)); 
        }
        if (status != LDNS_STATUS_OK) {
                return status;
@@ -941,6 +940,8 @@ ldns_pkt2buffer_str(ldns_buffer *output, ldns_pkt *pkt)
                /* add some futher fields */
                ldns_buffer_printf(output, ";; Query time: %d msec\n", ldns_pkt_querytime(pkt));
                ldns_buffer_printf(output, ";; SERVER: %s\n", ldns_rdf2str(ldns_pkt_answerfrom(pkt))); 
+#if 0
+#endif
        } else {
                return ldns_buffer_status(output);
        }
@@ -982,6 +983,7 @@ char *
 ldns_rr2str(ldns_rr *rr)
 {
        char *result = NULL;
+       /* XXX MACTEXTSTR???? */
        ldns_buffer *tmp_buffer = ldns_buffer_new(1000);
 
        if (ldns_rr2buffer_str(tmp_buffer, rr) == LDNS_STATUS_OK) {
@@ -997,6 +999,7 @@ char *
 ldns_pkt2str(ldns_pkt *pkt)
 {
        char *result = NULL;
+       /* XXX MAXTEXTPACKET?? */
        ldns_buffer *tmp_buffer = ldns_buffer_new(65535);
 
        if (ldns_pkt2buffer_str(tmp_buffer, pkt) == LDNS_STATUS_OK) {

diff --git a/net.c b/net.c
index b4f698072d10542daa14289bf7783714c9054aca..6865e70f8def1455335bc07e5ea061070dc2c0fe 100644 (file)
--- a/net.c
+++ b/net.c
@@ -65,7 +65,7 @@ ldns_send(ldns_resolver *r, ldns_pkt *query_pkt)
        ldns_rdf **ns_array;
        ldns_pkt *reply;
        ldns_buffer *qb;
-
+       
        ns_array = ldns_resolver_nameservers(r);
        reply = NULL; ns_len = 0;
        
@@ -109,6 +109,9 @@ ldns_send(ldns_resolver *r, ldns_pkt *query_pkt)
                        ldns_pkt_set_querytime(reply,
                                ((tv_e.tv_sec - tv_s.tv_sec) * 1000) +
                                (tv_e.tv_usec - tv_s.tv_usec) / 1000);
+                       printf("%x", ns_array[i]);
+                       printf("the answerfrom server\n");
+                       ldns_rdf_print(stdout, ns_array[i]);
                        ldns_pkt_set_answerfrom(reply, ns_array[i]);
                        break;
                }

diff --git a/packet.c b/packet.c
index 33ba6f46717605266e2be0e1a9bd31e5a9437336..1b13e9a91b8706723ad8b7b33bfd97f21045da59 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -334,6 +334,7 @@ ldns_pkt_new()
        packet->_additional = ldns_rr_list_new();
 
        ldns_pkt_set_querytime(packet, 0);
+       packet->_answerfrom = MALLOC(ldns_rdf);
        ldns_pkt_set_answerfrom(packet, NULL);
        
        return packet;

diff --git a/run-test10.c b/run-test10.c
new file mode 100644 (file)
index 0000000..7ed6509
--- /dev/null
+++ b/run-test10.c
@@ -0,0 +1,33 @@
+/**
+ * An example ldns program
+ *
+ * Setup a resolver
+ * Query a nameserver
+ * Print the result
+ */
+
+#include <config.h>
+#include <ldns/resolver.h>
+        
+int
+main(void)
+{       
+        ldns_pkt *pkt;
+       ldns_rdf *name;
+
+       name = ldns_dname_new_frm_str("www.miek.nl");
+       
+       pkt = ldns_pkt_query_new(name, LDNS_RR_TYPE_AAAA, 0, LDNS_RD);
+       ldns_pkt_set_answerfrom(pkt, name);
+       ldns_pkt_print(stdout, pkt);
+
+       pkt = ldns_pkt_query_new(name, LDNS_RR_TYPE_AAAA, 0, LDNS_RD);
+       ldns_pkt_set_answerfrom(pkt, name);
+       ldns_pkt_print(stdout, pkt);
+       
+       pkt = ldns_pkt_query_new(name, LDNS_RR_TYPE_AAAA, 0, LDNS_RD);
+       ldns_pkt_set_answerfrom(pkt, name);
+       ldns_pkt_print(stdout, pkt);
+       
+        return 0;
+}

diff --git a/run-test9.c b/run-test9.c
index 917f869cb1d8d24100a8f1c837888a6ca43c20eb..0ca50d583bb74bb167b071a111c5078ba50a1a7a 100644 (file)
--- a/run-test9.c
+++ b/run-test9.c
@@ -36,7 +36,12 @@ main(void)
 
         qname = ldns_dname_new_frm_str("www.miek.nl.");
         pkt = ldns_resolver_send(res, qname, LDNS_RR_TYPE_A, 0, LDNS_RD);
+       if (pkt) {
+               ldns_pkt_print(stdout, pkt);
+       }
         pkt = ldns_resolver_send(res, qname, LDNS_RR_TYPE_A, 0, LDNS_RD);
-       ldns_pkt_print(stdout, pkt);
+       if (pkt) {
+               ldns_pkt_print(stdout, pkt);
+       }
         return 0;
 }