websock: added WebSocket client/server module

Author: Richard Aas

Makefile

@@ -18,7 +18,7 @@ include $(MK)
 
 # List of modules
 MODULES += sip sipevent sipreg sipsess
-MODULES += uri http httpauth msg
+MODULES += uri http httpauth msg websock
 MODULES += stun turn ice
 MODULES += natbd
 MODULES += rtp sdp jbuf telev

docs/README

@@ -61,6 +61,7 @@ Modules:
 * turn      testing       Obtaining Relay Addresses from STUN (TURN)
 * udp       testing       UDP transport
 * uri       testing       Generic URI library
+* websock   unstable      WebSocket Client and Server
 
 legend:
  "stable"       - Code complete; Stable code and stable API
@@ -111,6 +112,7 @@ Features:
 * RFC 5780 - NAT Behaviour Discovery Using STUN
 * RFC 6026 - Correct Transaction Handling for 2xx Resp. to SIP INVITE Requests
 * RFC 6156 - TURN Extension for IPv6
+* RFC 6455 - The WebSocket Protocol
 * Symmetric RTP
 * ITU-T G.711 Appendix I and Appendix II
 * draft-ietf-bfcpbis-rfc4582bis-08

include/re.h

@@ -55,6 +55,7 @@ extern "C" {
 #include "re_tls.h"
 #include "re_turn.h"
 #include "re_udp.h"
+#include "re_websock.h"
 
 #ifdef __cplusplus
 }

include/re_http.h

@@ -122,6 +122,8 @@ int http_client_alloc(struct http_cli **clip, struct dnsc *dnsc);
 int http_request(struct http_req **reqp, struct http_cli *cli, const char *met,
 		 const char *uri, http_resp_h *resph, http_data_h *datah,
 		 void *arg, const char *fmt, ...);
+struct tcp_conn *http_req_tcp(struct http_req *req);
+struct tls_conn *http_req_tls(struct http_req *req);
 
 
 /* Server */

include/re_websock.h

@@ -0,0 +1,74 @@
+/**
+ * @file re_websock.h  The WebSocket Protocol
+ *
+ * Copyright (C) 2010 Creytiv.com
+ */
+
+
+enum {
+	WEBSOCK_VERSION = 13,
+};
+
+enum websock_opcode {
+	/* Data frames */
+	WEBSOCK_CONT  = 0x0,
+	WEBSOCK_TEXT  = 0x1,
+	WEBSOCK_BIN   = 0x2,
+	/* Control frames */
+	WEBSOCK_CLOSE = 0x8,
+	WEBSOCK_PING  = 0x9,
+	WEBSOCK_PONG  = 0xa,
+};
+
+enum websock_scode {
+	WEBSOCK_NORMAL_CLOSURE   = 1000,
+	WEBSOCK_GOING_AWAY       = 1001,
+	WEBSOCK_PROTOCOL_ERROR   = 1002,
+	WEBSOCK_UNSUPPORTED_DATA = 1003,
+	WEBSOCK_INVALID_PAYLOAD  = 1007,
+	WEBSOCK_POLICY_VIOLATION = 1008,
+	WEBSOCK_MESSAGE_TOO_BIG  = 1009,
+	WEBSOCK_EXTENSION_ERROR  = 1010,
+	WEBSOCK_INTERNAL_ERROR   = 1011,
+};
+
+struct websock_hdr {
+	unsigned fin:1;
+	unsigned rsv1:1;
+	unsigned rsv2:1;
+	unsigned rsv3:1;
+	unsigned opcode:4;
+	unsigned mask:1;
+	uint64_t len;
+	uint8_t mkey[4];
+};
+
+struct websock;
+struct websock_conn;
+
+typedef void (websock_estab_h)(void *arg);
+typedef void (websock_recv_h)(const struct websock_hdr *hdr, struct mbuf *mb,
+			      void *arg);
+typedef void (websock_close_h)(int err, void *arg);
+
+
+int websock_connect(struct websock_conn **connp, struct websock *sock,
+		    struct http_cli *cli, const char *uri, unsigned kaint,
+		    websock_estab_h *estabh, websock_recv_h *recvh,
+		    websock_close_h *closeh, void *arg,
+		    const char *fmt, ...);
+int websock_accept(struct websock_conn **connp, struct websock *sock,
+		   struct http_conn *htconn, const struct http_msg *msg,
+		   unsigned kaint, websock_recv_h *recvh,
+		   websock_close_h *closeh, void *arg);
+int websock_send(struct websock_conn *conn, enum websock_opcode opcode,
+		 const char *fmt, ...);
+int websock_close(struct websock_conn *conn, enum websock_scode scode,
+		  const char *fmt, ...);
+const struct sa *websock_peer(const struct websock_conn *conn);
+
+typedef void (websock_shutdown_h)(void *arg);
+
+int  websock_alloc(struct websock **sockp, websock_shutdown_h *shuth,
+		   void *arg);
+void websock_shutdown(struct websock *sock);

src/http/client.c

@@ -338,12 +338,14 @@ int http_request(struct http_req **reqp, struct http_cli *cli, const char *met,
 		     &scheme, &host, NULL, &port, &path) || scheme.p != uri)
 		return EINVAL;
 
-	if (!pl_strcasecmp(&scheme, "http")) {
+	if (!pl_strcasecmp(&scheme, "http") ||
+	    !pl_strcasecmp(&scheme, "ws")) {
 		secure  = false;
 		defport = 80;
 	}
 #ifdef USE_TLS
-	else if (!pl_strcasecmp(&scheme, "https")) {
+	else if (!pl_strcasecmp(&scheme, "https") ||
+		 !pl_strcasecmp(&scheme, "wss")) {
 		secure  = true;
 		defport = 443;
 	}
@@ -455,3 +457,15 @@ int http_client_alloc(struct http_cli **clip, struct dnsc *dnsc)
 
 	return err;
 }
+
+
+struct tcp_conn *http_req_tcp(struct http_req *req)
+{
+	return req ? req->tc : NULL;
+}
+
+
+struct tls_conn *http_req_tls(struct http_req *req)
+{
+	return req ? req->sc : NULL;
+}

src/websock/mod.mk

@@ -0,0 +1,7 @@
+#
+# mod.mk
+#
+# Copyright (C) 2010 Creytiv.com
+#
+
+SRCS	+= websock/websock.c