sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:pd/websocket: modules/websocket: updated example configuration and test scripts

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 64406b209d8b4fd9ed127a6b4b965e3c1863c3d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64406b2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:55:34 2012 +0100 modules/websocket: updated example configuration and test scripts - Added options_rx.xml SIPp script - kamailio.cfg routes OPTIONS to SIPp - websocket_test.html now using WSS (WS over TLS) --- modules/websocket/example/kamailio.cfg | 16 ++++++++++--- modules/websocket/example/options_rx.xml | 28 +++++++++++++++++++++++++ modules/websocket/example/websocket_test.html | 7 +---- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/modules/websocket/example/kamailio.cfg b/modules/websocket/example/kamailio.cfg index cac432c..c5bfb88 100644 --- a/modules/websocket/example/kamailio.cfg +++ b/modules/websocket/example/kamailio.cfg @@ -97,6 +97,14 @@ modparam("tls", "ca_list", "CA/calist.pem") # - note: this is the same as route { ... } request_route { + if ($rm == "OPTIONS") + { + force_rport(); + $du = "sip:192.168.111.2:5080;transport=udp"; + forward(); + exit; + } + # per request initial checks route(REQINIT); @@ -245,14 +253,14 @@ event_route[xhttp:request] { exit; } - xlog("L_INFO", "HTTP Request Received\n"); + xlog("L_DBG", "HTTP Request Received\n"); if ($hdr(Upgrade)=~"websocket" && $hdr(Connection)=~"Upgrade" && $rm=~"GET") { - xlog("L_INFO", "WebSocket\n"); - xlog("L_INFO", " Host: $hdr(Host)\n"); - xlog("L_INFO", " Origin: $hdr(Origin)\n"); + xlog("L_DBG", "WebSocket\n"); + xlog("L_DBG", " Host: $hdr(Host)\n"); + xlog("L_DBG", " Origin: $hdr(Origin)\n"); if ($hdr(Host) == $null || !is_myself($hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); diff --git a/modules/websocket/example/options_rx.xml b/modules/websocket/example/options_rx.xml new file mode 100644 index 0000000..d3160b6 --- /dev/null +++ b/modules/websocket/example/options_rx.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE scenario SYSTEM "sipp.dtd"> + +<scenario name="Basic OPTIONS responder"> + <recv request="OPTIONS" crlf="true"> + </recv> + + <send> + <![CDATA[ + + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:];tag=[pid]SIPpTag01[call_number] + [last_Call-ID:] + [last_CSeq:] + Contact: <sip:[local_ip]:[local_port];transport=[transport]> + Content-Length: 0 + + ]]> + </send> + + <timewait milliseconds="4000"/> + <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/> + <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> + +</scenario> + diff --git a/modules/websocket/example/websocket_test.html b/modules/websocket/example/websocket_test.html index 308b945..a7f9d20 100644 --- a/modules/websocket/example/websocket_test.html +++ b/modules/websocket/example/websocket_test.html @@ -5,7 +5,7 @@ <title>WebSocket Test</title> <script language="javascript" type="text/javascript"> -var wsUri = "ws://192.168.111.12/"; +var wsUri = "wss://192.168.111.2/"; var output; function init() @@ -26,10 +26,7 @@ function testWebSocket() function onOpen(evt) { writeToScreen("CONNECTED"); - doSend("WebSocket rocks"); - doSend("WebSocket rolls"); - doSend("012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"); - websocket.close(); + doSend("OPTIONS sip:alice@example.com SIP/2.0\r\nVia: SIP/2.0/WSS abcd1234.invalid;branch=z9hG4bkabcd1234\r\nMax-Forwards: 70\r\nTo: <sip:alice@example.com>\r\nFrom: <sip:bob@example.com>;tag=abcd1234\r\nCall-ID: abcd1234\r\nCSeq: 1 OPTIONS\r\nContact: <sip:bob@abcd1234;transport=ws>\r\n\r\n"); } function onClose(evt)

11 years, 10 months

git:pd/websocket: core: fixed segmentation fault I had added to forward.h

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 11a2ad18ea0b263316fe8728aa44b892d7c4fe86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11a2ad1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:52:15 2012 +0100 core: fixed segmentation fault I had added to forward.h --- forward.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.h b/forward.h index d3831f9..f5137df 100644 --- a/forward.h +++ b/forward.h @@ -145,7 +145,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) else if (dst->proto == PROTO_TLS) con = tcpconn_get(dst->id, 0, 0, 0, 0); #endif - if (con->flags & F_CONN_WS) + if (con && con->flags & F_CONN_WS) { memset(&wsev, 0, sizeof(ws_event_info_t)); wsev.type = SREV_TCP_WS_FRAME_OUT;

