server/: Split peer and admin initialization into smaller pieces.

[tripe] / server / tripe.c

diff --git a/server/tripe.c b/server/tripe.c
index b84388573d1e02dd4b038d210733543ddd9be806..60eaf8f9aa7bb8b254eb0a1a204cab5f3ec40d52 100644 (file)
--- a/server/tripe.c
+++ b/server/tripe.c
@@ -294,7 +294,8 @@ int main(int argc, char *argv[])
   signal(SIGPIPE, SIG_IGN);
   for (i = 0; tunnels[i]; i++)
     tunnels[i]->init();
-  p_init(ailist); freeaddrinfo(ailist);
+  p_init();
+  p_bind(ailist); freeaddrinfo(ailist);
   if (!(f & f_daemon)) {
     af = AF_WARN;
 #ifndef NTRACE
@@ -304,8 +305,18 @@ int main(int argc, char *argv[])
       af |= AF_FOREGROUND;
     a_create(STDIN_FILENO, STDOUT_FILENO, af);
   }
-  ps_split(f & f_daemon);
-  a_init(csock, u, g, csockmode);
+
+  for (i = 0; tunnels[i]; i++) {
+    if (tunnels[i]->flags&TUNF_PRIVOPEN) {
+      ps_split(f & f_daemon);
+      break;
+    }
+  }
+
+  a_init();
+  a_signals();
+  a_listen(csock, u, g, csockmode);
+  a_switcherr();
   u_setugid(u, g);
   km_init(kr_priv, kr_pub, tag_priv);
   kx_init();