sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:pd/websocket: modules/websocket: received frame decoding

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 68c60fd4156bda792463bd202b82afb2c967dcdd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68c60fd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 00:44:14 2012 +0100 modules/websocket: received frame decoding --- modules/websocket/example/websocket_test.html | 71 +++++++ modules/websocket/ws_frame.c | 245 +++++++++++++++++++++++- 2 files changed, 305 insertions(+), 11 deletions(-) diff --git a/modules/websocket/example/websocket_test.html b/modules/websocket/example/websocket_test.html new file mode 100644 index 0000000..308b945 --- /dev/null +++ b/modules/websocket/example/websocket_test.html @@ -0,0 +1,71 @@ +<!DOCTYPE html> + +<meta charset="utf-8" /> + +<title>WebSocket Test</title> + +<script language="javascript" type="text/javascript"> +var wsUri = "ws://192.168.111.12/"; +var output; + +function init() +{ + output = document.getElementById("output"); + testWebSocket(); +} + +function testWebSocket() +{ + websocket = new WebSocket(wsUri, "sip"); + websocket.onopen = function(evt) { onOpen(evt) }; + websocket.onclose = function(evt) { onClose(evt) }; + websocket.onmessage = function(evt) { onMessage(evt) }; + websocket.onerror = function(evt) { onError(evt) }; +} + +function onOpen(evt) +{ + writeToScreen("CONNECTED"); + doSend("WebSocket rocks"); + doSend("WebSocket rolls"); + doSend("012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"); + websocket.close(); +} + +function onClose(evt) +{ + writeToScreen("DISCONNECTED"); +} + +function onMessage(evt) +{ + writeToScreen('<span style="color: blue;">RESPONSE: ' + evt.data+'</span>'); websocket.close(); +} + +function onError(evt) +{ + writeToScreen('<span style="color: red;">ERROR:</span> ' + evt.data); +} + +function doSend(message) +{ + writeToScreen("SENT: " + message); + websocket.send(message); +} + +function writeToScreen(message) +{ + var pre = document.createElement("p"); + pre.style.wordWrap = "break-word"; + pre.innerHTML = message; output.appendChild(pre); +} + +window.addEventListener("load", init, false); + +</script> + +<h2>WebSocket Test</h2> + +<div id="output"></div> + +</html> diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index ed7943b..bce0a09 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -26,13 +26,204 @@ #include "ws_frame.h" #include "ws_mod.h" -#define FRAME_BUF_SIZE 1024 -static char frame_buf[FRAME_BUF_SIZE]; +/* 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-------+-+-------------+-------------------------------+ + |F|R|R|R| opcode|M| Payload len | Extended payload length | + |I|S|S|S| (4) |A| (7) | (16/64) | + |N|V|V|V| |S| | (if payload len==126/127) | + | |1|2|3| |K| | | + +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - + + | Extended payload length continued, if payload len == 127 | + + - - - - - - - - - - - - - - - +-------------------------------+ + | |Masking-key, if MASK set to 1 | + +-------------------------------+-------------------------------+ + | Masking-key (continued) | Payload Data | + +-------------------------------- - - - - - - - - - - - - - - - + + : Payload Data continued ... : + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + | Payload Data continued ... | + +---------------------------------------------------------------+ */ + +typedef struct { + unsigned int fin; + unsigned int rsv1; + unsigned int rsv2; + unsigned int rsv3; + unsigned int opcode; + unsigned int mask; + unsigned int payload_len; + unsigned char masking_key[4]; + char *payload_data; + tcp_event_info_t *tcpinfo; +} ws_frame_t; + +#define BYTE0_MASK_FIN (0x80) +#define BYTE0_MASK_RSV1 (0x40) +#define BYTE0_MASK_RSV2 (0x20) +#define BYTE0_MASK_RSV3 (0x10) +#define BYTE0_MASK_OPCODE (0x0F) +#define BYTE1_MASK_MASK (0x80) +#define BYTE1_MASK_PAYLOAD_LEN (0x7F) + +#define OPCODE_CONTINUATION (0x0) +#define OPCODE_TEXT_FRAME (0x1) +#define OPCODE_BINARY_FRAME (0x2) +/* 0x3 - 0x7 are reserved for further non-control frames */ +#define OPCODE_CLOSE (0x8) +#define OPCODE_PING (0x9) +#define OPCODE_PONG (0xa) +/* 0xb - 0xf are reserved for further control frames */ + + +static int decode_and_validate_ws_frame(ws_frame_t *frame) +{ + unsigned int i, len=frame->tcpinfo->len; + int mask_start, j; + char *buf = frame->tcpinfo->buf; + + /* Decode and validate first 9 bits */ + if (len < 2) + { + LM_WARN("message is too short\n"); + return -1; + } + frame->fin = (buf[0] & 0xff) & BYTE0_MASK_FIN; + frame->rsv1 = (buf[0] & 0xff) & BYTE0_MASK_RSV1; + frame->rsv2 = (buf[0] & 0xff) & BYTE0_MASK_RSV2; + frame->rsv3 = (buf[0] & 0xff) & BYTE0_MASK_RSV3; + frame->opcode = (buf[0] & 0xff) & BYTE0_MASK_OPCODE; + frame->mask = (buf[1] & 0xff) & BYTE1_MASK_MASK; + + if (!frame->fin) + { + LM_WARN("WebSocket fragmentation not supported in the sip " + "sub-protocol\n"); + return -1; + } + + if (frame->rsv1 || frame->rsv2 || frame->rsv3) + { + LM_WARN("WebSocket reserved fields with non-zero values\n"); + return -1; + } + + switch(frame->opcode) + { + case OPCODE_TEXT_FRAME: + case OPCODE_BINARY_FRAME: + LM_INFO("supported non-control frame: 0x%x\n", + (unsigned char) frame->opcode); + break; + + case OPCODE_CLOSE: + case OPCODE_PING: + case OPCODE_PONG: + LM_INFO("supported control frame: 0x%x\n", + (unsigned char) frame->opcode); + break; + + default: + LM_WARN("unsupported opcode: 0x%x\n", + (unsigned char) frame->opcode); + return -1; + } + + if (!frame->mask) + { + LM_WARN("this is a server - all received messages must be " + "masked\n"); + return -1; + } + + /* Decode and validate length */ + frame->payload_len = (buf[1] & 0xff) & BYTE1_MASK_PAYLOAD_LEN; + if (frame->payload_len == 126) + { + if (len < 4) + { + LM_WARN("message is too short\n"); + return -1; + } + mask_start = 4; + + frame->payload_len = ((buf[2] & 0xff) << 8) + | ((buf[3] & 0xff) << 0); + } + else if (frame->payload_len == 127) + { + if (len < 10) + { + LM_WARN("message is too short\n"); + return -1; + } + mask_start = 10; + + /* Only decoding the last four bytes of the length... + This limits the size of WebSocket messages that can be + handled to 2^32 = which should be plenty for SIP! */ + frame->payload_len = ((buf[6] & 0xff) << 24) + | ((buf[7] & 0xff) << 16) + | ((buf[8] & 0xff) << 8) + | ((buf[9] & 0xff) << 0); + } + else + mask_start = 2; + + /* Decode mask */ + frame->masking_key[0] = (buf[mask_start + 0] & 0xff); + frame->masking_key[1] = (buf[mask_start + 1] & 0xff); + frame->masking_key[2] = (buf[mask_start + 2] & 0xff); + frame->masking_key[3] = (buf[mask_start + 3] & 0xff); + + /* Decode and unmask payload */ + if (len < frame->payload_len + mask_start) + { + LM_WARN("message not complete payload_len = %u but only " + "received %u\n", frame->payload_len, len); + return -1; + } + frame->payload_data = &buf[mask_start + 4]; + for (i = 0; i < frame->payload_len; i++) + { + j = i % 4; + frame->payload_data[i] + = frame->payload_data[i] ^ frame->masking_key[j]; + } + + LM_INFO("Rx (decoded): %.*s\n", + (int) frame->payload_len, frame->payload_data); + + return frame->opcode; +} + +static int handle_sip_message(ws_frame_t *msg) +{ + LM_INFO("Received SIP message\n"); + return 0; +} + +static int handle_close(ws_frame_t *msg) +{ + LM_INFO("Received Close\n"); + return 0; +} + +static int handle_ping(ws_frame_t *msg) +{ + LM_INFO("Received Ping\n"); + return 0; +} + +static int handle_pong(ws_frame_t *msg) +{ + LM_INFO("Received Pong\n"); + return 0; +} int ws_frame_received(void *data) { - int printed; - str output; + ws_frame_t ws_frame; tcp_event_info_t *tev = (tcp_event_info_t *) data; if (tev == NULL || tev->buf == NULL || tev->len <= 0) @@ -41,14 +232,46 @@ int ws_frame_received(void *data) return -1; } - output.len = 0; - output.s = frame_buf; + ws_frame.tcpinfo = tev; + switch(decode_and_validate_ws_frame(&ws_frame)) + { + case OPCODE_TEXT_FRAME: + case OPCODE_BINARY_FRAME: + if (handle_sip_message(&ws_frame) < 0) + { + LM_ERR("handling SIP message\n"); + return -1; + } + break; + + case OPCODE_CLOSE: + if (handle_close(&ws_frame) < 0) + { + LM_ERR("handling Close\n"); + return -1; + } + break; - for (printed = 0; printed < tev->len && output.len < FRAME_BUF_SIZE - 3; - printed++) - output.len += sprintf(output.s + output.len, "%02x ", - (unsigned char) tev->buf[printed]); - LM_INFO("Rx: %.*s\n", output.len, output.s); + case OPCODE_PING: + if (handle_ping(&ws_frame) < 0) + { + LM_ERR("handling Ping\n"); + return -1; + } + break; + + case OPCODE_PONG: + if (handle_pong(&ws_frame) < 0) + { + LM_ERR("handling Pong\n"); + return -1; + } + break; + + default: + LM_WARN("received bad frame\n"); + return -1; + } return 0; }

