POTD skeleton #47.

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

1 files changed, 13 insertions, 13 deletions

diff --git a/src/main.c b/src/main.c
index 5b2248c..57c5a97 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,7 +5,7 @@
 #include "log.h"
 #include "log_colored.h"
 #include "utils.h"
-#include "server.h"
+#include "redirector.h"
 #include "server_ssh.h"
 #include "forward.h"
 #include "jail.h"
@@ -20,13 +20,13 @@ int main(int argc, char *argv[])
     const size_t jail_siz = 2;
     const char *ssh_ports[srv_siz];
     const char *jail_ports[jail_siz];
-    server_ctx *srv[srv_siz];
+    redirector_ctx *rdr[srv_siz];
     jail_ctx *jail[jail_siz];
     forward_ctx *ssh_fwd = NULL;
-    event_ctx *srv_event = NULL;
+    event_ctx *rdr_event = NULL;
     event_ctx *jail_event = NULL;
     int proc_status;
-    pid_t daemon_pid, srv_pid, jail_pid, wpid;
+    pid_t daemon_pid, rdr_pid, jail_pid, wpid;
 
     (void) argc;
     (void) argv;
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
             "Forwarder validation" );
     }
 
-    memset(srv, 0, sizeof(srv));
+    memset(rdr, 0, sizeof(rdr));
     ssh_ports[0] = "2222";
     ssh_ports[1] = "2223";
     ssh_ports[2] = "22050";
@@ -83,15 +83,15 @@ int main(int argc, char *argv[])
     for (size_t i = 0; i < srv_siz; ++i) {
         D("Initialising redirector service on port %s", ssh_ports[i]);
 
-        server_init_ctx(&srv[i], ssh_fwd);
-        ABORT_ON_FATAL( server_setup(srv[i], NULL, ssh_ports[i]),
+        redirector_init_ctx(&rdr[i], ssh_fwd);
+        ABORT_ON_FATAL( redirector_setup(rdr[i], NULL, ssh_ports[i]),
            "Server setup" );
-        ABORT_ON_FATAL( server_validate_ctx(srv[i]),
+        ABORT_ON_FATAL( redirector_validate_ctx(rdr[i]),
            "Server validation" );
     }
 
     D2("%s", "Server event setup");
-    ABORT_ON_FATAL( server_setup_event( srv, srv_siz, &srv_event ),
+    ABORT_ON_FATAL( redirector_setup_event( rdr, srv_siz, &rdr_event ),
         "Server event setup" );
 
     D2("Server dropping privileges to %s:%s", "nobody", "NULL");
@@ -99,16 +99,16 @@ int main(int argc, char *argv[])
         "Server dropping privileges" );
 
     N("%s", "Server epoll mainloop");
-    srv_pid = server_daemonize( srv_event, srv, srv_siz );
-    ABORT_ON_FATAL( srv_pid < 1, "Server epoll mainloop" );
+    rdr_pid = redirector_daemonize( rdr_event, rdr, srv_siz );
+    ABORT_ON_FATAL( rdr_pid < 1, "Server epoll mainloop" );
 
     while (1) {
         wpid = wait(&proc_status);
         if (wpid == jail_pid ||
-            wpid == srv_pid) {
+            wpid == rdr_pid) {
             E2("%s daemon with pid %d terminated, exiting",
                 (wpid == jail_pid ? "Jail" : "Server"),
-                (wpid == jail_pid ? jail_pid : srv_pid));
+                (wpid == jail_pid ? jail_pid : rdr_pid));
             break;
         }
     }