11 years, 10 months

git:pd/websocket: modules/websocket: now using libunistring:u8_check() to work out whether to send text or binary websocket frames

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 4611d052b9e73f9b301a043da632e28b7ec65bf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4611d05… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:57:37 2012 +0100 modules/websocket: now using libunistring:u8_check() to work out whether to send text or binary websocket frames - There is no straight-forward (or practical) way to be sure that a SIP request only contains UTF-8 characters and therefore should be sent as text instead of binary. However, you can sometimes tell whether the request definitely isn't UTF-8 by checking for invalid byte sequences - and when it is definitely not UTF-8 frames _MUST_ be sent as binary. --- modules/websocket/Makefile | 1 + modules/websocket/ws_frame.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/websocket/Makefile b/modules/websocket/Makefile index dade653..8304bfb 100644 --- a/modules/websocket/Makefile +++ b/modules/websocket/Makefile @@ -17,6 +17,7 @@ else DEFS+= $(shell pkg-config --cflags libssl) LIBS= $(shell pkg-config --libs libssl) endif +LIBS+= -lunistring DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 6b565c3..ec5f8a5 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -22,6 +22,7 @@ */ #include <limits.h> +#include <unistr.h> #include "../../receive.h" #include "../../stats.h" #include "../../str.h" @@ -592,9 +593,10 @@ int ws_frame_transmit(void *data) memset(&frame, 0, sizeof(frame)); frame.fin = 1; - /* Can't be sure whether this message is UTF-8 or not so always send - as binary */ - frame.opcode = OPCODE_BINARY_FRAME; + /* Can't be sure whether this message is UTF-8 or not so check to see + if it "might" be UTF-8 and send as binary if it definitely isn't */ + frame.opcode = (u8_check((uint8_t *) wsev->buf, wsev->len) == NULL) ? + OPCODE_TEXT_FRAME: OPCODE_BINARY_FRAME; frame.payload_len = wsev->len; frame.payload_data = wsev->buf; frame.wsc = wsconn_get(wsev->id); @@ -602,11 +604,9 @@ int ws_frame_transmit(void *data) if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) { LM_ERR("sending SIP message\n"); - if (wsev->buf) pkg_free(wsev->buf); return -1; } - if (wsev->buf) pkg_free(wsev->buf); return 0; }

11 years, 10 months

