From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Wed, 2 Feb 2005 10:14:34 +0000 (+0000)
Subject: lint, removed printfs
X-Git-Tag: release-0.50~468
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade73204e4dbd5b05b005531dedc7f17cab1bba5;p=thirdparty%2Fldns.git

lint, removed printfs
---

diff --git a/ldns/resolver.h b/ldns/resolver.h
index 05dfd178..7b67ca13 100644
--- a/ldns/resolver.h
+++ b/ldns/resolver.h
@@ -66,6 +66,10 @@ uint16_t ldns_resolver_port(ldns_resolver *);
 /* ldns_rr_list * ldns_resolver_nameservers(ldns_resolver *) pop>? */
 uint8_t ldns_resolver_recursive(ldns_resolver *);
 uint8_t ldns_resolver_debug(ldns_resolver *);
+uint8_t ldns_resolver_usevc(ldns_resolver *);
+
+size_t ldns_resolver_nameserver_count(ldns_resolver *);
+
 ldns_rdf * ldns_resolver_domain(ldns_resolver *);
 ldns_rdf ** ldns_resolver_searchlist(ldns_resolver *);
 ldns_rdf ** ldns_resolver_nameservers(ldns_resolver *);
diff --git a/net.c b/net.c
index bcb6e236..386c839b 100644
--- a/net.c
+++ b/net.c
@@ -21,6 +21,7 @@
 #include <ldns/host2wire.h>
 #include <ldns/host2str.h>
 #include <ldns/resolver.h>
+#include <ldns/net.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -56,14 +57,14 @@ ldns_send(ldns_resolver *r, ldns_pkt *query_pkt)
 	struct sockaddr_storage *ns;
 	struct sockaddr_in *ns4;
 	struct sockaddr_in6 *ns6;
-	size_t ns_len;
+	socklen_t ns_len;
 
 	ldns_rdf **ns_array;
 	ldns_pkt *reply;
 	ldns_buffer *qb;
 
 	ns_array = ldns_resolver_nameservers(r);
-	reply = NULL;
+	reply = NULL; ns_len = 0;
 	
 	printf("we are in ldns_send()\n");
 	qb = ldns_buffer_new(MAX_PACKET_SIZE);
@@ -73,8 +74,6 @@ ldns_send(ldns_resolver *r, ldns_pkt *query_pkt)
 		return NULL;
 	}
 
-	printf("nameservers %d\n",ldns_resolver_nameserver_count(r));
-	
 	/* loop through all defined nameservers */
 	for (i = 0; i < ldns_resolver_nameserver_count(r); i++) {
 
@@ -208,7 +207,7 @@ ldns_send_tcp(ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t to
 
 	gettimeofday(&tv_s, NULL);
 
-	if ((sockfd = socket((int)((struct sockaddr*)to)->sa_family, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
+	if ((sockfd = socket((int)((struct sockaddr*)to)->sa_family, SOCK_STREAM, IPPROTO_UDP)) == -1) {
 		printf("could not open socket\n");
 		return NULL;
 	}