POTD skeleton #49.

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

13 files changed, 270 insertions, 124 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index e3bd8fc..f382f08 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,4 +2,4 @@ AM_CFLAGS = -pedantic -Wall -std=gnu99 -fstrict-aliasing -D_GNU_SOURCE=1 $(libss
 AM_LDFLAGS = $(libssh_LIBS)
 
 sbin_PROGRAMS = potd
-potd_SOURCES = utils.c log.c log_colored.c socket.c pevent.c jail.c forward.c redirector.c server_ssh.c main.c
+potd_SOURCES = utils.c log.c log_colored.c socket.c pevent.c jail.c forward.c redirector.c protocol.c protocol_ssh.c main.c
diff --git a/src/forward.c b/src/forward.c
index d81f24c..84362be 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -6,16 +6,14 @@
 #include "log.h"
 
 
-int fwd_init_ctx(forward_ctx **ctx, init_cb init_fn)
+int fwd_init_ctx(forward_ctx **ctx)
 {
-    assert(ctx || init_fn);
+    assert(ctx);
     if (!*ctx)
         *ctx = (forward_ctx *) malloc(sizeof(**ctx));
     assert(*ctx);
 
     memset(*ctx, 0, sizeof(**ctx));
-    if (init_fn(*ctx))
-        return 1;
 
     return 0;
 }
@@ -23,37 +21,53 @@ int fwd_init_ctx(forward_ctx **ctx, init_cb init_fn)
 int fwd_setup_client(forward_ctx *ctx, const char *host, const char *port)
 {
     int s;
-    struct addrinfo *fwd_addr = NULL;
 
     assert(ctx);
     ctx->fwd_type = FT_CLIENT;
 
-    s = socket_init_in(host, port, &fwd_addr);
+    s = socket_init_in(host, port, &ctx->ai);
     if (s) {
         E_GAIERR(s, "Could not initialise client forward socket");
         return 1;
     }
 
-    if (!ctx->fwd_cbs.on_listen)
-        return 1;
-    if (ctx->fwd_cbs.on_listen(ctx, host, port))
-        return 1;
-
-    if (socket_connect_in(&ctx->sock, &fwd_addr)) {
-        E_STRERR("Connection to forward socket %s:%s", host, port);
-        return 1;
-    }
-    s = socket_addrtostr_in(&ctx->sock, ctx->host_buf, ctx->service_buf);
-    if (s) {
-        E_GAIERR(s, "Convert forward socket address to string");
-        return 1;
+    s = socket_connectaddr_in(&ctx->sock, &ctx->ai,
+                              ctx->host_buf,
+                              ctx->service_buf);
+    switch (s) {
+        case -1:
+            E_STRERR("Connection to forward socket %s:%s", host, port);
+            break;
+        case 0:
+            break;
+        default:
+            E_GAIERR(s, "Convert forward socket address to string");
+            break;
     }
+
     if (socket_close(&ctx->sock)) {
         E_STRERR("Forward socket to %s:%s close",
             ctx->host_buf, ctx->service_buf);
         return 1;
     }
 
+    return s != 0;
+}
+
+int fwd_setup_client_silent(forward_ctx *ctx, const char *host,
+                            const char *port)
+{
+    int s;
+
+    assert(ctx);
+    ctx->fwd_type = FT_CLIENT;
+
+    s = socket_init_in(host, port, &ctx->ai);
+    if (s) {
+        E_GAIERR(s, "Could not initialise client forward socket");
+        return 1;
+    }
+
     return 0;
 }
 
@@ -85,7 +99,6 @@ int fwd_validate_ctx(const forward_ctx *ctx)
     assert(ctx);
     assert(ctx->fwd_type == FT_CLIENT ||
            ctx->fwd_type == FT_SERVER);
-    assert(ctx->fwd_cbs.on_listen && ctx->fwd_cbs.on_shutdown);
     assert(ctx->sock.addr_len > 0);
     assert(strnlen(ctx->host_buf, NI_MAXHOST) > 0);
     assert(strnlen(ctx->service_buf, NI_MAXSERV) > 0);
@@ -95,6 +108,7 @@ int fwd_validate_ctx(const forward_ctx *ctx)
 
 int fwd_connect_sock(forward_ctx *ctx, psocket *fwd_client)
 {
+    int s;
     psocket *dst;
 
     assert(ctx);
@@ -106,7 +120,28 @@ int fwd_connect_sock(forward_ctx *ctx, psocket *fwd_client)
         dst = &ctx->sock;
     }
 
-    return socket_reconnect_in(dst);
+    if (ctx->ai) {
+        s = socket_connectaddr_in(&ctx->sock, &ctx->ai,
+                                  ctx->host_buf,
+                                  ctx->service_buf);
+        switch (s) {
+            case -1:
+                E_STRERR("Connection to forward socket with fd %d",
+                    ctx->sock.fd);
+                break;
+            case 0:
+                if (ctx->ai)
+                    s = 1;
+                break;
+            default:
+            E_GAIERR(s, "Convert forward socket address to string");
+            break;
+        }
+
+        return s != 0;
+    } else {
+        return socket_reconnect_in(dst);
+    }
 }
 
 int fwd_listen_sock(forward_ctx *ctx, psocket *fwd_server)
diff --git a/src/forward.h b/src/forward.h
index 1676c1b..3d2a89a 100644
--- a/src/forward.h
+++ b/src/forward.h
@@ -3,35 +3,26 @@
 
 #include "socket.h"
 
-struct forward_ctx;
-
-typedef int (*init_cb) (struct forward_ctx *ctx);
-typedef int (*on_listen_cb) (struct forward_ctx *ctx, const char *host,
-                             const char *port);
-typedef int (*on_shutdown_cb) (struct forward_ctx *ctx);
-
-typedef struct fwd_callbacks {
-    on_listen_cb on_listen;
-    on_shutdown_cb on_shutdown;
-} fwd_callbacks;
-
 typedef enum forward_type {
     FT_NONE = 0, FT_CLIENT, FT_SERVER
 } forward_type;
 
 typedef struct forward_ctx {
     forward_type fwd_type;
-    fwd_callbacks fwd_cbs;
     psocket sock;
     char host_buf[NI_MAXHOST], service_buf[NI_MAXSERV];
+    struct addrinfo *ai;
     void *data;
 } forward_ctx;
 
 
-int fwd_init_ctx(forward_ctx **ctx, init_cb init_fn);
+int fwd_init_ctx(forward_ctx **ctx);
 
 int fwd_setup_client(forward_ctx *ctx, const char *host, const char *port);
 
+int fwd_setup_client_silent(forward_ctx *ctx, const char *host,
+                            const char *port);
+
 int fwd_setup_server(forward_ctx *ctx, const char *listen_addr,
                                        const char *listen_port);
 
diff --git a/src/main.c b/src/main.c
index 57c5a97..9c0b265 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 #include "log_colored.h"
 #include "utils.h"
 #include "redirector.h"
-#include "server_ssh.h"
+#include "protocol_ssh.h"
 #include "forward.h"
 #include "jail.h"
 #ifdef HAVE_CONFIG_H
@@ -16,17 +16,19 @@
 
 int main(int argc, char *argv[])
 {
-    const size_t srv_siz = 3;
+    const size_t rdr_siz = 3;
+    const size_t proto_siz = 2;
     const size_t jail_siz = 2;
-    const char *ssh_ports[srv_siz];
+    const char *rdr_ports[rdr_siz];
+    const char *proto_ports[proto_siz];
     const char *jail_ports[jail_siz];
-    redirector_ctx *rdr[srv_siz];
+    redirector_ctx *rdr[rdr_siz];
+    protocol_ctx *ssh_proto[proto_siz];
     jail_ctx *jail[jail_siz];
-    forward_ctx *ssh_fwd = NULL;
     event_ctx *rdr_event = NULL;
     event_ctx *jail_event = NULL;
     int proc_status;
-    pid_t daemon_pid, rdr_pid, jail_pid, wpid;
+    pid_t daemon_pid, rdr_pid, jail_pid, child_pid;
 
     (void) argc;
     (void) argv;
@@ -66,49 +68,54 @@ int main(int argc, char *argv[])
     jail_pid = jail_daemonize(&jail_event, jail, jail_siz);
     ABORT_ON_FATAL( jail_pid < 1, "Jail daemon startup" );
 
-    {
-        ABORT_ON_FATAL( fwd_init_ctx(&ssh_fwd, ssh_init_cb),
-            "Forwarder initialisation" );
-        ABORT_ON_FATAL( fwd_setup_client(ssh_fwd, "127.0.0.1", "22222"),
-            "Forwarder setup" );
-        ABORT_ON_FATAL( fwd_validate_ctx( ssh_fwd ),
-            "Forwarder validation" );
+    memset(ssh_proto, 0, sizeof(proto_ports));
+    proto_ports[0] = "22222";
+    proto_ports[1] = "22223";
+
+    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" );
     }
 
     memset(rdr, 0, sizeof(rdr));
-    ssh_ports[0] = "2222";
-    ssh_ports[1] = "2223";
-    ssh_ports[2] = "22050";
+    rdr_ports[0] = "2222";
+    rdr_ports[1] = "2223";
+    rdr_ports[2] = "22050";
 
-    for (size_t i = 0; i < srv_siz; ++i) {
-        D("Initialising redirector service on port %s", ssh_ports[i]);
+    for (size_t i = 0; i < rdr_siz; ++i) {
+        D("Initialising redirector service on port %s", rdr_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( redirector_init_ctx(&rdr[i]),
+            "Redirector init" );
+        ABORT_ON_FATAL( redirector_setup(rdr[i], NULL, rdr_ports[i],
+            "127.0.0.1", "22222"), "Redirector setup" );
         ABORT_ON_FATAL( redirector_validate_ctx(rdr[i]),
-           "Server validation" );
+            "Redirector validation" );
     }
 
-    D2("%s", "Server event setup");
-    ABORT_ON_FATAL( redirector_setup_event( rdr, srv_siz, &rdr_event ),
-        "Server event setup" );
+    D2("%s", "Redirector event setup");
+    ABORT_ON_FATAL( redirector_setup_event( rdr, rdr_siz, &rdr_event ),
+        "Redirector event setup" );
 
-    D2("Server dropping privileges to %s:%s", "nobody", "NULL");
+    D2("Main process is dropping privileges to %s:%s", "nobody", "NULL");
     ABORT_ON_FATAL( change_user_group("nobody", NULL),
-        "Server dropping privileges" );
+        "Main process dropping privileges" );
 
-    N("%s", "Server epoll mainloop");
-    rdr_pid = redirector_daemonize( rdr_event, rdr, srv_siz );
+    N("%s", "Redirector epoll mainloop");
+    rdr_pid = redirector_daemonize( rdr_event, rdr, rdr_siz );
     ABORT_ON_FATAL( rdr_pid < 1, "Server epoll mainloop" );
 
     while (1) {
-        wpid = wait(&proc_status);
-        if (wpid == jail_pid ||
-            wpid == rdr_pid) {
+        child_pid = wait(&proc_status);
+        if (child_pid == jail_pid ||
+            child_pid == rdr_pid) {
             E2("%s daemon with pid %d terminated, exiting",
-                (wpid == jail_pid ? "Jail" : "Server"),
-                (wpid == jail_pid ? jail_pid : rdr_pid));
+                (child_pid == jail_pid ? "Jail" : "Server"),
+                (child_pid == jail_pid ? jail_pid : rdr_pid));
             break;
         }
     }
diff --git a/src/protocol.c b/src/protocol.c
new file mode 100644
index 0000000..0bea5a3
--- /dev/null
+++ b/src/protocol.c
@@ -0,0 +1,49 @@
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "protocol.h"
+#include "log.h"
+#include "socket.h"
+
+
+int proto_init_ctx(protocol_ctx **ctx, proto_init_cb init_fn)
+{
+    assert(ctx && init_fn);
+    if (!*ctx)
+        *ctx = (protocol_ctx *) malloc(sizeof(**ctx));
+    assert(*ctx);
+
+    memset(*ctx, 0, sizeof(**ctx));
+    if (init_fn(*ctx))
+        return 1;
+
+    return 0;
+}
+
+int proto_setup(protocol_ctx *ctx, const char *listen_addr,
+                const char *listen_port, const char *jail_host,
+                const char *jail_port)
+{
+    assert(ctx);
+
+    if (fwd_setup_server(&ctx->src, listen_addr, listen_port))
+        return 1;
+    if (fwd_setup_client_silent(&ctx->dst, jail_host, jail_port))
+        return 1;
+
+    if (!ctx->cbs.on_listen)
+        return 1;
+    if (ctx->cbs.on_listen(ctx, listen_addr, listen_port))
+        return 1;
+
+    return 0;
+}
+
+int proto_validate_ctx(const protocol_ctx *ctx)
+{
+    assert(ctx);
+    assert(ctx->cbs.on_listen && ctx->cbs.on_shutdown);
+
+    return 0;
+}
diff --git a/src/protocol.h b/src/protocol.h
new file mode 100644
index 0000000..88ffcf8
--- /dev/null
+++ b/src/protocol.h
@@ -0,0 +1,36 @@
+#ifndef POTD_PROTOCOL_H
+#define POTD_PROTOCOL_H 1
+
+#include "forward.h"
+
+#define PROTO_NAMELEN 16
+
+struct protocol_ctx;
+
+typedef int (*proto_init_cb) (struct protocol_ctx *ctx);
+typedef int (*proto_listen_cb) (struct protocol_ctx *ctx, const char *host,
+                                const char *port);
+typedef int (*proto_shutdown_cb) (struct protocol_ctx *ctx);
+
+typedef struct protocol_cbs {
+    proto_listen_cb on_listen;
+    proto_shutdown_cb on_shutdown;
+} protocol_cbs;
+
+typedef struct protocol_ctx {
+    const char name[PROTO_NAMELEN];
+    forward_ctx src;
+    forward_ctx dst;
+    protocol_cbs cbs;
+} protocol_ctx;
+
+
+int proto_init_ctx(protocol_ctx **ctx, proto_init_cb init_fn);
+
+int proto_setup(protocol_ctx *ctx, const char *listen_addr,
+                const char *listen_port, const char *jail_host,
+                const char *jail_port);
+
+int proto_validate_ctx(const protocol_ctx *ctx);
+
+#endif
diff --git a/src/server_ssh.c b/src/protocol_ssh.c
index 7e86096..ea2aa5b 100644
--- a/src/server_ssh.c
+++ b/src/protocol_ssh.c
@@ -11,7 +11,8 @@
 #include <libssh/callbacks.h>
 #include <libssh/server.h>
 
-#include "server_ssh.h"
+#include "protocol_ssh.h"
+#include "protocol.h"
 #include "log.h"
 
 #if LIBSSH_VERSION_MAJOR != 0 || LIBSSH_VERSION_MINOR < 7 || \
@@ -24,7 +25,7 @@ typedef struct ssh_data {
     ssh_bind sshbind;
 } ssh_data;
 
-struct fwd_callbacks potd_ssh_callbacks = {
+struct protocol_cbs potd_ssh_callbacks = {
     .on_listen = ssh_on_listen,
     .on_shutdown = ssh_on_shutdown
 };
@@ -52,7 +53,7 @@ struct ssh_channel_callbacks_struct ssh_channel_cb = {
 };
 
 
-int ssh_init_cb(struct forward_ctx *ctx)
+int ssh_init_cb(protocol_ctx *ctx)
 {
     N("libssh version: %s", ssh_version(0));
     if (ssh_version(SSH_VERSION_INT(LIBSSH_VERSION_MAJOR,
@@ -74,7 +75,7 @@ int ssh_init_cb(struct forward_ctx *ctx)
           "libssh versions > 0.7.3 may suffer "
           "from problems with the pki key generation/export");
     }
-    ctx->fwd_cbs = potd_ssh_callbacks;
+    ctx->cbs = potd_ssh_callbacks;
 
     if (ssh_init())
         return 1;
@@ -82,7 +83,7 @@ int ssh_init_cb(struct forward_ctx *ctx)
     ssh_data *d = (ssh_data *) calloc(1, sizeof(*d));
     assert(d);
     d->sshbind = ssh_bind_new();
-    ctx->data = d;
+    ctx->src.data = d;
 
     ssh_set_log_callback(ssh_log_cb);
     ssh_set_log_level(SSH_LOG_FUNCTIONS);
@@ -97,11 +98,11 @@ int ssh_init_cb(struct forward_ctx *ctx)
     return 0;
 }
 
-int ssh_on_listen(struct forward_ctx *ctx, const char *host,
+int ssh_on_listen(protocol_ctx *ctx, const char *host,
                   const char *port)
 {
     int s;
-    ssh_data *d = (ssh_data *) ctx->data;
+    ssh_data *d = (ssh_data *) ctx->src.data;
 
     if (ssh_bind_options_set(d->sshbind, SSH_BIND_OPTIONS_BINDADDR,
                              host))
@@ -127,7 +128,7 @@ int ssh_on_listen(struct forward_ctx *ctx, const char *host,
     return s;
 }
 
-int ssh_on_shutdown(struct forward_ctx *ctx)
+int ssh_on_shutdown(protocol_ctx *ctx)
 {
     return 0;
 }
diff --git a/src/protocol_ssh.h b/src/protocol_ssh.h
new file mode 100644
index 0000000..52b628b
--- /dev/null
+++ b/src/protocol_ssh.h
@@ -0,0 +1,15 @@
+#ifndef POTD_SERVER_SSH_H
+#define POTD_SERVER_SSH_H 1
+
+#include <libssh/server.h>
+
+#include "protocol.h"
+
+int ssh_init_cb(protocol_ctx *ctx);
+
+int ssh_on_listen(protocol_ctx *ctx, const char *host,
+                  const char *port);
+
+int ssh_on_shutdown(protocol_ctx *ctx);
+
+#endif
diff --git a/src/redirector.c b/src/redirector.c
index 9366079..c21fa61 100644
--- a/src/redirector.c
+++ b/src/redirector.c
@@ -15,11 +15,11 @@ typedef struct client_thread {
     pthread_t self;
     psocket client_sock;
     char host_buf[NI_MAXHOST], service_buf[NI_MAXSERV];
-    const redirector_ctx *rdr_ctx;
+    redirector_ctx *rdr_ctx;
 } client_thread;
 
 typedef struct server_event {
-    const redirector_ctx **rdr_ctx;
+    redirector_ctx **rdr_ctx;
     const size_t siz;
 } server_event;
 
@@ -32,7 +32,7 @@ static forward_state
 fwd_state_string(const forward_state c_state, const client_thread *args,
                  const psocket *fwd);
 static int
-redirector_mainloop(event_ctx *ev_ctx, const redirector_ctx *rdr_ctx[], size_t siz)
+redirector_mainloop(event_ctx *ev_ctx, redirector_ctx *rdr_ctx[], size_t siz)
     __attribute__((noreturn));
 static int redirector_accept_client(event_ctx *ev_ctx, int fd, void *user_data);
 static void *
@@ -40,19 +40,26 @@ client_mainloop(void *arg);
 static int client_io(event_ctx *ev_ctx, int src_fd, void *user_data);
 
 
-void redirector_init_ctx(redirector_ctx **ctx, forward_ctx *fwd_ctx)
+int redirector_init_ctx(redirector_ctx **ctx)
 {
-    assert(ctx && fwd_ctx);
+    forward_ctx *fwd;
+
+    assert(ctx);
     if (!*ctx)
         *ctx = (redirector_ctx *) malloc(sizeof(**ctx));
     assert(*ctx);
 
     memset(*ctx, 0, sizeof(**ctx));
-    (*ctx)->fwd_ctx = fwd_ctx;
+    fwd = &(*ctx)->fwd_ctx;
+    if (fwd_init_ctx(&fwd))
+        return 1;
+
+    return 0;
 }
 
 int redirector_setup(redirector_ctx *ctx,
-                 const char *listen_addr, const char *listen_port)
+                 const char *listen_addr, const char *listen_port,
+                 const char *host, const char *port)
 {
     int s;
     struct addrinfo *srv_addr = NULL;
@@ -60,8 +67,9 @@ int redirector_setup(redirector_ctx *ctx,
     assert(ctx);
     assert(listen_addr || listen_port);
 
-    D2("Try to listen on %s:%s",
-       (listen_addr ? listen_addr : "*"), listen_port);
+    D2("Try to listen on %s:%s and forward to %s:%s",
+       (listen_addr ? listen_addr : "*"), listen_port,
+       host, port);
     s = socket_init_in(listen_addr, listen_port, &srv_addr);
     if (s) {
         E_GAIERR(s, "Could not initialise server socket");
@@ -78,12 +86,17 @@ int redirector_setup(redirector_ctx *ctx,
         return 1;
     }
 
+    if (fwd_setup_client(&ctx->fwd_ctx, host, port))
+        return 1;
+    if (fwd_validate_ctx(&ctx->fwd_ctx))
+        return 1;
+
     return 0;
 }
 
 int redirector_validate_ctx(const redirector_ctx *ctx)
 {
-    assert(ctx && ctx->fwd_ctx);
+    assert(ctx);
     assert(ctx->sock.fd >= 0 && ctx->sock.addr_len > 0);
 
     return 0;
@@ -145,7 +158,7 @@ pid_t redirector_daemonize(event_ctx *ev_ctx, redirector_ctx *rdr_ctx[], size_t
             return -1;
         case 0:
             N("%s", "Server daemon mainloop");
-            redirector_mainloop(ev_ctx, (const redirector_ctx **) rdr_ctx, siz);
+            redirector_mainloop(ev_ctx, rdr_ctx, siz);
             break;
     }
     D2("Server daemon pid: %d", p);
@@ -172,14 +185,14 @@ fwd_state_string(const forward_state c_state, const client_thread *args,
             break;
         case CON_OUT_ERROR:
             N("Lost forward connection to %s:%s: %d",
-                args->rdr_ctx->fwd_ctx->host_buf,
-                args->rdr_ctx->fwd_ctx->service_buf,
+                args->rdr_ctx->fwd_ctx.host_buf,
+                args->rdr_ctx->fwd_ctx.service_buf,
                 fwd->fd);
             break;
         case CON_OUT_TERMINATED:
             N("Forward connection terminated: %s:%s: %d",
-                args->rdr_ctx->fwd_ctx->host_buf,
-                args->rdr_ctx->fwd_ctx->service_buf,
+                args->rdr_ctx->fwd_ctx.host_buf,
+                args->rdr_ctx->fwd_ctx.service_buf,
                 fwd->fd);
             break;
     }
@@ -187,7 +200,7 @@ fwd_state_string(const forward_state c_state, const client_thread *args,
     return c_state;
 }
 
-static int redirector_mainloop(event_ctx *ev_ctx, const redirector_ctx *rdr_ctx[], size_t siz)
+static int redirector_mainloop(event_ctx *ev_ctx, redirector_ctx *rdr_ctx[], size_t siz)
 {
     int rc;
     server_event ev_srv = { rdr_ctx, siz };
@@ -207,7 +220,7 @@ static int redirector_accept_client(event_ctx *ev_ctx, int fd, void *user_data)
     int s;
     server_event *ev_srv = (server_event *) user_data;
     client_thread *args;
-    const redirector_ctx *rdr_ctx;
+    redirector_ctx *rdr_ctx;
 
     (void) ev_ctx;
     assert(ev_srv);
@@ -278,21 +291,21 @@ client_mainloop(void *arg)
         goto finish;
     }
 
-    if (fwd_connect_sock(args->rdr_ctx->fwd_ctx, &fwd)) {
+    if (fwd_connect_sock(&args->rdr_ctx->fwd_ctx, &fwd)) {
         E_STRERR("Forward connection to %s:%s server fd %d",
-            args->rdr_ctx->fwd_ctx->host_buf,
-            args->rdr_ctx->fwd_ctx->service_buf,
+            args->rdr_ctx->fwd_ctx.host_buf,
+            args->rdr_ctx->fwd_ctx.service_buf,
             args->rdr_ctx->sock.fd);
         goto finish;
     }
     N("Forwarding connection to %s:%s forward fd %d",
-        args->rdr_ctx->fwd_ctx->host_buf,
-        args->rdr_ctx->fwd_ctx->service_buf, fwd.fd);
+        args->rdr_ctx->fwd_ctx.host_buf,
+        args->rdr_ctx->fwd_ctx.service_buf, fwd.fd);
 
     if (event_add_sock(ev_ctx, &fwd)) {
         E_STRERR("Forward event context add to %s:%s forward fd %d",
-            args->rdr_ctx->fwd_ctx->host_buf,
-            args->rdr_ctx->fwd_ctx->service_buf, fwd.fd);
+            args->rdr_ctx->fwd_ctx.host_buf,
+            args->rdr_ctx->fwd_ctx.service_buf, fwd.fd);
         goto finish;
     }
 
@@ -303,14 +316,14 @@ client_mainloop(void *arg)
     s = socket_nonblock(&args->client_sock);
     if (s) {
         E_STRERR("Socket non blocking mode to %s:%s forward fd %d",
-            args->rdr_ctx->fwd_ctx->host_buf,
-            args->rdr_ctx->fwd_ctx->service_buf, fwd.fd);
+            args->rdr_ctx->fwd_ctx.host_buf,
+            args->rdr_ctx->fwd_ctx.service_buf, fwd.fd);
         goto finish;
     }
     if (event_add_sock(ev_ctx, &args->client_sock)) {
         E_STRERR("Forward event context add to %s:%s forward fd %d",
-	        args->rdr_ctx->fwd_ctx->host_buf,
-            args->rdr_ctx->fwd_ctx->service_buf, fwd.fd);
+	        args->rdr_ctx->fwd_ctx.host_buf,
+            args->rdr_ctx->fwd_ctx.service_buf, fwd.fd);
         goto finish;
     }
 
diff --git a/src/redirector.h b/src/redirector.h
index 3d62335..a076f77 100644
--- a/src/redirector.h
+++ b/src/redirector.h
@@ -7,16 +7,17 @@
 
 
 typedef struct redirector_ctx { 
-    forward_ctx *fwd_ctx;
+    forward_ctx fwd_ctx;
     psocket sock;
     char host_buf[NI_MAXHOST], service_buf[NI_MAXSERV];
 } redirector_ctx;
 
 
-void redirector_init_ctx(redirector_ctx **rdr_ctx, forward_ctx *fwd_ctx);
+int redirector_init_ctx(redirector_ctx **rdr_ctx);
 
 int redirector_setup(redirector_ctx *rdr_ctx,
-                     const char *listen_addr, const char *listen_port);
+                     const char *listen_addr, const char *listen_port,
+                     const char *host, const char *port);
 
 int redirector_validate_ctx(const redirector_ctx *rdr_ctx);
 
diff --git a/src/server_ssh.h b/src/server_ssh.h
deleted file mode 100644
index 291478b..0000000
--- a/src/server_ssh.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef POTD_SERVER_SSH_H
-#define POTD_SERVER_SSH_H 1
-
-#include <libssh/server.h>
-
-#include "forward.h"
-
-int ssh_init_cb(struct forward_ctx *ctx);
-
-int ssh_on_listen(struct forward_ctx *ctx, const char *host,
-                  const char *port);
-
-int ssh_on_shutdown(struct forward_ctx *ctx);
-
-#endif
diff --git a/src/socket.c b/src/socket.c
index 2689c0f..917ade1 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -166,6 +166,15 @@ finalise:
     return s;
 }
 
+int socket_connectaddr_in(psocket *psock, struct addrinfo **results,
+                          char host_buf[NI_MAXHOST],
+                          char service_buf[NI_MAXSERV])
+{
+    if (socket_connect_in(psock, results))
+        return -1;
+    return socket_addrtostr_in(psock, host_buf, service_buf);
+}
+
 int socket_addrtostr_in(const psocket *psock,
                         char hbuf[NI_MAXHOST], char sbuf[NI_MAXSERV])
 {
diff --git a/src/socket.h b/src/socket.h
index d2bb160..913f6c2 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -28,6 +28,10 @@ int socket_accept_in(const psocket *psock, psocket *client_psock);
 
 int socket_connect_in(psocket *psock, struct addrinfo **results);
 
+int socket_connectaddr_in(psocket *psock, struct addrinfo **results,
+                          char host_buf[NI_MAXHOST],
+                          char service_buf[NI_MAXSERV]);
+
 int socket_addrtostr_in(const psocket *psock,
                         char hbuf[NI_MAXHOST], char sbuf[NI_MAXSERV]);