dnslookup: minor cleanups

diff --git a/include/dnslookup.h b/include/dnslookup.h
index 3581794e1052586921f439dff65961f531f88cef..38e529ab1f615ee6b455c2dd494d875b00008379 100644 (file)
--- a/include/dnslookup.h
+++ b/include/dnslookup.h
@@ -36,7 +36,7 @@
 
 struct DNSContext;
 
-typedef void (*adns_callback_f)(void *arg, const struct sockaddr *ai, int salen);
+typedef void (*adns_callback_f)(void *arg, const struct sockaddr *sa, int salen);
 
 struct DNSContext *adns_create_context(void);
 void adns_reload(struct DNSContext *ctx);

diff --git a/src/dnslookup.c b/src/dnslookup.c
index 1bca94f73422cc20d574017c778d560ebc56f96b..40a2933167f15d18a38b0f47ee6deb60a5fd237c 100644 (file)
--- a/src/dnslookup.c
+++ b/src/dnslookup.c
@@ -108,7 +108,6 @@ static void dns_signal(int f, short ev, void *arg)
 
                /* got one */
                list_del(&rq->node);
-               rq->req->done = true;
                got_result_gai(e, rq->gairq.ar_result, rq->req);
                free(rq);
        }
@@ -196,8 +195,9 @@ static bool impl_init(struct DNSContext *ctx)
 static void impl_launch_query(struct DNSRequest *req)
 {
        struct evdns_getaddrinfo_request *gai_req;
+       struct evdns_base *dns = req->ctx->edns;
 
-       gai_req = evdns_getaddrinfo(req->ctx->edns, req->name, NULL, NULL, got_result_gai, req);
+       gai_req = evdns_getaddrinfo(dns, req->name, NULL, NULL, got_result_gai, req);
        log_noise("dns: evdns_getaddrinfo(%s)=%p", req->name, gai_req);
 }