From bc07424dca80830704295cc1cfee04da75479f8c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 29 Sep 2014 15:00:47 +0100
Subject: [PATCH] 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>
---
 resolver.c | 14 ++++++++------
 secnet.h   |  4 +++-
 site.c     |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/resolver.c b/resolver.c
index 6088c56..2466245 100644
--- 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 6724698..986ef26 100644
--- 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 15dace8..20bf518 100644
--- 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;
 
-- 
2.30.2