12 years, 6 months

git:pd/websocket: core: make it possible to retrieve TCP connection without updating connection liifetime

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 74a32e90a9c86c40d9497a9543eedba63556e865 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74a32e9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 22:58:00 2012 +0100 core: make it possible to retrieve TCP connection without updating connection liifetime --- tcp_main.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index d629647..c5a2547 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1540,10 +1540,11 @@ struct tcp_connection* tcpconn_get(int id, struct ip_addr* ip, int port, if (likely(c)){ atomic_inc(&c->refcnt); /* update the timeout only if the connection is not handled - * by a tcp reader (the tcp reader process uses c->timeout for - * its own internal timeout and c->timeout will be overwritten - * anyway on return to tcp_main) */ - if (likely(c->reader_pid==0)) + * by a tcp reader _and_the timeout is non-zero (the tcp + * reader process uses c->timeout for its own internal + * timeout and c->timeout will be overwritten * anyway on + * return to tcp_main) */ + if (likely(c->reader_pid==0 && timeout != 0)) c->timeout=get_ticks_raw()+timeout; } TCPCONN_UNLOCK;

12 years, 6 months

git:pd/websocket: core: improved de-buffering for websockets

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 1718093cfad0ea8085d20a7b5fd995f93c91a48a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1718093… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 22:58:36 2012 +0100 core: improved de-buffering for websockets - This should handle the case that the full TCP packet hasn't been received when the read function is called. Not sure how to explicitly test this though. --- tcp_read.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 116 insertions(+), 11 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index c68dbdd..ccb5481 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -110,11 +110,6 @@ int is_msg_complete(struct tcp_req* r); #define HTTP11CONTINUE_LEN (sizeof(HTTP11CONTINUE)-1) #endif -#ifdef READ_WS -static int ws_process_msg(char* tcpbuf, unsigned int len, - struct receive_info* rcv_info, struct tcp_connection* con); -#endif - #define TCPCONN_TIMEOUT_MIN_RUN 1 /* run the timers each new tick */ /* types used in io_wait* */ @@ -444,10 +439,6 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) if (bytes<=0) return bytes; } p=r->parsed; -#ifdef READ_WS - if (c->flags & F_CONN_WS) - return ws_process_msg(p, bytes, &c->rcv, c); -#endif while(p<r->pos && r->error==TCP_REQ_OK){ switch((unsigned char)r->state){ @@ -1025,6 +1016,110 @@ int msrp_process_msg(char* tcpbuf, unsigned int len, #endif #ifdef READ_WS +static int tcp_read_ws(struct tcp_connection *c, int* read_flags) +{ + int bytes, pos, mask_present; + unsigned long len; + char *p; + struct tcp_req *r; + + r=&c->req; + if (unlikely(r->parsed < r->pos)) + bytes = 0; + else + { +#ifdef USE_TLS + if (unlikely(c->type == PROTO_TLS)) + bytes = tls_read(c, read_flags); + else +#endif + bytes = tcp_read(c, read_flags); + + if (bytes <= 0) + return 0; + } + + p = r->parsed; + pos = 0; + + /* + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-------+-+-------------+-------------------------------+ + |F|R|R|R| opcode|M| Payload len | Extended payload length | + |I|S|S|S| (4) |A| (7) | (16/64) | + |N|V|V|V| |S| | (if payload len==126/127) | + | |1|2|3| |K| | | + +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - + + | Extended payload length continued, if payload len == 127 | + + - - - - - - - - - - - - - - - +-------------------------------+ + | |Masking-key, if MASK set to 1 | + +-------------------------------+-------------------------------+ + | Masking-key (continued) | Payload Data | + +-------------------------------- - - - - - - - - - - - - - - - + + : Payload Data continued ... : + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + | Payload Data continued ... | + +---------------------------------------------------------------+ + + Do minimal parse required to make sure the full message has been + received (websocket module will do full parse and validation). + */ + + /* Process first two bytes */ + if (bytes < pos + 2) + goto skip; + pos++; + mask_present = p[pos] & 0x80; + len = (p[pos++] & 0xff) & ~0x80; + + /* Work out real length */ + if (len == 126) + { + if (bytes < pos + 2) + goto skip; + + len = 0; + len |= (p[pos++] & 0xff) << 8; + len |= (p[pos++] & 0xff) << 0; + } + else if (len == 127) + { + if (bytes < pos + 8) + goto skip; + + /* Only decoding the last four bytes of the length... + This limits the size of WebSocket messages that can be + handled to 2^32 - which should be plenty for SIP! */ + len = 0; + pos += 4; + len |= (p[pos++] & 0xff) << 24; + len |= (p[pos++] & 0xff) << 16; + len |= (p[pos++] & 0xff) << 8; + len |= (p[pos++] & 0xff) << 0; + } + + /* Skip mask */ + if (mask_present) + { + if (bytes < pos + 4) + goto skip; + pos += 4; + } + + /* Now check the whole message has been received */ + if (bytes < pos + len) + goto skip; + + pos += len; + r->bytes_to_go = bytes - pos; + r->flags |= F_TCP_REQ_COMPLETE; + r->parsed = &p[pos]; + +skip: + return bytes; +} + static int ws_process_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_info, struct tcp_connection* con) { @@ -1145,7 +1240,12 @@ int tcp_read_req(struct tcp_connection* con, int* bytes_read, int* read_flags) again: if (likely(req->error==TCP_REQ_OK)){ - bytes=tcp_read_headers(con, read_flags); +#ifdef READ_WS + if (unlikely(con->flags&F_CONN_WS)) + bytes=tcp_read_ws(con, read_flags); + else +#endif + bytes=tcp_read_headers(con, read_flags); #ifdef EXTRA_DEBUG /* if timeout state=0; goto end__req; */ DBG("read= %d bytes, parsed=%d, state=%d, error=%d\n", @@ -1173,7 +1273,6 @@ again: resp=CONN_EOF; goto end_req; } - } if (unlikely(req->error!=TCP_REQ_OK)){ LOG(L_ERR,"ERROR: tcp_read_req: bad request, state=%d, error=%d " @@ -1261,6 +1360,12 @@ again: &con->rcv, con); }else #endif +#ifdef READ_WS + if (unlikely(con->flags&F_CONN_WS)){ + ret = ws_process_msg(req->start, req->parsed-req->start, + &con->rcv, con); + }else +#endif ret = receive_tcp_msg(req->start, req->parsed-req->start, &con->rcv, con);

12 years, 6 months

git:pd/websocket: modules/websocket: small tidy up to handshake code

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 68686612a5775e6d677becffa0873028b1c766bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6868661… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 22:57:34 2012 +0100 modules/websocket: small tidy up to handshake code --- modules/websocket/ws_handshake.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 3a2174a..996eb01 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -122,27 +122,24 @@ int ws_handle_handshake(struct sip_msg *msg) str key = {0, 0}, headers = {0, 0}, reply_key = {0, 0}; unsigned char sha1[20]; unsigned int hdr_flags = 0; - int lifetime = 0, version; + int version; struct hdr_field *hdr = msg->headers; + struct tcp_connection *con; if (*ws_enabled == 0) { LM_INFO("disabled: bouncing handshake\n"); - ws_send_reply(msg, 503, &str_status_internal_server_error, + ws_send_reply(msg, 503, &str_status_service_unavailable, NULL); return 0; } - /* Check the protocol the request arrived over */ - switch (msg->rcv.proto) + /* Retrieve TCP/TLS connection */ + if ((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) { - case PROTO_TCP: - case PROTO_TLS: - lifetime = cfg_get(tcp, tcp_cfg, con_lifetime); - break; - default: - LM_WARN("websocket handshake on unsupported protocol\n"); - ws_send_reply(msg, 500, &str_status_service_unavailable, NULL); + LM_ERR("retrieving connection\n"); + ws_send_reply(msg, 500, &str_status_internal_server_error, + NULL); return 0; } @@ -313,8 +310,7 @@ int ws_handle_handshake(struct sip_msg *msg) /* Make sure Kamailio core sends future requests on this connection directly to this module */ - tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, lifetime)->flags - |= F_CONN_WS; + con->flags |= F_CONN_WS; return 0; }

12 years, 6 months

git:pd/websocket: core: Added WS support/events to Kamailio core

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 3ec469611f9f6c57d593c000614f461488b760a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ec4696… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 17:06:33 2012 +0100 core: Added WS support/events to Kamailio core --- events.c | 13 +++++++++++++ events.h | 2 ++ tcp_conn.h | 5 +++++ tcp_read.c | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 1 deletions(-) diff --git a/events.c b/events.c index 5ad2b44..d4a24f8 100644 --- a/events.c +++ b/events.c @@ -96,6 +96,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.tcp_msrp_frame = f; else return -1; break; + case SREV_TCP_WS_FRAME: + if(_sr_events_list.tcp_ws_frame==0) + _sr_events_list.tcp_ws_frame = f; + else return -1; + break; default: return -1; } @@ -187,6 +192,12 @@ int sr_event_exec(int type, void *data) ret = _sr_events_list.tcp_msrp_frame(data); return ret; } else return 1; + case SREV_TCP_WS_FRAME: + if(unlikely(_sr_events_list.tcp_ws_frame!=0)) + { + ret = _sr_events_list.tcp_ws_frame(data); + return ret; + } else return 1; default: return -1; } @@ -216,6 +227,8 @@ int sr_event_enabled(int type) return (_sr_events_list.tcp_http_100c!=0)?1:0; case SREV_TCP_MSRP_FRAME: return (_sr_events_list.tcp_msrp_frame!=0)?1:0; + case SREV_TCP_WS_FRAME: + return (_sr_events_list.tcp_ws_frame!=0)?1:0; } return 0; } diff --git a/events.h b/events.h index 1a4c5e0..f919a00 100644 --- a/events.h +++ b/events.h @@ -32,6 +32,7 @@ #define SREV_NET_DGRAM_IN 7 #define SREV_TCP_HTTP_100C 8 #define SREV_TCP_MSRP_FRAME 9 +#define SREV_TCP_WS_FRAME 10 typedef int (*sr_event_cb_f)(void *data); @@ -46,6 +47,7 @@ typedef struct sr_event_cb { sr_event_cb_f net_dgram_in; sr_event_cb_f tcp_http_100c; sr_event_cb_f tcp_msrp_frame; + sr_event_cb_f tcp_ws_frame; } sr_event_cb_t; void sr_event_cb_init(void); diff --git a/tcp_conn.h b/tcp_conn.h index a8a7e04..3b3f546 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -75,6 +75,7 @@ #define F_CONN_WANTS_RD 4096 /* conn. should be watched for READ */ #define F_CONN_WANTS_WR 8192 /* conn. should be watched for WRITE */ #define F_CONN_PASSIVE 16384 /* conn. created via accept() and not connect()*/ +#define F_CONN_WS 32768 /* conn. is a websocket */ #ifndef NO_READ_HTTP11 #define READ_HTTP11 @@ -84,6 +85,10 @@ #define READ_MSRP #endif +#ifndef NO_READ_WS +#define READ_WS +#endif + enum tcp_req_errors { TCP_REQ_INIT, TCP_REQ_OK, TCP_READ_ERROR, TCP_REQ_OVERRUN, TCP_REQ_BAD_LEN }; enum tcp_req_states { H_SKIP_EMPTY, H_SKIP_EMPTY_CR_FOUND, diff --git a/tcp_read.c b/tcp_read.c index f73a239..c68dbdd 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -110,6 +110,11 @@ int is_msg_complete(struct tcp_req* r); #define HTTP11CONTINUE_LEN (sizeof(HTTP11CONTINUE)-1) #endif +#ifdef READ_WS +static int ws_process_msg(char* tcpbuf, unsigned int len, + struct receive_info* rcv_info, struct tcp_connection* con); +#endif + #define TCPCONN_TIMEOUT_MIN_RUN 1 /* run the timers each new tick */ /* types used in io_wait* */ @@ -439,7 +444,11 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) if (bytes<=0) return bytes; } p=r->parsed; - +#ifdef READ_WS + if (c->flags & F_CONN_WS) + return ws_process_msg(p, bytes, &c->rcv, c); +#endif + while(p<r->pos && r->error==TCP_REQ_OK){ switch((unsigned char)r->state){ case H_BODY: /* read the body*/ @@ -1015,6 +1024,30 @@ int msrp_process_msg(char* tcpbuf, unsigned int len, } #endif +#ifdef READ_WS +static int ws_process_msg(char* tcpbuf, unsigned int len, + struct receive_info* rcv_info, struct tcp_connection* con) +{ + int ret; + tcp_event_info_t tev; + + ret = 0; + LM_DBG("WebSocket Message: [[>>>\n%.*s<<<]]\n", len, tcpbuf); + if(likely(sr_event_enabled(SREV_TCP_WS_FRAME))) { + memset(&tev, 0, sizeof(tcp_event_info_t)); + tev.type = SREV_TCP_WS_FRAME; + tev.buf = tcpbuf; + tev.len = len; + tev.rcv = rcv_info; + tev.con = con; + ret = sr_event_exec(SREV_TCP_WS_FRAME, (void*)(&tev)); + } else { + LM_DBG("no callback registering for handling WebSockets - dropping!\n"); + } + return ret; +} +#endif + /** * @brief wrapper around receive_msg() to clone the tcpbuf content *

