server/tripe.h: Allow `break' from FOREACH_PEER.

[tripe] / server / tripe.c

diff --git a/server/tripe.c b/server/tripe.c
index 522fe7f1603b880cb85f0ce5bcb62ecb3e88fa62..1e6d406249d5a98f73105fd84513d65d2787dc66 100644 (file)
--- a/server/tripe.c
+++ b/server/tripe.c
@@ -72,8 +72,8 @@ static void interval(struct timeval *tv, void *v)
 
 static void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-D] [-d DIR] [-b ADDR] [-p PORT] [-n TUNNEL]\n\
-       [-U USER] [-G GROUP] [-a SOCKET] [-T TRACE-OPTS]\n\
+  pquis(fp, "Usage: $ [-DF] [-d DIR] [-b ADDR] [-p PORT] [-n TUNNEL]\n\
+       [-U USER] [-G GROUP] [-a SOCKET] [-m MODE] [-T TRACE-OPTS]\n\
        [-k PRIV-KEYRING] [-K PUB-KEYRING] [-t KEY-TAG]\n");
 }
 
@@ -93,6 +93,7 @@ Options:\n\
     --tunnels          Display IP tunnel drivers and exit.\n\
 \n\
 -D, --daemon           Run in the background.\n\
+-F, --foreground       Quit when stdin reports end-of-file.\n\
 -d, --directory=DIR    Switch to directory DIR [default " CONFIGDIR "].\n\
 -b, --bind-address=ADDR        Bind UDP socket to this IP ADDR.\n\
 -p, --port=PORT                Select UDP port to listen to "
@@ -104,6 +105,7 @@ Options:\n\
 -K, --pub-keyring=FILE Get public keys from FILE.\n\
 -t, --tag=KEYTAG       Use private key labelled TAG.\n\
 -a, --admin-socket=FILE        Use FILE as the adminstration socket.\n\
+-m, --admin-perms=MODE Permissions to set on admin socket [default 600].\n\
 " T( "\
 -T, --trace=OPTIONS    Turn on tracing options.\n\
 " ) "\
@@ -113,8 +115,9 @@ Options:\n\
 int main(int argc, char *argv[])
 {
   const char *kr_priv = "keyring", *kr_pub = "keyring.pub";
-  const char *tag_priv = "tripe-dh";
+  const char *tag_priv = 0;
   const char *csock = SOCKETDIR "/tripesock";
+  int csockmode = 0600;
   const char *dir = CONFIGDIR;
   const char *p;
   unsigned port = TRIPE_PORT;
@@ -122,12 +125,14 @@ int main(int argc, char *argv[])
   unsigned f = 0;
   int i;
   int selerr = 0;
+  unsigned af;
   struct timeval tv;
   uid_t u = -1;
   gid_t g = -1;
 
 #define f_bogus 1u
 #define f_daemon 2u
+#define f_foreground 4u
 
   ego(argv[0]);
   T( trace_on(stderr, 0); )
@@ -146,6 +151,7 @@ int main(int argc, char *argv[])
       { "tunnels",     0,              0,      '0' },
 
       { "daemon",      0,              0,      'D' },
+      { "foreground",  0,              0,      'F' },
       { "uid",         OPTF_ARGREQ,    0,      'U' },
       { "setuid",      OPTF_ARGREQ,    0,      'U' },
       { "gid",         OPTF_ARGREQ,    0,      'G' },
@@ -158,6 +164,7 @@ int main(int argc, char *argv[])
       { "pub-keyring", OPTF_ARGREQ,    0,      'K' },
       { "tag",         OPTF_ARGREQ,    0,      't' },
       { "admin-socket", OPTF_ARGREQ,   0,      'a' },
+      { "admin-perms", OPTF_ARGREQ,    0,      'm' },
 #ifndef NTRACE
       { "trace",       OPTF_ARGREQ,    0,      'T' },
 #endif
@@ -165,7 +172,7 @@ int main(int argc, char *argv[])
       { 0,             0,              0,      0 }
     };
 
-    i = mdwopt(argc, argv, "hvuDU:G:b:n:p:d:k:K:t:a:" T("T:"),
+    i = mdwopt(argc, argv, "hvuDFU:G:b:n:p:d:k:K:t:a:m:" T("T:"),
               opts, 0, 0, 0);
     if (i < 0)
       break;
@@ -189,6 +196,9 @@ int main(int argc, char *argv[])
       case 'G':
        g = u_getgroup(optarg);
        break;
+      case 'F':
+       f |= f_foreground;
+       break;
 
       case 'b': {
        struct hostent *h = gethostbyname(optarg);
@@ -231,6 +241,11 @@ int main(int argc, char *argv[])
       case 'a':
        csock = optarg;
        break;
+      case 'm': {
+       char *p;
+       csockmode = strtol(optarg, &p, 8);
+       if (*p) die(EXIT_FAILURE, "bad permissions: `%s'", optarg);
+      } break;
       case 't':
        tag_priv = optarg;
        break;
@@ -256,6 +271,8 @@ int main(int argc, char *argv[])
     usage(stderr);
     exit(EXIT_FAILURE);
   }
+  if (!(~f & (f_daemon | f_foreground)))
+    die(EXIT_FAILURE, "foreground operation for a daemon is silly");
 
   if (chdir(dir)) {
     die(EXIT_FAILURE, "can't set current directory to `%s': %s",
@@ -271,15 +288,18 @@ int main(int argc, char *argv[])
     tunnels[i]->init();
   p_init(baddr, port);
   if (!(f & f_daemon)) {
+    af = AF_WARN;
 #ifndef NTRACE
-    a_create(STDIN_FILENO, STDOUT_FILENO, AF_TRACE | AF_WARN);
-#else
-    a_create(STDIN_FILENO, STDOUT_FILENO, AF_WARN);
+    af |= AF_TRACE;
 #endif
+    if (f & f_foreground)
+      af |= AF_FOREGROUND;
+    a_create(STDIN_FILENO, STDOUT_FILENO, af);
   }
+  ps_split(f & f_daemon);
+  a_init(csock, u, g, csockmode);
   u_setugid(u, g);
   km_init(kr_priv, kr_pub, tag_priv);
-  a_init(csock);
   if (f & f_daemon) {
     if (daemonize())
       die(EXIT_FAILURE, "couldn't become a daemon: %s", strerror(errno));