sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
402 discussions

[tracker] Comment added: usrloc module stops updating some records in db_mode 2
by sip-router 25 Apr '13

25 Apr '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Daniel-Constantin Mierla (miconda) ---------- You can try to cherry-pick in branch 3.3 (commits 61e08282c905c2ee03a2be618b1e700fc0acbdeb and 0125cdf0e75271a8478a3eadacc54ea1c1eb4da0) - just be aware that files were relocated from modules_k/usrloc to modules/usrloc. I don't have time for the moment, but sometime soon should be a new release from branch 3.3. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278#comment862 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

double record-routing also at outbound edge
by Juha Heinanen 25 Apr '13

25 Apr '13

peter, do you think you would have time in near future to re-instate double record-routing also when outbound is in use? since the fix is not trivial, i'm afraid to try it myself. -- juha

2 27

use_ob == 2 ?
by Juha Heinanen 25 Apr '13

25 Apr '13

peter, rr/save.c has: 381 int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; 382 int sips; 383 384 user.len = 0; 385 386 if (add_username) { 387 /* check if there is a custom user set */ 388 if (get_custom_user(_m, &user) < 0) { 389 if (get_username(_m, &user) < 0) { 390 LM_ERR("failed to extract username\n"); 391 return -1; 392 } 393 } 394 } else if (use_ob == 1) { 395 if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { 396 LM_ERR("encoding outbound flow-token\n"); 397 return -1; 398 } 399 } else if (use_ob == 2) { 400 if (copy_flow_token(&user, _m) != 0) { 401 LM_ERR("copying outbound flow-token\n"); 402 return -1; 403 } 404 } i have not found that use_outbound would ever return value 2. is "} else if (use_ob == 2) {" part something that can be removed? -- juha

2 2

git:master: modules/msrp: Use "msrps://" instead of "msrp://" in headers when the transport is WSS
by Peter Dunkley 25 Apr '13

25 Apr '13

