*
* This file is part of Trivial IP Encryption (TrIPE).
*
- * TrIPE is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * TrIPE is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your
+ * option) any later version.
*
- * TrIPE is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * TrIPE is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
*
* You should have received a copy of the GNU General Public License
- * along with TrIPE; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with TrIPE. If not, see <https://www.gnu.org/licenses/>.
*/
/*----- Header files ------------------------------------------------------*/
*
* 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: ---
*
* * "[!]..." ... -- @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_vputf(d, fmt + 1, &ap);
+ dstr_vputf(d, fmt + 1, ap);
} 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");
abort();
}
} else if (strcmp(fmt, "?B64") == 0) {
- const octet *p = va_arg(ap, const octet *);
- size_t n = va_arg(ap, size_t);
- base64_ctx b64;
+ const octet *p = va_arg(*ap, const octet *);
+ size_t n = va_arg(*ap, size_t);
+ codec *b64 = base64_class.encoder(CDCF_NOEQPAD, "", 0);
dstr_putc(d, ' ');
- base64_init(&b64);
- b64.indent = "";
- b64.maxline = 0;
- base64_encode(&b64, p, n, d);
- base64_encode(&b64, 0, 0, d);
- while (d->len && d->buf[d->len - 1] == '=') d->len--;
+ b64->ops->code(b64, p, n, d);
+ b64->ops->code(b64, 0, 0, d);
+ b64->ops->destroy(b64);
} 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)
- 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 (*fmt == '!') fmt++;
DRESET(&dd);
- dstr_vputf(&dd, fmt, &ap);
+ dstr_vputf(&dd, fmt, ap);
u_quotify(d, dd.buf);
}
- fmt = va_arg(ap, const char *);
+ fmt = va_arg(*ap, const char *);
}
+ dstr_putz(d);
dstr_destroy(&dd);
}
va_list ap;
va_start(ap, fmt);
- a_vformat(d, fmt, ap);
+ a_vformat(d, fmt, &ap);
va_end(ap);
}
* @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: ---
*/
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;
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, status, tag, fmt, ap);
+ a_vwrite(a, status, tag, fmt, &ap);
va_end(ap);
}
-/* --- @a_ok@, @a_info@, @a_fail@ --- *
+/* --- @a_ok@, @a_fail@ --- *
*
* Arguments: @admin *a@ = connection
* @const char *fmt@ = format string
static void a_ok(admin *a) { a_write(a, "OK", 0, A_END); }
-static void a_info(admin *a, const char *fmt, ...)
+static void a_fail(admin *a, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "INFO", 0, fmt, ap);
+ a_vwrite(a, "FAIL", 0, fmt, &ap);
va_end(ap);
}
-static void a_fail(admin *a, const char *fmt, ...)
+/* --- @a_info@ --- *
+ *
+ * Arguments: @admin *a@ = connection
+ * @const char *fmt@ = format string
+ * @...@ = other arguments
+ *
+ * Returns: ---
+ *
+ * Use: Report information to an admin client.
+ */
+
+void a_info(admin *a, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "FAIL", 0, fmt, ap);
+ a_vwrite(a, "INFO", 0, fmt, &ap);
va_end(ap);
}
* @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: ---
}
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;
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_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);
- a_vformat(&d, fmt, ap);
+ a_vformat(&d, fmt, &ap);
dstr_putc(&d, '\n');
dstr_write(&d, stderr);
dstr_destroy(&d);
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_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_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);
}
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);
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;
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);
}
if (add->peer.tag) xfree(add->peer.tag);
+ if (add->peer.privtag) xfree(add->peer.privtag);
xfree(add->peer.name);
}
OPTTIME("-keepalive", t, { add->peer.t_ka = t; })
OPT("-cork", { add->peer.f |= KXF_CORK; })
OPTARG("-key", arg, {
- if (add->peer.tag)
- xfree(add->peer.tag);
+ if (add->peer.tag) xfree(add->peer.tag);
add->peer.tag = xstrdup(arg);
})
OPT("-mobile", { add->peer.f |= PSF_MOBILE; })
OPTARG("-priv", arg, {
- if (add->peer.privtag)
- xfree(add->peer.privtag);
+ if (add->peer.privtag) xfree(add->peer.privtag);
add->peer.privtag = xstrdup(arg);
})
});
{
peer *p;
const kdata *kd;
- const group *g;
+ const dhgrp *g;
const algswitch *algs;
if (!ac)
if ((p = a_findpeer(a, av[0])) == 0) return;
kd = p->kx.kpriv;
}
- g = kd->g;
+ g = kd->grp;
algs = &kd->algs;
- a_info(a,
- "kx-group=%s", g->ops->name,
- "kx-group-order-bits=%lu", (unsigned long)mp_bits(g->r),
- "kx-group-elt-bits=%lu", (unsigned long)g->nbits,
- A_END);
+ g->ops->grpinfo(g, a);
a_info(a,
"hash=%s", algs->h->name,
"mgf=%s", algs->mgf->name,
"hash-sz=%lu", (unsigned long)algs->h->hashsz,
A_END);
a_info(a,
- "cipher=%s", algs->c->name,
- "cipher-keysz=%lu", (unsigned long)algs->cksz,
- "cipher-blksz=%lu", (unsigned long)algs->c->blksz,
+ "bulk-transform=%s", algs->bulk->ops->name,
+ "bulk-overhead=%lu",
+ (unsigned long)algs->bulk->ops->overhead(algs->bulk),
A_END);
+ algs->bulk->ops->alginfo(algs->bulk, a);
a_info(a,
- "cipher-data-limit=%lu", (unsigned long)algs->expsz,
- A_END);
- a_info(a,
- "mac=%s", algs->m->name,
- "mac-keysz=%lu", (unsigned long)algs->mksz,
- "mac-tagsz=%lu", (unsigned long)algs->tagsz,
+ "cipher-data-limit=%lu",
+ (unsigned long)algs->bulk->ops->expsz(algs->bulk),
A_END);
a_ok(a);
}
static void acmd_checkchal(admin *a, unsigned ac, char *av[])
{
- base64_ctx b64;
+ codec *b64 = base64_class.decoder(CDCF_NOEQPAD);
+ int err;
buf b;
dstr d = DSTR_INIT;
- base64_init(&b64);
- base64_decode(&b64, av[0], strlen(av[0]), &d);
- base64_decode(&b64, 0, 0, &d);
- buf_init(&b, d.buf, d.len);
- if (c_check(&b) || BBAD(&b) || BLEFT(&b))
- a_fail(a, "invalid-challenge", A_END);
- else
- a_ok(a);
+ if ((err = b64->ops->code(b64, av[0], strlen(av[0]), &d)) != 0 ||
+ (err = b64->ops->code(b64, 0, 0, &d)) != 0)
+ 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))
+ a_fail(a, "invalid-challenge", A_END);
+ else
+ a_ok(a);
+ }
+ b64->ops->destroy(b64);
dstr_destroy(&d);
}
static void acmd_greet(admin *a, unsigned ac, char *av[])
{
peer *p;
- base64_ctx b64;
+ int err;
+ codec *b64;
dstr d = DSTR_INIT;
- if ((p = a_findpeer(a, av[0])) != 0) {
- base64_init(&b64);
- base64_decode(&b64, av[1], strlen(av[1]), &d);
- base64_decode(&b64, 0, 0, &d);
+ if ((p = a_findpeer(a, av[0])) == 0) return;
+ b64 = base64_class.decoder(CDCF_NOEQPAD);
+ if ((err = b64->ops->code(b64, av[1], strlen(av[1]), &d)) != 0 ||
+ (err = b64->ops->code(b64, 0, 0, &d)) != 0)
+ a_fail(a, "bad-base64", "%s", codec_strerror(err), A_END);
+ else {
p_greet(p, d.buf, d.len);
- dstr_destroy(&d);
a_ok(a);
}
+ b64->ops->destroy(b64);
+ dstr_destroy(&d);
}
static void acmd_addr(admin *a, unsigned ac, char *av[])
a_info(a, "private-key=%s", ptag,
"current-private-key=%s", p->kx.kpriv->tag, A_END);
a_info(a, "keepalive=%lu", ps->t_ka, A_END);
+ a_info(a, "corked=%s", BOOL(p->kx.f&KXF_CORK),
+ "mobile=%s", BOOL(ps->f&PSF_MOBILE),
+ A_END);
a_ok(a);
}
}
{ "reload", 0, 0, 0, acmd_reload },
{ "servinfo", 0, 0, 0, acmd_servinfo },
{ "setifname", "PEER NEW-NAME", 2, 2, acmd_setifname },
+ { "stats", "PEER", 1, 1, acmd_stats },
{ "svcclaim", "SERVICE VERSION", 2, 2, acmd_svcclaim },
{ "svcensure", "SERVICE [VERSION]", 1, 2, acmd_svcensure },
{ "svcfail", "JOBID TOKENS...", 1, 0xffff, acmd_svcfail },
{ "svcrelease", "SERVICE", 1, 1, acmd_svcrelease },
{ "svcsubmit", "[OPTIONS] SERVICE TOKENS...",
2, 0xffff, acmd_svcsubmit },
- { "stats", "PEER", 1, 1, acmd_stats },
#ifndef NTRACE
{ "trace", "[OPTIONS]", 0, 1, acmd_trace },
#endif
char *av[16 + 1];
size_t ac;
- TIMER;
+ QUICKRAND;
if (a->f & AF_DEAD)
return;
if (!p) {
{
int nfd;
struct sockaddr_un sun;
- size_t sz = sizeof(sun);
+ socklen_t sz = sizeof(sun);
if ((nfd = accept(fd, (struct sockaddr *)&sun, &sz)) < 0) {
if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK &&