~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/admin.h: Consolidate address construction during resolution.
[tripe]
/
server
/
admin.c
diff --git
a/server/admin.c
b/server/admin.c
index
8cb44a3
..
c5fed8b
100644
(file)
--- a/
server/admin.c
+++ b/
server/admin.c
@@
-1028,7
+1028,9
@@
static void a_resolved(struct hostent *h, void *v)
r->func(r, ARES_FAIL);
} else {
T( trace(T_ADMIN, "admin: resop %s ok", BGTAG(r)); )
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));
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);
r->func(r, ARES_OK);
}
sel_rmtimer(&r->t);
@@
-1130,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;
}
a_fail(a, "invalid-port", "%lu", pt, A_END);
goto fail;
}
- r->
sa.sin.sin_port = htons(pt)
;
+ r->
port = pt
;
/* --- Report backgrounding --- *
*
/* --- Report backgrounding --- *
*
@@
-1147,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)); )
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);
func(r, ARES_OK);
xfree(r->addr);
a_bgrelease(&r->bg);