POTD skeleton #71.

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

5 files changed, 18 insertions, 3 deletions

diff --git a/src/jail.c b/src/jail.c
index 564e611..3f77dfd 100644
--- a/src/jail.c
+++ b/src/jail.c
@@ -29,6 +29,8 @@ typedef struct server_event {
 
 typedef struct client_event {
     psocket *client_sock;
+    char *host_buf;
+    char *service_buf;
     int tty_fd;
     int signal_fd;
     char tty_logbuf[BUFSIZ];
@@ -399,7 +401,7 @@ finalise:
 
 static int jail_socket_tty(prisoner_process *ctx, int tty_fd)
 {
-    static client_event ev_cli = {NULL, -1, -1, {0}, 0, 0, 0};
+    static client_event ev_cli = {NULL, NULL, NULL, -1, -1, {0}, 0, 0, 0};
     int s, rc = 1;
     event_ctx *ev_ctx = NULL;
     sigset_t mask;
@@ -448,6 +450,8 @@ static int jail_socket_tty(prisoner_process *ctx, int tty_fd)
     }
 
     ev_cli.client_sock = &ctx->client_psock;
+    ev_cli.host_buf = &ctx->host_buf[0];
+    ev_cli.service_buf = &ctx->service_buf[0];
     rc = event_loop(ev_ctx, jail_socket_tty_io, &ev_cli);
 finish:
     close(ev_cli.signal_fd);
@@ -508,7 +512,8 @@ static int jail_log_input(event_ctx *ev_ctx, int src_fd, int dst_fd,
             if (slen == 0) {
                 escape_ascii_string(ev_cli->tty_logbuf, ev_cli->off_logbuf,
                                     &ev_cli->tty_logbuf_escaped, &ev_cli->tty_logbuf_size);
-                C("%s", ev_cli->tty_logbuf_escaped);
+                C("[%s:%s] %s", ev_cli->host_buf, ev_cli->service_buf,
+                    ev_cli->tty_logbuf_escaped);
                 ev_cli->off_logbuf = 0;
                 ev_cli->tty_logbuf[0] = 0;
                 continue;
@@ -521,7 +526,8 @@ static int jail_log_input(event_ctx *ev_ctx, int src_fd, int dst_fd,
         if (buf[siz-1] == '\r' || buf[siz-1] == '\n') {
             escape_ascii_string(ev_cli->tty_logbuf, ev_cli->off_logbuf,
                                 &ev_cli->tty_logbuf_escaped, &ev_cli->tty_logbuf_size);
-            C("%s", ev_cli->tty_logbuf_escaped);
+            C("[%s:%s] %s", ev_cli->host_buf, ev_cli->service_buf,
+                ev_cli->tty_logbuf_escaped);
             ev_cli->off_logbuf = 0;
             ev_cli->tty_logbuf[0] = 0;
         }
diff --git a/src/log.c b/src/log.c
index a2d8cbf..0cc4a76 100644
--- a/src/log.c
+++ b/src/log.c
@@ -2,6 +2,7 @@
 
 #include "log.h"
 
+log_priority log_prio = NOTICE;
 log_open_cb log_open = NULL;
 log_close_cb log_close = NULL;
 log_fmt_cb log_fmt = NULL;
diff --git a/src/log.h b/src/log.h
index a43c93d..00042f9 100644
--- a/src/log.h
+++ b/src/log.h
@@ -60,6 +60,7 @@ typedef void (*log_fmtexerr_cb) (log_priority prio, const char *srcfile,
                                  __attribute__ ((format (printf, 4, 5)));
 
 
+extern log_priority log_prio;
 extern log_open_cb log_open;
 extern log_close_cb log_close;
 extern log_fmt_cb log_fmt;
diff --git a/src/log_colored.c b/src/log_colored.c
index 71f6d42..bd9f243 100644
--- a/src/log_colored.c
+++ b/src/log_colored.c
@@ -35,6 +35,8 @@ void log_fmt_colored(log_priority prio, const char *fmt, ...)
     char out[LOGMSG_MAXLEN+1] = {0};
     va_list arglist;
 
+    if (prio < log_prio)
+        return;
     assert(fmt);
     va_start(arglist, fmt);
     assert( vsnprintf(&out[0], LOGMSG_MAXLEN, fmt, arglist) >= 0 );
@@ -67,6 +69,8 @@ void log_fmtex_colored(log_priority prio, const char *srcfile,
     char out[LOGMSG_MAXLEN+1] = {0};
     va_list arglist;
 
+    if (prio < log_prio)
+        return;
     assert(fmt);
     va_start(arglist, fmt);
     assert( vsnprintf(&out[0], LOGMSG_MAXLEN, fmt, arglist) >= 0 );
@@ -102,6 +106,8 @@ void log_fmtexerr_colored(log_priority prio, const char *srcfile,
     char out[LOGMSG_MAXLEN+1] = {0};
     va_list arglist;
 
+    if (prio < log_prio)
+        return;
     assert(fmt);
     va_start(arglist, fmt);
     assert( vsnprintf(&out[0], LOGMSG_MAXLEN, fmt, arglist) >= 0 );
diff --git a/src/main.c b/src/main.c
index 3934fad..65d4eb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -128,6 +128,7 @@ int main(int argc, char *argv[])
     arg0 = argv[0];
 
     LOG_SET_FUNCS_VA(LOG_COLORED_FUNCS);
+    //log_prio = DEBUG;
 #ifdef HAVE_CONFIG_H
     N("%s (C) 2018 Toni Uhlig (%s)", PACKAGE_STRING, PACKAGE_BUGREPORT);
 #endif