~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/: Augment challenges to allow a payload.
[tripe]
/
server
/
admin.c
diff --git
a/server/admin.c
b/server/admin.c
index
867c424
..
d80992c
100644
(file)
--- a/
server/admin.c
+++ b/
server/admin.c
@@
-1110,7
+1110,6
@@
static void a_resolve(admin *a, admin_resop *r, const char *tag,
goto fail;
}
r->sa.sin.sin_family = AF_INET;
goto fail;
}
r->sa.sin.sin_family = AF_INET;
- r->sasz = sizeof(r->sa.sin);
r->addr = xstrdup(av[i]);
if (!av[i + 1])
pt = TRIPE_PORT;
r->addr = xstrdup(av[i]);
if (!av[i + 1])
pt = TRIPE_PORT;
@@
-1223,7
+1222,6
@@
static void a_doadd(admin_resop *r, int rc)
T( trace(T_ADMIN, "admin: done add op %s", BGTAG(add)); )
if (rc == ARES_OK) {
T( trace(T_ADMIN, "admin: done add op %s", BGTAG(add)); )
if (rc == ARES_OK) {
- add->peer.sasz = add->r.sasz;
add->peer.sa = add->r.sa;
if (p_findbyaddr(&add->r.sa))
a_bgfail(&add->r.bg, "peer-addr-exists", "?ADDR", &add->r.sa, A_END);
add->peer.sa = add->r.sa;
if (p_findbyaddr(&add->r.sa))
a_bgfail(&add->r.bg, "peer-addr-exists", "?ADDR", &add->r.sa, A_END);
@@
-1778,7
+1776,7
@@
static void acmd_getchal(admin *a, unsigned ac, char *av[])
buf b;
buf_init(&b, buf_i, PKBUFSZ);
buf b;
buf_init(&b, buf_i, PKBUFSZ);
- c_new(&b);
+ c_new(
0, 0,
&b);
a_info(a, "?B64", BBASE(&b), (size_t)BLEN(&b), A_END);
a_ok(a);
}
a_info(a, "?B64", BBASE(&b), (size_t)BLEN(&b), A_END);
a_ok(a);
}
@@
-1795,7
+1793,7
@@
static void acmd_checkchal(admin *a, unsigned ac, char *av[])
a_fail(a, "bad-base64", "%s", codec_strerror(err), A_END);
else {
buf_init(&b, d.buf, d.len);
a_fail(a, "bad-base64", "%s", codec_strerror(err), A_END);
else {
buf_init(&b, d.buf, d.len);
- if (c_check(&b) || BBAD(&b) || BLEFT(&b))
+ if (c_check(
0, 0,
&b) || BBAD(&b) || BLEFT(&b))
a_fail(a, "invalid-challenge", A_END);
else
a_ok(a);
a_fail(a, "invalid-challenge", A_END);
else
a_ok(a);
@@
-2363,7
+2361,6
@@
again:
sig_add(&s_term, SIGTERM, a_sigdie, 0);
sig_add(&s_hup, SIGHUP, a_sighup, 0);
sig_add(&s_term, SIGTERM, a_sigdie, 0);
sig_add(&s_hup, SIGHUP, a_sighup, 0);
- signal(SIGPIPE, SIG_IGN);
sigaction(SIGINT, 0, &sa);
if (sa.sa_handler != SIG_IGN)
sig_add(&s_int, SIGINT, a_sigdie, 0);
sigaction(SIGINT, 0, &sa);
if (sa.sa_handler != SIG_IGN)
sig_add(&s_int, SIGINT, a_sigdie, 0);