~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keys/tripe-keys.conf.5.in, server/tripe.8.in: Contemplate more group types.
[tripe]
/
server
/
admin.c
diff --git
a/server/admin.c
b/server/admin.c
index
f3091be
..
06922db
100644
(file)
--- a/
server/admin.c
+++ b/
server/admin.c
@@
-237,7
+237,7
@@
static void a_flush(int fd, unsigned mode, void *v)
*
* Arguments: @dstr *d@ = where to leave the formatted message
* @const char *fmt@ = pointer to format string
*
* Arguments: @dstr *d@ = where to leave the formatted message
* @const char *fmt@ = pointer to format string
- * @va_list ap@ = arguments in list
+ * @va_list
*
ap@ = arguments in list
*
* Returns: ---
*
*
* Returns: ---
*
@@
-262,17
+262,17
@@
static void a_flush(int fd, unsigned mode, void *v)
* * "[!]..." ... -- @dstr_putf@-like string as single token
*/
* * "[!]..." ... -- @dstr_putf@-like string as single token
*/
-void a_vformat(dstr *d, const char *fmt, va_list ap)
+void a_vformat(dstr *d, const char *fmt, va_list
*
ap)
{
dstr dd = DSTR_INIT;
while (fmt) {
if (*fmt == '*') {
if (d->len) dstr_putc(d, ' ');
{
dstr dd = DSTR_INIT;
while (fmt) {
if (*fmt == '*') {
if (d->len) dstr_putc(d, ' ');
- dstr_vputf(d, fmt + 1,
&
ap);
+ dstr_vputf(d, fmt + 1, ap);
} else if (*fmt == '?') {
if (strcmp(fmt, "?ADDR") == 0) {
} else if (*fmt == '?') {
if (strcmp(fmt, "?ADDR") == 0) {
- const addr *a = va_arg(ap, const addr *);
+ const addr *a = va_arg(
*
ap, const addr *);
switch (a->sa.sa_family) {
case AF_INET:
u_quotify(d, "INET");
switch (a->sa.sa_family) {
case AF_INET:
u_quotify(d, "INET");
@@
-283,8
+283,8
@@
void a_vformat(dstr *d, const char *fmt, va_list ap)
abort();
}
} else if (strcmp(fmt, "?B64") == 0) {
abort();
}
} else if (strcmp(fmt, "?B64") == 0) {
- const octet *p = va_arg(ap, const octet *);
- size_t n = va_arg(ap, size_t);
+ const octet *p = va_arg(
*
ap, const octet *);
+ size_t n = va_arg(
*
ap, size_t);
base64_ctx b64;
dstr_putc(d, ' ');
base64_init(&b64);
base64_ctx b64;
dstr_putc(d, ' ');
base64_init(&b64);
@@
-294,10
+294,10
@@
void a_vformat(dstr *d, const char *fmt, va_list ap)
base64_encode(&b64, 0, 0, d);
while (d->len && d->buf[d->len - 1] == '=') d->len--;
} else if (strcmp(fmt, "?TOKENS") == 0) {
base64_encode(&b64, 0, 0, d);
while (d->len && d->buf[d->len - 1] == '=') d->len--;
} else if (strcmp(fmt, "?TOKENS") == 0) {
- const char *const *av = va_arg(ap, const char *const *);
+ const char *const *av = va_arg(
*
ap, const char *const *);
while (*av) u_quotify(d, *av++);
} else if (strcmp(fmt, "?PEER") == 0)
while (*av) u_quotify(d, *av++);
} else if (strcmp(fmt, "?PEER") == 0)
- u_quotify(d, p_name(va_arg(ap, peer *)));
+ u_quotify(d, p_name(va_arg(
*
ap, peer *)));
else if (strcmp(fmt, "?ERRNO") == 0) {
dstr_putf(d, " E%d", errno);
u_quotify(d, strerror(errno));
else if (strcmp(fmt, "?ERRNO") == 0) {
dstr_putf(d, " E%d", errno);
u_quotify(d, strerror(errno));
@@
-306,11
+306,12
@@
void a_vformat(dstr *d, const char *fmt, va_list ap)
} else {
if (*fmt == '!') fmt++;
DRESET(&dd);
} else {
if (*fmt == '!') fmt++;
DRESET(&dd);
- dstr_vputf(&dd, fmt,
&
ap);
+ dstr_vputf(&dd, fmt, ap);
u_quotify(d, dd.buf);
}
u_quotify(d, dd.buf);
}
- fmt = va_arg(ap, const char *);
+ fmt = va_arg(
*
ap, const char *);
}
}
+ dstr_putz(d);
dstr_destroy(&dd);
}
dstr_destroy(&dd);
}
@@
-331,7
+332,7
@@
void a_format(dstr *d, const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
va_list ap;
va_start(ap, fmt);
- a_vformat(d, fmt, ap);
+ a_vformat(d, fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-341,7
+342,7
@@
void a_format(dstr *d, const char *fmt, ...)
* @const char *status@ = status code to report
* @const char *tag@ = tag string, or null
* @const char *fmt@ = pointer to format string
* @const char *status@ = status code to report
* @const char *tag@ = tag string, or null
* @const char *fmt@ = pointer to format string
- * @va_list ap@ = arguments in list
+ * @va_list
*
ap@ = arguments in list
* @...@ = other arguments
*
* Returns: ---
* @...@ = other arguments
*
* Returns: ---
@@
-350,7
+351,7
@@
void a_format(dstr *d, const char *fmt, ...)
*/
static void a_vwrite(admin *a, const char *status, const char *tag,
*/
static void a_vwrite(admin *a, const char *status, const char *tag,
- const char *fmt, va_list ap)
+ const char *fmt, va_list
*
ap)
{
dstr d = DSTR_INIT;
{
dstr d = DSTR_INIT;
@@
-369,7
+370,7
@@
static void a_write(admin *a, const char *status, const char *tag,
va_list ap;
va_start(ap, fmt);
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, status, tag, fmt, ap);
+ a_vwrite(a, status, tag, fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-391,7
+392,7
@@
static void a_info(admin *a, const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "INFO", 0, fmt, ap);
+ a_vwrite(a, "INFO", 0, fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-400,7
+401,7
@@
static void a_fail(admin *a, const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "FAIL", 0, fmt, ap);
+ a_vwrite(a, "FAIL", 0, fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-411,7
+412,7
@@
static void a_fail(admin *a, const char *fmt, ...)
* @const char *fmt@ = pointer to format string
* @const char *p@ = pointer to raw string
* @size_t sz@ = size of raw string
* @const char *fmt@ = pointer to format string
* @const char *p@ = pointer to raw string
* @size_t sz@ = size of raw string
- * @va_list ap@ = arguments in list
+ * @va_list
*
ap@ = arguments in list
* @...@ = other arguments
*
* Returns: ---
* @...@ = other arguments
*
* Returns: ---
@@
-445,7
+446,7
@@
static void a_rawalert(unsigned f_and, unsigned f_eq, const char *status,
}
static void a_valert(unsigned f_and, unsigned f_eq, const char *status,
}
static void a_valert(unsigned f_and, unsigned f_eq, const char *status,
- const char *fmt, va_list ap)
+ const char *fmt, va_list
*
ap)
{
dstr d = DSTR_INIT;
{
dstr d = DSTR_INIT;
@@
-462,7
+463,7
@@
static void a_alert(unsigned f_and, unsigned f_eq, const char *status,
va_list ap;
va_start(ap, fmt);
va_list ap;
va_start(ap, fmt);
- a_valert(f_and, f_eq, status, fmt, ap);
+ a_valert(f_and, f_eq, status, fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-482,11
+483,11
@@
void a_warn(const char *fmt, ...)
va_start(ap, fmt);
if (flags & F_INIT)
va_start(ap, fmt);
if (flags & F_INIT)
- a_valert(0, 0, "WARN", fmt, ap);
+ a_valert(0, 0, "WARN", fmt,
&
ap);
else {
dstr d = DSTR_INIT;
fprintf(stderr, "%s: ", QUIS);
else {
dstr d = DSTR_INIT;
fprintf(stderr, "%s: ", QUIS);
- a_vformat(&d, fmt, ap);
+ a_vformat(&d, fmt,
&
ap);
dstr_putc(&d, '\n');
dstr_write(&d, stderr);
dstr_destroy(&d);
dstr_putc(&d, '\n');
dstr_write(&d, stderr);
dstr_destroy(&d);
@@
-526,7
+527,7
@@
void a_notify(const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
va_list ap;
va_start(ap, fmt);
- a_valert(AF_NOTE, AF_NOTE, "NOTE", fmt, ap);
+ a_valert(AF_NOTE, AF_NOTE, "NOTE", fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-696,7
+697,7
@@
static void a_bginfo(admin_bgop *bg, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(bg->a, "INFO", bg->tag, fmt, ap);
+ a_vwrite(bg->a, "INFO", bg->tag, fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-704,7
+705,7
@@
static void a_bgfail(admin_bgop *bg, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(bg->a, "FAIL", bg->tag, fmt, ap);
+ a_vwrite(bg->a, "FAIL", bg->tag, fmt,
&
ap);
va_end(ap);
}
va_end(ap);
}
@@
-1013,7
+1014,7
@@
static void a_resolved(struct hostent *h, void *v)
admin_resop *r = v;
T( trace(T_ADMIN, "admin: resop %s resolved", BGTAG(r)); )
admin_resop *r = v;
T( trace(T_ADMIN, "admin: resop %s resolved", BGTAG(r)); )
-
TIMER
;
+
QUICKRAND
;
if (!h) {
a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END);
r->func(r, ARES_FAIL);
if (!h) {
a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END);
r->func(r, ARES_FAIL);
@@
-1751,6
+1752,13
@@
static void acmd_algs(admin *a, unsigned ac, char *av[])
"mac-tagsz=%lu", (unsigned long)algs->tagsz,
A_END);
}
"mac-tagsz=%lu", (unsigned long)algs->tagsz,
A_END);
}
+ if (algs->b) {
+ a_info(a,
+ "blkc=%.*s", strlen(algs->b->name) - 4, algs->b->name,
+ "blkc-keysz=%lu", (unsigned long)algs->bksz,
+ "blkc-blksz=%lu", (unsigned long)algs->b->blksz,
+ A_END);
+ }
a_ok(a);
}
a_ok(a);
}
@@
-2148,7
+2156,7
@@
static void a_line(char *p, size_t len, void *vp)
char *av[16 + 1];
size_t ac;
char *av[16 + 1];
size_t ac;
-
TIMER
;
+
QUICKRAND
;
if (a->f & AF_DEAD)
return;
if (!p) {
if (a->f & AF_DEAD)
return;
if (!p) {
@@
-2230,7
+2238,7
@@
static void a_accept(int fd, unsigned mode, void *v)
{
int nfd;
struct sockaddr_un sun;
{
int nfd;
struct sockaddr_un sun;
- s
ize
_t sz = sizeof(sun);
+ s
ocklen
_t sz = sizeof(sun);
if ((nfd = accept(fd, (struct sockaddr *)&sun, &sz)) < 0) {
if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK &&
if ((nfd = accept(fd, (struct sockaddr *)&sun, &sz)) < 0) {
if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK &&