sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
251 discussions

git:pd/websocket: everything: shotgun attempt to put PROTO_WS and PROTO_WSS across core and in modules I use
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 1e2f18da2f2c8791f804b33e96dea043f18642bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e2f18d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 00:01:07 2012 +0100 everything: shotgun attempt to put PROTO_WS and PROTO_WSS across core and in modules I use - Bound to have missed something and lots of testing required. --- forward.c | 7 ++++++- ip_addr.c | 4 ++++ modules/sanity/sanity.c | 26 ++++++++++++++++++++++++++ modules/tm/tm.c | 7 ++++++- modules/tm/ut.h | 14 +++++++++++--- modules_k/permissions/hash.c | 4 ++++ modules_k/permissions/trusted.c | 23 +++++++++++++++++++++++ modules_k/presence/subscribe.c | 6 ++++++ modules_k/presence/utils_func.h | 5 +++++ modules_k/pv/pv_core.c | 6 ++++++ modules_k/registrar/save.c | 8 ++++---- modules_k/siptrace/siptrace.c | 4 ++++ socket_info.c | 4 ++++ 13 files changed, 109 insertions(+), 9 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1e2…

1 0

git:pd/websocket: core: Make sure that responses to requests received on a WebSocket are sent on existing connections
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 242920ec30af3a954f8a193d417c671a29d383b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=242920e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:05:48 2012 +0100 core: Make sure that responses to requests received on a WebSocket are sent on existing connections - WebSocket servers cannot create connections to WebSocket clients - so this setting is essential. - It does exactly the same thing as using set_reply_no_connect() in kamailio.cfg - but this way it is always on (as it must be) for WebSockets. --- receive.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/receive.c b/receive.c index 4426b6d..9c53e0e 100644 --- a/receive.c +++ b/receive.c @@ -172,9 +172,9 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* check for the alias stuff */ #ifdef USE_TCP if (msg->via1->alias && cfg_get(tcp, tcp_cfg, accept_aliases) && - (((rcv_info->proto==PROTO_TCP) && !tcp_disable) + (((rcv_info->proto==PROTO_TCP || rcv_info->proto==PROTO_WS) && !tcp_disable) #ifdef USE_TLS - || ((rcv_info->proto==PROTO_TLS) && !tls_disable) + || ((rcv_info->proto==PROTO_TLS || rcv_info->proto==PROTO_WSS) && !tls_disable) #endif ) ){ @@ -185,7 +185,12 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } } #endif - + + /* Force connection reuse for responses if the message arrived on a + WebSocket */ + if (rcv_info->proto==PROTO_WS || rcv_info->proto==PROTO_WSS) + msg->rpl_send_flags.f |= SND_F_FORCE_CON_REUSE; + /* skip: */ DBG("preparing to run routing scripts...\n"); #ifdef STATS

1 0

git:pd/websocket: modules_k/nathelper: Added nat_uac_test() check for WebSockets
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 915894b15d9096388a0136d2d2bdf48ef65b4c4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=915894b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:03:15 2012 +0100 modules_k/nathelper: Added nat_uac_test() check for WebSockets - At the moment (and until Kamailio and _all_ WebSocket clients support outbound) we want to treat WebSocket UAs as behind NATs (even when they are not). - This is so that the aliasing (which is good for TCP/TLS connection reuse as well as NAT traversal) can be used to make sure messages to WebSocket UAs are routed correctly. --- modules_k/nathelper/README | 41 ++++++++++++++------------- modules_k/nathelper/doc/nathelper_admin.xml | 4 ++ modules_k/nathelper/nathelper.c | 8 +++++ 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/modules_k/nathelper/README b/modules_k/nathelper/README index c49aac4..cbf4256 100644 --- a/modules_k/nathelper/README +++ b/modules_k/nathelper/README @@ -472,6 +472,7 @@ fix_nated_register(); * 16 - test if the source port is different from the port in Via * 32 - test if the source IP address of signaling is a RFC1918 address + * 64 - test if the source connection of signaling is a WebSocket All flags can be bitwise combined, the test returns true if any of the tests identified a NAT. @@ -593,38 +594,38 @@ Chapter 2. Frequently Asked Questions 2.1. - What happend with “rtpproxy_disable” parameter? + What happend with “rtpproxy_disable” parameter? - It was removed as it became obsolete - now “rtpproxy_sock” can take - empty value to disable the rtpproxy functionality. + It was removed as it became obsolete - now “rtpproxy_sock” can take + empty value to disable the rtpproxy functionality. 2.2. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at http://www.kamailio.org/. + Take a look at http://www.kamailio.org/. 2.3. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.sip-router.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.sip-router.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.sip-router.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.sip-router.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.sip-router.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.sip-router.org>. 2.4. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - http://sip-router.org/tracker. + Please follow the guidelines provided at: + http://sip-router.org/tracker. diff --git a/modules_k/nathelper/doc/nathelper_admin.xml b/modules_k/nathelper/doc/nathelper_admin.xml index d57757a..8f49d03 100644 --- a/modules_k/nathelper/doc/nathelper_admin.xml +++ b/modules_k/nathelper/doc/nathelper_admin.xml @@ -540,6 +540,10 @@ fix_nated_register(); <emphasis>32</emphasis> - test if the source IP address of signaling is a RFC1918 address </para></listitem> + <listitem><para> + <emphasis>64</emphasis> - test if the source connection of + signaling is a WebSocket + </para></listitem> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 4007004..4afae00 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -241,6 +241,7 @@ MODULE_VERSION #define NAT_UAC_TEST_S_1918 0x08 #define NAT_UAC_TEST_RPORT 0x10 #define NAT_UAC_TEST_O_1918 0x20 +#define NAT_UAC_TEST_WS 0x40 #define DEFAULT_RTPP_SET_ID 0 @@ -1279,6 +1280,13 @@ nat_uac_test_f(struct sip_msg* msg, char* str1, char* str2) if ((tests & NAT_UAC_TEST_O_1918) && is1918addr_ip(&msg->rcv.src_ip)) return 1; + /* + * tests prototype to check whether the message arrived on a WebSocket + */ + if ((tests & NAT_UAC_TEST_WS) + && (msg->rcv.proto == PROTO_WS || msg->rcv.proto == PROTO_WSS)) + return 1; + /* no test succeeded */ return -1;

