Merged with pipe

diff --cc include/siri/net/protocol.h
Simple merge

diff --cc src/siri/net/clserver.c
index d051aab4365bff68e86acd0a72fe7cf6ddbc2ebb,88467609bc3ab082853dddf1a0202ec026427159..65ba365f30b233f0a0456b7fc5bf342b49176370
--- 1/src/siri/net/clserver.c
--- 2/src/siri/net/clserver.c
+++ b/src/siri/net/clserver.c
@@@ -69,26 -69,29 +69,30 @@@ static const int SERVER_RUNNING_REINDEX
  
  static uv_loop_t * loop = NULL;
  static struct sockaddr_storage client_addr;
- static uv_tcp_t client_server;
- 
- static void on_data(uv_stream_t * client, sirinet_pkg_t * pkg);
- static void on_new_connection(uv_stream_t * server, int status);
- static void on_auth_request(uv_stream_t * client, sirinet_pkg_t * pkg);
- static void on_query(uv_stream_t * client, sirinet_pkg_t * pkg);
- static void on_insert(uv_stream_t * client, sirinet_pkg_t * pkg);
- static void on_ping(uv_stream_t * client, sirinet_pkg_t * pkg);
+ static uv_tcp_t client_server_tcp;
+ static uv_pipe_t client_server_pipe;
+ 
+ static void on_tcp_new_connection(uv_stream_t * server, int status);
+ static void on_pipe_new_connection(uv_stream_t * server, int status);
+ static void on_data(sirinet_stream_t * client, sirinet_pkg_t * pkg);
+ static void on_stream_data(sirinet_stream_t * client, sirinet_pkg_t * pkg);
+ static void on_auth_request(sirinet_stream_t * client, sirinet_pkg_t * pkg);
+ static void on_query(sirinet_stream_t * client, sirinet_pkg_t * pkg);
+ static void on_insert(sirinet_stream_t * client, sirinet_pkg_t * pkg);
+ static void on_ping(sirinet_stream_t * client, sirinet_pkg_t * pkg);
++
  static void on_reqfile(
-         uv_stream_t * client,
+         sirinet_stream_t * client,
          sirinet_pkg_t * pkg,
          sirinet_clserver_getfile getfile);
- static void on_register_server(uv_stream_t * client, sirinet_pkg_t * pkg);
- static void on_req_admin(uv_stream_t * client, sirinet_pkg_t * pkg);
+ static void on_register_server(sirinet_stream_t * client, sirinet_pkg_t * pkg);
+ static void on_req_admin(sirinet_stream_t * client, sirinet_pkg_t * pkg);
  static void CLSERVER_send_server_error(
          siridb_t * siridb,
-         uv_stream_t * stream,
+         sirinet_stream_t * client,
          sirinet_pkg_t * pkg);
  static void CLSERVER_send_pool_error(
-         uv_stream_t * stream,
+         sirinet_stream_t * client,
          sirinet_pkg_t * pkg);
  static void CLSERVER_on_register_server_response(
          slist_t * promises,

diff --cc src/siri/net/protocol.c
index 401979583bb032babb074c0317d1a061fc00a3c8,52fbf99214b36e75db77d2211300efbe0dbc845a..a4a2b0087de60f115f29469fd4f1a547112fc61d
--- 1/src/siri/net/protocol.c
--- 2/src/siri/net/protocol.c
+++ b/src/siri/net/protocol.c
@@@ -60,8 -62,8 +62,7 @@@ const char * sirinet_cproto_server_str(
      case CPROTO_ERR_NOT_AUTHENTICATED: return "CPROTO_ERR_NOT_AUTHENTICATED";
      case CPROTO_ERR_AUTH_CREDENTIALS: return "CPROTO_ERR_AUTH_CREDENTIALS";
      case CPROTO_ERR_AUTH_UNKNOWN_DB: return "CPROTO_ERR_AUTH_UNKNOWN_DB";
 -
      case CPROTO_ERR_FILE: return "CPROTO_ERR_FILE";
- 
      case CPROTO_ERR_ADMIN: return "CPROTO_ERR_ADMIN";
      case CPROTO_ERR_ADMIN_INVALID_REQUEST: return "CPROTO_ERR_ADMIN_INVALID_REQUEST";
      default: