From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Tue, 22 Feb 2005 10:20:06 +0000 (+0000)
Subject: allow external progs to include only ldns/dns.h. Some other tweaks
X-Git-Tag: release-0.50~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af50c07e77af0bed9fe53bf735489c19eae15fd0;p=thirdparty%2Fldns.git

allow external progs to include only ldns/dns.h. Some other tweaks
---

diff --git a/ldns/dns.h b/ldns/dns.h
index 65fb5391..ad4cd526 100644
--- a/ldns/dns.h
+++ b/ldns/dns.h
@@ -11,6 +11,23 @@
 #ifndef _DNS_H_
 #define _DNS_H_
 
+#include <util.h>
+#include <ldns/buffer.h>
+#include <ldns/common.h>
+#include <ldns/dname.h>
+#include <ldns/dns.h>
+#include <ldns/error.h>
+#include <ldns/host2str.h>
+#include <ldns/host2wire.h>
+#include <ldns/ldns.h>
+#include <ldns/net.h>
+#include <ldns/packet.h>
+#include <ldns/rdata.h>
+#include <ldns/resolver.h>
+#include <ldns/rr.h>
+#include <ldns/str2host.h>
+#include <ldns/wire2host.h>
+
 #define LDNS_IP4ADDRLEN      (32/8)
 #define LDNS_IP6ADDRLEN      (128/8)
 #define LDNS_PORT	53
diff --git a/ldns/resolver.h b/ldns/resolver.h
index 7f62acd8..673da568 100644
--- a/ldns/resolver.h
+++ b/ldns/resolver.h
@@ -92,7 +92,8 @@ ldns_pkt * ldns_resolver_query(ldns_resolver *, ldns_rdf*, ldns_rr_type, ldns_rr
 ldns_pkt * ldns_resolver_search(ldns_resolver *, ldns_rdf*, ldns_rr_type, ldns_rr_class, uint16_t);
 
 ldns_resolver *ldns_resolver_new(void);
-void ldns_resolver_set_defnames(ldns_resolver *r, bool d);
-void ldns_resolver_set_usevc(ldns_resolver *r, bool vc);
+void ldns_resolver_free(ldns_resolver *);
+void ldns_resolver_set_defnames(ldns_resolver *, bool);
+void ldns_resolver_set_usevc(ldns_resolver *, bool);
 
 #endif  /* !_LDNS_RESOLVER_H */
diff --git a/resolver.c b/resolver.c
index 5c5b423c..e48986cb 100644
--- a/resolver.c
+++ b/resolver.c
@@ -258,15 +258,6 @@ ldns_resolver_new(void)
 void
 ldns_resolver_free(ldns_resolver *res)
 {
-	size_t i;
-/*
-	for (i = 0; i < res->_nameserver_count; i++) {
-		ldns_rdf_free(res->_nameservers[i]);
-	}
-	for (i = 0; i < res->_searchlist_count; i++) {
-		ldns_rdf_free(res->_searchlist[i]);
-	}
-*/
 	FREE(res->_searchlist);
 	FREE(res->_nameservers);
 	FREE(res);
@@ -304,7 +295,6 @@ ldns_pkt *
 ldns_resolver_query(ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr_class class,
                 uint16_t flags)
 {
-	ldns_rdf *domainname;
 	ldns_rdf *newname;
 	ldns_pkt *pkt;
 	
@@ -321,10 +311,7 @@ ldns_resolver_query(ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr
 	if (!newname) {
 		return NULL;
 	}
-	ldns_rdf_print(stdout, newname);
-	printf("the new name\n");
 	pkt = ldns_resolver_send(r, newname, type, class, flags);
-	
 	ldns_rdf_free(newname);
 	return pkt;
 }