]> rtime.felk.cvut.cz Git - coffee/mt-apps.git/blobdiff - mt_server.c
mt_server: Use "%s" format string in syslog()
[coffee/mt-apps.git] / mt_server.c
index 26dc90b2d45d730989ba99805265653367a1f9fa..3b617bd68eea29d53d2b6b353337e4f3ec7ec3d4 100644 (file)
+#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()
+{
+    char *line = (char *)malloc((LWS_PRE + INPUT_LINE_LENGTH)*sizeof(char));
+    if (!line) {
+        perror("malloc");
+        return NULL;
+    }
+    return line + LWS_PRE;
+}
+
+char *copy_line(char *line) {
+    char *copy = new_line();
+    if (!copy) {
+        return NULL;
+    }
+    strncpy(copy, line, INPUT_LINE_LENGTH);
+}
+
+void free_line(char *line)
+{
+    free(line - LWS_PRE);
+}
+
+node *node_init(char *line)
+{
+    node *res = (node *)malloc(sizeof(node));
+    if (!res) {
+        perror("malloc");
+        return res;
+    }
+    res->line = line;;
+    res->next = NULL;
+    return res;
+}
+
+list *list_init()
+{
+    list *res = (list *)calloc(1, sizeof(list));
+    if (!res) {
+        perror("malloc");
+    }
+    return res;
+}
+
+int list_add(list *in, char *line)
+{
+    node *new = node_init(line);
+    if (!new) {
+        return -1;
+    }
+    if (!in->first) {
+        in->first = new;
+    } else {
+        in->last->next = new;
+    }
+    in->last = new;
+    return 0;
+}
+
+void list_remove(list *in)
+{
+    node *tmp = in->first;
+    if (tmp) {
+        in->first = tmp->next;
+        if (!tmp->next) {
+            in->last = NULL;
+        }
+        free_line(tmp->line);
+        free(tmp);
+    }
+}
+
+void list_deinit(list *in)
+{
+    while (in->first) {
+        list_remove(in);
+    }
+    free(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 {
@@ -63,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);
     /*
@@ -75,7 +160,8 @@ static int callback_merica_terminal(struct lws *wsi,
 
     int n, m;
 
-    char *line = (char *)prot->user;
+    list *lines = (list *)lws_context_user(context);
+    char *line;
 
     switch (reason) {
         case LWS_CALLBACK_PROTOCOL_INIT:
@@ -83,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;
@@ -98,20 +184,24 @@ static int callback_merica_terminal(struct lws *wsi,
             break;
 
         case LWS_CALLBACK_SERVER_WRITEABLE:
-            n = strlen(line);
-            m = lws_write(wsi, (unsigned char *)line, n, LWS_WRITE_TEXT);
-            if (m < n) {
-                fprintf(stderr, "ERROR %d writing to di socket\n", n);
-                return -1;
+            if (lines->first) {
+                line = lines->first->line;
+                n = strlen(line);
+                m = lws_write(wsi, (unsigned char *)line, n, LWS_WRITE_TEXT);
+                list_remove(lines);
+                if (lines->first) {
+                    lws_callback_on_writable_all_protocol(context,
+                        &protocols[PROTOCOL_MERICA_TERMINAL]);
+                }
+                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) {
-                strcpy(line, JSON_EMPTY);
-                lws_callback_on_writable_all_protocol(lws_get_context(wsi),
-                                                      &protocols[PROTOCOL_MERICA_TERMINAL]);
-            } 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);
@@ -135,10 +225,23 @@ 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;
-        w->pos = w->text;
-        lws_callback_on_writable_all_protocol(w->context,
-                                              &protocols[PROTOCOL_MERICA_TERMINAL]);
+       syslog(LOG_INFO, "%s", w->text);
+        char *line = new_line();
+        if (line) {
+            if (list_add(w->lines, w->text) == 0) {
+                w->text = line;
+                w->pos = w->text;
+                lws_callback_on_writable_all_protocol(w->context,
+                    &protocols[PROTOCOL_MERICA_TERMINAL]);
+                return;
+            }
+            free_line(line);
+        }
+        fprintf(stderr, "cannot malloc new line\n");
     }
 }
 
@@ -146,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;
     }
 
@@ -163,25 +275,27 @@ 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->text = (char *)malloc(INPUT_LINE_LENGTH*sizeof(char));
-    if (!w->text) {
-        perror("malloc");
+    w->lines = l;
+
+    char *line = new_line();
+    if (!line) {
+        list_deinit(l);
         return -1;
     }
-    strcpy(w->text, JSON_EMPTY);
+    w->text = line;
     w->pos = w->text;
-    protocols[PROTOCOL_MERICA_TERMINAL].user = (void *)w->text;
     ev_io_init(&(w->w), fd_cb, fd, EV_READ);
     ev_io_start(loop, (ev_io *)w);
 
     return lws_ev_initloop(context, loop, 0);
 }
 
-void mt_server_deinit(mt_server_t *self) //TODO wtf
+void mt_server_deinit(mt_server_t *self)
 {
-    //free(self->fd_watcher.text);
-    //protocols[PROTOCOL_MERICA_TERMINAL].user = NULL;
+    free_line(self->fd_watcher.text);
+    list_deinit(self->fd_watcher.lines);
     lws_context_destroy(self->context);
+    closelog();
 }
 
 #ifndef NO_MAIN
@@ -199,6 +313,7 @@ int main(int argc, const char **argv)
     ev_run(loop, 0);
 
     mt_server_deinit(&server);
+    ev_loop_destroy(loop);
 
     return 0;
 }