test defnames, small other fixes

diff --git a/ldns/resolver.h b/ldns/resolver.h
index 673da568700712242d77b56446aae4fd8d32bab8..b51395759a0f28d0f727204b156a15b7ef5c5e95 100644 (file)
--- a/ldns/resolver.h
+++ b/ldns/resolver.h
@@ -95,5 +95,6 @@ ldns_resolver *ldns_resolver_new(void);
 void ldns_resolver_free(ldns_resolver *);
 void ldns_resolver_set_defnames(ldns_resolver *, bool);
 void ldns_resolver_set_usevc(ldns_resolver *, bool);
+void ldns_resolver_set_dnsrch(ldns_resolver *, bool);
 
 #endif  /* !_LDNS_RESOLVER_H */

diff --git a/run-test7.c b/run-test7.c
index faae4d495a6d37d06591d6d7470502ec746c9403..d219539a0d011b5dc7fd00bb713c225fb5f0448c 100644 (file)
--- a/run-test7.c
+++ b/run-test7.c
@@ -7,8 +7,7 @@
  */
 
 #include <config.h>
-#include <ldns/resolver.h>
-#include <ldns/host2str.h>        
+#include <ldns/dns.h>
 
 void
 print_usage(char *file)
@@ -24,6 +23,7 @@ main(int argc, char **argv)
         ldns_resolver *res;
         ldns_rdf *qname;
         ldns_rdf *nameserver;
+       ldns_rdf *default_dom;
         ldns_pkt *pkt;
         char *server_ip = NULL;
         char *name = NULL;
@@ -43,38 +43,31 @@ main(int argc, char **argv)
                 return 1;
 
         /* create a default domain and add it */
-/*
-        default_dom = ldns_rdf_new_frm_str("miek.nl.", LDNS_RDF_TYPE_DNAME);
-       if (!default_dom) {
-               printf("error default dom\n");
-               return 1;
-       }
-*/
+
+        default_dom = ldns_dname_new_frm_str("miek.nl.");
+        ldns_resolver_set_domain(res, default_dom);
+       ldns_resolver_set_defnames(res, true); /* use the suffix */
+
         nameserver  = ldns_rdf_new_frm_str(server_ip, LDNS_RDF_TYPE_A);
        if (!nameserver) {
                printf("Bad server ip\n");
                return 1;
        }
 
-/*
-        if (ldns_resolver_set_domain(res, default_dom) != LDNS_STATUS_OK) {
-               printf("error set domain\n");
-                return 1;
-       }
-*/
+
+
         if (ldns_resolver_push_nameserver(res, nameserver) != LDNS_STATUS_OK) {
                printf("error push nameserver\n");
                 return 1;
        }
-
         /* setup the question */
-        qname = ldns_rdf_new_frm_str(name, LDNS_RDF_TYPE_DNAME);
+        qname = ldns_dname_new_frm_str(name);
        if (!qname) {
                printf("error making qname\n");
                 return 1;
        }
         
-        pkt = ldns_resolver_send(res, qname, ldns_rr_get_type_by_name(type), 0, LDNS_RD);
+        pkt = ldns_resolver_query(res, qname, ldns_rr_get_type_by_name(type), 0, LDNS_RD);
 
        if (!pkt)  {
                printf("error pkt sending\n");