X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/c7053da92278377bbbce19d8e87cc22c50b78cb3..3cdc3f3a27e8c4f4fe692009d868c773d298a68c:/admin.c

diff --git a/admin.c b/admin.c
index e5e9201c..0213996a 100644
--- a/admin.c
+++ b/admin.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: admin.c,v 1.5 2001/02/16 21:22:51 mdw Exp $
+ * $Id$
  *
  * Admin interface for configuration
  *
@@ -26,31 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: admin.c,v $
- * Revision 1.5  2001/02/16 21:22:51  mdw
- * Support for displaying statistics.  Make client connections blocking, so
- * that things don't get dropped.  (This might change again if I add
- * buffering.)
- *
- * Revision 1.4  2001/02/06 09:34:53  mdw
- * Change ERR response to FAIL for consistency with other programs.
- *
- * Revision 1.3  2001/02/04 01:17:12  mdw
- * The `DAEMON' notification to stdout is replaced by a warning.  The
- * `DAEMON' and `QUIT' command send `OK' on successful completion.  Put
- * assignment of sequence number in a T(...) guard.
- *
- * Revision 1.2  2001/02/03 22:40:29  mdw
- * Put timer information into the entropy pool when packets are received
- * and on similar events.  Reseed the generator on the interval timer.
- *
- * Revision 1.1  2001/02/03 20:26:37  mdw
- * Initial checkin.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "tripe.h"
@@ -75,6 +50,14 @@ const trace_opt tr_opts[] = {
 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;
@@ -89,12 +72,168 @@ static sig s_term, s_int, s_hup;
 
 #define T_RESOLVE SEC(30)
 
+static void a_destroy(admin */*a*/);
+static void a_lock(admin */*a*/);
+static void a_unlock(admin */*a*/);
+
+/*----- 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
+ *		@const char *p@ = pointer to buffer to write
+ *		@size_t sz@ = size of data to write
+ *
+ * Returns:	The number of bytes written, or less than zero on error.
+ *
+ * Use:		Attempts to write data to a client.
+ */
+
+static ssize_t trywrite(admin *a, const char *p, size_t sz)
+{
+  ssize_t n, done = 0;
+
+again:
+  if (!sz)
+    return (done);
+  n = write(a->w.fd, p, sz);
+  if (n > 0) {
+    done += n;
+    p += n;
+    sz -= n;
+    goto again;
+  }
+  if (n < 0) {
+    if (errno == EINTR)
+      goto again;
+    if (errno != EAGAIN && errno != EWOULDBLOCK) {
+      a_destroy(a);
+      a_warn("ADMIN client-read-error -- %s", strerror(errno));
+      return (-1);
+    }
+  }
+  return (done);
+}
+
+/* --- @dosend@ --- *
+ *
+ * Arguemnts:	@admin *a@ = pointer to an admin block
+ *		@const char *p@ = pointer to buffer to write
+ *		@size_t sz@ = size of data to write
+ *
+ * Returns:	---
+ *
+ * Use:		Sends data to an admin client.
+ */
+
+static void dosend(admin *a, const char *p, size_t sz)
+{
+  ssize_t n;
+  obuf *o;
+
+  if (a->f & AF_DEAD)
+    return;
+
+  /* --- Try to send the data immediately --- */
+
+  if (!a->o_head) {
+    if ((n = trywrite(a, p, sz)) < 0)
+      return;
+    p += n;
+    sz -= n;
+    if (!sz)
+      return;
+  }
+	
+  /* --- Fill buffers with the data until it's all gone --- */
+
+  o = a->o_tail;
+  if (!o)
+    sel_addfile(&a->w);
+  else if (o->p_in < o->buf + OBUFSZ)
+    goto noalloc;
+
+  do {
+    o = xmalloc(sizeof(obuf));
+    o->next = 0;
+    o->p_in = o->p_out = o->buf;
+    if (a->o_tail)
+      a->o_tail->next = o;
+    else
+      a->o_head = o;
+    a->o_tail = o;
+
+  noalloc:
+    n = o->buf + OBUFSZ - o->p_in;
+    if (n > sz)
+      n = sz;
+    memcpy(o->p_in, p, n);
+    o->p_in += n;
+    p += n;
+    sz -= n;
+  } while (sz);
+}
+
+/* --- @a_flush@ --- *
+ *
+ * Arguments:	@int fd@ = file descriptor
+ *		@unsigned mode@ = what's happening
+ *		@void *v@ = pointer to my admin block
+ *
+ * Returns:	---
+ *
+ * Use:		Flushes buffers when a client is ready to read again.
+ */
+
+static void a_flush(int fd, unsigned mode, void *v)
+{
+  admin *a = v;
+  obuf *o, *oo;
+  ssize_t n;
+
+  o = a->o_head;
+  while (o) {
+    if ((n = trywrite(a, o->p_out, o->p_in - o->p_out)) < 0)
+      return;
+    o->p_out += n;
+    if (o->p_in < o->p_out)
+      break;
+    oo = o;
+    o = o->next;
+    xfree(oo);
+  }
+  a->o_head = o;
+  if (!o) {
+    a->o_tail = 0;
+    sel_rmfile(&a->w);
+  }
+}
+
 /*----- 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:	---
@@ -102,17 +241,124 @@ static sig s_term, s_int, s_hup;
  * 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);
+  a_vwrite(a, tag, fmt, ap);
+  va_end(ap);
+}
+
+/* --- @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);
-  dstr_vputf(&d, fmt, ap);
+  a_vwrite(a, "FAIL", fmt, ap);
   va_end(ap);
-  write(a->fd, d.buf, d.len);
+}
+
+/* --- @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
@@ -126,22 +372,16 @@ static void a_write(admin *a, const char *fmt, ...)
 void a_warn(const char *fmt, ...)
 {
   va_list ap;
-  admin *a;
-  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 = a->next)
-      write(a->fd, d.buf, d.len);
+    fprintf(stderr, "%s: ", QUIS);
+    vfprintf(stderr, fmt, ap);
+    fputc('\n', stderr);
   }
-  dstr_destroy(&d);
+  va_end(ap);
 }
 
 /* --- @a_trace@ --- *
@@ -152,24 +392,36 @@ void a_warn(const char *fmt, ...)
  *
  * 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;
-
-  dstr_puts(&d, "TRACE ");
-  dstr_putm(&d, p, sz);
-  dstr_putc(&d, '\n');
-  for (a = admins; a; a = a->next)
-    write(a->fd, 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:	---
@@ -205,11 +457,11 @@ static void a_sigdie(int sig, void *v)
     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();
 }
 
@@ -225,7 +477,7 @@ static void a_sigdie(int sig, void *v)
 
 static void a_sighup(int sig, void *v)
 {
-  a_warn("received SIGHUP: ignoring");
+  a_warn("SERVER ignore signal SIGHUP");
 }
 
 /*----- Adding peers ------------------------------------------------------*/
@@ -243,24 +495,27 @@ static void a_sighup(int sig, void *v)
 static void a_resolve(struct hostent *h, void *v)
 {
   admin *a = v;
+
+  a_lock(a);
   T( trace(T_ADMIN, "admin: %u resolved", a->seq); )
   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->pname = 0;
   selbuf_enable(&a->b);
+  a_unlock(a);
 }
 
 /* --- @a_timer@ --- *
@@ -276,13 +531,16 @@ static void a_resolve(struct hostent *h, void *v)
 static void a_timer(struct timeval *tv, void *v)
 {
   admin *a = v;
+
+  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;
   selbuf_enable(&a->b);
+  a_unlock(a);
 }
 
 /* --- @acmd_add@ --- *
@@ -300,42 +558,49 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
 {
   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;
   }
 
@@ -347,7 +612,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
    */
 
   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;
@@ -361,21 +626,36 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
 
 /* --- 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) {
@@ -383,48 +663,98 @@ static void acmd_trace(admin *a, unsigned ac, char *av[])
 	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_port(admin *a, unsigned ac, char *av[])
+static void acmd_watch(admin *a, unsigned ac, char *av[])
 {
-  a_write(a, "INFO %u\nOK\n", p_port());
+  traceish(a, ac, av, "watch", w_opts, &a->f);
 }
 
-static void a_destroy(admin */*a*/);
+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_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);
     }
   }
 }
@@ -433,8 +763,8 @@ static void acmd_list(admin *a, unsigned ac, char *av[])
 {
   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[])
@@ -442,9 +772,11 @@ 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[])
@@ -453,13 +785,14 @@ 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);
   }
 }
 
@@ -469,24 +802,25 @@ static void acmd_stats(admin *a, unsigned ac, char *av[])
   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);
   }
 }
 
@@ -494,20 +828,26 @@ static void acmd_kill(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]);
+    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 {
@@ -520,19 +860,23 @@ typedef struct acmd {
 static void acmd_help(admin */*a*/, unsigned /*ac*/, char */*av*/[]);
 
 static const acmd acmdtab[] = {
-  { "help",	"HELP",			0,	0,	acmd_help },
+  { "help",	"help",			0,	0,	acmd_help },
+  { "version",	"version",		0,	0,	acmd_version },
 #ifndef NTRACE
-  { "trace",	"TRACE [options]",	0,	1,	acmd_trace },
+  { "trace",	"trace [OPTIONS]",	0,	1,	acmd_trace },
 #endif
-  { "port",	"PORT",			0,	0,	acmd_port },
-  { "daemon",	"DAEMON",		0,	0,	acmd_daemon },
-  { "list",	"LIST",			0,	0,	acmd_list },
-  { "ifname",	"IFNAME peer",		1,	1,	acmd_ifname },
-  { "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 },
-  { "quit",	"QUIT",			0,	0,	acmd_quit },
+  { "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 },
+  { "ifname",	"ifname PEER",		1,	1,	acmd_ifname },
+  { "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 ...",	2,	0xffff,	acmd_add },
+  { "quit",	"quit",			0,	0,	acmd_quit },
   { 0,		0,			0,	0,	0 }
 };
 
@@ -540,48 +884,115 @@ static void acmd_help(admin *a, unsigned ac, char *av[])
 {
   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 -----------------------------------------------*/
 
-/* --- @a_destroy@ --- *
+/* --- @a_lock@ --- *
  *
  * Arguments:	@admin *a@ = pointer to an admin block
  *
  * Returns:	---
  *
- * Use:		Destroys an admin block.
+ * Use:		Locks an admin block so that it won't be destroyed
+ *		immediately.
  */
 
-static void a_destroy(admin *a)
+static void a_lock(admin *a) { assert(!(a->f & AF_LOCK)); a->f |= AF_LOCK; }
+
+/* --- @a_unlock@ --- *
+ *
+ * Arguments:	@admin *a@ = pointer to an admin block
+ *
+ * Returns:	---
+ *
+ * Use:		Unlocks an admin block, allowing its destruction.  This is
+ *		also the second half of @a_destroy@.
+ */
+
+static void a_unlock(admin *a)
 {
-  T( trace(T_ADMIN, "admin: destroying connection %u", a->seq); )
+  assert(a->f & AF_LOCK);
+  if (!(a->f & AF_DEAD)) {
+    a->f &= ~AF_LOCK;
+    return;
+  }
+
+  T( trace(T_ADMIN, "admin: completing destruction of connection %u",
+	   a->seq); )
+
   selbuf_destroy(&a->b);
-  if (a->b.reader.fd != a->fd)
-    close(a->b.reader.fd);
-  close(a->fd);
   if (a->pname) {
     xfree(a->pname);
     xfree(a->paddr);
     bres_abort(&a->r);
     sel_rmtimer(&a->t);
   }
+  if (a->b.reader.fd != a->w.fd)
+    close(a->b.reader.fd);
+  close(a->w.fd);
+
+  if (a_stdin == a)
+    a_stdin = 0;
   if (a->next)
     a->next->prev = a->prev;
   if (a->prev)
     a->prev->next = a->next;
   else
     admins = a->next;
-  if (a_stdin == a)
-    a_stdin = 0;
   DESTROY(a);
 }
 
+/* --- @a_destroy@ --- *
+ *
+ * Arguments:	@admin *a@ = pointer to an admin block
+ *
+ * Returns:	---
+ *
+ * Use:		Destroys an admin block.  This requires a certain amount of
+ *		care.
+ */
+
+static void a_destroy(admin *a)
+{
+  /* --- Don't multiply destroy admin blocks --- */
+
+  if (a->f & AF_DEAD)
+    return;
+
+  /* --- Make sure nobody expects it to work --- */
+
+  a->f |= AF_DEAD;
+  T( trace(T_ADMIN, "admin: destroying connection %u", a->seq); )
+
+  /* --- Free the output buffers --- */
+
+  if (a->o_head) {
+    obuf *o, *oo;
+    sel_rmfile(&a->w);
+    for (o = a->o_head; o; o = oo) {
+      oo = o->next;
+      xfree(o);
+    }
+    a->o_head = 0;
+  }
+
+  /* --- If the block is locked, that's all we can manage --- */
+
+  if (a->f & AF_LOCK) {
+    T( trace(T_ADMIN, "admin: deferring destruction..."); )
+    return;
+  }
+  a->f |= AF_LOCK;
+  a_unlock(a);
+}
+
 /* --- @a_line@ --- *
  *
  * Arguments:	@char *p@ = pointer to the line read
+ *		@size_t len@ = length of the line
  *		@void *vp@ = pointer to my admin block
  *
  * Returns:	---
@@ -589,58 +1000,67 @@ static void a_destroy(admin *a)
  * Use:		Handles a line of input.
  */
 
-static void a_line(char *p, void *vp)
+static void a_line(char *p, size_t len, void *vp)
 {
   admin *a = vp;
   const acmd *c;
-  char *av[4];
+  char *av[16];
   size_t ac;
 
   TIMER;
+  if (a->f & AF_DEAD)
+    return;
   if (!p) {
     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);
-      else
+	a_fail(a, "bad-syntax -- %s", c->help);
+      else {
+	a_lock(a);
 	c->func(a, ac, av + 1);
+	a_unlock(a);
+      }
       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 = f;
   if (fd_in == STDIN_FILENO)
     a_stdin = a;
-  fdflags(fd_in, O_NONBLOCK, 0, FD_CLOEXEC, FD_CLOEXEC);
+  fdflags(fd_in, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   if (fd_out != fd_in)
-    fdflags(fd_out, O_NONBLOCK, 0, FD_CLOEXEC, FD_CLOEXEC);
-  a->fd = fd_out;
+    fdflags(fd_out, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   selbuf_init(&a->b, &sel, fd_in, a_line, a);
+  sel_initfile(&sel, &a->w, fd_out, SEL_WRITE, a_flush, a);
+  a->o_head = 0;
+  a->o_tail = 0;
   a->next = admins;
   a->prev = 0;
   if (admins)
@@ -666,10 +1086,12 @@ static void a_accept(int fd, unsigned mode, void *v)
   size_t sz = sizeof(sun);
 
   if ((nfd = accept(fd, (struct sockaddr *)&sun, &sz)) < 0) {
-    a_warn("accept admin connection failed: %s", strerror(errno));
+    if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK &&
+	errno != ECONNABORTED && errno != EPROTO)
+      a_warn("ADMIN accept-error -- %s", strerror(errno));
     return;
   }
-  a_create(nfd, nfd);
+  a_create(nfd, nfd, 0);
 }
 
 /* --- @a_daemon@ --- *
@@ -765,6 +1187,7 @@ again:
 
   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);