Module: sip-router Branch: master Commit: ad11cdca0941cd114e17bb80337a7557818220d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad11cdc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 25 18:16:28 2013 +0100 modules/msrp: Use "msrps://" instead of "msrp://" in headers when the transport is WSS --- modules/msrp/msrp_cmap.c | 4 ++-- modules/msrp/msrp_vars.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/msrp/msrp_cmap.c b/modules/msrp/msrp_cmap.c index f558172..3e4c351 100644 --- a/modules/msrp/msrp_cmap.c +++ b/modules/msrp/msrp_cmap.c @@ -211,7 +211,7 @@ int msrp_cmap_save(msrp_frame_t *mf) idx = msrp_get_slot(hid, _msrp_cmap_head->mapsize); srcaddr.s = sbuf;; - if(mf->tcpinfo->rcv->proto==PROTO_TLS) + if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS) { memcpy(srcaddr.s, "msrps://", 8); srcaddr.s+=8; @@ -295,7 +295,7 @@ int msrp_cmap_save(msrp_frame_t *mf) _msrp_cmap_head->cslots[idx].lsize++; lock_release(&_msrp_cmap_head->cslots[idx].lock); - if(mf->tcpinfo->rcv->proto==PROTO_TLS) + if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS) { srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Use-Path: msrps://%.*s/%.*s;tcp\r\nExpires: %d\r\n", diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index fdc277a..939cfb2 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -273,7 +273,7 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); s.s = pv_get_buffer(); p = s.s; - if(mf->tcpinfo->rcv->proto==PROTO_TLS) + if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS) { memcpy(p, "msrps://", 8); p+=8;

1 0

Kamailio v4.0.1 Released
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Hello, Kamailio SIP Server v4.0.1 stable release is out. This is a maintenance release of the latest stable branch, 4.0, that includes fixes since release of v4.0.0. There is no change to database schema or configuration language structure that you have to do on installations of v4.0.0. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.0.1. For more details about version 4.0.1 (including links and hints to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2013/04/kamailio-v4-0-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:master: modules/websocket: fixed segmentation fault relating to recent counter changes
by Peter Dunkley 25 Apr '13

25 Apr '13

Module: sip-router Branch: master Commit: 4c7195915b38ba343484833532b82b42879d7138 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c71959… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 25 16:13:48 2013 +0100 modules/websocket: fixed segmentation fault relating to recent counter changes --- modules/websocket/ws_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 4159a47..74f70a8 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -93,7 +93,7 @@ static stat_export_t stats[] = { "ws_sip_current_connections", 0, &ws_sip_current_connections }, { "ws_sip_max_concurrent_connectons", 0, &ws_sip_max_concurrent_connections }, { "ws_msrp_current_connections", 0, &ws_msrp_current_connections }, - { "ws_msrp_max_concurrent_connectons", 0, &ws_sip_max_concurrent_connections }, + { "ws_msrp_max_concurrent_connectons", 0, &ws_msrp_max_concurrent_connections }, /* ws_frame.c */ { "ws_failed_connections", 0, &ws_failed_connections },

1 0

git:4.0: ChangeLog: content updated for v4.0.1
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: 319723c0493722dee255b0053b3a38d4f14e2870 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=319723c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 25 16:53:45 2013 +0200 ChangeLog: content updated for v4.0.1 --- ChangeLog | 478 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 478 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=319…

1 0

git:4.0: Makefile.defs: version set to 4.0.1
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: d293977786ae7831f89f7b8a09d22516775778b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d293977… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 25 16:50:15 2013 +0200 Makefile.defs: version set to 4.0.1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index faefbd8..cda0322 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 4 PATCHLEVEL = 0 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:master: tm: add angle brackets around From/ To URI for local generated requests
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: master Commit: 4e4b1339bfd3a832f5feeb1d2a2380c7455ec82b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e4b133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 25 14:50:40 2013 +0200 tm: add angle brackets around From/To URI for local generated requests - safer for special cases of URI format --- modules/tm/t_msgbuilder.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index aa0144c..b5ff309 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1401,7 +1401,9 @@ static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) t->to.len = TO_LEN + dialog->rem_uri.len + CRLF_LEN; memapp(w, TO, TO_LEN); + if(dialog->rem_uri.s[0]!='<') memapp(w, "<", 1); memapp(w, dialog->rem_uri.s, dialog->rem_uri.len); + if(dialog->rem_uri.s[0]!='<') memapp(w, ">", 1); if (dialog->id.rem_tag.len) { t->to.len += TOTAG_LEN + dialog->id.rem_tag.len ; @@ -1423,7 +1425,9 @@ static inline char* print_from(char* w, dlg_t* dialog, struct cell* t) t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN; memapp(w, FROM, FROM_LEN); + if(dialog->loc_uri.s[0]!='<') memapp(w, "<", 1); memapp(w, dialog->loc_uri.s, dialog->loc_uri.len); + if(dialog->loc_uri.s[0]!='<') memapp(w, ">", 1); if (dialog->id.loc_tag.len) { t->from.len += FROMTAG_LEN + dialog->id.loc_tag.len; @@ -1544,8 +1548,10 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int bra *len += TO_LEN + dialog->rem_uri.len + (dialog->id.rem_tag.len ? (TOTAG_LEN + dialog->id.rem_tag.len) : 0) + CRLF_LEN; /* To */ + if(dialog->rem_uri.s[0]!='<') *len += 2; /* To-URI < > */ *len += FROM_LEN + dialog->loc_uri.len + (dialog->id.loc_tag.len ? (FROMTAG_LEN + dialog->id.loc_tag.len) : 0) + CRLF_LEN; /* From */ + if(dialog->loc_uri.s[0]!='<') *len += 2; /* From-URI < > */ *len += CALLID_LEN + dialog->id.call_id.len + CRLF_LEN; /* Call-ID */ *len += CSEQ_LEN + cseq.len + 1 + method->len + CRLF_LEN; /* CSeq */ *len += calculate_routeset_length(dialog); /* Route set */

1 0

git:master: modules/outbound: added force_no_outbound flag
by Juha Heinanen 25 Apr '13

25 Apr '13

Module: sip-router Branch: master Commit: 744a8d317b894a1360e3441a9e69ac9190a1745b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=744a8d3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Apr 25 14:12:21 2013 +0300 modules/outbound: added force_no_outbound flag --- modules/outbound/README | 29 +++++++++++++++++++++++------ modules/outbound/doc/outbound_admin.xml | 19 +++++++++++++++++++ modules/outbound/ob_mod.c | 17 ++++++++++++++++- 3 files changed, 58 insertions(+), 7 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index 057fefa..2f23ab1 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -4,7 +4,7 @@ Peter Dunkley Crocodile RCS Ltd - Copyright © 2012-2013 Crocodile RCS Ltd + Copyright (c) 2012-2013 Crocodile RCS Ltd __________________________________________________________________ Table of Contents @@ -24,6 +24,7 @@ Peter Dunkley 3. Parameters 3.1. force_outbound_flag (integer) + 3.2. force_no_outbound_flag (integer) 4. Functions 5. MI Commands @@ -33,6 +34,7 @@ Peter Dunkley 1.1. Edge Proxy Configuration 1.2. Registrar Configuration 1.3. Set force_outbound_flag parameter + 1.4. Set force_no_outbound_flag parameter Chapter 1. Admin Guide @@ -51,6 +53,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. force_outbound_flag (integer) + 3.2. force_no_outbound_flag (integer) 4. Functions 5. MI Commands @@ -69,7 +72,7 @@ Chapter 1. Admin Guide 1.1. Edge Proxy Keep-Alives (STUN) Outbound Edge Proxies MUST support STUN NAT keep-alives on their SIP - UDP ports. Kamailio supports this though the “stun” module. + UDP ports. Kamailio supports this though the "stun" module. 1.2. Flow Timer @@ -78,9 +81,9 @@ Chapter 1. Admin Guide 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). @@ -88,9 +91,9 @@ Chapter 1. Admin Guide 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.1. Edge Proxy Configuration #!KAMAILIO @@ -489,6 +492,7 @@ event_route[tm:branch-failure:FAIL-BRANCH] { 3. Parameters 3.1. force_outbound_flag (integer) + 3.2. force_no_outbound_flag (integer) 3.1. force_outbound_flag (integer) @@ -503,6 +507,19 @@ event_route[tm:branch-failure:FAIL-BRANCH] { modparam("outbound", "force_outbound_flag", 1) ... +3.2. force_no_outbound_flag (integer) + + A flag which, if set for a request, will force path and rr not to add + flow tokens to Path: and Record-Route: headers regardless of the + request contents. + + Default value is -1. + + Example 1.4. Set force_no_outbound_flag parameter +... +modparam("outbound", "force_no_outbound_flag", 2) +... + 4. Functions None diff --git a/modules/outbound/doc/outbound_admin.xml b/modules/outbound/doc/outbound_admin.xml index dca8448..4cd8f0d 100644 --- a/modules/outbound/doc/outbound_admin.xml +++ b/modules/outbound/doc/outbound_admin.xml @@ -481,6 +481,25 @@ modparam("outbound", "force_outbound_flag", 1) </programlisting> </example> </section> + + <section> + <title><varname>force_no_outbound_flag</varname> (integer)</title> + <para>A flag which, if set for a request, will force + <emphasis>path</emphasis> and <emphasis>rr</emphasis> not + to add flow tokens to Path: and Record-Route: headers + regardless of the request contents.</para> + <para><emphasis>Default value is -1.</emphasis></para> + <example> + <title>Set <varname>force_no_outbound_flag</varname> parameter + </title> + <programlisting format="linespecific"> +... +modparam("outbound", "force_no_outbound_flag", 2) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 69ac1e0..a2b6d12 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -48,6 +48,7 @@ static int mod_init(void); static void destroy(void); static unsigned int ob_force_flag = (unsigned int) -1; +static unsigned int ob_force_no_flag = (unsigned int) -1; static str ob_key = {0, 0}; static cmd_export_t cmds[]= @@ -61,6 +62,7 @@ static cmd_export_t cmds[]= static param_export_t params[]= { { "force_outbound_flag", INT_PARAM, &ob_force_flag }, + { "force_no_outbound_flag", INT_PARAM, &ob_force_no_flag }, { 0, 0, 0 } }; @@ -88,6 +90,12 @@ static int mod_init(void) return -1; } + if (ob_force_no_flag != -1 && !flag_in_range(ob_force_no_flag)) + { + LM_ERR("bad no_outbound_flag value (%d)\n", ob_force_no_flag); + return -1; + } + if ((ob_key.s = shm_malloc(OB_KEY_LEN)) == NULL) { LM_ERR("Failed to allocate memory for flow-token key\n"); @@ -451,10 +459,17 @@ int use_outbound(struct sip_msg *msg) /* If Outbound is forced return success without any further checks */ if (ob_force_flag != -1 && isflagset(msg, ob_force_flag) > 0) { - LM_DBG("outbound forced\n"); + LM_DBG("outbound used by force\n"); return 1; } + /* If Outbound is turned off, return failure without any further checks */ + if (ob_force_no_flag != -1 && isflagset(msg, ob_force_no_flag) > 0) + { + LM_DBG("outbound not used by force\n"); + return 0; + } + LM_DBG("Analysing %.*s for outbound markers\n", msg->first_line.u.request.method.len, msg->first_line.u.request.method.s);

1 0

← Newer
1
2
3
4
5
6
7
8
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013