X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/0ba8de86535cf6025076f5034b76ab753e4dde08..060ca767db058036f7ade27219de9ebaf1d4737b:/admin.c?ds=sidebyside

diff --git a/admin.c b/admin.c
index e081bdf6..987de7ab 100644
--- a/admin.c
+++ b/admin.c
@@ -77,6 +77,8 @@ static void a_destroy(admin */*a*/);
 static void a_lock(admin */*a*/);
 static void a_unlock(admin */*a*/);
 
+#define BOOL(x) ((x) ? "t" : "nil")
+
 /*----- Output functions --------------------------------------------------*/
 
 /* --- @trywrite@ --- *
@@ -116,41 +118,26 @@ again:
   return (done);
 }
 
-/* --- @dosend@ --- *
+/* --- @doqueue@ -- *
  *
- * Arguemnts:	@admin *a@ = pointer to an admin block
+ * Arguments:	@oqueue *q@ = pointer to output queue
  *		@const char *p@ = pointer to buffer to write
- *		@size_t sz@ = size of data to write
+ *		@size_t sz@ = size of buffer
  *
- * Returns:	---
+ * Returns:	Nonzero if the queue was previously empty.
  *
- * Use:		Sends data to an admin client.
+ * Use:		Queues data to be written later.
  */
 
-static void dosend(admin *a, const char *p, size_t sz)
+static int doqueue(oqueue *q, const char *p, size_t sz)
 {
-  ssize_t n;
   obuf *o;
+  int rc = 0;
+  size_t n;
 
-  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;
+  o = q->tl;
   if (!o)
-    sel_addfile(&a->w);
+    rc = 1;
   else if (o->p_in < o->buf + OBUFSZ)
     goto noalloc;
 
@@ -158,11 +145,11 @@ static void dosend(admin *a, const char *p, size_t sz)
     o = xmalloc(sizeof(obuf));
     o->next = 0;
     o->p_in = o->p_out = o->buf;
-    if (a->o_tail)
-      a->o_tail->next = o;
+    if (q->tl)
+      q->tl->next = o;
     else
-      a->o_head = o;
-    a->o_tail = o;
+      q->hd = o;
+    q->tl = o;
 
   noalloc:
     n = o->buf + OBUFSZ - o->p_in;
@@ -173,6 +160,37 @@ static void dosend(admin *a, const char *p, size_t sz)
     p += n;
     sz -= n;
   } while (sz);
+
+  return (rc);
+}
+
+/* --- @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;
+
+  if (a->f & AF_DEAD)
+    return;
+  if (!a->out.hd) {
+    if ((n = trywrite(a, p, sz)) < 0)
+      return;
+    p += n;
+    sz -= n;
+    if (!sz)
+      return;
+  }
+  if (doqueue(&a->out, p, sz))
+    sel_addfile(&a->w);
 }
 
 /* --- @a_flush@ --- *
@@ -192,7 +210,7 @@ static void a_flush(int fd, unsigned mode, void *v)
   obuf *o, *oo;
   ssize_t n;
 
-  o = a->o_head;
+  o = a->out.hd;
   while (o) {
     if ((n = trywrite(a, o->p_out, o->p_in - o->p_out)) < 0)
       return;
@@ -203,9 +221,9 @@ static void a_flush(int fd, unsigned mode, void *v)
     o = o->next;
     xfree(oo);
   }
-  a->o_head = o;
+  a->out.hd = o;
   if (!o) {
-    a->o_tail = 0;
+    a->out.tl = 0;
     sel_rmfile(&a->w);
   }
 }
@@ -215,7 +233,8 @@ static void a_flush(int fd, unsigned mode, void *v)
 /* --- @a_write@, @a_vwrite@ --- *
  *
  * Arguments:	@admin *a@ = admin connection to write to
- *		@const char *tag@ = tag prefix string, or null
+ *		@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
  *		@...@ = other arguments
@@ -225,26 +244,32 @@ static void a_flush(int fd, unsigned mode, void *v)
  * Use:		Sends a message to an admin connection.
  */
 
-static void a_vwrite(admin *a, const char *tag, const char *fmt, va_list ap)
+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) {
+    dstr_putc(&d, ' ');
     dstr_puts(&d, tag);
-    if (fmt)
-      dstr_putc(&d, ' ');
   }
-  if (fmt)
+  if (fmt) {
+    dstr_putc(&d, ' ');
     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, ...)
