X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/ef2f29c9c7089b38d128b5c61207f33a95fd65ad..ad99c6f61e103a0c665b5ac543a13dbddcd2b721:/server/admin.c diff --git a/server/admin.c b/server/admin.c index d0201693..135a589c 100644 --- a/server/admin.c +++ b/server/admin.c @@ -1,13 +1,11 @@ /* -*-c-*- * - * $Id$ - * * Admin interface for configuration * * (c) 2001 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Trivial IP Encryption (TrIPE). * @@ -15,12 +13,12 @@ * 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 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. @@ -231,34 +229,6 @@ static void a_flush(int fd, unsigned mode, void *v) /*----- Utility functions -------------------------------------------------*/ -/* --- @quotify@ --- * - * - * Arguments: @dstr *d@ = where to write the answer - * @const char *p@ = string to quotify - * - * Returns: --- - * - * Use: Quotes the given string if necessary, according to our - * quoting rules. - */ - -static void quotify(dstr *d, const char *p) -{ - if (d->len) - dstr_putc(d, ' '); - if (*p && !p[strcspn(p, "\"' \t\n\v")]) - dstr_puts(d, p); - else { - dstr_putc(d, '\"'); - while (*p) { - if (*p == '\\' || *p == '\"') - dstr_putc(d, '\\'); - dstr_putc(d, *p++); - } - dstr_putc(d, '\"'); - } -} - /* --- @a_vformat@ --- * * * Arguments: @dstr *d@ = where to leave the formatted message @@ -283,8 +253,8 @@ static void a_vformat(dstr *d, const char *fmt, va_list ap) const addr *a = va_arg(ap, const addr *); switch (a->sa.sa_family) { case AF_INET: - quotify(d, "INET"); - quotify(d, inet_ntoa(a->sin.sin_addr)); + u_quotify(d, "INET"); + u_quotify(d, inet_ntoa(a->sin.sin_addr)); dstr_putf(d, " %u", (unsigned)ntohs(a->sin.sin_port)); break; default: @@ -303,19 +273,19 @@ static void a_vformat(dstr *d, const char *fmt, va_list ap) 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 *); - while (*av) quotify(d, *av++); + while (*av) u_quotify(d, *av++); } else if (strcmp(fmt, "?PEER") == 0) - 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); - quotify(d, strerror(errno)); + u_quotify(d, strerror(errno)); } else abort(); } else { if (*fmt == '!') fmt++; DRESET(&dd); dstr_vputf(&dd, fmt, &ap); - quotify(d, dd.buf); + u_quotify(d, dd.buf); } fmt = va_arg(ap, const char *); } @@ -341,9 +311,10 @@ static void a_vwrite(admin *a, const char *status, const char *tag, const char *fmt, va_list ap) { dstr d = DSTR_INIT; + if (tag) dstr_puts(&d, "BG"); dstr_puts(&d, status); - if (tag) quotify(&d, tag); + if (tag) u_quotify(&d, tag); a_vformat(&d, fmt, ap); dstr_putc(&d, '\n'); dosend(a, d.buf, d.len); @@ -354,6 +325,7 @@ static void a_write(admin *a, const char *status, const char *tag, const char *fmt, ...) { va_list ap; + va_start(ap, fmt); a_vwrite(a, status, tag, fmt, ap); va_end(ap); @@ -375,6 +347,7 @@ static void a_ok(admin *a) { a_write(a, "OK", 0, A_END); } static void a_info(admin *a, const char *fmt, ...) { va_list ap; + va_start(ap, fmt); a_vwrite(a, "INFO", 0, fmt, ap); va_end(ap); @@ -383,6 +356,7 @@ 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, "FAIL", 0, fmt, ap); va_end(ap); @@ -409,7 +383,7 @@ static void a_rawalert(unsigned f_and, unsigned f_eq, const char *status, { admin *a, *aa; dstr d = DSTR_INIT; - + if (!(flags & F_INIT)) return; dstr_puts(&d, status); @@ -428,7 +402,7 @@ static void a_rawalert(unsigned f_and, unsigned f_eq, const char *status, dstr_destroy(&d); } -static void a_valert(unsigned f_and, unsigned f_eq, const char *tag, +static void a_valert(unsigned f_and, unsigned f_eq, const char *status, const char *fmt, va_list ap) { dstr d = DSTR_INIT; @@ -436,16 +410,17 @@ static void a_valert(unsigned f_and, unsigned f_eq, const char *tag, if (!(flags & F_INIT)) return; a_vformat(&d, fmt, ap); - a_rawalert(f_and, f_eq, tag, fmt ? d.buf : 0, fmt ? d.len : 0); + a_rawalert(f_and, f_eq, status, fmt ? d.buf : 0, fmt ? d.len : 0); dstr_destroy(&d); } -static void a_alert(unsigned f_and, unsigned f_eq, const char *tag, +static void a_alert(unsigned f_and, unsigned f_eq, const char *status, const char *fmt, ...) { va_list ap; + va_start(ap, fmt); - a_valert(f_and, f_eq, tag, fmt, ap); + a_valert(f_and, f_eq, status, fmt, ap); va_end(ap); } @@ -571,9 +546,7 @@ static void a_sigdie(int sig, void *v) */ static void a_sighup(int sig, void *v) -{ - a_warn("SERVER", "ignore", "signal", "SIGHUP", A_END); -} + { a_warn("SERVER", "ignore", "signal", "SIGHUP", A_END); } /* --- @a_parsetime@ --- * * @@ -592,10 +565,10 @@ static long a_parsetime(const char *p) case 'h': t *= 60; case 'm': t *= 60; case 's': if (q[1] != 0) - default: t = -1; + default: t = -1; case 0: break; } - return (t); + return (t); } /* --- @a_findpeer@ --- * @@ -1011,7 +984,7 @@ static void a_resolved(struct hostent *h, void *v) sel_rmtimer(&r->t); xfree(r->addr); a_bgrelease(&r->bg); -} +} /* --- @a_restimer@ --- * * @@ -1084,21 +1057,25 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag, r->addr = 0; r->func = func; if (mystrieq(av[i], "inet")) i++; - if (ac - i != 2) { - a_fail(a, "bad-addr-syntax", "[inet] ADDRESS PORT", A_END); + if (ac - i != 1 && ac - i != 2) { + a_fail(a, "bad-addr-syntax", "[inet] ADDRESS [PORT]", A_END); goto fail; } r->sa.sin.sin_family = AF_INET; r->sasz = sizeof(r->sa.sin); r->addr = xstrdup(av[i]); - pt = strtoul(av[i + 1], &p, 0); - if (*p) { - struct servent *s = getservbyname(av[i + 1], "udp"); - if (!s) { - a_fail(a, "unknown-service", "%s", av[i + 1], A_END); - goto fail; + if (!av[i + i]) + pt = TRIPE_PORT; + else { + pt = strtoul(av[i + 1], &p, 0); + if (*p) { + struct servent *s = getservbyname(av[i + 1], "udp"); + if (!s) { + a_fail(a, "unknown-service", "%s", av[i + 1], A_END); + goto fail; + } + pt = ntohs(s->s_port); } - pt = ntohs(s->s_port); } if (pt == 0 || pt >= 65536) { a_fail(a, "invalid-port", "%lu", pt, A_END); @@ -1118,7 +1095,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag, a->seq, BGTAG(r), r->addr); ) /* --- If the name is numeric, do it the easy way --- */ - + if (inet_aton(av[i], &r->sa.sin.sin_addr)) { T( trace(T_ADMIN, "admin: resop %s done the easy way", BGTAG(r)); ) func(r, ARES_OK); @@ -1256,7 +1233,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[]) /* --- Make sure someone's not got there already --- */ - if (!*av) + if (!av[0] || !av[1]) goto bad_syntax; if (p_find(*av)) { a_fail(a, "peer-exists", "%s", *av, A_END); @@ -1374,7 +1351,7 @@ static void a_ping(admin *a, unsigned ac, char *av[], a_bgrelease(&pg->bg); } return; - + bad_syntax: a_fail(a, "bad-syntax", "%s", cmd, "[OPTIONS] PEER", cmd, A_END); fail: @@ -1590,7 +1567,7 @@ static int traceish(admin *a, unsigned ac, char *av[], } a_fail(a, "bad-%s-option", what, "%c", *p, A_END); return (0); - tropt_ok:; + tropt_ok:; break; } p++; @@ -1613,9 +1590,7 @@ static void acmd_trace(admin *a, unsigned ac, char *av[]) #endif static void acmd_watch(admin *a, unsigned ac, char *av[]) -{ - traceish(a, ac, av, "watch", w_opts, &a->f); -} + { traceish(a, ac, av, "watch", w_opts, &a->f); } static void alertcmd(admin *a, unsigned f_and, unsigned f_eq, const char *status, char *av[]) @@ -1626,10 +1601,7 @@ static void acmd_warn(admin *a, unsigned ac, char *av[]) { alertcmd(a, AF_WARN, AF_WARN, "WARN", av); } static void acmd_port(admin *a, unsigned ac, char *av[]) -{ - a_info(a, "%u", p_port(), A_END); - a_ok(a); -} + { a_info(a, "%u", p_port(), A_END); a_ok(a); } static void acmd_daemon(admin *a, unsigned ac, char *av[]) { @@ -1639,7 +1611,7 @@ static void acmd_daemon(admin *a, unsigned ac, char *av[]) a_notify("DAEMON", A_END); if (a_stdin) a_destroy(a_stdin); - if (u_daemon()) + if (daemonize()) a_fail(a, "daemon-error", "?ERRNO", A_END); else { flags |= F_DAEMON; @@ -1675,6 +1647,7 @@ static void acmd_bgcancel(admin *a, unsigned ac, char *av[]) static void acmd_list(admin *a, unsigned ac, char *av[]) { peer *p; + for (p = p_first(); p; p = p_next(p)) a_info(a, "%s", p_name(p), A_END); a_ok(a); @@ -1698,7 +1671,7 @@ static void acmd_setifname(admin *a, unsigned ac, char *av[]) a_notify("NEWIFNAME", "?PEER", p, "%s", p_ifname(p), "%s", av[1], A_END); p_setifname(p, av[1]); a_ok(a); - } + } } static void acmd_getchal(admin *a, unsigned ac, char *av[]) @@ -1790,17 +1763,27 @@ static void acmd_stats(admin *a, unsigned ac, char *av[]) a_info(a, "start-time=%s", timestr(st->t_start), A_END); a_info(a, "last-packet-time=%s", timestr(st->t_last), A_END); a_info(a, "last-keyexch-time=%s", timestr(st->t_kx), A_END); - a_info(a, "packets-in=%lu bytes-in=%lu", st->n_in, st->sz_in, A_END); - a_info(a, "packets-out=%lu bytes-out=%lu", - st->n_out, st->sz_out, A_END); - a_info(a, "keyexch-packets-in=%lu keyexch-bytes-in=%lu", - st->n_kxin, st->sz_kxin, A_END); - a_info(a, "keyexch-packets-out=%lu keyexch-bytes-out=%lu", - st->n_kxout, st->sz_kxout, A_END); - a_info(a, "ip-packets-in=%lu ip-bytes-in=%lu", - st->n_ipin, st->sz_ipin, A_END); - a_info(a, "ip-packets-out=%lu ip-bytes-out=%lu", - st->n_ipout, st->sz_ipout, A_END); + a_info(a, "packets-in=%lu", st->n_in, "bytes-in=%lu", st->sz_in, A_END); + a_info(a, + "packets-out=%lu", st->n_out, + "bytes-out=%lu", st->sz_out, + A_END); + a_info(a, + "keyexch-packets-in=%lu", st->n_kxin, + "keyexch-bytes-in=%lu", st->sz_kxin, + A_END); + a_info(a, + "keyexch-packets-out=%lu", st->n_kxout, + "keyexch-bytes-out=%lu", st->sz_kxout, + A_END); + a_info(a, + "ip-packets-in=%lu", st->n_ipin, + "ip-bytes-in=%lu", st->sz_ipin, + A_END); + a_info(a, + "ip-packets-out=%lu", st->n_ipout, + "ip-bytes-out=%lu", st->sz_ipout, + A_END); a_info(a, "rejected-packets=%lu", st->n_reject, A_END); a_ok(a); } @@ -1808,6 +1791,7 @@ static void acmd_stats(admin *a, unsigned ac, char *av[]) static void acmd_kill(admin *a, unsigned ac, char *av[]) { peer *p; + if ((p = a_findpeer(a, av[0])) != 0) { p_destroy(p); a_ok(a); @@ -1817,6 +1801,7 @@ static void acmd_kill(admin *a, unsigned ac, char *av[]) static void acmd_forcekx(admin *a, unsigned ac, char *av[]) { peer *p; + if ((p = a_findpeer(a, av[0])) != 0) { kx_start(&p->kx, 1); a_ok(a); @@ -1842,6 +1827,7 @@ static void acmd_version(admin *a, unsigned ac, char *av[]) static void acmd_tunnels(admin *a, unsigned ac, char *av[]) { int i; + for (i = 0; tunnels[i]; i++) a_info(a, "%s", tunnels[i]->name, A_END); a_ok(a); @@ -1898,17 +1884,18 @@ static const acmd acmdtab[] = { { "tunnels", 0, 0, 0, acmd_tunnels }, { "version", 0, 0, 0, acmd_version }, { "warn", "MESSAGE ...", 1, 0xffff, acmd_warn }, - { "watch", "[OPTIONS]", 0, 1, acmd_watch }, + { "watch", "[OPTIONS]", 0, 1, acmd_watch }, { 0, 0, 0, 0, 0 } }; static void acmd_help(admin *a, unsigned ac, char *av[]) { const acmd *c; + for (c = acmdtab; c->name; c++) { if (c->help) a_info(a, "%s", c->name, "*%s", c->help, A_END); - else + else a_info(a, "%s", c->name, A_END); } a_ok(a); @@ -2055,7 +2042,7 @@ static void a_line(char *p, size_t len, void *vp) if (c->argmin > ac || ac > c->argmax) { if (!c->help) a_fail(a, "bad-syntax", "%s", c->name, "", A_END); - else + else a_fail(a, "bad-syntax", "%s", c->name, "%s", c->help, A_END); } else c->func(a, ac, av + 1); @@ -2148,10 +2135,7 @@ void a_preselect(void) { if (a_dead) a_destroypending(); } * Use: Informs the admin module that it's a daemon. */ -void a_daemon(void) -{ - flags |= F_DAEMON; -} +void a_daemon(void) { flags |= F_DAEMON; } /* --- @a_init@ --- * *