]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
lint, removed printfs
authorMiek Gieben <miekg@NLnetLabs.nl>
Wed, 2 Feb 2005 10:14:34 +0000 (10:14 +0000)
committerMiek Gieben <miekg@NLnetLabs.nl>
Wed, 2 Feb 2005 10:14:34 +0000 (10:14 +0000)
ldns/resolver.h
net.c

index 05dfd178906b54d49ec3705189d9dbfce11028ab..7b67ca13a54c418fe93b6a0f04573d0c67cd25cb 100644 (file)
@@ -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 bcb6e236f411dafa986547a53047f933a3729e81..386c839bd702b0aede4e392b42649909d846ca0a 100644 (file)
--- 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;
        }