unsigned tr_flags = 0;
#endif
+static const trace_opt w_opts[] = {
+ { 't', AF_TRACE, "trace messages" },
+ { 'n', AF_NOTE, "asynchronous notifications" },
+ { 'w', AF_WARN, "warnings" },
+ { 'A', AF_ALLMSGS, "all of the above" },
+ { 0, 0, 0 }
+};
+
/*----- Static variables --------------------------------------------------*/
static admin *admins;
/*----- Output functions --------------------------------------------------*/
+/* --- @mystrieq@ --- *
+ *
+ * Arguments: @const char *x, *y@ = two strings
+ *
+ * Returns: True if @x@ and @y are equal, up to case.
+ */
+
+static int mystrieq(const char *x, const char *y)
+{
+ for (;;) {
+ if (!*x && !*y) return (1);
+ if (tolower((unsigned char)*x) != tolower((unsigned char)*y))
+ return (0);
+ x++; y++;
+ }
+}
+
/* --- @trywrite@ --- *
*
* Arguments: @admin *a@ = pointer to an admin block
goto again;
if (errno != EAGAIN && errno != EWOULDBLOCK) {
a_destroy(a);
- a_warn("disconnecting admin client due to write errors: %s",
- strerror(errno));
+ a_warn("ADMIN client-read-error -- %s", strerror(errno));
return (-1);
}
}
/*----- Utility functions -------------------------------------------------*/
-/* --- @a_write@ --- *
+/* --- @a_write@, @a_vwrite@ --- *
*
* Arguments: @admin *a@ = admin connection to write to
+ * @const char *tag@ = tag prefix string, or null
* @const char *fmt@ = pointer to format string
+ * @va_list ap@ = arguments in list
* @...@ = other arguments
*
* Returns: ---
* Use: Sends a message to an admin connection.
*/
-static void a_write(admin *a, const char *fmt, ...)
+static void a_vwrite(admin *a, const char *tag, const char *fmt, va_list ap)
{
- va_list ap;
dstr d = DSTR_INIT;
+ if (tag) {
+ dstr_puts(&d, tag);
+ if (fmt)
+ dstr_putc(&d, ' ');
+ }
+ if (fmt)
+ dstr_vputf(&d, fmt, &ap);
+ dstr_putc(&d, '\n');
+ dosend(a, d.buf, d.len);
+ dstr_destroy(&d);
+}
+
+static void a_write(admin *a, const char *tag, const char *fmt, ...)
+{
+ va_list ap;
va_start(ap, fmt);
- dstr_vputf(&d, fmt, &ap);
+ a_vwrite(a, tag, fmt, ap);
va_end(ap);
- dosend(a, d.buf, d.len);
+}
+
+/* --- @a_ok@, @a_info@, @a_fail@ --- *
+ *
+ * Arguments: @admin *a@ = connection
+ * @const char *fmt@ = format string
+ * @...@ = other arguments
+ *
+ * Returns: ---
+ *
+ * Use: Convenience functions for @a_write@.
+ */
+
+static void a_ok(admin *a) { a_write(a, "OK", 0); }
+
+static void a_info(admin *a, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ a_vwrite(a, "INFO", fmt, ap);
+ va_end(ap);
+}
+
+static void a_fail(admin *a, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ a_vwrite(a, "FAIL", fmt, ap);
+ va_end(ap);
+}
+
+/* --- @a_alert@, @a_valert@, @a_rawalert@ --- *
+ *
+ * Arguments: @unsigned f_and, f_eq@ = filter for connections
+ * @const char *tag@ = tag prefix 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
+ * @...@ = other arguments
+ *
+ * Returns: ---
+ *
+ * Use: Write a message to all admin connections matched by the given
+ * filter.
+ */
+
+static void a_rawalert(unsigned f_and, unsigned f_eq, const char *tag,
+ const char *p, size_t sz)
+{
+ admin *a, *aa;
+ dstr d = DSTR_INIT;
+
+ if (!(flags & F_INIT))
+ return;
+ if (tag) {
+ dstr_puts(&d, tag);
+ if (p)
+ dstr_putc(&d, ' ');
+ }
+ if (p)
+ dstr_putm(&d, p, sz);
+ dstr_putc(&d, '\n');
+ p = d.buf;
+ sz = d.len;
+ for (a = admins; a; a = aa) {
+ aa = a->next;
+ if ((a->f & f_and) == f_eq)
+ dosend(a, d.buf, d.len);
+ }
dstr_destroy(&d);
}
+static void a_valert(unsigned f_and, unsigned f_eq, const char *tag,
+ const char *fmt, va_list ap)
+{
+ dstr d = DSTR_INIT;
+
+ if (!(flags & F_INIT))
+ return;
+ if (fmt)
+ dstr_vputf(&d, fmt, &ap);
+ a_rawalert(f_and, f_eq, tag, fmt ? d.buf : 0, fmt ? d.len : 0);
+ dstr_destroy(&d);
+}
+
+#if 0 /*unused*/
+static void a_alert(unsigned f_and, unsigned f_eq, const char *tag,
+ const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ a_valert(f_and, f_eq, tag, fmt, ap);
+ va_end(ap);
+}
+#endif
+
/* --- @a_warn@ --- *
*
* Arguments: @const char *fmt@ = pointer to format string
void a_warn(const char *fmt, ...)
{
va_list ap;
- admin *a, *aa;
- dstr d = DSTR_INIT;
- if (flags & F_INIT)
- dstr_puts(&d, "WARN ");
va_start(ap, fmt);
- dstr_vputf(&d, fmt, &ap);
- va_end(ap);
- if (!(flags & F_INIT))
- moan("%s", d.buf);
+ if (flags & F_INIT)
+ a_valert(0, 0, "WARN", fmt, ap);
else {
- dstr_putc(&d, '\n');
- for (a = admins; a; a = aa) {
- aa = a->next;
- dosend(a, d.buf, d.len);
- }
+ fprintf(stderr, "%s: ", QUIS);
+ vfprintf(stderr, fmt, ap);
+ fputc('\n', stderr);
}
- dstr_destroy(&d);
+ va_end(ap);
}
/* --- @a_trace@ --- *
*
* Returns: ---
*
- * Use: Custom trace output handler.
+ * Use: Custom trace output handler. Sends trace messages to
+ * interested admin connections.
*/
#ifndef NTRACE
static void a_trace(const char *p, size_t sz, void *v)
{
- dstr d = DSTR_INIT;
- admin *a, *aa;
-
- dstr_puts(&d, "TRACE ");
- dstr_putm(&d, p, sz);
- dstr_putc(&d, '\n');
- for (a = admins; a; a = aa) {
- aa = a->next;
- dosend(a, d.buf, d.len);
- }
- dstr_destroy(&d);
+ a_rawalert(AF_TRACE, AF_TRACE, "TRACE", p, sz);
}
#endif
+/* --- @a_notify@ --- *
+ *
+ * Arguments: @const char *fmt@ = pointer to format string
+ * @...@ = other arguments
+ *
+ * Returns: ---
+ *
+ * Use: Sends a notification to interested admin connections.
+ */
+
+void a_notify(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ a_valert(AF_NOTE, AF_NOTE, "NOTE", fmt, ap);
+ va_end(ap);
+}
+
/* --- @a_quit@ --- *
*
* Arguments: ---
case SIGTERM: p = "SIGTERM"; break;
case SIGINT: p = "SIGINT"; break;
default:
- sprintf(buf, "signal %i", sig);
+ sprintf(buf, "%i", sig);
p = buf;
break;
}
- a_warn("shutting down on %s", p);
+ a_warn("SERVER quit signal %s", p);
a_quit();
}
static void a_sighup(int sig, void *v)
{
- a_warn("received SIGHUP: ignoring");
+ a_warn("SERVER ignore signal SIGHUP");
}
/*----- Adding peers ------------------------------------------------------*/
TIMER;
sel_rmtimer(&a->t);
if (!h)
- a_write(a, "FAIL couldn't resolve hostname `%s'\n", a->paddr);
+ a_fail(a, "resolve-error %s", a->paddr);
else if (p_find(a->pname))
- a_write(a, "FAIL peer `%s' already registered\n", a->pname);
+ a_fail(a, "peer-exists %s", a->pname);
else {
memcpy(&a->peer.sin.sin_addr, h->h_addr, sizeof(struct in_addr));
if (!p_create(a->pname, &a->peer.sa, a->sasz))
- a_write(a, "FAIL couldn't create peer\n");
+ a_fail(a, "peer-create-fail %s" a->pname);
else
- a_write(a, "OK\n");
+ a_ok(a);
}
xfree(a->pname);
xfree(a->paddr);
a_lock(a);
T( trace(T_ADMIN, "admin: %u resolver timeout", a->seq); )
bres_abort(&a->r);
- a_write(a, "FAIL timeout resolving `%s'\n", a->paddr);
+ a_fail(a, "resolver-timeout %s\n", a->paddr);
xfree(a->pname);
xfree(a->paddr);
a->pname = 0;
{
unsigned long pt;
struct timeval tv;
+ unsigned i;
char *p;
/* --- Make sure someone's not got there already --- */
if (p_find(av[0])) {
- a_write(a, "FAIL peer `%s' already registered\n", av[0]);
+ a_fail(a, "peer-exists %s", av[0]);
return;
}
/* --- Fill in the easy bits of address --- */
BURN(a->peer);
+ i = 1;
+ if (mystrieq(av[i], "inet")) i++;
+ if (ac - i != 2) {
+ a_fail(a, "bad-syntax -- add PEER [inet] ADDRESS PORT");
+ return;
+ }
a->peer.sin.sin_family = AF_INET;
a->sasz = sizeof(a->peer.sin);
- pt = strtoul(av[2], &p, 0);
+ pt = strtoul(av[i + 1], &p, 0);
if (*p) {
- struct servent *s = getservbyname(av[2], "udp");
+ struct servent *s = getservbyname(av[i + 1], "udp");
if (!s) {
- a_write(a, "FAIL service `%s' not known\n", av[2]);
+ a_fail(a, "unknown-service %s", av[i + 1]);
return;
}
pt = ntohs(s->s_port);
}
if (pt == 0 || pt >= 65536) {
- a_write(a, "FAIL bad port number %lu\n", pt);
+ a_fail(a, "invalid-port %lu", pt);
return;
}
a->peer.sin.sin_port = htons(pt);
/* --- If the name is numeric, do it the easy way --- */
- if (inet_aton(av[1], &a->peer.sin.sin_addr)) {
+ if (inet_aton(av[i], &a->peer.sin.sin_addr)) {
if (!p_create(av[0], &a->peer.sa, a->sasz))
- a_write(a, "FAIL couldn't create peer\n");
+ a_fail(a, "peer-create-fail %s", a->pname);
else
- a_write(a, "OK\n");
+ a_ok(a);
return;
}
*/
a->pname = xstrdup(av[0]);
- a->paddr = xstrdup(av[1]);
+ a->paddr = xstrdup(av[i]);
selbuf_disable(&a->b);
gettimeofday(&tv, 0);
tv.tv_sec += T_RESOLVE;
/* --- Miscellaneous commands --- */
-#ifndef NTRACE
+/* --- @traceish@ --- *
+ *
+ * Arguments: @admin *a@ = connection to complain on
+ * @unsigned ac@ = number of arguments
+ * @char *av[]@ = vector of arguments
+ * @const char *what@ = what we're messing with
+ * @const trace_opt *tt@ = options table
+ * @unsigned *ff@ = where the flags are
+ *
+ * Returns: Nonzero if anything changed.
+ *
+ * Use: Guts of trace-ish commands like `trace' and `watch'.
+ */
-static void acmd_trace(admin *a, unsigned ac, char *av[])
+static int traceish(admin *a, unsigned ac, char *av[],
+ const char *what, const trace_opt *tt, unsigned *ff)
{
+ int ch = 0;
+
if (!ac || strcmp(av[0], "?") == 0) {
const trace_opt *t;
- a_write(a, "INFO Trace options:\n");
- for (t = tr_opts; t->ch; t++) {
- a_write(a, "INFO %c %c %s\n",
- t->ch, (tr_flags & t->f) == t->f ? '*' : ' ', t->help);
+ a_info(a, "Current %s status:", what);
+ for (t = tt; t->ch; t++) {
+ a_info(a, "%c %c %s",
+ t->ch, (*ff & t->f) == t->f ? '*' : ' ', t->help);
}
} else {
unsigned sense = 1;
- unsigned f = tr_flags;
- const trace_opt *tt;
+ unsigned f = *ff;
+ const trace_opt *t;
char *p = av[0];
while (*p) {
case '+': sense = 1; break;
case '-': sense = 0; break;
default:
- for (tt = tr_opts; tt->ch; tt++) {
- if (tt->ch == *p) {
- if (sense) f |= tt->f;
- else f &= ~tt->f;
+ for (t = tt; t->ch; t++) {
+ if (t->ch == *p) {
+ if (sense) f |= t->f;
+ else f &= ~t->f;
goto tropt_ok;
}
}
- a_write(a, "FAIL unknown trace option `%c'\n", *p);
- return;
+ a_fail(a, "bad-%s-option %c", what, *p);
+ return (0);
tropt_ok:;
break;
}
p++;
}
- tr_flags = f;
- trace_level(tr_flags);
+ *ff = f;
+ ch = 1;
}
- a_write(a, "OK\n");
+ a_ok(a);
+ return (ch);
+}
+
+#ifndef NTRACE
+
+static void acmd_trace(admin *a, unsigned ac, char *av[])
+{
+ if (traceish(a, ac, av, "trace", tr_opts, &tr_flags))
+ trace_level(tr_flags);
}
#endif
+static void acmd_watch(admin *a, unsigned ac, char *av[])
+{
+ traceish(a, ac, av, "watch", w_opts, &a->f);
+}
+
+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, '\"');
+ }
+}
+
+static void alertcmd(admin *a, unsigned f_and, unsigned f_eq,
+ const char *tag, unsigned ac, char *av[])
+{
+ dstr d = DSTR_INIT;
+ unsigned i;
+
+ dstr_puts(&d, "USER");
+ for (i = 0; i < ac; i++)
+ quotify(&d, av[i]);
+ dstr_putz(&d);
+ a_rawalert(f_and, f_eq, tag, d.buf, d.len);
+ dstr_destroy(&d);
+ a_ok(a);
+}
+
+static void acmd_notify(admin *a, unsigned ac, char *av[])
+ { alertcmd(a, AF_NOTE, AF_NOTE, "NOTE", ac, av); }
+static void acmd_warn(admin *a, unsigned ac, char *av[])
+ { alertcmd(a, AF_WARN, AF_WARN, "WARN", ac, av); }
+
static void acmd_port(admin *a, unsigned ac, char *av[])
{
- a_write(a, "INFO %u\nOK\n", p_port());
+ a_info(a, "%u", p_port());
+ a_ok(a);
}
static void acmd_daemon(admin *a, unsigned ac, char *av[])
{
if (flags & F_DAEMON)
- a_write(a, "FAIL already running as a daemon\n");
+ a_fail(a, "already-daemon");
else {
- a_warn("becoming a daemon");
+ a_notify("DAEMON");
if (a_stdin)
a_destroy(a_stdin);
if (u_daemon())
- a_write(a, "FAIL error becoming a daemon: %s", strerror(errno));
+ a_fail(a, "daemon-error -- %s", strerror(errno));
else {
flags |= F_DAEMON;
- a_write(a, "OK\n");
+ a_ok(a);
}
}
}
{
peer *p;
for (p = p_first(); p; p = p_next(p))
- a_write(a, "INFO %s\n", p_name(p));
- a_write(a, "OK\n");
+ a_info(a, "%s", p_name(p));
+ a_ok(a);
}
static void acmd_ifname(admin *a, unsigned ac, char *av[])
peer *p;
if ((p = p_find(av[0])) == 0)
- a_write(a, "FAIL peer `%s' not found\n", av[0]);
- else
- a_write(a, "INFO %s\nOK\n", p_ifname(p));
+ a_fail(a, "unknown-peer %s", av[0]);
+ else {
+ a_info(a, "%s", p_ifname(p));
+ a_ok(a);
+ }
}
static void acmd_addr(admin *a, unsigned ac, char *av[])
const addr *ad;
if ((p = p_find(av[0])) == 0)
- a_write(a, "FAIL peer `%s' not found\n", av[0]);
+ a_fail(a, "unknown-peer %s", av[0]);
else {
ad = p_addr(p);
assert(ad->sa.sa_family == AF_INET);
- a_write(a, "INFO %s %u\nOK\n",
+ a_info(a, "INET %s %u",
inet_ntoa(ad->sin.sin_addr),
(unsigned)ntohs(ad->sin.sin_port));
+ a_ok(a);
}
}
stats *st;
if ((p = p_find(av[0])) == 0)
- a_write(a, "FAIL peer `%s' not found\n", av[0]);
+ a_fail(a, "unknown-peer %s", av[0]);
else {
st = p_stats(p);
- a_write(a, "INFO start-time=%s\n", timestr(st->t_start));
- a_write(a, "INFO last-packet-time=%s\n", timestr(st->t_last));
- a_write(a, "INFO packets-in=%lu bytes-in=%lu\n", st->n_in, st->sz_in);
- a_write(a, "INFO packets-out=%lu bytes-out=%lu\n",
+ a_info(a, "start-time=%s", timestr(st->t_start));
+ a_info(a, "last-packet-time=%s", timestr(st->t_last));
+ a_info(a, "last-keyexch-time=%s", timestr(st->t_kx));
+ a_info(a, "packets-in=%lu bytes-in=%lu", st->n_in, st->sz_in);
+ a_info(a, "packets-out=%lu bytes-out=%lu",
st->n_out, st->sz_out);
- a_write(a, "INFO keyexch-packets-in=%lu keyexch-bytes-in=%lu\n",
+ a_info(a, "keyexch-packets-in=%lu keyexch-bytes-in=%lu",
st->n_kxin, st->sz_kxin);
- a_write(a, "INFO keyexch-packets-out=%lu keyexch-bytes-out=%lu\n",
+ a_info(a, "keyexch-packets-out=%lu keyexch-bytes-out=%lu",
st->n_kxout, st->sz_kxout);
- a_write(a, "INFO ip-packets-in=%lu ip-bytes-in=%lu\n",
+ a_info(a, "ip-packets-in=%lu ip-bytes-in=%lu",
st->n_ipin, st->sz_ipin);
- a_write(a, "INFO ip-packets-out=%lu ip-bytes-out=%lu\n",
+ a_info(a, "ip-packets-out=%lu ip-bytes-out=%lu",
st->n_ipout, st->sz_ipout);
- a_write(a, "INFO rejected-packets=%lu\n", st->n_reject);
- a_write(a, "OK\n");
+ a_info(a, "rejected-packets=%lu", st->n_reject);
+ a_ok(a);
}
}
{
peer *p;
if ((p = p_find(av[0])) == 0)
- a_write(a, "FAIL peer `%s' not found\n", av[0]);
+ a_fail(a, "unknown-peer %s", av[0]);
else {
p_destroy(p);
- a_write(a, "OK\n");
+ a_ok(a);
}
}
static void acmd_quit(admin *a, unsigned ac, char *av[])
{
- a_warn("closing down on admin request");
- a_write(a, "OK\n");
+ a_warn("SERVER quit admin-request");
+ a_ok(a);
a_quit();
}
+static void acmd_version(admin *a, unsigned ac, char *av[])
+{
+ a_info(a, "%s %s", PACKAGE, VERSION);
+ a_ok(a);
+}
+
/* --- The command table and help --- */
typedef struct acmd {
static const acmd acmdtab[] = {
{ "help", "help", 0, 0, acmd_help },
+ { "version", "version", 0, 0, acmd_version },
#ifndef NTRACE
{ "trace", "trace [OPTIONS]", 0, 1, acmd_trace },
#endif
+ { "watch", "watch [OPTIONS]", 0, 1, acmd_watch },
+ { "notify", "notify MESSAGE ...", 1, 0xffff, acmd_notify },
+ { "warn", "warn MESSAGE ...", 1, 0xffff, acmd_warn },
{ "port", "port", 0, 0, acmd_port },
{ "daemon", "daemon", 0, 0, acmd_daemon },
{ "list", "list", 0, 0, acmd_list },
{ "addr", "addr PEER", 1, 1, acmd_addr },
{ "stats", "stats PEER", 1, 1, acmd_stats },
{ "kill", "kill PEER", 1, 1, acmd_kill },
- { "add", "add PEER ADDR PORT", 3, 3, acmd_add },
+ { "add", "add PEER ADDR ...", 2, 0xffff, acmd_add },
{ "quit", "quit", 0, 0, acmd_quit },
{ 0, 0, 0, 0, 0 }
};
{
const acmd *c;
for (c = acmdtab; c->name; c++)
- a_write(a, "INFO %s\n", c->help);
- a_write(a, "OK\n");
+ a_info(a, "%s", c->help);
+ a_ok(a);
}
/*----- Connection handling -----------------------------------------------*/
{
admin *a = vp;
const acmd *c;
- char *av[4];
+ char *av[16];
size_t ac;
TIMER;
a_destroy(a);
return;
}
- ac = str_qsplit(p, av, 4, 0, STRF_QUOTE);
+ ac = str_qsplit(p, av, 16, 0, STRF_QUOTE);
if (!ac)
return;
- for (p = av[0]; *p; p++) *p = tolower((unsigned char)*p);
for (c = acmdtab; c->name; c++) {
- if (strcmp(av[0], c->name) == 0) {
+ if (mystrieq(av[0], c->name)) {
ac--;
if (c->argmin > ac || ac > c->argmax)
- a_write(a, "FAIL syntax: %s\n", c->help);
+ a_fail(a, "bad-syntax -- %s", c->help);
else {
a_lock(a);
c->func(a, ac, av + 1);
return;
}
}
- a_write(a, "FAIL unknown command `%s'\n", av[0]);
+ a_fail(a, "unknown-command %s", av[0]);
}
/* --- @a_create@ --- *
*
* Arguments: @int fd_in, fd_out@ = file descriptors to use
+ * @unsigned f@ = initial flags to set
*
* Returns: ---
*
* Use: Creates a new admin connection.
*/
-void a_create(int fd_in, int fd_out)
+void a_create(int fd_in, int fd_out, unsigned f)
{
admin *a = CREATE(admin);
+
T( static unsigned seq = 0;
a->seq = seq++; )
T( trace(T_ADMIN, "admin: accepted connection %u", a->seq); )
a->pname = 0;
- a->f = 0;
+ a->f = f;
if (fd_in == STDIN_FILENO)
a_stdin = a;
fdflags(fd_in, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
if ((nfd = accept(fd, (struct sockaddr *)&sun, &sz)) < 0) {
if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK &&
errno != ECONNABORTED && errno != EPROTO)
- a_warn("accept admin connection failed: %s", strerror(errno));
+ a_warn("ADMIN accept-error -- %s", strerror(errno));
return;
}
- a_create(nfd, nfd);
+ a_create(nfd, nfd, 0);
}
/* --- @a_daemon@ --- *
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);
~mdw / tripe / blobdiff