Index: hid_srv_ws/Makefile
===================================================================
--- hid_srv_ws/Makefile	(nonexistent)
+++ hid_srv_ws/Makefile	(revision 16236)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_srv_ws
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: hid_srv_ws/Plug.tmpasm
===================================================================
--- hid_srv_ws/Plug.tmpasm	(nonexistent)
+++ hid_srv_ws/Plug.tmpasm	(revision 16236)
@@ -0,0 +1,18 @@
+put /local/pcb/mod {hid_srv_ws}
+append /local/pcb/mod/OBJS_C99 [@
+	$(PLUGDIR)/hid_srv_ws/server.o
+	$(PLUGDIR)/hid_srv_ws/c2s.o
+@]
+
+switch /local/pcb/hid_srv_ws/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/LDFLAGS  {-lwebsockets }
+	end
+end
+
+switch /local/pcb/hid_srv_ws/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: hid_srv_ws/c2s.c
===================================================================
--- hid_srv_ws/c2s.c	(nonexistent)
+++ hid_srv_ws/c2s.c	(revision 16236)
@@ -0,0 +1,72 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Needed by libuv to compile in C99 */
+#define _POSIX_C_SOURCE 200112
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include "error.h"
+#include "server.h"
+#include "c2s.h"
+
+typedef struct {
+	pcb_c2s_msg_t msg;
+} dgram_t;
+
+void hid_ws_recv_msg(hid_srv_ws_t *ctx)
+{
+	dgram_t dg;
+	int len;
+
+	len = recv(ctx->c2s[0], &dg, sizeof(dg), MSG_DONTWAIT);
+	if (len != sizeof(dg)) {
+		pcb_message(PCB_MSG_ERROR, "websocket [%d]: server msg invliad size %d (expected %d)\n", ctx->pid, len, sizeof(dg));
+		return;
+	}
+
+	switch(dg.msg) {
+		case PCB_C2S_MSG_START:
+			if (ctx->pollfds[ctx->listen_idx].fd < 0)
+				ctx->pollfds[ctx->listen_idx].fd = -ctx->pollfds[ctx->listen_idx].fd; /* enable listen because the client finished accepting the connection */
+			pcb_message(PCB_MSG_INFO, "websocket [%d]: new client conn acked, reenabling listen\n", ctx->pid);
+			break;
+		default:
+			pcb_message(PCB_MSG_ERROR, "websocket [%d]: server msg invliad msg %d\n", ctx->pid, dg.msg);
+	}
+}
+
+void hid_ws_send_msg(hid_srv_ws_t *ctx, pcb_c2s_msg_t msg)
+{
+	dgram_t dg;
+
+	dg.msg = msg;
+
+	send(ctx->c2s[1], &dg, sizeof(dg), 0);
+}
Index: hid_srv_ws/c2s.h
===================================================================
--- hid_srv_ws/c2s.h	(nonexistent)
+++ hid_srv_ws/c2s.h	(revision 16236)
@@ -0,0 +1,34 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "server.h"
+
+typedef enum {
+	PCB_C2S_MSG_START
+} pcb_c2s_msg_t;
+
+void hid_ws_recv_msg(hid_srv_ws_t *ctx);
+void hid_ws_send_msg(hid_srv_ws_t *ctx, pcb_c2s_msg_t msg);
Index: hid_srv_ws/hid_srv_ws.pup
===================================================================
--- hid_srv_ws/hid_srv_ws.pup	(nonexistent)
+++ hid_srv_ws/hid_srv_ws.pup	(revision 16236)
@@ -0,0 +1,6 @@
+$class hid
+$short websocket server HID
+$long HID server: websockets using hid_remote.
+$state WIP
+default disable-all
+autoload 1
Index: hid_srv_ws/server.c
===================================================================
--- hid_srv_ws/server.c	(nonexistent)
+++ hid_srv_ws/server.c	(revision 16236)
@@ -0,0 +1,345 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Websocket server HID: listen for connections and fork session servers */
+
+/* Needed by libuv to compile in C99 */
+#define _POSIX_C_SOURCE 200112
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <genht/hash.h>
+
+#include "plugins.h"
+#include "error.h"
+
+#include "server.h"
+#include "c2s.h"
+
+int pplg_check_ver_hid_srv_ws(int ver_needed) { return 0; }
+
+extern int pplg_init_hid_remote(void);
+extern void pcb_set_hid_name(const char *new_hid_name);
+
+#warning TODO: make this a configuration
+static int max_clients = 3;
+
+static hid_srv_ws_t hid_srv_ws_ctx;
+
+
+static int callback_http(struct lws *wsi, enum lws_callback_reasons reason, void *user, void *in, size_t len)
+{
+	int n;
+	struct lws_pollargs *pa = (struct lws_pollargs *)in;
+/*	hid_srv_ws_t *ctx = lws_wsi_user(wsi); why does this return NULL???? */
+	hid_srv_ws_t *ctx = &hid_srv_ws_ctx;
+	struct lws_pollfd *lwsp;
+
+	switch (reason) {
+		case LWS_CALLBACK_ADD_POLL_FD:
+			if (ctx->count_pollfds >= WS_MAX_FDS) {
+				lwsl_err("LWS_CALLBACK_ADD_POLL_FD: too many sockets to track\n");
+				return 1;
+			}
+
+			/* assume the first fd added via this callback is the listener */
+			if (ctx->listen_fd < 0) {
+				ctx->listen_fd = pa->fd;
+				ctx->listen_idx = ctx->count_pollfds;
+			}
+
+			htip_set(&ctx->fd_lookup, pa->fd, &ctx->pollfds[ctx->count_pollfds]);
+			ctx->pollfds[ctx->count_pollfds].fd = pa->fd;
+			ctx->pollfds[ctx->count_pollfds].events = pa->events;
+			ctx->pollfds[ctx->count_pollfds].revents = 0;
+			ctx->count_pollfds++;
+			break;
+
+		case LWS_CALLBACK_DEL_POLL_FD:
+			/* the server process has 1 listening socket; the client process has 1
+			   client sokcet. Any socket close means the main task is over. */
+			pcb_message(PCB_MSG_INFO, "websocket [%d]: connection closed, exiting\n", ctx->pid);
+			exit(0);
+
+		case LWS_CALLBACK_CHANGE_MODE_POLL_FD:
+			lwsp = htip_get(&ctx->fd_lookup, pa->fd);
+			if (lwsp != NULL)
+				lwsp->events = pa->events;
+			break;
+			
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+
+static int callback_dumb_increment(struct lws *wsi, enum lws_callback_reasons reason, void *user, void *in, size_t len)
+{
+	hid_srv_ws_t *ctx = &hid_srv_ws_ctx;
+
+	switch (reason) {
+		case LWS_CALLBACK_ESTABLISHED: /* just log message that someone is connecting */
+			pcb_message(PCB_MSG_INFO, "websocket [%d]: high level connection established\n", ctx->pid);
+			break;
+			
+		case LWS_CALLBACK_RECEIVE: {
+			/* the funny part
+			   create a buffer to hold our response
+			   it has to have some pre and post padding. You don't need to care
+			   what comes there, lwss will do everything for you. For more info see
+			   http://git.warmcat.com/cgi-bin/cgit/lwss/tree/lib/lwss.h#n597 */
+			unsigned char *buf = (unsigned char*) malloc(LWS_SEND_BUFFER_PRE_PADDING + len + LWS_SEND_BUFFER_POST_PADDING);
+			int i;
+
+			/* pointer to `void *in` holds the incomming request
+			   we're just going to put it in reverse order and put it in `buf` with
+			   correct offset. `len` holds length of the request. */
+			for (i=0; i < len; i++) {
+				buf[LWS_SEND_BUFFER_PRE_PADDING + (len - 1) - i ] = ((char *) in)[i];
+			}
+
+			/* log what we recieved and what we're going to send as a response.
+			   that disco syntax `%.*s` is used to print just a part of our buffer
+			   http://stackoverflow.com/questions/5189071/print-part-of-char-array */
+			pcb_message(PCB_MSG_INFO, "websocket [%d]: received data: %s, replying: %.*s\n", ctx->pid, (char *)in, (int)len, buf + LWS_SEND_BUFFER_PRE_PADDING);
+
+			/* send response
+			   just notice that we have to tell where exactly our response starts. That's
+			   why there's `buf[LWS_SEND_BUFFER_PRE_PADDING]` and how long it is.
+			   we know that our response has the same length as request because
+			   it's the same message in reverse order. */
+			lws_write(wsi, &buf[LWS_SEND_BUFFER_PRE_PADDING], len, LWS_WRITE_TEXT);
+
+			free(buf);
+			break;
+			}
+			
+		case LWS_CALLBACK_CLOSED:
+			pcb_message(PCB_MSG_INFO, "websocket [%d]: connection closed\n", ctx->pid);
+			break;
+			
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+static void hid_ws_new_client(hid_srv_ws_t *ctx, int n)
+{
+	/* listening socket: fork for each client */
+	pid_t p;
+	
+	p = fork();
+	if (p == 0) {
+		/* child: client */
+		if (lws_service_fd(ctx->context, &ctx->pollfds[n]) < 0)
+			exit(1);
+		close(ctx->pollfds[n].fd);
+		ctx->pollfds[n].fd = -ctx->pollfds[n].fd; /* disable listen */
+		close(ctx->pollfds[0].fd);
+		ctx->pollfds[0].fd = -ctx->pollfds[0].fd; /* disable server reads */
+		ctx->pid = getpid();
+		ctx->num_clients++;
+
+		if (ctx->num_clients >= max_clients) {
+			pcb_message(PCB_MSG_INFO, "websocket [%d]: client conn refused - too many clients\n", ctx->pid);
+			exit(1);
+		}
+		else
+			pcb_message(PCB_MSG_INFO, "websocket [%d]: new client conn accepted\n", ctx->pid);
+		hid_ws_send_msg(ctx, PCB_C2S_MSG_START);
+	}
+	else {
+		/* parent */
+		hid_srv_ws_client_t *cl = calloc(sizeof(hid_srv_ws_client_t), 1);
+		htip_set(&ctx->clients, p, cl);
+		if (ctx->pollfds[n].fd > 0)
+			ctx->pollfds[n].fd = -ctx->pollfds[n].fd; /* disable listen until the client finished accepting */
+		pcb_message(PCB_MSG_INFO, "websocket [%d]: new client conn forked\n", ctx->pid);
+		ctx->num_clients++;
+		if (ctx->num_clients >= max_clients) { /* throttle excess forking */
+			sleep(5);
+			ctx->num_clients--; /* it was refused in the client */
+		}
+	}
+}
+
+
+static int src_ws_mainloop(hid_srv_ws_t *ctx)
+{
+	unsigned int ms, ms_1sec = 0;
+
+	for(;;) {
+		struct timeval tv;
+		int n;
+
+		gettimeofday(&tv, NULL);
+		ms = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
+
+		n = poll(ctx->pollfds, ctx->count_pollfds, 50);
+
+		if (n < 0)
+			continue;
+
+		if (n != 0) {
+			for(n = 0; n < ctx->count_pollfds; n++) {
+				if (ctx->pollfds[n].revents) {
+					if (ctx->pollfds[n].fd == ctx->c2s[0]) {
+						hid_ws_recv_msg(ctx);
+					}
+					else if (ctx->pollfds[n].fd == ctx->listen_fd) {
+						hid_ws_new_client(ctx, n);
+					}
+					else {
+						/* returns immediately if the fd does not match anything under libwebsocketscontrol */
+						if (lws_service_fd(ctx->context, &ctx->pollfds[n]) < 0)
+							return -1;
+					}
+				}
+			}
+		}
+
+		/* no revents, but before polling again, make lws check for any timeouts */
+		if (ms - ms_1sec > 1000) {
+			static int ctr = 0;
+			lws_service_fd(ctx->context, NULL);
+			ms_1sec = ms;
+			
+			if ((ctx->pollfds[0].fd > 0) && ((ctr++ % 5) == 0)) { /* server: print client stats */
+				htip_entry_t *e;
+				pcb_message(PCB_MSG_INFO, "websocket [%d] Client stats (%d):\n", ctx->pid, ctx->num_clients);
+				for (e = htip_first(&ctx->clients); e; e = htip_next(&ctx->clients, e)) {
+					pcb_message(PCB_MSG_INFO, " [%d]\n", e->key);
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+static void srv_ws_sigchld(int sig)
+{
+	pid_t p;
+	int st;
+	hid_srv_ws_t *ctx = &hid_srv_ws_ctx;
+	hid_srv_ws_client_t *cl;
+
+	p = wait(&st);
+
+	cl = htip_get(&ctx->clients, p);
+	if (cl != NULL) {
+		ctx->num_clients--;
+		htip_pop(&ctx->clients, p);
+		pcb_message(PCB_MSG_INFO, "websocket [%d]: sigchld ack'd\n", p);
+		free(cl);
+	}
+}
+
+static int srv_ws_listen(hid_srv_ws_t *ctx)
+{
+
+#warning TODO: get these from the conf
+	int port = 9000;
+
+	static struct lws_protocols protocols[] = {
+	/* first protocol must always be HTTP handler */
+	{
+		"http-only",   /* name */
+		callback_http, /* callback */
+		0,             /* per_session_data_size */
+		0              /* max frame size / rx buffer */
+	},
+	{
+		"remote-hid-protocol",     /* protocol name - very important! */
+		callback_dumb_increment,   /* callback */
+		0,                         /* we don't use any per session data */
+		0                          /* max frame size / rx buffer */
+	},
+	{ NULL, NULL, 0, 0 }   /* End of list */
+	};
+
+	struct lws_context_creation_info context_info = {
+		.port = port, .iface = NULL, .protocols = protocols, .extensions = NULL,
+#ifdef WANT_SSL
+		.ssl_cert_filepath = "cert.pem", .ssl_private_key_filepath = "key.pem", .ssl_ca_filepath = NULL,
+		.options = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT,
+		.gid = -1, .uid = -1, .ka_time = 0, .ka_probes = 0, .ka_interval = 0,
+#else
+		.ssl_cert_filepath = NULL, .ssl_private_key_filepath = NULL, .ssl_ca_filepath = NULL,
+		.gid = -1, .uid = -1, .options = 0, NULL, .ka_time = 0, .ka_probes = 0, .ka_interval = 0,
+#endif
+		.user = ctx
+	};
+
+	if (socketpair(AF_LOCAL, SOCK_DGRAM, 0, ctx->c2s) != 0) {
+		pcb_message(PCB_MSG_ERROR, "websockets [%d]: can't create c2s socketpair\n", ctx->pid);
+		return -1;
+	}
+
+	ctx->pollfds[0].fd = ctx->c2s[0];
+	ctx->pollfds[0].events = POLLIN;
+	ctx->count_pollfds = 1;
+
+	ctx->listen_fd = -1;
+	ctx->pid = getpid();
+	htip_init(&ctx->clients, longhash, longkeyeq);
+	htip_init(&ctx->fd_lookup, longhash, longkeyeq);
+
+	signal(SIGCHLD, srv_ws_sigchld);
+
+	/* create lws context representing this server */
+	ctx->context = lws_create_context(&context_info);
+	if (ctx->context == NULL) {
+		pcb_message(PCB_MSG_ERROR, "lws_create_context() failed\n");
+		return -1;
+	}
+
+	pcb_message(PCB_MSG_INFO, "websockets [%d]: listening for clients\n", ctx->pid);
+
+	return 0;
+}
+
+
+void pplg_uninit_hid_srv_ws(void)
+{
+}
+
+int pplg_init_hid_srv_ws(void)
+{
+	pcb_set_hid_name("remote");
+	if (srv_ws_listen(&hid_srv_ws_ctx) != 0)
+		return -1;
+
+	return src_ws_mainloop(&hid_srv_ws_ctx);
+}
Index: hid_srv_ws/server.h
===================================================================
--- hid_srv_ws/server.h	(nonexistent)
+++ hid_srv_ws/server.h	(revision 16236)
@@ -0,0 +1,56 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_HID_SRV_WS_SERER_H
+#define PCB_HID_SRV_WS_SERER_H
+
+#include <sys/types.h>
+#include <libwebsockets.h>
+#include <genht/htip.h>
+
+/* Number of sockets to handle - need one listening socket and one accepted
+   because each client is forked; leave some room for retries and whatnot */
+#define WS_MAX_FDS 8
+
+typedef struct {
+	struct lws_context *context;
+	struct lws_pollfd pollfds[WS_MAX_FDS];
+	htip_t fd_lookup;
+	int count_pollfds;
+	int listen_fd, listen_idx;
+	pid_t pid;
+	int num_clients;
+
+	int c2s[2]; /* Client to server communication; 0 is read by the server, 1 is written by clients */
+
+	htip_t clients;
+} hid_srv_ws_t;
+
+typedef struct {
+	char *user;
+} hid_srv_ws_client_t;
+
+#endif