X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/010e6f63edc4be4e127c18fc6c2c2a138efc93d2..383a9d7197f7a2c86d1f4267789ea3599314baf8:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 73c71070..c4433e45 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -70,6 +70,7 @@ static sig s_term, s_int, s_hup;
 
 #define F_DAEMON 1u
 #define F_INIT 2u
+#define F_FOREGROUND 4u
 
 #define T_RESOLVE SEC(30)
 #define T_PING SEC(5)
@@ -499,12 +500,9 @@ void a_notify(const char *fmt, ...)
 
 void a_quit(void)
 {
-  peer *p;
-
   close(sock.fd);
   unlink(sockname);
-  while ((p = p_first()) != 0)
-    p_destroy(p);
+  FOREACH_PEER(p, { p_destroy(p); });
   exit(0);
 }
 
@@ -1064,7 +1062,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag,
   r->sa.sin.sin_family = AF_INET;
   r->sasz = sizeof(r->sa.sin);
   r->addr = xstrdup(av[i]);
-  if (!av[i + i])
+  if (!av[i + 1])
     pt = TRIPE_PORT;
   else {
     pt = strtoul(av[i + 1], &p, 0);
@@ -1177,7 +1175,9 @@ static void a_doadd(admin_resop *r, int rc)
   if (rc == ARES_OK) {
     add->peer.sasz = add->r.sasz;
     add->peer.sa = add->r.sa;
-    if (p_find(add->peer.name))
+    if (p_findbyaddr(&add->r.sa))
+      a_bgfail(&add->r.bg, "peer-addr-exists", "?ADDR", &add->r.sa, A_END);
+    else if (p_find(add->peer.name))
       a_bgfail(&add->r.bg, "peer-exists", "%s", add->peer.name, A_END);
     else if (!p_create(&add->peer))
       a_bgfail(&add->r.bg, "peer-create-fail", "%s", add->peer.name, A_END);
@@ -1648,10 +1648,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);
+  FOREACH_PEER(p, {  a_info(a, "%s", p_name(p), A_END); });
   a_ok(a);
 }
 
@@ -1916,53 +1913,66 @@ static void acmd_help(admin *a, unsigned ac, char *av[])
 
 static void a_destroypending(void)
 {
-  admin *a, *aa;
+  admin *a, *aa, *head;
   admin_bgop *bg, *bbg;
   admin_service *svc, *ssvc;
 
-  /* --- Destroy connections marked as pending --- */
+  /* --- Destroy connections marked as pending --- *
+   *
+   * Slightly messy.  Killing clients may cause others to finally die.  Make
+   * sure that they can be put on the list without clobbering anything or
+   * getting lost.
+   */
 
-  for (a = a_dead; a; a = aa) {
-    aa = a->next;
-    assert(a->f & AF_DEAD);
+  while (a_dead) {
+    head = a_dead;
+    a_dead = 0;
+    for (a = head; a; a = aa) {
+      aa = a->next;
+      assert(a->f & AF_DEAD);
 
-    /* --- Report what we're doing --- */
+      /* --- Report what we're doing --- */
 
-    T( trace(T_ADMIN, "admin: completing destruction of connection %u",
-	     a->seq); )
+      T( trace(T_ADMIN, "admin: completing destruction of connection %u",
+	       a->seq); )
 
-    /* --- Abort any background jobs in progress --- */
+      /* --- If this is the foreground client then shut down --- */
 
-    for (bg = a->bg; bg; bg = bbg) {
-      bbg = bg->next;
-      bg->cancel(bg);
-      if (bg->tag) xfree(bg->tag);
-      xfree(bg);
-    }
+      if (a->f & AF_FOREGROUND) {
+	T( trace(T_ADMIN, "admin: foreground client quit: shutting down"); )
+	a_warn("SERVER", "quit", "foreground-eof", A_END);
+	a_quit();
+      }
 
-    /* --- Release services I hold, and abort pending jobs --- */
+      /* --- Abort any background jobs in progress --- */
 
-    for (svc = a->svcs; svc; svc = ssvc) {
-      ssvc = svc->next;
-      a_svcrelease(svc);
-    }
-    a_jobtablefinal(&a->j);
+      for (bg = a->bg; bg; bg = bbg) {
+	bbg = bg->next;
+	bg->cancel(bg);
+	if (bg->tag) xfree(bg->tag);
+	xfree(bg);
+      }
 
-    /* --- Close file descriptors and selectory --- */
+      /* --- Release services I hold, and abort pending jobs --- */
 
-    selbuf_destroy(&a->b);
-    if (a->b.reader.fd != a->w.fd) close(a->b.reader.fd);
-    close(a->w.fd);
-    if (a_stdin == a) a_stdin = 0;
+      for (svc = a->svcs; svc; svc = ssvc) {
+	ssvc = svc->next;
+	a_svcrelease(svc);
+      }
+      a_jobtablefinal(&a->j);
 
-    /* --- Done --- */
+      /* --- Close file descriptors and selectory --- */
 
-    DESTROY(a);
-  }
+      selbuf_destroy(&a->b);
+      if (a->b.reader.fd != a->w.fd) close(a->b.reader.fd);
+      close(a->w.fd);
+      if (a_stdin == a) a_stdin = 0;
 
-  /* --- All pending destruction completed --- */
+      /* --- Done --- */
 
-  a_dead = 0;
+      DESTROY(a);
+    }
+  }
 }
 
 /* --- @a_destroy@ --- *
@@ -2020,7 +2030,7 @@ static void a_line(char *p, size_t len, void *vp)
 {
   admin *a = vp;
   const acmd *c;
-  char *av[16];
+  char *av[16 + 1];
   size_t ac;
 
   TIMER;
@@ -2035,9 +2045,10 @@ static void a_line(char *p, size_t len, void *vp)
     }
     return;
   }
-  ac = str_qsplit(p, av, 16, 0, STRF_QUOTE);
+  ac = str_qsplit(p, av, N(av) - 1, 0, STRF_QUOTE);
   if (!ac)
     return;
+  av[ac] = 0;
   for (c = acmdtab; c->name; c++) {
     if (mystrieq(av[0], c->name)) {
       ac--;