1 0

git:pd/websocket: core: rolled back changes to receive.c
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 9349870abc5eb0688cf0fd50c0fa54098158fa79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9349870… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:11:15 2012 +0100 core: rolled back changes to receive.c - Not actually needed because the recent change to ws_frame.c covers it all (I think) --- receive.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/receive.c b/receive.c index 9c53e0e..a4018ff 100644 --- a/receive.c +++ b/receive.c @@ -172,9 +172,9 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* check for the alias stuff */ #ifdef USE_TCP if (msg->via1->alias && cfg_get(tcp, tcp_cfg, accept_aliases) && - (((rcv_info->proto==PROTO_TCP || rcv_info->proto==PROTO_WS) && !tcp_disable) + (((rcv_info->proto==PROTO_TCP) && !tcp_disable) #ifdef USE_TLS - || ((rcv_info->proto==PROTO_TLS || rcv_info->proto==PROTO_WSS) && !tls_disable) + || ((rcv_info->proto==PROTO_TLS) && !tls_disable) #endif ) ){ @@ -186,11 +186,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } #endif - /* Force connection reuse for responses if the message arrived on a - WebSocket */ - if (rcv_info->proto==PROTO_WS || rcv_info->proto==PROTO_WSS) - msg->rpl_send_flags.f |= SND_F_FORCE_CON_REUSE; - /* skip: */ DBG("preparing to run routing scripts...\n"); #ifdef STATS

1 0

git:pd/websocket: modules/websocket: Make sure that all WebSocket messages are sent on connections that already exist
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 636a6dabd14e08f2255e52a58353822642deda10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=636a6da… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:08:19 2012 +0100 modules/websocket: Make sure that all WebSocket messages are sent on connections that already exist - This is the same as using set_forward_no_connect() and set_reply_no_connect() in kamailio.cfg. But this means it will always happen automatically for WebSocket messages. - This is important as a WebSocket server cannot create connections - so we always have to use one that already exists. --- modules/websocket/ws_frame.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 66c797f..ca66582 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -260,6 +260,11 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) from = &local_addr; } + /* Regardless of what has been set before _always_ use existing + connections for WebSockets. This is required because a WebSocket + server (which Kamailio is) CANNOT create connections. */ + dst.send_flags.f |= SND_F_FORCE_CON_REUSE; + if (tcp_send(&dst, from, send_buf, frame_length) < 0) { STATS_TX_DROPS;

1 0

git:pd/websocket: modules/websockets: Changes WS to be a protocol in its own right instead of a flag on TCP/ TLS connections
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 353ad95af22d7a4c7d20aebbed291fef085867ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=353ad95… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:47:22 2012 +0100 modules/websockets: Changes WS to be a protocol in its own right instead of a flag on TCP/TLS connections --- modules/websocket/ws_handshake.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index ecc8fad..4bacd61 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -133,6 +133,12 @@ int ws_handle_handshake(struct sip_msg *msg) return 0; } + if (con->type != PROTO_TCP && con->type != PROTO_TLS) + { + LM_ERR("unsupported transport: %d", con->type); + return 0; + } + /* Process HTTP headers */ while (hdr != NULL) { @@ -304,7 +310,10 @@ int ws_handle_handshake(struct sip_msg *msg) /* Make sure Kamailio core sends future messages on this connection directly to this module */ - con->flags |= F_CONN_WS; + if (con->type == PROTO_TLS) + con->type = con->rcv.proto = PROTO_WSS; + else + con->type = con->rcv.proto = PROTO_WS; return 0; }

