mt_server: Use "%s" format string in syslog()

[coffee/mt-apps.git] / mt_server.c

diff --git a/mt_server.c b/mt_server.c
index cb5ba026a70d29639ddaa01f3329b07b3592f867..3b617bd68eea29d53d2b6b353337e4f3ec7ec3d4 100644 (file)
--- a/mt_server.c
+++ b/mt_server.c
@@ -1,9 +1,13 @@
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <syslog.h>
 
 #include "mt_server.h"
 #include "signal_exit.h"
+#include "mt_blank.h"
 
 char *new_line()
 {
@@ -86,23 +90,23 @@ void list_deinit(list *in)
 }
 
 static const struct lws_http_mount mount = {
-    /* .mount_next */            NULL,         /* linked-list "next" */
-    /* .mountpoint */            HTTP_MOUNTPOINT,
-    /* .origin */                HTTP_ORIGIN,  /* serve from dir */
-    /* .def */                   HTTP_DEFAULT, /* default filename */
-    /* .protocol */              NULL,
-    /* .cgienv */                NULL,
-    /* .extra_mimetypes */       NULL,
-    /* .interpret */             NULL,
-    /* .cgi_timeout */           0,
-    /* .cache_max_age */         0,
-    /* .auth_mask */             0,
-    /* .cache_reusable */        0,
-    /* .cache_revalidate */      0,
-    /* .cache_intermediaries */  0,
-    /* .origin_protocol */       LWSMPRO_FILE, /* files in a dir */
-    /* .mountpoint_len */        1,            /* char count */
-    /* .basic_auth_login_file */ NULL,
+    .mount_next =            NULL,         /* linked-list "next" */
+    .mountpoint =            HTTP_MOUNTPOINT,
+    .origin =                HTTP_ORIGIN,  /* serve from dir */
+    .def =                   HTTP_DEFAULT, /* default filename */
+    .protocol =              NULL,
+    .cgienv =                NULL,
+    .extra_mimetypes =       NULL,
+    .interpret =             NULL,
+    .cgi_timeout =           0,
+    .cache_max_age =         0,
+    .auth_mask =             0,
+    .cache_reusable =        0,
+    .cache_revalidate =      0,
+    .cache_intermediaries =  0,
+    .origin_protocol =       LWSMPRO_FILE, /* files in a dir */
+    .mountpoint_len =        1,            /* char count */
+    .basic_auth_login_file = NULL,
 };
 
 typedef struct per_vhost_data__merica_terminal {
@@ -143,6 +147,7 @@ static int callback_merica_terminal(struct lws *wsi,
                                     enum lws_callback_reasons reason,
                                     void *user, void *in, size_t len)
 {
+    struct lws_context *context = lws_get_context(wsi);
     struct lws_vhost *vhost = lws_get_vhost(wsi);
     const struct lws_protocols *prot = lws_get_protocol(wsi);
     /*
@@ -155,7 +160,7 @@ static int callback_merica_terminal(struct lws *wsi,
 
     int n, m;
 
-    list *lines = (list *)prot->user;
+    list *lines = (list *)lws_context_user(context);
     char *line;
 
     switch (reason) {
@@ -164,7 +169,7 @@ static int callback_merica_terminal(struct lws *wsi,
                       vhost, prot,
                       sizeof(struct per_vhost_data__merica_terminal)
                   );
-            vhd->context = lws_get_context(wsi);
+            vhd->context = context;
             vhd->protocol = prot;
             vhd->vhost = vhost;
             break;
@@ -185,37 +190,18 @@ static int callback_merica_terminal(struct lws *wsi,
                 m = lws_write(wsi, (unsigned char *)line, n, LWS_WRITE_TEXT);
                 list_remove(lines);
                 if (lines->first) {
-                    lws_callback_on_writable_all_protocol(lws_get_context(wsi),
+                    lws_callback_on_writable_all_protocol(context,
                         &protocols[PROTOCOL_MERICA_TERMINAL]);
                 }
-            } else {
-                line = copy_line(JSON_EMPTY);
-                if (line) {
-                    n = strlen(line);
-                    m = lws_write(wsi, (unsigned char *)line, n, LWS_WRITE_TEXT);
-                    free_line(line);
-                } else {
+                if (m < n) {
+                    fprintf(stderr, "ERROR %d writing to di socket\n", n);
                     return -1;
                 }
             }
-            if (m < n) {
-                fprintf(stderr, "ERROR %d writing to di socket\n", n);
-                return -1;
-            }
             break;
 
         case LWS_CALLBACK_RECEIVE:
-            if (strcmp((const char *)in, "reset") == 0) {
-                line = copy_line(JSON_EMPTY);
-                if (line) {
-                    if (list_add(lines, line) == 0) {
-                        lws_callback_on_writable_all_protocol(lws_get_context(wsi),
-                            &protocols[PROTOCOL_MERICA_TERMINAL]);
-                    } else {
-                        free_line(line);
-                    }
-                }
-            } else if (strcmp((const char *)in, "close") == 0) {
+            if (strcmp((const char *)in, "close") == 0) {
                 fprintf(stderr, "closing websocket\n");
                 lws_close_reason(wsi, LWS_CLOSE_STATUS_GOINGAWAY,
                                  (unsigned char *)"seeya", 5);
@@ -239,7 +225,11 @@ static void fd_cb(EV_P_ ev_io *w_, int revents)
     read(w->w.fd, pos, 1);
 
     if (*pos == '\n' || (w->pos - w->text) == INPUT_LINE_LENGTH) {
+#ifdef NO_MAIN
+       mt_blank_wake();
+#endif
         *pos = 0;
+       syslog(LOG_INFO, "%s", w->text);
         char *line = new_line();
         if (line) {
             if (list_add(w->lines, w->text) == 0) {
@@ -259,16 +249,25 @@ int mt_server_init(mt_server_t *self, struct ev_loop *loop, int fd)
 {
     struct lws_context_creation_info info;
 
+    list *l = list_init();
+    if (!l) {
+        return -1;
+    }
+
+    openlog(program_invocation_short_name, LOG_PID | LOG_PERROR, LOG_DAEMON);
+
     memset(&info, 0, sizeof(info));
     info.port = HTTP_PORT;
     info.mounts = &mount;
     info.protocols = protocols;
     info.max_http_header_pool = 1;
     info.options |= LWS_SERVER_OPTION_LIBEV;
+    info.user = l;
 
     struct lws_context *context = lws_create_context(&info);
     if (!context) {
         fprintf(stderr, "lws_create_context failed\n");
+        list_deinit(l);
         return -1;
     }
 
@@ -276,14 +275,11 @@ int mt_server_init(mt_server_t *self, struct ev_loop *loop, int fd)
 
     ev_io_ws *w = &(self->fd_watcher);
     w->context = context;
-    w->lines = list_init();
-    if (!w->lines) {
-        return -1;
-    }
-    protocols[PROTOCOL_MERICA_TERMINAL].user = (void *)w->lines;
+    w->lines = l;
+
     char *line = new_line();
     if (!line) {
-        list_deinit(w->lines);
+        list_deinit(l);
         return -1;
     }
     w->text = line;
@@ -299,6 +295,7 @@ void mt_server_deinit(mt_server_t *self)
     free_line(self->fd_watcher.text);
     list_deinit(self->fd_watcher.lines);
     lws_context_destroy(self->context);
+    closelog();
 }
 
 #ifndef NO_MAIN