~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/: Wrap `udpsock' selectors up in a custom structure.
[tripe]
/
server
/
admin.c
diff --git
a/server/admin.c
b/server/admin.c
index
87bb905
..
24f8397
100644
(file)
--- a/
server/admin.c
+++ b/
server/admin.c
@@
-1233,7
+1233,7
@@
static void a_resolve(admin *a, admin_resop *r, const char *tag,
{ fam = "ANY"; af = AF_UNSPEC; i++; }
else for (j = 0; j < NADDRFAM; j++) {
if (mystrieq(av[i], aftab[j].name)) {
{ fam = "ANY"; af = AF_UNSPEC; i++; }
else for (j = 0; j < NADDRFAM; j++) {
if (mystrieq(av[i], aftab[j].name)) {
- if (udpsock[j].fd < 0) {
+ if (udpsock[j].
sf.
fd < 0) {
a_fail(a, "disabled-address-family", "%s", aftab[j].name, A_END);
goto fail;
}
a_fail(a, "disabled-address-family", "%s", aftab[j].name, A_END);
goto fail;
}
@@
-1286,7
+1286,7
@@
static void a_resolve(admin *a, admin_resop *r, const char *tag,
aihint.ai_flags = AI_NUMERICHOST;
if (!getaddrinfo(av[i], 0, &aihint, &ailist)) {
for (ai = ailist; ai; ai = ai->ai_next) {
aihint.ai_flags = AI_NUMERICHOST;
if (!getaddrinfo(av[i], 0, &aihint, &ailist)) {
for (ai = ailist; ai; ai = ai->ai_next) {
- if ((j = afix(ai->ai_family)) >= 0 && udpsock[j].fd >= 0)
+ if ((j = afix(ai->ai_family)) >= 0 && udpsock[j].
sf.
fd >= 0)
break;
}
if (!ai) {
break;
}
if (!ai) {
@@
-1315,7
+1315,7
@@
static void a_resolve(admin *a, admin_resop *r, const char *tag,
#ifdef HAVE_LIBADNS
qf = adns_qf_search;
for (j = 0; j < NADDRFAM; j++) {
#ifdef HAVE_LIBADNS
qf = adns_qf_search;
for (j = 0; j < NADDRFAM; j++) {
- if ((af == AF_UNSPEC || af == aftab[i].af) && udpsock[j].fd >= 0)
+ if ((af == AF_UNSPEC || af == aftab[i].af) && udpsock[j].
sf.
fd >= 0)
qf |= aftab[j].qf;
}
if ((err = adns_submit(ads, r->addr, adns_r_addr, qf, r, &r->q)) != 0) {
qf |= aftab[j].qf;
}
if ((err = adns_submit(ads, r->addr, adns_r_addr, qf, r, &r->q)) != 0) {
@@
-1331,7
+1331,7
@@
static void a_resolve(admin *a, admin_resop *r, const char *tag,
a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END);
goto fail_release;
}
a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END);
goto fail_release;
}
- if (udpsock[AFIX_INET].fd < 0) {
+ if (udpsock[AFIX_INET].
sf.
fd < 0) {
a_bgfail(&r->bg, "disabled-address-family", "INET", A_END);
goto fail_release;
}
a_bgfail(&r->bg, "disabled-address-family", "INET", A_END);
goto fail_release;
}
@@
-1870,13
+1870,13
@@
static void acmd_port(admin *a, unsigned ac, char *av[])
a_fail(a, "unknown-address-family", "%s", av[0], A_END);
return;
found:
a_fail(a, "unknown-address-family", "%s", av[0], A_END);
return;
found:
- if (udpsock[i].fd < 0) {
+ if (udpsock[i].
sf.
fd < 0) {
a_fail(a, "disabled-address-family", "%s", aftab[i].name, A_END);
return;
}
} else {
for (i = 0; i < NADDRFAM; i++)
a_fail(a, "disabled-address-family", "%s", aftab[i].name, A_END);
return;
}
} else {
for (i = 0; i < NADDRFAM; i++)
- if (udpsock[i].fd >= 0) goto found;
+ if (udpsock[i].
sf.
fd >= 0) goto found;
abort();
}
a_info(a, "%u", p_port(i), A_END);
abort();
}
a_info(a, "%u", p_port(i), A_END);