char *line = (char *)malloc((LWS_PRE + INPUT_LINE_LENGTH)*sizeof(char));
if (!line) {
perror("malloc");
+ return NULL;
}
return line + LWS_PRE;
}
if (!copy) {
return NULL;
}
- strcpy(copy, line);
+ strncpy(copy, line, INPUT_LINE_LENGTH);
}
void free_line(char *line)
free(line - LWS_PRE);
}
-list *list_init(char *line)
+node *node_init(char *line)
{
- list *res = (list *)malloc(sizeof(list));
+ node *res = (node *)malloc(sizeof(node));
if (!res) {
perror("malloc");
return res;
return res;
}
-int list_add(list **in, char *line)
+list *list_init()
+{
+ list *res = (list *)calloc(1, sizeof(list));
+ if (!res) {
+ perror("malloc");
+ }
+ return res;
+}
+
+int list_add(list *in, char *line)
{
- list *new = list_init(line);
+ node *new = node_init(line);
if (!new) {
return -1;
}
- (*in)->next = new;
- *in = new;
+ if (!in->first) {
+ in->first = new;
+ } else {
+ in->last->next = new;
+ }
+ in->last = new;
return 0;
}
-void list_remove(list **in)
+void list_remove(list *in)
{
- list *tmp = *in;
- *in = (*in)->next;
- free_line(tmp->line);
- free(tmp);
+ 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) {
- list_remove(&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 {
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);
/*
int n, m;
- list **lines = (list **)&(prot->user);
+ list *lines = (list *)lws_context_user(context);
char *line;
switch (reason) {
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;
break;
case LWS_CALLBACK_SERVER_WRITEABLE:
- line = (*lines)->line;
- n = strlen(line);
- m = lws_write(wsi, (unsigned char *)line, n, LWS_WRITE_TEXT);
- if ((*lines)->next != NULL) {
+ if (lines->first) {
+ line = lines->first->line;
+ n = strlen(line);
+ m = lws_write(wsi, (unsigned char *)line, n, LWS_WRITE_TEXT);
list_remove(lines);
- lws_callback_on_writable_all_protocol(lws_get_context(wsi),
- &protocols[PROTOCOL_MERICA_TERMINAL]);
+ if (lines->first) {
+ 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 {
+ return -1;
+ }
}
if (m < n) {
fprintf(stderr, "ERROR %d writing to di socket\n", n);
case LWS_CALLBACK_RECEIVE:
if (strcmp((const char *)in, "reset") == 0) {
- strcpy((*lines)->line, JSON_EMPTY);
- lws_callback_on_writable_all_protocol(lws_get_context(wsi),
- &protocols[PROTOCOL_MERICA_TERMINAL]);
+ line = copy_line(JSON_EMPTY);
+ if (line) {
+ if (list_add(lines, line) == 0) {
+ lws_callback_on_writable_all_protocol(context,
+ &protocols[PROTOCOL_MERICA_TERMINAL]);
+ } else {
+ free_line(line);
+ }
+ }
} else if (strcmp((const char *)in, "close") == 0) {
fprintf(stderr, "closing websocket\n");
lws_close_reason(wsi, LWS_CLOSE_STATUS_GOINGAWAY,
if (*pos == '\n' || (w->pos - w->text) == INPUT_LINE_LENGTH) {
*pos = 0;
- if (list_add(&(w->lines), w->text) == 0) {
- char *line = new_line();
- if (line) {
+ 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");
}
{
struct lws_context_creation_info info;
+ list *l = list_init();
+ if (!l) {
+ return -1;
+ }
+
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;
}
ev_io_ws *w = &(self->fd_watcher);
w->context = context;
- char *line = copy_line(JSON_EMPTY);
- if (!line) {
- return -1;
- }
- w->lines = list_init(line);
- if (!w->lines) {
- free_line(line);
- return -1;
- }
- protocols[PROTOCOL_MERICA_TERMINAL].user = (void *)w->lines;
- line = new_line();
+ w->lines = l;
+
+ char *line = new_line();
if (!line) {
- list_deinit(w->lines);
+ list_deinit(l);
return -1;
}
w->text = line;
void mt_server_deinit(mt_server_t *self)
{
- list_deinit((list *)protocols[PROTOCOL_MERICA_TERMINAL].user);
+ free_line(self->fd_watcher.text);
+ list_deinit(self->fd_watcher.lines);
lws_context_destroy(self->context);
}
ev_run(loop, 0);
mt_server_deinit(&server);
+ ev_loop_destroy(loop);
return 0;
}