12 years, 6 months

git:pd/websocket: modules/websocket: WS module registering for WS messages and basic handler implementation

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 6d93ce1b8a752e2b3fdb0ff7a3cbef0c7bc44787 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d93ce1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 17:05:54 2012 +0100 modules/websocket: WS module registering for WS messages and basic handler implementation --- modules/websocket/ws_frame.c | 28 ++++++++++++++++++++++++++++ modules/websocket/ws_frame.h | 1 + modules/websocket/ws_handshake.c | 33 +++++++++++++++++++++++++++------ modules/websocket/ws_mod.c | 7 +++++++ 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 50c8d68..ed7943b 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -21,10 +21,38 @@ * */ +#include "../../tcp_conn.h" #include "../../lib/kmi/tree.h" #include "ws_frame.h" #include "ws_mod.h" +#define FRAME_BUF_SIZE 1024 +static char frame_buf[FRAME_BUF_SIZE]; + +int ws_frame_received(void *data) +{ + int printed; + str output; + tcp_event_info_t *tev = (tcp_event_info_t *) data; + + if (tev == NULL || tev->buf == NULL || tev->len <= 0) + { + LM_WARN("received bad frame\n"); + return -1; + } + + output.len = 0; + output.s = frame_buf; + + for (printed = 0; printed < tev->len && output.len < FRAME_BUF_SIZE - 3; + printed++) + output.len += sprintf(output.s + output.len, "%02x ", + (unsigned char) tev->buf[printed]); + LM_INFO("Rx: %.*s\n", output.len, output.s); + + return 0; +} + struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) { /* TODO close specified or all connections */ diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index c777a15..782367f 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -27,6 +27,7 @@ #include "../../sr_module.h" #include "../../lib/kmi/tree.h" +int ws_frame_received(void *data); struct mi_root *ws_mi_close(struct mi_root *cmd, void *param); struct mi_root *ws_mi_ping(struct mi_root *cmd, void *param); diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 721b2aa..3a2174a 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -27,11 +27,13 @@ #include "../../data_lump_rpl.h" #include "../../dprint.h" #include "../../locking.h" +#include "../../tcp_conn.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kcore/cmpapi.h" #include "../../lib/kmi/tree.h" #include "../../parser/msg_parser.h" #include "../sl/sl.h" +#include "../tls/tls_cfg.h" #include "ws_handshake.h" #include "ws_mod.h" @@ -120,16 +122,31 @@ int ws_handle_handshake(struct sip_msg *msg) str key = {0, 0}, headers = {0, 0}, reply_key = {0, 0}; unsigned char sha1[20]; unsigned int hdr_flags = 0; - int version; + int lifetime = 0, version; struct hdr_field *hdr = msg->headers; if (*ws_enabled == 0) { LM_INFO("disabled: bouncing handshake\n"); - ws_send_reply(msg, 503, &str_status_service_unavailable, NULL); + ws_send_reply(msg, 503, &str_status_internal_server_error, + NULL); + return 0; + } + + /* Check the protocol the request arrived over */ + switch (msg->rcv.proto) + { + case PROTO_TCP: + case PROTO_TLS: + lifetime = cfg_get(tcp, tcp_cfg, con_lifetime); + break; + default: + LM_WARN("websocket handshake on unsupported protocol\n"); + ws_send_reply(msg, 500, &str_status_service_unavailable, NULL); return 0; } + /* Process HTTP headers */ while (hdr != NULL) { /* Decode and validate Connection */ @@ -289,11 +306,15 @@ int ws_handle_handshake(struct sip_msg *msg) str_hdr_sec_websocket_protocol.s, str_sip.len, str_sip.s); - /* TODO: make sure Kamailio core sends future requests on this - connection directly to this module */ - /* Send reply */ - ws_send_reply(msg, 101, &str_status_switching_protocols, &headers); + if (ws_send_reply(msg, 101, + &str_status_switching_protocols, &headers) < 0) + return 0; + + /* Make sure Kamailio core sends future requests on this connection + directly to this module */ + tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, lifetime)->flags + |= F_CONN_WS; return 0; } diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 23d3f7a..4ca1758 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -22,6 +22,7 @@ */ #include "../../dprint.h" +#include "../../events.h" #include "../../locking.h" #include "../../sr_module.h" #include "../../lib/kcore/kstats_wrapper.h" @@ -117,6 +118,12 @@ static int mod_init(void) return -1; } + if (sr_event_register_cb(SREV_TCP_WS_FRAME, ws_frame_received) != 0) + { + LM_ERR("registering WebSocket call-back\n"); + return -1; + } + if (register_module_stats(exports.name, stats) != 0) { LM_ERR("registering core statistics\n");