git:pd/websocket: core: added events and data-structures so that Kamailio core can transmit through the WebSocket module

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 1f139814262a4c5979c5301812f81304d885e92c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f13981… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 19:10:03 2012 +0100 core: added events and data-structures so that Kamailio core can transmit through the WebSocket module --- events.c | 29 +++++++++++++++++++++-------- events.h | 6 ++++-- forward.h | 25 ++++++++++++++++++++++++- tcp_conn.h | 7 +++++++ tcp_read.c | 6 +++--- 5 files changed, 59 insertions(+), 14 deletions(-) diff --git a/events.c b/events.c index d4a24f8..d26ae9b 100644 --- a/events.c +++ b/events.c @@ -96,9 +96,14 @@ 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; + case SREV_TCP_WS_FRAME_IN: + if(_sr_events_list.tcp_ws_frame_in==0) + _sr_events_list.tcp_ws_frame_in = f; + else return -1; + break; + case SREV_TCP_WS_FRAME_OUT: + if(_sr_events_list.tcp_ws_frame_out==0) + _sr_events_list.tcp_ws_frame_out = f; else return -1; break; default: @@ -192,10 +197,16 @@ 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)) + case SREV_TCP_WS_FRAME_IN: + if(unlikely(_sr_events_list.tcp_ws_frame_in!=0)) + { + ret = _sr_events_list.tcp_ws_frame_in(data); + return ret; + } else return 1; + case SREV_TCP_WS_FRAME_OUT: + if(unlikely(_sr_events_list.tcp_ws_frame_out!=0)) { - ret = _sr_events_list.tcp_ws_frame(data); + ret = _sr_events_list.tcp_ws_frame_out(data); return ret; } else return 1; default: @@ -227,8 +238,10 @@ 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; + case SREV_TCP_WS_FRAME_IN: + return (_sr_events_list.tcp_ws_frame_in!=0)?1:0; + case SREV_TCP_WS_FRAME_OUT: + return (_sr_events_list.tcp_ws_frame_out!=0)?1:0; } return 0; } diff --git a/events.h b/events.h index f919a00..734e90c 100644 --- a/events.h +++ b/events.h @@ -32,7 +32,8 @@ #define SREV_NET_DGRAM_IN 7 #define SREV_TCP_HTTP_100C 8 #define SREV_TCP_MSRP_FRAME 9 -#define SREV_TCP_WS_FRAME 10 +#define SREV_TCP_WS_FRAME_IN 10 +#define SREV_TCP_WS_FRAME_OUT 11 typedef int (*sr_event_cb_f)(void *data); @@ -47,7 +48,8 @@ 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_f tcp_ws_frame_in; + sr_event_cb_f tcp_ws_frame_out; } sr_event_cb_t; void sr_event_cb_init(void); diff --git a/forward.h b/forward.h index 674a6f0..d3831f9 100644 --- a/forward.h +++ b/forward.h @@ -54,6 +54,7 @@ #include "udp_server.h" #ifdef USE_TCP #include "tcp_server.h" +#include "tcp_conn.h" #endif #ifdef USE_SCTP #include "sctp_server.h" @@ -128,12 +129,34 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) #ifdef USE_TCP union sockaddr_union* from; union sockaddr_union local_addr; + struct tcp_connection *con = NULL; + struct ws_event_info wsev; #endif outb.s = buf; outb.len = len; sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb); - + +#ifdef USE_TCP + if (unlikely(sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) { + if (dst->proto == PROTO_TCP) + con = tcpconn_get(dst->id, 0, 0, 0, 0); +#ifdef USE_TLS + else if (dst->proto == PROTO_TLS) + con = tcpconn_get(dst->id, 0, 0, 0, 0); +#endif + if (con->flags & F_CONN_WS) + { + memset(&wsev, 0, sizeof(ws_event_info_t)); + wsev.type = SREV_TCP_WS_FRAME_OUT; + wsev.buf = outb.s; + wsev.len = outb.len; + wsev.id = dst->id; + return sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev); + } + } +#endif + if (likely(dst->proto==PROTO_UDP)){ if (unlikely((dst->send_sock==0) || (dst->send_sock->flags & SI_IS_MCAST))){ diff --git a/tcp_conn.h b/tcp_conn.h index 3b3f546..ec7c44f 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -355,6 +355,13 @@ typedef struct tcp_event_info { struct tcp_connection *con; } tcp_event_info_t; +typedef struct ws_event_info { + int type; + char *buf; + unsigned int len; + int id; +} ws_event_info_t; + #endif diff --git a/tcp_read.c b/tcp_read.c index d8b4653..e33984b 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -1132,14 +1132,14 @@ static int ws_process_msg(char* tcpbuf, unsigned int len, ret = 0; LM_DBG("WebSocket Message: [[>>>\n%.*s<<<]]\n", len, tcpbuf); - if(likely(sr_event_enabled(SREV_TCP_WS_FRAME))) { + if(likely(sr_event_enabled(SREV_TCP_WS_FRAME_IN))) { memset(&tev, 0, sizeof(tcp_event_info_t)); - tev.type = SREV_TCP_WS_FRAME; + tev.type = SREV_TCP_WS_FRAME_IN; tev.buf = tcpbuf; tev.len = len; tev.rcv = rcv_info; tev.con = con; - ret = sr_event_exec(SREV_TCP_WS_FRAME, (void*)(&tev)); + ret = sr_event_exec(SREV_TCP_WS_FRAME_IN, (void*)(&tev)); } else { LM_DBG("no callback registering for handling WebSockets - dropping!\n"); }

11 years, 10 months

