server/admin.h: Consolidate address construction during resolution.

[tripe] / server / admin.c

diff --git a/server/admin.c b/server/admin.c
index 3b99848..c5fed8b 100644 (file)
--- a/server/admin.c
+++ b/server/admin.c
@@ -1020,13 +1020,17 @@ static void a_resolved(struct hostent *h, void *v)
 {
   admin_resop *r = v;
 
-  T( trace(T_ADMIN, "admin: resop %s resolved", BGTAG(r)); )
   QUICKRAND;
   if (!h) {
+    T( trace(T_ADMIN, "admin: resop %s failed: %s",
+            BGTAG(r), hstrerror(h_errno)); )
     a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END);
     r->func(r, ARES_FAIL);
   } else {
+    T( trace(T_ADMIN, "admin: resop %s ok", BGTAG(r)); )
+    r->sa.sin.sin_family = AF_INET;
     memcpy(&r->sa.sin.sin_addr, h->h_addr, sizeof(struct in_addr));
+    r->sa.sin.sin_port = htons(r->port);
     r->func(r, ARES_OK);
   }
   sel_rmtimer(&r->t);
@@ -1128,7 +1132,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag,
     a_fail(a, "invalid-port", "%lu", pt, A_END);
     goto fail;
   }
-  r->sa.sin.sin_port = htons(pt);
+  r->port = pt;
 
   /* --- Report backgrounding --- *
    *
@@ -1145,6 +1149,8 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag,
 
   if (inet_aton(av[i], &r->sa.sin.sin_addr)) {
     T( trace(T_ADMIN, "admin: resop %s done the easy way", BGTAG(r)); )
+    r->sa.sin.sin_family = AF_INET;
+    r->sa.sin.sin_port = htons(r->port);
     func(r, ARES_OK);
     xfree(r->addr);
     a_bgrelease(&r->bg);
@@ -1846,7 +1852,6 @@ static void acmd_addr(admin *a, unsigned ac, char *av[])
 
   if ((p = a_findpeer(a, av[0])) != 0) {
     ad = p_addr(p);
-    assert(ad->sa.sa_family == AF_INET);
     a_info(a, "?ADDR", ad, A_END);
     a_ok(a);
   }