12 years, 6 months

git:pd/websocket: modules/websocket: more work on module boiler-plate and handshake

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 48e7ee701571c127effa3b0ddd06468154ddf139 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48e7ee7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 14:38:22 2012 +0100 modules/websocket: more work on module boiler-plate and handshake - Handshake now works with Google Chrome --- modules/websocket/Makefile | 1 + modules/websocket/example/kamailio.cfg | 1 + modules/websocket/ws_frame.c | 38 ++++++++ modules/websocket/ws_frame.h | 33 +++++++ modules/websocket/ws_handshake.c | 164 ++++++++++++++++++++++++-------- modules/websocket/ws_handshake.h | 3 + modules/websocket/ws_mod.c | 115 ++++++++++++++++++++--- modules/websocket/ws_mod.h | 22 ++++- 8 files changed, 318 insertions(+), 59 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=48e…

12 years, 6 months

git:3.2: dialog(k): proper local linking of profile before dlg is created

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.2 Commit: 72899d84896a32d6a1598e3a4b2db61da4283327 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72899d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 15 17:17:07 2012 +0200 dialog(k): proper local linking of profile before dlg is created - reported by Nick R. (cherry picked from commit 80c4f4b1d9ff31e79c999b82db35c3b9abc56e22) --- modules_k/dialog/dlg_profile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index 4765763..b1e3078 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -467,6 +467,13 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p /* add linker directly to the dialog and profile */ link_dlg_profile( linker, dlg); } else { + /* if existing linkers are not from current request, just discard them */ + if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) { + current_dlg_msg_id = msg->id; + current_dlg_msg_pid = msg->pid; + destroy_linkers(current_pending_linkers); + current_pending_linkers = NULL; + } /* no dialog yet -> set linker as pending */ linker->next = current_pending_linkers; current_pending_linkers = linker;

