server: Option `-F' to run the server in the `foreground'.

[tripe] / server / admin.c

diff --git a/server/admin.c b/server/admin.c
index 55ed82b3eedde575cf6fbc15467ceae05bd72ef8..382baca97b7ea6e85c2705a477b72fbd127845ad 100644 (file)
--- a/server/admin.c
+++ b/server/admin.c
@@ -1,6 +1,4 @@
 /* -*-c-*-
- *
- * $Id$
  *
  * Admin interface for configuration
  *
@@ -72,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)
@@ -501,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);
 }
 
@@ -1179,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);
@@ -1212,6 +1210,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   add->peer.name = 0;
   add->peer.t_ka = 0;
   add->peer.tops = tun_default;
+  add->peer.kxf = 0;
 
   /* --- Parse options --- */
 
@@ -1231,6 +1230,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
       }
     })
     OPTTIME("-keepalive", t, { add->peer.t_ka = t; })
+    OPT("-cork", { add->peer.kxf |= KXF_CORK; })
   });
 
   /* --- Make sure someone's not got there already --- */
@@ -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);
 }
 
@@ -1931,6 +1928,14 @@ static void a_destroypending(void)
     T( trace(T_ADMIN, "admin: completing destruction of connection %u",
             a->seq); )
 
+    /* --- If this is the foreground client then shut down --- */
+
+    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();
+    }
+
     /* --- Abort any background jobs in progress --- */
 
     for (bg = a->bg; bg; bg = bbg) {