+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, tag, fmt, ap);
+  a_vwrite(a, status, tag, fmt, ap);
   va_end(ap);
 }
 
@@ -259,13 +284,13 @@ static void a_write(admin *a, const char *tag, const char *fmt, ...)
  * Use:		Convenience functions for @a_write@.
  */
 
-static void a_ok(admin *a) { a_write(a, "OK", 0); }
+static void a_ok(admin *a) { a_write(a, "OK", 0, 0); }
 
 static void a_info(admin *a, const char *fmt, ...)
 {
   va_list ap;
   va_start(ap, fmt);
-  a_vwrite(a, "INFO", fmt, ap);
+  a_vwrite(a, "INFO", 0, fmt, ap);
   va_end(ap);
 }
 
@@ -273,16 +298,16 @@ static void a_fail(admin *a, const char *fmt, ...)
 {
   va_list ap;
   va_start(ap, fmt);
-  a_vwrite(a, "FAIL", fmt, ap);
+  a_vwrite(a, "FAIL", 0, 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 *status@ = status string
  *		@const char *fmt@ = pointer to format string
- @		@const char *p@ = pointer to raw string
+ *		@const char *p@ = pointer to raw string
  *		@size_t sz@ = size of raw string
  *		@va_list ap@ = arguments in list
  *		@...@ = other arguments
@@ -293,7 +318,7 @@ static void a_fail(admin *a, const char *fmt, ...)
  *		filter.
  */
 
-static void a_rawalert(unsigned f_and, unsigned f_eq, const char *tag,
+static void a_rawalert(unsigned f_and, unsigned f_eq, const char *status,
 		       const char *p, size_t sz)
 {
   admin *a, *aa;
@@ -301,13 +326,11 @@ static void a_rawalert(unsigned f_and, unsigned f_eq, const char *tag,
   
   if (!(flags & F_INIT))
     return;
-  if (tag) {
-    dstr_puts(&d, tag);
-    if (p)
-      dstr_putc(&d, ' ');
-  }
-  if (p)
+  dstr_puts(&d, status);
+  if (p) {
+    dstr_putc(&d, ' ');
     dstr_putm(&d, p, sz);
+  }
   dstr_putc(&d, '\n');
   p = d.buf;
   sz = d.len;
@@ -382,9 +405,7 @@ void a_warn(const char *fmt, ...)
 
 #ifndef NTRACE
 static void a_trace(const char *p, size_t sz, void *v)
-{
-  a_rawalert(AF_TRACE, AF_TRACE, "TRACE", p, sz);
-}
+  { a_rawalert(AF_TRACE, AF_TRACE, "TRACE", p, sz); }
 #endif
 
 /* --- @a_notify@ --- *
@@ -419,10 +440,10 @@ void a_quit(void)
 {
   peer *p;
 
-  while ((p = p_first()) != 0)
-    p_destroy(p);
   close(sock.fd);
   unlink(sockname);
+  while ((p = p_first()) != 0)
+    p_destroy(p);
   exit(0);
 }
 
@@ -491,67 +512,200 @@ static long a_parsetime(const char *p)
   return (t);    
 }
 
+/*----- Backgrounded operations -------------------------------------------*/
+
+#define BGTAG(bg)							\
+  (((admin_bgop *)(bg))->tag ? ((admin_bgop *)(bg))->tag : "<foreground>")
+
+/* --- @a_bgrelease@ --- *
+ *
+ * Arguments:	@admin_bgop *bg@ = backgrounded operation
+ *
+ * Returns:	---
+ *
+ * Use:		Removes a backgrounded operation from the queue, since
+ *		(presumably) it's done.
+ */
+
+static void a_bgrelease(admin_bgop *bg)
+{
+  admin *a = bg->a;
+
+  T( trace(T_ADMIN, "admin: release bgop %s", BGTAG(bg)); )
+  if (bg->tag) xfree(bg->tag);
+  else selbuf_enable(&a->b);
+  if (bg->next) bg->next->prev = bg->prev;
+  if (bg->prev) bg->prev->next = bg->next;
+  else a->bg = bg->next;
+  xfree(bg);
+  if (a->f & AF_CLOSE) a_destroy(a);
+  a_unlock(a);
+}
+
+/* --- @a_bgok@, @a_bginfo@, @a_bgfail@ --- *
+ *
+ * Arguments:	@admin_bgop *bg@ = backgrounded operation
+ *		@const char *fmt@ = format string
+ *		@...@ = other arguments
+ *
+ * Returns:	---
+ *
+ * Use:		Convenience functions for @a_write@.
+ */
+
+static void a_bgok(admin_bgop *bg)
+  { a_write(bg->a, "OK", bg->tag, 0); }
+
+static void a_bginfo(admin_bgop *bg, const char *fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  a_vwrite(bg->a, "INFO", bg->tag, fmt, ap);
+  va_end(ap);
+}
+
+static void a_bgfail(admin_bgop *bg, const char *fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  a_vwrite(bg->a, "FAIL", bg->tag, fmt, ap);
+  va_end(ap);
+}
+
+/* --- @a_bgadd@ --- *
+ *
+ * Arguments:	@admin *a@ = administration connection
+ *		@admin_bgop *bg@ = pointer to background operation
+ *		@const char *tag@ = background tag, or null for foreground
+ *		@void (*cancel)(admin_bgop *)@ = cancel function
+ *
+ * Returns:	---
+ *
+ * Use:		Links a background job into the list.
+ */
+
+static void a_bgadd(admin *a, admin_bgop *bg, const char *tag,
+		    void (*cancel)(admin_bgop *))
+{
+  if (tag)
+    bg->tag = xstrdup(tag);
+  else {
+    bg->tag = 0;
+    selbuf_disable(&a->b);
+  }
+  bg->a = a;
+  bg->cancel = cancel;
+  bg->next = a->bg;
+  bg->prev = 0;
+  if (a->bg) a->bg->prev = bg;
+  a->bg = bg;
+  a_lock(a);
+  T( trace(T_ADMIN, "admin: add bgop %s", BGTAG(bg)); )
+  if (tag) a_write(a, "DETACH", tag, 0);
+}
+
 /*----- Adding peers ------------------------------------------------------*/
+
+/* --- @a_addfree@ --- *
+ *
+ * Arguments:	@admin_addop *add@ = operation block
+ *
+ * Returns:	---
+ *
+ * Use:		Frees an add operation.
+ */
+
+static void a_addfree(admin_addop *add)
+{
+  T( trace(T_ADMIN, "admin: free add op %s", BGTAG(add)); )
+  if (add->peer.name) xfree(add->peer.name);
+  if (add->paddr) xfree(add->paddr);
+}
+
+/* --- @a_addcancel@ --- *
+ *
+ * Arguments:	@admin_bgop *bg@ = background operation
+ *
+ * Returns:	---
+ *
+ * Use:		Cancels an add operation.
+ */
+
+static void a_addcancel(admin_bgop *bg)
+{
+  admin_addop *add = (admin_addop *)bg;
+
+  T( trace(T_ADMIN, "admin: cancel add op %s", BGTAG(add)); )
+  sel_rmtimer(&add->t);
+  bres_abort(&add->r);
+  a_addfree(add);
+}
+
+/* --- @a_doadd@ --- *
+ *
+ * Arguments:	@admin_addop *add@ = operation block
+ *
+ * Returns:	---
+ *
+ * Use:		Does the peer add thing.
+ */
+
+static void a_doadd(admin_addop *add)
+{
+  if (p_find(add->peer.name))
+    a_bgfail(&add->bg, "peer-exists %s", add->peer.name);
+  else if (!p_create(&add->peer))
+    a_bgfail(&add->bg, "peer-create-fail %s", add->peer.name);
+  else
+    a_bgok(&add->bg);
+}
  
-/* --- @a_resolve@ --- *
+/* --- @a_addresolve@ --- *
  *
  * Arguments:	@struct hostent *h@ = pointer to resolved hostname
- *		@void *v@ = pointer to admin block
+ *		@void *v@ = pointer to add operation
  *
  * Returns:	---
  *
  * Use:		Handles a completed name resolution.
  */
 
-static void a_resolve(struct hostent *h, void *v)
+static void a_addresolve(struct hostent *h, void *v)
 {
-  admin *a = v;
+  admin_addop *add = v;
 
-  a_lock(a);
-  T( trace(T_ADMIN, "admin: %u resolved", a->seq); )
+  T( trace(T_ADMIN, "admin: add op %s resolved", BGTAG(add)); )
   TIMER;
-  sel_rmtimer(&a->t);
   if (!h)
-    a_fail(a, "resolve-error %s", a->paddr);
-  else if (p_find(a->peer.name))
-    a_fail(a, "peer-exists %s", a->peer.name);
+    a_bgfail(&add->bg, "resolve-error %s", add->paddr);
   else {
-    memcpy(&a->peer.sa.sin.sin_addr, h->h_addr, sizeof(struct in_addr));
-    if (!p_create(&a->peer))
-      a_fail(a, "peer-create-fail %s", a->peer.name);
-    else
-      a_ok(a);
+    memcpy(&add->peer.sa.sin.sin_addr, h->h_addr, sizeof(struct in_addr));
+    a_doadd(add);
   }
-  xfree(a->peer.name);
-  xfree(a->paddr);
-  a->peer.name = 0;
-  selbuf_enable(&a->b);
-  a_unlock(a);
+  sel_rmtimer(&add->t);
+  a_addfree(add);
+  a_bgrelease(&add->bg);
 }
 
-/* --- @a_timer@ --- *
+/* --- @a_addtimer@ --- *
  *
  * Arguments:	@struct timeval *tv@ = timer
- *		@void *v@ = pointer to admin block
+ *		@void *v@ = pointer to add operation
  *
  * Returns:	---
  *
  * Use:		Times out a resolver.
  */
 
-static void a_timer(struct timeval *tv, void *v)
+static void a_addtimer(struct timeval *tv, void *v)
 {
-  admin *a = v;
+  admin_addop *add = v;
 
-  a_lock(a);
-  T( trace(T_ADMIN, "admin: %u resolver timeout", a->seq); )
-  bres_abort(&a->r);
-  a_fail(a, "resolver-timeout %s\n", a->paddr);
-  xfree(a->peer.name);
-  xfree(a->paddr);
-  a->peer.name = 0;
-  selbuf_enable(&a->b);
-  a_unlock(a);
+  T( trace(T_ADMIN, "admin: add op %s timeout", BGTAG(add)); )
+  a_bgfail(&add->bg, "resolver-timeout %s\n", add->paddr);
+  bres_abort(&add->r);
+  a_addfree(add);
+  a_bgrelease(&add->bg);
 }
 
 /* --- @acmd_add@ --- *
@@ -571,19 +725,23 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   struct timeval tv;
   unsigned i, j;
   char *p;
+  const char *tag = 0;
+  admin_addop *add = 0;
 
   /* --- Make sure someone's not got there already --- */
 
   if (p_find(av[0])) {
     a_fail(a, "peer-exists %s", av[0]);
-    return;
+    goto fail;
   }
 
   /* --- Set stuff up --- */
 
-  a->peer.name = av[0];
-  a->peer.t_ka = 0;
-  a->peer.tops = tun_default;
+  add = xmalloc(sizeof(*add));
+  add->peer.name = xstrdup(av[0]);
+  add->peer.t_ka = 0;
+  add->peer.tops = tun_default;
+  add->paddr = 0;
 
   /* --- Parse options --- */
 
@@ -591,7 +749,10 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   for (;;) {
     if (!av[i])
       goto bad_syntax;
-    if (mystrieq(av[i], "-tunnel")) {
+    if (mystrieq(av[i], "-background")) {
+      if (!av[++i]) goto bad_syntax;
+      tag = av[i];
+    } else if (mystrieq(av[i], "-tunnel")) {
       if (!av[++i]) goto bad_syntax;
       for (j = 0;; j++) {
 	if (!tunnels[j]) {
@@ -599,7 +760,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
 	  return;
 	}
 	if (mystrieq(av[i], tunnels[j]->name)) {
-	  a->peer.tops = tunnels[j];
+	  add->peer.tops = tunnels[j];
 	  break;
 	}
       }
@@ -610,7 +771,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
 	a_fail(a, "bad-time-spec %s", av[i]);
 	return;
       }
-      a->peer.t_ka = t;
+      add->peer.t_ka = t;
     } else if (mystrieq(av[i], "--")) {
       i++;
       break;
@@ -624,98 +785,119 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   if (mystrieq(av[i], "inet")) i++;
   if (ac - i != 2) {
     a_fail(a, "bad-syntax -- add PEER [OPTIONS] [inet] ADDRESS PORT");
-    return;
+    goto fail;
   }
-  a->peer.sa.sin.sin_family = AF_INET;
-  a->peer.sasz = sizeof(a->peer.sa.sin);
+  add->peer.sa.sin.sin_family = AF_INET;
+  add->peer.sasz = sizeof(add->peer.sa.sin);
+  add->paddr = 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]);
-      return;
+      goto fail;
     }
     pt = ntohs(s->s_port);
   }
   if (pt == 0 || pt >= 65536) {
     a_fail(a, "invalid-port %lu", pt);
-    return;
+    goto fail;
   }
-  a->peer.sa.sin.sin_port = htons(pt);
+  add->peer.sa.sin.sin_port = htons(pt);
+
+  /* --- Report backgrounding --- *
+   *
+   * Do this for consistency of interface, even if we're going to get the
+   * answer straight away.
+   */
+
+  a_bgadd(a, &add->bg, tag, a_addcancel);
+  T( trace(T_ADMIN, "admin: %u, add op %s resolving hostname `%s'",
+	   a->seq, BGTAG(add), add->paddr); )
 
   /* --- If the name is numeric, do it the easy way --- */
   
-  if (inet_aton(av[i], &a->peer.sa.sin.sin_addr)) {
-    if (!p_create(&a->peer))
-      a_fail(a, "peer-create-fail %s", av[0]);
-    else
-      a_ok(a);
-    a->peer.name = 0;
+  if (inet_aton(av[i], &add->peer.sa.sin.sin_addr)) {
+    T( trace(T_ADMIN, "admin: add op %s done the easy way", BGTAG(add)); )
+    a_doadd(add);
+    a_addfree(add);
+    a_bgrelease(&add->bg);
     return;
   }
 
-  /* --- Store everything for later and crank up the resolver --- *
-   *
-   * We disable the line buffer until the resolver completes (or times out).
-   * This prevents other commands on the same connection (though the rest of
-   * the system continues regardless), but makes life simpler for the client.
-   */
+  /* --- Store everything for later and crank up the resolver --- */
 
-  a->peer.name = xstrdup(av[0]);
-  a->paddr = xstrdup(av[i]);
-  selbuf_disable(&a->b);
   gettimeofday(&tv, 0);
   tv.tv_sec += T_RESOLVE;
-  sel_addtimer(&sel, &a->t, &tv, a_timer, a);
-  bres_byname(&a->r, a->paddr, a_resolve, a);
-  T( trace(T_ADMIN, "admin: %u resolving hostname `%s'",
-	   a->seq, a->paddr); )
+  sel_addtimer(&sel, &add->t, &tv, a_addtimer, add);
+  bres_byname(&add->r, add->paddr, a_addresolve, add);
   return;
 
 bad_syntax:
   a_fail(a, "bad-syntax -- add PEER [OPTIONS] ADDR ...");
+fail:
+  if (add) {
+    a_addfree(add);
+    xfree(add);
+  }
   return;
 }
 
 /*----- Ping --------------------------------------------------------------*/
 
+/* --- @a_pingcancel@ --- *
+ *
+ * Arguments:	@admin_bgop *bg@ = background operation block
+ *
+ * Returns:	---
+ *
+ * Use:		Cancels a running ping.
+ */
+
+static void a_pingcancel(admin_bgop *bg)
+{
+  admin_pingop *pg = (admin_pingop *)bg;
+  T( trace(T_ADMIN, "admin: cancel ping op %s", BGTAG(pg)); )
+  p_pingdone(&pg->ping, PING_NONOTIFY);
+}
+
 /* --- @a_pong@ --- *
  *
  * Arguments:	@int rc@ = return code
- *		@void *av@ = admin connection which requested the ping
+ *		@void *v@ = ping operation block
  *
  * Returns:	---
  *
  * Use:		Collects what happened to a ping message.
  */
 
-static void a_pong(int rc, void *av)
+static void a_pong(int rc, void *v)
 {
-  admin *a = av;
+  admin_pingop *pg = v;
   struct timeval tv;
   double millis;
 
-  a_lock(a);
   switch (rc) {
     case PING_OK:
       gettimeofday(&tv, 0);
-      tv_sub(&tv, &tv, &a->pingtime);
+      tv_sub(&tv, &tv, &pg->pingtime);
       millis = (double)tv.tv_sec * 1000 + (double)tv.tv_usec/1000;
-      a_info(a, "ping-ok %.1f", millis);
-      a_ok(a);
+      a_bginfo(&pg->bg, "ping-ok %.1f", millis);
+      a_bgok(&pg->bg);
       break;
     case PING_TIMEOUT:
-      a_info(a, "ping-timeout");
-      a_ok(a);
+      a_bginfo(&pg->bg, "ping-timeout");
+      a_bgok(&pg->bg);
       break;
     case PING_PEERDIED:
-      a_info(a, "ping-peer-died");
-      a_ok(a);
+      a_bginfo(&pg->bg, "ping-peer-died");
+      a_bgok(&pg->bg);
       break;
     default:
       abort();
   }
-  a_unlock(a);
+  T( trace(T_ADMIN, "admin: ponged ping op %s", BGTAG(pg)); )
+  a_bgrelease(&pg->bg);
 }
 
 /* --- @acmd_ping@, @acmd_eping@ --- *
@@ -735,12 +917,17 @@ static void a_ping(admin *a, unsigned ac, char *av[],
   long t = T_PING;
   int i;
   peer *p;
+  admin_pingop *pg = 0;
+  const char *tag = 0;
 
   i = 0;
   for (;;) {
     if (!av[i])
       goto bad_syntax;
-    if (mystrieq(av[i], "-timeout")) {
+    if (mystrieq(av[i], "-background")) {
+      if (!av[++i]) goto bad_syntax;
+      tag = av[i];
+    } else if (mystrieq(av[i], "-timeout")) {
       if (!av[++i]) goto bad_syntax;
       if ((t = a_parsetime(av[i])) < 0) {
 	a_fail(a, "bad-time-spec %s", av[i]);
@@ -759,9 +946,15 @@ static void a_ping(admin *a, unsigned ac, char *av[],
     a_fail(a, "unknown-peer %s", av[i]);
     return;
   }
-  gettimeofday(&a->pingtime, 0);
-  if (p_pingsend(p, &a->ping, msg, t, a_pong, a))
-    a_fail(a, "ping-send-failed");
+  pg = xmalloc(sizeof(*pg));
+  gettimeofday(&pg->pingtime, 0);
+  a_bgadd(a, &pg->bg, tag, a_pingcancel);
+  T( trace(T_ADMIN, "admin: ping op %s: %s to %s",
+	   BGTAG(pg), cmd, p_name(p)); )
+  if (p_pingsend(p, &pg->ping, msg, t, a_pong, pg)) {
+    a_bgfail(&pg->bg, "ping-send-failed");
+    a_bgrelease(&pg->bg);
+  }
   return;
     
 bad_syntax:
@@ -773,7 +966,6 @@ static void acmd_ping(admin *a, unsigned ac, char *av[])
   { a_ping(a, ac, av, "ping", MISC_PING); }
 static void acmd_eping(admin *a, unsigned ac, char *av[])
   { a_ping(a, ac, av, "eping", MISC_EPING); }
-  
 
 /*----- Administration commands -------------------------------------------*/
 
@@ -800,10 +992,9 @@ static int traceish(admin *a, unsigned ac, char *av[],
 
   if (!ac || strcmp(av[0], "?") == 0) {
     const trace_opt *t;
-    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);
+      a_info(a, "%c%c %s",
+	     t->ch, (*ff & t->f) == t->f ? '+' : ' ', t->help);
     }
   } else {
     unsigned sense = 1;
@@ -949,32 +1140,57 @@ static void acmd_addr(admin *a, unsigned ac, char *av[])
   }
 }
 
+static void acmd_peerinfo(admin *a, unsigned ac, char *av[])
+{
+  peer *p;
+  const peerspec *ps;
+
+  if ((p = p_find(av[0])) == 0) {
+    a_fail(a, "unknown-peer %s", av[0]);
+    return;
+  }
+
+  ps = p_spec(p);
+  a_info(a, "tunnel=%s", ps->tops->name);
+  a_info(a, "keepalive=%lu", ps->t_ka);
+  a_ok(a);
+}
+
+static void acmd_servinfo(admin *a, unsigned ac, char *av[])
+{
+  a_info(a, "implementation=edgeware-tripe");
+  a_info(a, "version=%s", VERSION);
+  a_info(a, "daemon=%s", BOOL(flags & F_DAEMON));
+  a_ok(a);
+}
+
 static void acmd_stats(admin *a, unsigned ac, char *av[])
 {
   peer *p;
   stats *st;
 
-  if ((p = p_find(av[0])) == 0)
+  if ((p = p_find(av[0])) == 0) {
     a_fail(a, "unknown-peer %s", av[0]);
-  else {
-    st = p_stats(p);
-    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_info(a, "keyexch-packets-in=%lu keyexch-bytes-in=%lu",
-	    st->n_kxin, st->sz_kxin);
-    a_info(a, "keyexch-packets-out=%lu keyexch-bytes-out=%lu",
-	    st->n_kxout, st->sz_kxout);
-    a_info(a, "ip-packets-in=%lu ip-bytes-in=%lu",
-	    st->n_ipin, st->sz_ipin);
-    a_info(a, "ip-packets-out=%lu ip-bytes-out=%lu",
-	    st->n_ipout, st->sz_ipout);
-    a_info(a, "rejected-packets=%lu", st->n_reject);
-    a_ok(a);
+    return;
   }
+
+  st = p_stats(p);
+  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_info(a, "keyexch-packets-in=%lu keyexch-bytes-in=%lu",
+	 st->n_kxin, st->sz_kxin);
+  a_info(a, "keyexch-packets-out=%lu keyexch-bytes-out=%lu",
+	 st->n_kxout, st->sz_kxout);
+  a_info(a, "ip-packets-in=%lu ip-bytes-in=%lu",
+	 st->n_ipin, st->sz_ipin);
+  a_info(a, "ip-packets-out=%lu ip-bytes-out=%lu",
+	 st->n_ipout, st->sz_ipout);
+  a_info(a, "rejected-packets=%lu", st->n_reject);
+  a_ok(a);
 }
 
 static void acmd_kill(admin *a, unsigned ac, char *av[])
@@ -994,15 +1210,19 @@ static void acmd_forcekx(admin *a, unsigned ac, char *av[])
   if ((p = p_find(av[0])) == 0)
     a_fail(a, "unknown-peer %s", av[0]);
   else {
-    kx_start(&p->kx);
+    kx_start(&p->kx, 1);
     a_ok(a);
   }
 }
 
+static void acmd_reload(admin *a, unsigned ac, char *av[])
+  { p_keyreload(); a_ok(a); }
+
 static void acmd_quit(admin *a, unsigned ac, char *av[])
 {
   a_warn("SERVER quit admin-request");
   a_ok(a);
+  a_unlock(a);
   a_quit();
 }
 
@@ -1032,28 +1252,31 @@ typedef struct acmd {
 static void acmd_help(admin */*a*/, unsigned /*ac*/, char */*av*/[]);
 
 static const acmd acmdtab[] = {
+  { "add",	"add PEER [OPTIONS] ADDR ...",
+					2,	0xffff,	acmd_add },
+  { "addr",	"addr PEER",		1,	1,	acmd_addr },
+  { "daemon",	"daemon",		0,	0,	acmd_daemon },
+  { "eping",	"eping [OPTIONS] PEER",	1,	0xffff,	acmd_eping },
+  { "forcekx",	"forcekx PEER",		1,	1,	acmd_forcekx },
   { "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 },
+  { "ifname",	"ifname PEER",		1,	1,	acmd_ifname },
+  { "kill",	"kill PEER",		1,	1,	acmd_kill },
+  { "list",	"list",			0,	0,	acmd_list },
   { "notify",	"notify MESSAGE ...",	1,	0xffff,	acmd_notify },
-  { "warn",	"warn MESSAGE ...",	1,	0xffff,	acmd_warn },
+  { "peerinfo",	"peerinfo PEER",	1,	1,	acmd_peerinfo },
+  { "ping",	"ping [OPTIONS] PEER",	1,	0xffff,	acmd_ping },
   { "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 },
+  { "quit",	"quit",			0,	0,	acmd_quit },
+  { "reload",	"reload",		0,	0,	acmd_reload },
+  { "servinfo",	"servinfo",		0,	0,	acmd_servinfo },
   { "stats",	"stats PEER",		1,	1,	acmd_stats },
-  { "ping",	"ping [OPTIONS] PEER",	1,	0xffff,	acmd_ping },
-  { "eping",	"eping [OPTIONS] PEER",	1,	0xffff,	acmd_eping },
-  { "kill",	"kill PEER",		1,	1,	acmd_kill },
-  { "forcekx",	"forcekx PEER",		1,	1,	acmd_forcekx },
-  { "add",	"add PEER [OPTIONS] ADDR ...",
-					2,	0xffff,	acmd_add },
+#ifndef NTRACE
+  { "trace",	"trace [OPTIONS]",	0,	1,	acmd_trace },
+#endif
   { "tunnels",	"tunnels",		0,	0,	acmd_tunnels },
-  { "quit",	"quit",			0,	0,	acmd_quit },
+  { "version",	"version",		0,	0,	acmd_version },
+  { "warn",	"warn MESSAGE ...",	1,	0xffff,	acmd_warn },
+  { "watch",	"watch [OPTIONS]", 	0,	1,	acmd_watch },
   { 0,		0,			0,	0,	0 }
 };
 
@@ -1077,40 +1300,32 @@ static void acmd_help(admin *a, unsigned ac, char *av[])
  *		immediately.
  */
 
-static void a_lock(admin *a) { assert(!(a->f & AF_LOCK)); a->f |= AF_LOCK; }
+static void a_lock(admin *a) { a->ref++; }
 
-/* --- @a_unlock@ --- *
+/* --- @a_dodestroy@ --- *
  *
  * 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@.
+ * Use:		Actually does the legwork of destroying an admin block.
  */
 
-static void a_unlock(admin *a)
+static void a_dodestroy(admin *a)
 {
-  assert(a->f & AF_LOCK);
-  if (!(a->f & AF_DEAD)) {
-    a->f &= ~AF_LOCK;
-    return;
-  }
+  admin_bgop *bg, *bbg;
 
   T( trace(T_ADMIN, "admin: completing destruction of connection %u",
 	   a->seq); )
 
   selbuf_destroy(&a->b);
-  if (a->peer.name) {
-    xfree(a->peer.name);
-    xfree(a->paddr);
-    bres_abort(&a->r);
-    sel_rmtimer(&a->t);
+  for (bg = a->bg; bg; bg = bbg) {
+    bbg = bg->next;
+    bg->cancel(bg);
+    if (bg->tag) xfree(bg->tag);
+    xfree(bg);
   }
-  if (a->ping.p)
-    p_pingdone(&a->ping, PING_NONOTIFY);
-  if (a->b.reader.fd != a->w.fd)
-    close(a->b.reader.fd);
+  if (a->b.reader.fd != a->w.fd) close(a->b.reader.fd);
   close(a->w.fd);
 
   if (a_stdin == a)
@@ -1124,6 +1339,23 @@ static void a_unlock(admin *a)
   DESTROY(a);
 }
 
+/* --- @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)
+{
+  assert(a->ref);
+  if (!--a->ref && (a->f & AF_DEAD))
+    a_dodestroy(a);
+}
+
 /* --- @a_destroy@ --- *
  *
  * Arguments:	@admin *a@ = pointer to an admin block
@@ -1134,6 +1366,17 @@ static void a_unlock(admin *a)
  *		care.
  */
 
+static void freequeue(oqueue *q)
+{
+  obuf *o, *oo;
+
+  for (o = q->hd; o; o = oo) {
+    oo = o->next;
+    xfree(o);
+  }
+  q->hd = q->tl = 0;
+}
+
 static void a_destroy(admin *a)
 {
   /* --- Don't multiply destroy admin blocks --- */
@@ -1148,24 +1391,16 @@ static void a_destroy(admin *a)
 
   /* --- Free the output buffers --- */
 
-  if (a->o_head) {
-    obuf *o, *oo;
+  if (a->out.hd)
     sel_rmfile(&a->w);
-    for (o = a->o_head; o; o = oo) {
-      oo = o->next;
-      xfree(o);
-    }
-    a->o_head = 0;
-  }
+  freequeue(&a->out);
 
   /* --- 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);
+  if (!a->ref)
+    a_dodestroy(a);
+  T( else 
+     trace(T_ADMIN, "admin: deferring destruction..."); )
 }
 
 /* --- @a_line@ --- *
@@ -1190,7 +1425,12 @@ static void a_line(char *p, size_t len, void *vp)
   if (a->f & AF_DEAD)
     return;
   if (!p) {
-    a_destroy(a);
+    if (!a->bg)
+      a_destroy(a);
+    else {
+      a->f |= AF_CLOSE;
+      selbuf_disable(&a->b);
+    }
     return;
   }
   ac = str_qsplit(p, av, 16, 0, STRF_QUOTE);
@@ -1229,22 +1469,18 @@ void a_create(int fd_in, int fd_out, unsigned f)
   T( static unsigned seq = 0;
      a->seq = seq++; )
   T( trace(T_ADMIN, "admin: accepted connection %u", a->seq); )
-  a->peer.name = 0;
-  a->ping.p = 0;
+  a->bg = 0;
   a->f = f;
-  if (fd_in == STDIN_FILENO)
-    a_stdin = a;
+  if (fd_in == STDIN_FILENO) a_stdin = a;
   fdflags(fd_in, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   if (fd_out != fd_in)
     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->out.hd = a->out.tl = 0;
   a->next = admins;
   a->prev = 0;
-  if (admins)
-    admins->prev = a;
+  if (admins) admins->prev = a;
   admins = a;
 }