12 years, 6 months

git:3.3: dialog(k): proper local linking of profile before dlg is created

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: c70012b1252174c66771f8d81611d2428ea48e50 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c70012b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 15 17:17:07 2012 +0200 dialog(k): proper local linking of profile before dlg is created - reported by Nick R. (cherry picked from commit 80c4f4b1d9ff31e79c999b82db35c3b9abc56e22) --- modules_k/dialog/dlg_profile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index c8e3150..70ec2c5 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -468,6 +468,13 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p /* add linker directly to the dialog and profile */ link_dlg_profile( linker, dlg); } else { + /* if existing linkers are not from current request, just discard them */ + if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) { + current_dlg_msg_id = msg->id; + current_dlg_msg_pid = msg->pid; + destroy_linkers(current_pending_linkers); + current_pending_linkers = NULL; + } /* no dialog yet -> set linker as pending */ if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) { current_dlg_msg_id = msg->id;

12 years, 6 months

git:master: dialog(k): proper local linking of profile before dlg is created

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 80c4f4b1d9ff31e79c999b82db35c3b9abc56e22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80c4f4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 15 17:17:07 2012 +0200 dialog(k): proper local linking of profile before dlg is created - reported by Nick R. --- modules_k/dialog/dlg_profile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index c8e3150..70ec2c5 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -468,6 +468,13 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p /* add linker directly to the dialog and profile */ link_dlg_profile( linker, dlg); } else { + /* if existing linkers are not from current request, just discard them */ + if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) { + current_dlg_msg_id = msg->id; + current_dlg_msg_pid = msg->pid; + destroy_linkers(current_pending_linkers); + current_pending_linkers = NULL; + } /* no dialog yet -> set linker as pending */ if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) { current_dlg_msg_id = msg->id;

12 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012