1 0

git:pd/websocket: modules/tm: Added PROTO_WS support
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: d08c4dc3341d2f2ac497a81fed9aef522ce16ed9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d08c4dc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:46:36 2012 +0100 modules/tm: Added PROTO_WS support --- modules/tm/ut.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tm/ut.h b/modules/tm/ut.h index 3aa829a..3a9f1f2 100644 --- a/modules/tm/ut.h +++ b/modules/tm/ut.h @@ -83,6 +83,7 @@ inline static enum sip_protos get_proto(enum sip_protos force_proto, case PROTO_UDP:/* transport specified explicitly */ #ifdef USE_TCP case PROTO_TCP: + case PROTO_WS: #endif #ifdef USE_TLS case PROTO_TLS: @@ -99,6 +100,7 @@ inline static enum sip_protos get_proto(enum sip_protos force_proto, case PROTO_UDP: /* some protocol has been forced -- take it */ #ifdef USE_TCP case PROTO_TCP: + case PROTO_WS: #endif #ifdef USE_TLS case PROTO_TLS:

1 0

git:pd/websocket: modules_k/nathelper: Added PROTO_WS support
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 8c4d2e7379e783ac22b63266c3a63a2579100d87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c4d2e7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:47:06 2012 +0100 modules_k/nathelper: Added PROTO_WS support --- modules_k/nathelper/nathelper.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index bec490c..4007004 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -888,7 +888,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); /* proto */ append_chr(at, '~'); - if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { + if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_WSS)) { LM_ERR("invalid transport protocol\n"); goto err; } @@ -1843,6 +1843,12 @@ create_rcv_uri(str* uri, struct sip_msg* m) proto.len = 4; break; + case PROTO_WS: + case PROTO_WSS: + proto.s = "WS"; + proto.len = 2; + break; + default: LM_ERR("unknown transport protocol\n"); return -1;

1 0

git:pd/websocket: core: Changed WS from being a flag on a TCP/ TLS connection to a protocol in its own right
by Peter Dunkley 29 Jun '12

29 Jun '12

Module: sip-router Branch: pd/websocket Commit: 8393efff31843b04b45e6bf728469b32625e86b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8393eff… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:44:15 2012 +0100 core: Changed WS from being a flag on a TCP/TLS connection to a protocol in its own right - Also added ;transport=ws parameter parsing for URIs --- cfg.lex | 2 + cfg.y | 24 +++++++++++++-------- forward.c | 1 + forward.h | 57 +++++++++++++++++++++++++++++---------------------- ip_addr.h | 2 +- msg_translator.c | 2 + parser/parse_uri.c | 23 ++++++++++++++++++++- parser/parse_via.c | 12 +++++----- route.c | 9 -------- socket_info.c | 1 + tcp_conn.h | 1 - tcp_read.c | 12 +++++----- 12 files changed, 88 insertions(+), 58 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=839…

1 0

git:master: kamailio.cfg: use add_contact_alias()/handle_uri_alias() for NATed calls
by Daniel-Constantin Mierla 29 Jun '12

29 Jun '12

Module: sip-router Branch: master Commit: 9d720b83c9dd27e927627132ec052b15efeba518 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d720b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 29 16:06:42 2012 +0200 kamailio.cfg: use add_contact_alias()/handle_uri_alias() for NATed calls --- etc/kamailio.cfg | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index b30639e..12bd155 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -571,6 +571,7 @@ route[WITHINDLG] { # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { + route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails @@ -738,7 +739,7 @@ route[NATDETECT] { if (is_method("REGISTER")) { fix_nated_register(); } else { - fix_nated_contact(); + add_contact_alias(); } setflag(FLT_NATS); } @@ -768,13 +769,23 @@ route[NATMANAGE] { } if (is_reply()) { if(isbflagset(FLB_NATB)) { - fix_nated_contact(); + add_contact_alias(); } } #!endif return; } +# URI update for dialog requests +route[DLGURI] { +#!ifdef WITH_NAT + if(!isdsturiset()) { + handle_ruri_alias(); + } +#!endif + return; +} + # Routing to foreign domains route[SIPOUT] { if (!uri==myself)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012