git:pd/websocket: modules/websocket: added generic transmit functions to WebSocket module so Kamailio core can send WebSocket frames

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 50d20ecde5503d11358b86cbd23456e2a302c9be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50d20ec… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 19:08:38 2012 +0100 modules/websocket: added generic transmit functions to WebSocket module so Kamailio core can send WebSocket frames --- modules/websocket/ws_frame.c | 69 ++++++++++++++++++++++++++++++++++++++++-- modules/websocket/ws_frame.h | 3 +- modules/websocket/ws_mod.c | 10 +++++- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index f969119..6b565c3 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -23,6 +23,7 @@ #include <limits.h> #include "../../receive.h" +#include "../../stats.h" #include "../../str.h" #include "../../tcp_conn.h" #include "../../tcp_server.h" @@ -119,6 +120,8 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) char *send_buf; struct tcp_connection *con; struct dest_info dst; + union sockaddr_union *from = NULL; + union sockaddr_union local_addr; LM_DBG("encoding WebSocket frame\n"); @@ -227,8 +230,38 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) } } - if (tcp_send(&dst, NULL, send_buf, frame_length) < 0) + if (dst.proto == PROTO_TCP) { + if (unlikely(tcp_disable)) + { + STATS_TX_DROPS; + LM_WARN("TCP disabled\n"); + return -1; + } + } +#ifdef USE_TLS + else if (dst.proto == PROTO_TLS) + { + if (unlikely(tls_disable)) + { + STATS_TX_DROPS; + LM_WARN("TLS disabled\n"); + return -1; + } + } +#endif /* USE_TLS */ + + if (unlikely((dst.send_flags.f & SND_F_FORCE_SOCKET) + && dst.send_sock)) + { + local_addr = dst.send_sock->su; + su_setport(&local_addr, 0); + from = &local_addr; + } + + if (tcp_send(&dst, from, send_buf, frame_length) < 0) + { + STATS_TX_DROPS; LM_ERR("sending WebSocket frame\n"); pkg_free(send_buf); update_stat(ws_failed_connections, 1); @@ -494,7 +527,12 @@ static int handle_ping(ws_frame_t *frame) frame->opcode = OPCODE_PONG; frame->mask = 0; - encode_and_send_ws_frame(frame, CONN_CLOSE_DONT); + + if (encode_and_send_ws_frame(frame, CONN_CLOSE_DONT) < 0) + { + LM_ERR("sending Pong\n"); + return -1; + } return 0; } @@ -510,7 +548,7 @@ static int handle_pong(ws_frame_t *frame) return 0; } -int ws_frame_received(void *data) +int ws_frame_receive(void *data) { ws_frame_t ws_frame; tcp_event_info_t *tcpinfo = (tcp_event_info_t *) data; @@ -547,6 +585,31 @@ int ws_frame_received(void *data) return 0; } +int ws_frame_transmit(void *data) +{ + ws_event_info_t *wsev = (ws_event_info_t *) data; + ws_frame_t frame; + + memset(&frame, 0, sizeof(frame)); + frame.fin = 1; + /* Can't be sure whether this message is UTF-8 or not so always send + as binary */ + frame.opcode = OPCODE_BINARY_FRAME; + frame.payload_len = wsev->len; + frame.payload_data = wsev->buf; + frame.wsc = wsconn_get(wsev->id); + + if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) + { + LM_ERR("sending SIP message\n"); + if (wsev->buf) pkg_free(wsev->buf); + return -1; + } + + if (wsev->buf) pkg_free(wsev->buf); + return 0; +} + static int ping_pong(ws_connection_t *wsc, int opcode) { ws_frame_t frame; diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index 6cae2eb..6be9529 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -58,7 +58,8 @@ extern stat_var *ws_received_frames; extern stat_var *ws_remote_closed_connections; extern stat_var *ws_transmitted_frames; -int ws_frame_received(void *data); +int ws_frame_receive(void *data); +int ws_frame_transmit(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); struct mi_root *ws_mi_pong(struct mi_root *cmd, void *param); diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 67e15c1..ced58ee 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -140,9 +140,15 @@ static int mod_init(void) goto error; } - if (sr_event_register_cb(SREV_TCP_WS_FRAME, ws_frame_received) != 0) + if (sr_event_register_cb(SREV_TCP_WS_FRAME_IN, ws_frame_receive) != 0) { - LM_ERR("registering WebSocket call-back\n"); + LM_ERR("registering WebSocket receive call-back\n"); + goto error; + } + + if (sr_event_register_cb(SREV_TCP_WS_FRAME_OUT, ws_frame_transmit) != 0) + { + LM_ERR("registering WebSocket transmit call-back\n"); goto error; }

11 years, 10 months

