resolver: Log reason for DNS resolution failure

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/resolver.c b/resolver.c
index d203a9683b76e4f5d044a6f120a1b6382368b15e..83afd2f50654b9ca037a6ee8e579dddad6e9d6dc 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -47,9 +47,9 @@ static bool_t resolve_request(void *sst, cstring_t name,
        ca.ia.sin.sin_family=AF_INET;
        ca.ia.sin.sin_port=htons(port);
        if (inet_aton(trimmed,&ca.ia.sin.sin_addr))
-           cb(cst,&ca,1,1);
+           cb(cst,&ca,1,1,0);
        else
-           cb(cst,0,0,0);
+           cb(cst,0,0,0,"invalid IP address");
        return True;
     }
 
@@ -95,7 +95,7 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
        if (rv==0) {
            q=qp;
            if (ans->status!=adns_s_ok) {
-               q->answer(q->cst,NULL,0,0); /* Failure */
+               q->answer(q->cst,NULL,0,0,adns_strerror(ans->status));
                free(q);
                free(ans);
            } else {
@@ -127,7 +127,7 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds)
                    memcpy(&ca->ia,&ra->addr,ra->len);
                    wslot++;
                }
-               q->answer(q->cst,ca_buf,wslot,total);
+               q->answer(q->cst,ca_buf,wslot,total,0);
                free(q);
                free(ans);
            }

diff --git a/secnet.h b/secnet.h
index ad4d91cce83bac3db2a2a67ca4e51407d2f4b7e3..6724698c2b7cc84f2c4de6296df6a01cc9abb9ea 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -297,7 +297,8 @@ struct buffer_if;
    actually found in the DNS, which may be bigger if addrs is equal
    to MAX_PEER_ADDRS (ie there were too many). */
 typedef void resolve_answer_fn(void *st, const struct comm_addr *addrs,
-                              int naddrs, int was_naddrs);
+                              int naddrs, int was_naddrs,
+                              const char *failwhy);
 typedef bool_t resolve_request_fn(void *st, cstring_t name,
                                  int remoteport, struct comm_if *comm,
                                  resolve_answer_fn *cb, void *cst);

diff --git a/site.c b/site.c
index d360699214bdd5b54bffa8738193ce06099b9a5d..15dace88d3c74f0e22a35b891d91a061c311877e 100644 (file)
--- a/site.c
+++ b/site.c
@@ -1191,7 +1191,8 @@ static bool_t send_msg(struct site *st)
 }
 
 static void site_resolve_callback(void *sst, const struct comm_addr *addrs,
-                                 int naddrs, int was_naddrs)
+                                 int naddrs, int was_naddrs,
+                                 const char *failwhy)
 {
     struct site *st=sst;
 
@@ -1206,7 +1207,7 @@ static void site_resolve_callback(void *sst, const struct comm_addr *addrs,
                 was_naddrs, naddrs);
        }
     } else {
-       slog(st,LOG_ERROR,"resolution of %s failed",st->address);
+       slog(st,LOG_ERROR,"resolution of %s failed: %s",st->address,failwhy);
     }
 
     switch (st->state) {