POTD skeleton #64.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 37 insertions, 12 deletions

diff --git a/src/main.c b/src/main.c
index b2723c0..8130676 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <assert.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -15,6 +16,31 @@
 #include "config.h"
 #endif
 
+static void ssh_protocol_preinit(const char *ssh_ports[], protocol_ctx *ctx[],
+                                 const char *jail_ports[], const size_t siz);
+static void ssh_protocol_postinit(protocol_ctx *ctx[], const size_t siz);
+
+
+static void ssh_protocol_preinit(const char *ssh_ports[], protocol_ctx *ctx[],
+                                 const char *jail_ports[], const size_t siz)
+{
+    for (size_t i = 0; i < siz; ++i) {
+        ABORT_ON_FATAL( proto_init_ctx(&ctx[i], ssh_init_cb),
+            "SSH Protocol init" );
+        ABORT_ON_FATAL( proto_setup(ctx[i], "127.0.0.1", ssh_ports[i],
+            "127.0.0.1", jail_ports[i]), "SSH Protocol setup" );
+        ABORT_ON_FATAL( proto_validate_ctx(ctx[i]),
+            "SSH validation" );
+    }
+}
+
+static void ssh_protocol_postinit(protocol_ctx *ctx[], const size_t siz)
+{
+    for (size_t i = 0; i < siz; ++i) {
+        ABORT_ON_FATAL( proto_listen(ctx[i]),
+            "SSH Protocol listen" );
+    }
+}
 
 int main(int argc, char *argv[])
 {
@@ -38,7 +64,9 @@ int main(int argc, char *argv[])
     arg0 = argv[0];
 
     LOG_SET_FUNCS_VA(LOG_COLORED_FUNCS);
+#ifdef HAVE_CONFIG_H
     N("%s (C) 2018 Toni Uhlig (%s)", PACKAGE_STRING, PACKAGE_BUGREPORT);
+#endif
 
     if (geteuid() != 0) {
         E("%s", "I was made for root!");
@@ -60,6 +88,8 @@ int main(int argc, char *argv[])
         FATAL("Forking (fork returned %d)", daemon_pid);
     }
     D2("Master pid: %d", getpid());
+    ABORT_ON_FATAL( set_master_sighandler(),
+        "Master sighandler" );
 
     memset(jail, 0, sizeof(jail));
     jail_ports[0] = "33333";
@@ -85,15 +115,14 @@ int main(int argc, char *argv[])
     memset(ssh_proto, 0, sizeof(proto_ports));
     proto_ports[0] = "22222";
     proto_ports[1] = "22223";
+    assert(SIZEOF(proto_ports) == SIZEOF(jail_ports));
+    ssh_protocol_preinit(proto_ports, ssh_proto, jail_ports, proto_siz);
 
-    for (size_t i = 0; i < proto_siz; ++i) {
-        ABORT_ON_FATAL( proto_init_ctx(&ssh_proto[i], ssh_init_cb),
-            "SSH Protocol init" );
-        ABORT_ON_FATAL( proto_setup(ssh_proto[i], "127.0.0.1", proto_ports[i],
-            "127.0.0.1", jail_ports[i]), "SSH Protocol setup" );
-        ABORT_ON_FATAL( proto_validate_ctx(ssh_proto[i]),
-            "SSH validation" );
-    }
+    D2("Main process is dropping privileges to %s:%s", "nobody", "NULL");
+    ABORT_ON_FATAL( change_user_group("nobody", NULL),
+        "Main process dropping privileges" );
+
+    ssh_protocol_postinit(ssh_proto, proto_siz);
 
     memset(rdr, 0, sizeof(rdr));
     rdr_ports[0] = "2222";
@@ -115,10 +144,6 @@ int main(int argc, char *argv[])
     ABORT_ON_FATAL( redirector_setup_event( rdr, rdr_siz, &rdr_event ),
         "Redirector event setup" );
 
-    D2("Main process is dropping privileges to %s:%s", "nobody", "NULL");
-    ABORT_ON_FATAL( change_user_group("nobody", NULL),
-        "Main process dropping privileges" );
-
     N("%s", "Redirector epoll mainloop");
     rdr_pid = redirector_daemonize( rdr_event, rdr, rdr_siz );
     ABORT_ON_FATAL( rdr_pid < 1, "Server epoll mainloop" );