resolver: Provide input name as argument to callback

This is going to be convenient for our one call site.

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

diff --git a/resolver.c b/resolver.c
index 6088c562ed5c3d603756fb793f88fa46b8cc6466..2466245f12c43689a0ce8eeba3133939811f77e7 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -20,6 +20,7 @@ struct adns {
 
 struct query {
     void *cst;
+    const char *name;
     int port;
     struct comm_if *comm;
     resolve_answer_fn *answer;
@@ -59,17 +60,17 @@ static bool_t resolve_request(void *sst, cstring_t name,
            snprintf(msg,sizeof(msg),"invalid address literal: %s",
                     strerror(rv));
            msg[sizeof(msg)-1]=0;
-           cb(cst,0,0,0,msg);
+           cb(cst,0,0,0,name,msg);
        } else {
-           cb(cst,&ca,1,1,0);
+           cb(cst,&ca,1,1,name,0);
        }
 #else
        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,0);
+           cb(cst,&ca,1,1,name,0);
        else
-           cb(cst,0,0,0,"invalid IP address");
+           cb(cst,0,0,0,name,"invalid IP address");
 #endif
        return True;
     }
@@ -78,6 +79,7 @@ static bool_t resolve_request(void *sst, cstring_t name,
     q->cst=cst;
     q->comm=comm;
     q->port=port;
+    q->name=name;
     q->answer=cb;
 
     rv=adns_submit(st->ast, name, adns_r_addr, 0, q, &q->query);
@@ -116,7 +118,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,adns_strerror(ans->status));
+               q->answer(q->cst,NULL,0,0,q->name,adns_strerror(ans->status));
                free(q);
                free(ans);
            } else {
@@ -148,7 +150,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,0);
+               q->answer(q->cst,ca_buf,wslot,total,q->name,0);
                free(q);
                free(ans);
            }

diff --git a/secnet.h b/secnet.h
index 6724698c2b7cc84f2c4de6296df6a01cc9abb9ea..986ef260283824c9b60b9053e2801affb9839a8c 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -298,7 +298,9 @@ struct buffer_if;
    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,
-                              const char *failwhy);
+                              const char *name, const char *failwhy);
+  /* name is the same ptr as passed to request, so its lifetime must
+   * be suitable*/
 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 15dace88d3c74f0e22a35b891d91a061c311877e..20bf51885ee8cd5eb5c563b037f2d12e1fe73f5b 100644 (file)
--- a/site.c
+++ b/site.c
@@ -1192,7 +1192,7 @@ 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,
-                                 const char *failwhy)
+                                 const char *address, const char *failwhy)
 {
     struct site *st=sst;