sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:tmp/tm_async_reply_support: tm: bug fix t_continue for responses

by Richard Good

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 7ec4b5106ce14f353b5cb3ec0af9bc0af4ac5f90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ec4b51… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Mar 15 17:57:36 2013 +0200 tm: bug fix t_continue for responses - t_continue.c : Only set as final response if result code >= 200 when continuing a suspended response --- modules/tm/t_suspend.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 607be99..9aea87f 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -328,7 +328,11 @@ int t_continue(unsigned int hash_index, unsigned int label, //} } else { LOG(L_DBG,"t is NOT local sending relaying reply with status code: [%d]", t->uac[branch].reply->first_line.u.reply.statuscode); - reply_status=relay_reply( t, t->uac[branch].reply, branch, t->uac[branch].reply->first_line.u.reply.statuscode,0, 1 ); + int do_put_on_wait = 0; + if(t->uac[branch].reply->first_line.u.reply.statuscode>=200){ + do_put_on_wait = 1; + } + reply_status=relay_reply( t, t->uac[branch].reply, branch, t->uac[branch].reply->first_line.u.reply.statuscode,0, do_put_on_wait ); //TODO do we need this? //if (reply_status == RPS_COMPLETED) { /* no more UAC FR/RETR (if I received a 2xx, there may

11 years, 8 months

git:tmp/tm_async_reply_support: tm: bug fixes for t_continue on responses

by Richard Good

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 27cd1fac72c48fca1891ad24499af70f4a6b02c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27cd1fa… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Mar 15 17:49:55 2013 +0200 tm: bug fixes for t_continue on responses - free uac branch once sent and update FR/RETR timers --- modules/tm/t_suspend.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 2408749..607be99 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -164,7 +164,6 @@ int t_continue(unsigned int hash_index, unsigned int label, { struct cell *t; struct sip_msg faked_req; - struct sip_msg faked_reply; int branch; struct ua_client *uac =NULL; int ret; @@ -285,13 +284,15 @@ int t_continue(unsigned int hash_index, unsigned int label, ) { //TODO not sure if this will work yet - think we need to pass which branch to continue when we call t_continue! if (t->uac[branch].suspended_reply==1){ - LOG(L_DBG,"Found branch that has suspend reply set!"); + LOG(L_DBG,"Found branch that has suspend reply set"); - LOG(L_DBG,"Disabling suspend branch!"); + LOG(L_DBG,"Disabling suspend branch"); t->uac[branch].reply->flags &= ~FL_RPL_SUSPENDED; + if (t->uas.request) t->uas.request->flags&= ~FL_RPL_SUSPENDED; + t->uac[branch].suspended_reply = 0; - LOG(L_DBG,"Running pre script!"); + LOG(L_DBG,"Running pre script"); if (exec_pre_script_cb(t->uac[branch].reply, ONREPLY_CB_TYPE)>0) { LOG(L_DBG,"Success running pre script!"); if (run_top_route(route, t->uac[branch].reply, 0)<0){ @@ -306,7 +307,6 @@ int t_continue(unsigned int hash_index, unsigned int label, LOG(L_DBG,"Failed running pre script!"); } - int reply_status; if ( is_local(t) ) { LOG(L_DBG,"t is local sending local reply with status code: [%d]", t->uac[branch].reply->first_line.u.reply.statuscode); @@ -364,9 +364,12 @@ int t_continue(unsigned int hash_index, unsigned int label, ( (last_uac_status<msg_status) && ((msg_status>=180) || (last_uac_status==0)) ) ) ) { /* provisional now */ - restart_rb_fr(& uac->request, t->fr_inv_timeout); + restart_rb_fr(& t->uac[branch].request, t->fr_inv_timeout); t->uac[branch].request.flags|=F_RB_FR_INV; /* mark fr_inv */ } + + sip_msg_free(t->uac[branch].reply); + t->uac[branch].reply = 0; } }

11 years, 8 months

git:master: modules/outbound: Warn during mod_init() if STUN is not built or enabled

by Peter Dunkley

Module: sip-router Branch: master Commit: 85b26219f9e4c3c8c7c990a4897d40645b4ad6e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85b2621… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 15:04:07 2013 +0000 modules/outbound: Warn during mod_init() if STUN is not built or enabled - STUN is required for outbound with UDP. Don't want to stop Kamailio starting when the outbound module is loaded and STUN is not available - but a warning seems appropriate. --- modules/outbound/ob_mod.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 7cf0c74..fb110d8 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -98,6 +98,15 @@ static int mod_init(void) "random bytes\n", ob_key.len); } +#ifndef USE_STUN + LM_WARN("STUN support not built-in. UDP keep-alive not supported.\n"); +#else + if (stun_allow_stun != 1) + { + LM_WARN("STUN disabled. UDP keep-alive not supported.\n"); + } +#endif + return 0; }

11 years, 8 months

git:master: modules/outbound: free shared memory for flow-token key during shutdown

by Peter Dunkley

Module: sip-router Branch: master Commit: 9d9d51438acd1d534f14ecbc8eb0030b45333177 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d9d514… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 14:54:41 2013 +0000 modules/outbound: free shared memory for flow-token key during shutdown --- modules/outbound/ob_mod.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 4c4e7ea..7cf0c74 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -43,6 +43,7 @@ MODULE_VERSION #define OB_KEY_LEN 20 static int mod_init(void); +static void destroy(void); static unsigned int ob_force_flag = (unsigned int) -1; static str ob_key = {0, 0}; @@ -73,7 +74,7 @@ struct module_exports exports= 0, /* extra processes */ mod_init, /* module initialization function */ 0, /* response function */ - 0, /* destroy function */ + destroy, /* destroy function */ 0 /* per-child initialization function */ }; @@ -100,6 +101,11 @@ static int mod_init(void) return 0; } +static void destroy(void) +{ + shm_free(ob_key.s); +} + /* Structure of flow-token <HMAC-SHA1-80><protocol><dst_ip><dst_port><src_ip><src_port>

11 years, 8 months

git:master: sca: reduce log level to DBG when replacing RURI when retrieving held call.

by Andrew Mortensen

Module: sip-router Branch: master Commit: a51bc822f70f4185b55455456dc147205cbbbdc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a51bc82… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Mar 15 10:22:26 2013 -0400 sca: reduce log level to DBG when replacing RURI when retrieving held call. --- modules/sca/sca_call_info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 0195b0e..dee4f87 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -589,7 +589,7 @@ sca_call_info_seize_held_call( sip_msg_t *msg, sca_call_info *call_info, * to watch for it. log our overwriting of it. */ - LM_INFO( "SCA caller retrieving held call, but RURI was already " + LM_DBG( "SCA caller retrieving held call, but RURI was already " "rewritten as %.*s. Overwriting with %.*s.", STR_FMT( &msg->new_uri ), STR_FMT( &app->callee ));

11 years, 8 months

git:master: modules/outbound: Fixed bug in outbound mod_init

by Peter Dunkley

Module: sip-router Branch: master Commit: c924645fcfb706fc20ed715a00531d785f99cbde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c924645… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 14:07:04 2013 +0000 modules/outbound: Fixed bug in outbound mod_init --- modules/outbound/ob_mod.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 37b0a60..4c4e7ea 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -85,12 +85,17 @@ static int mod_init(void) return -1; } - if (RAND_bytes((unsigned char *) ob_key.s, OB_KEY_LEN) == 0) + if ((ob_key.s = shm_malloc(OB_KEY_LEN)) == NULL) { - LM_ERR("unable to get %d cryptographically strong pseudo-" - "random bytes\n", OB_KEY_LEN); + LM_ERR("Failed to allocate memory for flow-token key\n"); + return -1; } ob_key.len = OB_KEY_LEN; + if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) + { + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", ob_key.len); + } return 0; }

11 years, 8 months

git:tmp/tm_async_reply_support: tm: 2nd run allowing t_suspend/ t_continue for resp

by Richard Good

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 490bb8bb6f15d53ba8aee8b93d8f3e1a8443861c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=490bb8b… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Mar 15 15:55:41 2013 +0200 tm: 2nd run allowing t_suspend/t_continue for resp - Stop reply being relayed when msg is suspended and relay reply when transaction continued --- modules/tm/t_reply.c | 12 ++++ modules/tm/t_suspend.c | 153 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 117 insertions(+), 48 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=490…

11 years, 8 months

git:master: modules/outbound: The flow-token key is now automatically generated

by Peter Dunkley

Module: sip-router Branch: master Commit: f474e85616f6f98a6ac193c7425f6c85af8efa20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f474e85… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 12:14:31 2013 +0000 modules/outbound: The flow-token key is now automatically generated - Uses OpenSSL RAND_bytes() to select 20 cryptographically strong pseudo-random bytes for the key. - Flow-token key can no longer be manually set. --- modules/outbound/README | 33 ++++-------------------------- modules/outbound/doc/outbound_admin.xml | 21 ------------------- modules/outbound/ob_mod.c | 20 ++++++------------ 3 files changed, 12 insertions(+), 62 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index 3e6aa97..08c6038 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -4,7 +4,7 @@ Peter Dunkley Crocodile RCS Ltd - Copyright � 2012 Crocodile RCS Ltd + Copyright © 2012 Crocodile RCS Ltd __________________________________________________________________ Table of Contents @@ -24,7 +24,6 @@ Peter Dunkley 3. Parameters 3.1. force_outbound_flag (integer) - 3.2. flow_token_key (string) 4. Functions 5. MI Commands @@ -35,7 +34,6 @@ Peter Dunkley 1.2. Edge Proxy Configuration 1.3. Registrar Configuration 1.4. Set force_outbound_flag parameter - 1.5. Set flow_token_key parameter Chapter 1. Admin Guide @@ -54,7 +52,6 @@ Chapter 1. Admin Guide 3. Parameters 3.1. force_outbound_flag (integer) - 3.2. flow_token_key (string) 4. Functions 5. MI Commands @@ -87,9 +84,9 @@ make all responses to REGISTERs. When using TCP or TLS as the SIP transport care should be taken to set - the "tcp_connection_lifetime" on the Edge Proxy to a value slightly + the “tcp_connection_lifetime” on the Edge Proxy to a value slightly larger than the interval the Registrar is using for flow timer. Setting - "tcp_connection_lifetime" to less than the interval could cause + “tcp_connection_lifetime” to less than the interval could cause connections to be lost, and setting it to a value much larger than the interval will keep connections open far longer than is required (which is wasteful). @@ -97,9 +94,9 @@ make all Application-layer keep-alives are optional when the underlying transport already has a keep-alive mechanism. The WebSocket transport has a transport-layer keep-alive. When using the WebSocket transport - the "keepalive_timeout" should be set to a value a little greater than + the “keepalive_timeout” should be set to a value a little greater than the Registrar flow timer interval and a little less than the - "tcp_connection_lifetime". + “tcp_connection_lifetime”. Example 1.2. Edge Proxy Configuration ... @@ -114,8 +111,6 @@ loadmodule "path.so" ... modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) ... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... route { route(REQINIT); ... @@ -284,7 +279,6 @@ failure_route[FAIL_OUTBOUND] { 3. Parameters 3.1. force_outbound_flag (integer) - 3.2. flow_token_key (string) 3.1. force_outbound_flag (integer) @@ -299,23 +293,6 @@ failure_route[FAIL_OUTBOUND] { modparam("outbound", "force_outbound_flag", 1) ... -3.2. flow_token_key (string) - - The outbound flow token is generated using the algorithm described in - RFC 5626 section 5.2. This algorithm requires a 20 octet crypto random - key that is unique for each Edge Proxy. - -Note - - If this 20 character string is not set Kamailio will not start. - - Default value is: "". - - Example 1.5. Set flow_token_key parameter -... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... - 4. Functions None diff --git a/modules/outbound/doc/outbound_admin.xml b/modules/outbound/doc/outbound_admin.xml index 837e0da..2e5d21e 100644 --- a/modules/outbound/doc/outbound_admin.xml +++ b/modules/outbound/doc/outbound_admin.xml @@ -69,8 +69,6 @@ loadmodule "path.so" ... modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) ... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... route { route(REQINIT); ... @@ -274,25 +272,6 @@ modparam("outbound", "force_outbound_flag", 1) </programlisting> </example> </section> - <section> - <title><varname>flow_token_key</varname> (string)</title> - <para>The outbound flow token is generated using the algorithm - described in RFC 5626 section 5.2. This algorithm requires a 20 - octet crypto random key that is unique for each Edge Proxy. - </para> - <note><para>If this 20 character string is not set &kamailio; - will not start.</para></note> - <para><emphasis>Default value is: "".</emphasis></para> - <example> - <title>Set <varname>flow_token_key</varname> parameter - </title> - <programlisting format="linespecific"> -... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... -</programlisting> - </example> - </section> </section> <section> diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 775d0b6..37b0a60 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -21,6 +21,7 @@ * */ #include <openssl/hmac.h> +#include <openssl/rand.h> #include "../../basex.h" #include "../../dprint.h" @@ -39,6 +40,8 @@ MODULE_VERSION +#define OB_KEY_LEN 20 + static int mod_init(void); static unsigned int ob_force_flag = (unsigned int) -1; @@ -55,7 +58,6 @@ static cmd_export_t cmds[]= static param_export_t params[]= { { "force_outbound_flag", INT_PARAM, &ob_force_flag }, - { "flow_token_key", STR_PARAM, &ob_key.s}, { 0, 0, 0 } }; @@ -83,20 +85,12 @@ static int mod_init(void) return -1; } - if (ob_key.s == 0) + if (RAND_bytes((unsigned char *) ob_key.s, OB_KEY_LEN) == 0) { - LM_ERR("flow_token_key not set\n"); - return -1; - } - else - ob_key.len = strlen(ob_key.s); - - if (ob_key.len != 20) - { - LM_ERR("flow_token_key wrong length. Expected 20 got %d\n", - ob_key.len); - return -1; + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", OB_KEY_LEN); } + ob_key.len = OB_KEY_LEN; return 0; }

11 years, 8 months

Status of outbound

by Peter Dunkley

Hi, As 4.0.0 is now out I thought it would be a good time to post a summary for those who are interested in outbound support. I have listed the known issues below, their status, and what is likely to be available as bug-fixes in the 4.0 branch. _*1 Registrar module issues surrounding Require:/Supported: headers and outbound *_*Detail:* The registrar module doesn't quite follow the procedures in RFC 5626 with regards to checking and setting Require: and Supported: headers (issue identified by Olle during SIPit) *Status**:* Fixed in pd/outbound (some tidying of the parser code still required) *4.0 branch:* won't be fixed in this branch as some extensive changes have been made to the Kamailio parser code to support these fixes *_2 Registrar module cannot unregister on broken flo_*_*w *_*Detail:* When a broken flow is detected the contact binding associated with that flow should be removed to prevent it being used again. Failure to do so could result in a large number of old, broken, contact bindings ending up in usrloc (especially if long registration expiry times are used) *Status:* Fix in progress in pd/outbound (updated API needs to be tested and ruid needs to be added to the destination set and made available as a PV) *4.0 branch:* won't be fixed in this branch as the changes are architectural in nature _*3 Forking issues with outbound *_*Detail**:* When a broken flow is found during forking we need to be able to re-send the request to that client instance immediately without waiting for all other forked legs to complete (issue identified by Olle during SIPit) *Status:* Hugh Waite is working on this. An email describing the proposed fix will be sent to sr-dev soon for others to comment on. *4.0 branch:* won't be fixed in this branch as this will require extensive architectural changes relating to the handling of branch failures _*4) Broken in-dialog routing when using outbound *_*Detail:* In-dialog requests (including ACK and BYE) are incorrectly routed when outbound is used (issued identified by Olle during SIPit) *Status:* The bug is in the loose routing code in the rr module. I now have a test system for this here and will work on this issue once issues 1 and 2 are finished. *4.0 branch:* will be fixed in this branch. It should be a relatively small change in one function in the rr module. The upshot of this is that I expect Kamailio 4.0.1 (when it is released) to be suitable for use as an outbound edge proxy, but anyone wanting to use Kamailio as an outbound registrar will need Kamailio 4.1.0 and above. Regards, Peter __

11 years, 8 months

git:master: Merge branch 'outbound'

by Peter Dunkley

Module: sip-router Branch: master Commit: 3445718155b324c3c9e4eac0d6137b6d8dca8cbf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3445718… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 11:28:25 2013 +0000 Merge branch 'outbound' * outbound: (46 commits) modules/registrar: fixed lock usage in unregister() modules/pv: can only retrieve $ruid for a request modules/pv: added new $ruid and $branch(ruid) PVs modules/xprint: updated use of get_branch() and next_branch() to cope with additional argument modules/tm: updated use of get_branch() and next_branch() to cope with additional argument modules/pv: updated use of get_branch() and next_branch() to cope with additional argument modules/permissions: updated use of get_branch() and next_branch() to cope with additional argument modules/domain: updated use of get_branch() and next_branch() to cope with additional argument core: updated use of get_branch() and next_branch() to cope with additional argument core: updated get_branch() and next_branch() to return ruid (if set) modules/tm: updated t_serial to store/retrieve ruid modules/registrar: tidied up unregister() function modules/ims_isc: updated to include new argument to append_branch() modules/ims_icscf: updated to include new argument to append_branch() modules/exec: updated to include new argument to append_branch() modules/enum: updated to include new argument to append_branch() modules/dialplan: updated to include new argument to append_branch() modules/cpl-c: updated to include new argument to append_branch() modules/corex: updated to include new argument to append_branch() modules/avpops: updated to include new argument to append_branch() ... ---

11 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013