git:pd/websocket: modules/websocket: updated example/test kamailio. cfg to support TLS

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: ad7ea60ff5e8e2a8d5b9ddeaca99a2bab7941e70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad7ea60… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 16:07:12 2012 +0100 modules/websocket: updated example/test kamailio.cfg to support TLS - Basic WebSocket working over TLS --- modules/websocket/example/kamailio.cfg | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/modules/websocket/example/kamailio.cfg b/modules/websocket/example/kamailio.cfg index ba20abb..cac432c 100644 --- a/modules/websocket/example/kamailio.cfg +++ b/modules/websocket/example/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO -#!define DBURL "sqlite:////etc/kamailio/db.sqlite" +#!define DBURL "sqlite:////etc/kamailio/db.sqlite" ####### Global Parameters ######### @@ -8,15 +8,21 @@ debug=2 fork=yes children=4 +enable_tls=1 + alias="example.com" -listen=192.168.111.12 -port=5060 -listen=192.168.111.12 -port=80 + +listen=192.168.111.2:5060 +listen=tcp:192.168.111.2:80 + +listen=tls:192.168.111.2:5061 +listen=tls:192.168.111.2:443 tcp_connection_lifetime=3604 tcp_accept_no_cl=yes +enable_tls=1 + syn_branch=0 #mpath="/usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/" @@ -41,6 +47,7 @@ loadmodule "xhttp.so" loadmodule "kex.so" loadmodule "websocket.so" loadmodule "mi_rpc.so" +loadmodule "tls.so" # ----------------- setting module-specific parameters --------------- @@ -73,6 +80,14 @@ modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") +# ----- websocket params ----- +modparam("websocket", "keepalive_timeout", 30) + +# ----- tls params ----- +modparam("tls", "tls_method", "SSLv23") +modparam("tls", "certificate", "CA/ser1_cert.pem") +modparam("tls", "private_key", "CA/privkey.pem") +modparam("tls", "ca_list", "CA/calist.pem") ####### Routing Logic ######## @@ -224,12 +239,14 @@ route[AUTH] { } event_route[xhttp:request] { - if ($Rp != "80") { + if ($Rp != "80" && $Rp != "443") { xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } + xlog("L_INFO", "HTTP Request Received\n"); + if ($hdr(Upgrade)=~"websocket" && $hdr(Connection)=~"Upgrade" && $rm=~"GET") {

11 years, 10 months

git:pd/websocket: modules/websocket: finished off WebSocket connection management

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 5d8239f5da2176938e0c789b9b2caa493725daa1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d8239f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 15:03:48 2012 +0100 modules/websocket: finished off WebSocket connection management --- modules/websocket/ws_conn.c | 270 +++++++++++++++++++++++++++++++----------- modules/websocket/ws_conn.h | 15 ++- modules/websocket/ws_frame.c | 38 ++++++- modules/websocket/ws_frame.h | 18 +++ modules/websocket/ws_mod.c | 116 ++++++++++++++++--- 5 files changed, 365 insertions(+), 92 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5d8…

11 years, 10 months

git:pd/websocket: modules/websocket: tidied up some of the WS connection code

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 3a64dffb99cfe098f90fdd5c79adc938ac230bf6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a64dff… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 11:31:50 2012 +0100 modules/websocket: tidied up some of the WS connection code --- modules/websocket/ws_conn.c | 84 ++++----- modules/websocket/ws_conn.h | 18 +- modules/websocket/ws_frame.c | 387 +++++++++++++++++++------------------- modules/websocket/ws_handshake.c | 6 +- 4 files changed, 248 insertions(+), 247 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3a6…

11 years, 10 months

What needs updating in Kamailio core/parser and modules for WebSockets

by Peter Dunkley

Hi, I am just trying to work out exactly what needs to be updated in the Kamailio core/parser for WebSockets. I already know that the Via: parser needs to be updated to understand the WS and WSS transports, and the URI parser needs to be updated to understand the the WS transport, but is there anything else? I'd appreciate it if anyone has any ideas about what else might need changed (and where in the code), as my guessing at this could be a bit hit-and-miss... I don't plan to add a forward_ws() function to core because I don't think it'll work (or at least not in all cases as servers cannot initiate WebSocket connections). But are there updates needed in the following areas (and any ideas where in the code I should look)? * forward_no_connect() * the proto core variable * the snd_proto core variable * Is a WS keyword (like SCTP/TCP/TLS/UDP) needed * Are the pseudo variables (for example, I know that the mutable variable $du needs to do the right thing as this is fundamental to being able to route requests), transformations, and selects that need to be updated * Are there any modules (rr, nathelper?) that need to be updated Thanks for your help, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 10 months

git:pd/websocket: modules/websocket: Closing handshake now working

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 2f30521ea903b1805c728d60cccda6b2636cacde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f30521… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 22 00:34:24 2012 +0100 modules/websocket: Closing handshake now working - Also completed MI commands which allowed me to test Ping and Pong --- modules/websocket/ws_conn.c | 171 ++++++++++++++++++++--- modules/websocket/ws_conn.h | 21 ++-- modules/websocket/ws_frame.c | 293 ++++++++++++++++++++++++++++++-------- modules/websocket/ws_frame.h | 14 ++ modules/websocket/ws_handshake.c | 26 +--- modules/websocket/ws_handshake.h | 3 + modules/websocket/ws_mod.c | 126 ++--------------- modules/websocket/ws_mod.h | 10 -- 8 files changed, 437 insertions(+), 227 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2f3…

11 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
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