sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
169 discussions

Parsing of P-Preferred/Asserted-ID headers

by Hugh Waite

Hello, The current kamailio devel supports a single P-Asserted-ID or P-Preferred-ID header value, but the RFC allows one or two either in one or two headers. [RFC3325 <http://tools.ietf.org/html/rfc3325>] I am most of the way through coding a fix, but Daniel's comment about kamailio module licensing has prompted me to wonder about why parse_ppi/pai is in lib/kcore. The dev-guide says new headers should be put in parser/parse_xxx.[ch], but I wasn't going to change the location unless something forces me to. Is there any guidance on whether I should leave the parse_pai/ppi files in /lib/kcore or if they should be placed with other files in /parser/? For information, my change extends the $ai, $pd, $pu, $pn and $pU psuedo variables so they can be accessed with an index (e.g. $ai[0] and $ai[1]) for the first and second instances of the header values, whether they occur on one header (comma separated) or on two headers. Existing usage will not be changed as $ai will continue to return the first instance. Regards, Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

12 years, 4 months

considering to add corex module

by Daniel-Constantin Mierla

Hello, I am considering to pull out some functions from core and add them to a new module to be named 'corex (core eXtensions), for few reasons: - most of the core functions have support for static parameters, some of them could become more useful if cfg variables (pv + selects) will be supported there - then it is easier to export some of these functions to inter-module API for usage from embedded scripts (lua, perl, ...) - there are many situations when no core function is used in a config file (like load balancing cfgs), not loading the code will make the footprint smaller for embedded system (although, I guess this would be the least important, the extra size is not that significant). Why a new module is because it has to stay within the licensing decision made when we merged ser+kamailio, new core code has to be released under BSD license, if it is not left under FhG GPL2 (e.g., the case of small touches to existing code). So if it is gonna be a major copy, it will be moved with the license, if it is going to be re-coded to support variables, then will be BSD. With this approach I hope nobody has anything against, the code can be used like so far. Any comments? Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw

12 years, 4 months

Outbound summary (take 2)

by Peter Dunkley

Hello, I thought I would update this based on today's feedback... Please let me know if anything is incorrect or missing. There are three use cases for Kamailio with Outbound/Path: * EDGE server between client and registrar * Registrar with EDGE server between it and client * Single server (EDGE server and registrar combined) using Outbound instead of aliasing for NAT traversal EDGE server ----------- * Path - Existing Path module does (most of) what is required when called for REGISTER requests - Received parameters are not needed on Path: headers because we will use Outbound flow tokens now * Outbound - Need to generate/add flow token and ;ob parameter to the Path/Record-Route headers when: # It's an initial request (out-of-dialog INVITE, REGISTER, SUBSCRIBE, or REFER), with # A single Via:, and # Top Route: points to us and has ;ob parameter or Contact: has ;ob parameter or it's a REGISTER with ;+sip.instance, or # force_outbound() API has been called - path and rr modules will be updated to support Outbound (see API details below) - NAT keep-alive from section 5.4 support required - STUN stuff from section 8 Registrar --------- * Path - Path already supported in usrloc * Outbound - instance and reg IDs already stored in usrloc - multiple registrations with the same instance ID but different reg IDs must be supported (may be already) - Parallel and serial forking behaviour must be preserved, when forking branch to each unique instance ID not reg ID. - registrar and usrloc modules will be updated to support Outbound (see API details below) Single server ------------- * Path - Use this to add single (local) Path header - just needed to get the Outbound flow token into the usrloc table - Received parameters are not needed on Path: headers because we will use Outbound flow tokens now * Outbound - Similar to the combined behaviour of EDGE server and Registrar, but because the mapping of flow token to connection is local there is no need for 430 response handling - can just loop through the list of matching connections locally until a good one is found. Note: Double-Path and advertised address... * Double-Path is not required as, unlike Record-Route, Path is only used for routing in the server to client direction. * Because the Path header needs to show the address of the outbound interface it should use the advertised address for that interface, not the listening address of the interface. Proposed API ------------ * Either new module (outbound) or additions to an existing utils module that: - Contains either an exposed function (force_outbound()) or has a modparam that indicates which flag is used to specify when Outbound should be forced for a request. - Contains a modparam that specifies the string to be used as the encryption key for the flow-token - Contains a C-API function to perform the Outbound check (deciding based on message or flag whether to put Outbound stuff in Path: or Record-Route:) - Contains a C-API function to generate a flow token string from a set of connection details (using mechanism recommended in Outbound specification) - Contains a C-API function to generate a set of connection details from a flow token string * Add new modparam to path and rr module to enable outbound. When outbound is enabled these modules bind to module providing the Outbound C-API functions. - They then use these functions add Outbound Path: and Record-Route: compatible headers when needed. - loose_route() function updated to set $du based on decoded flow token when present [1]. * Add new modparam to enable outbound on registrar and usrloc. - When outbound is used lookup() populates an AVP (specified as another modparam) with the ordered list (by reg ID) of contacts - New lookup_next_dest() API to remove "dead" contact and try the next [1] If flow token has been tampered with, or indicates a connection that does not exist (so not active WS, WSS, TCP, TLS, or SCTP connection) then an error is returned from loose_route() and a 430 should be generated. Other connection errors (for example, time-outs) handled in failure_route[] on the EDGE server and converted to 430 where needed. Token/connection map maintenance -------------------------------- Map not required. Token is calculated from source address, port, and protocol and these can be recovered from the token. Questions --------- * NAT keep-alive from section 5.4 support... does this need to be handled in the core before things like the sanity module are called? * STUN stuff from section 8... again, in the core? -- Peter Dunkley Technical Director Crocodile RCS Ltd

12 years, 4 months

git:master: tm: removed inexistent function from docs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dbc44c00534b8c34dc8a39dd2d9d931a2cd2d4ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dbc44c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 16 22:26:17 2012 +0200 tm: removed inexistent function from docs - append_branch()/t_fork() does not exist in tm anymore --- modules/tm/README | 229 ++++++++++++++++++++---------------------- modules/tm/doc/functions.xml | 23 ---- 2 files changed, 107 insertions(+), 145 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dbc…

12 years, 4 months

git:master: pv: new pv class $version(key)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e159eb090c9355431aa1e69a9d1dc622eb94cd89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e159eb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 16 20:24:28 2012 +0200 pv: new pv class $version(key) - return attributes of the software version - key can be: - num - return version number - full - return all version string - hash - return git hash code and status --- modules_k/pv/pv.c | 2 + modules_k/pv/pv_stats.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_stats.h | 3 ++ 3 files changed, 66 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 6b7dccb..aff1ee1 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -407,6 +407,8 @@ static pv_export_t mod_pvs[] = { 0, pv_parse_timeval_name, 0, 0, 0}, { {"nh", (sizeof("nh")-1)}, PVT_OTHER, pv_get_nh, 0, pv_parse_nh_name, 0, 0, 0}, + { {"version", (sizeof("version")-1)}, PVT_OTHER, pv_get_sr_version, + 0, pv_parse_sr_version_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/modules_k/pv/pv_stats.c b/modules_k/pv/pv_stats.c index c8a1f29..9ca4f5c 100644 --- a/modules_k/pv/pv_stats.c +++ b/modules_k/pv/pv_stats.c @@ -26,8 +26,12 @@ */ #include "../../lib/kcore/statistics.h" +#include "../../ver.h" #include "pv_stats.h" +/** + * + */ int pv_parse_stat_name(pv_spec_p sp, str *in) { if (in == NULL || in->s == NULL || sp == NULL) @@ -39,6 +43,9 @@ int pv_parse_stat_name(pv_spec_p sp, str *in) } +/** + * + */ int pv_get_stat(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { stat_var *stat; @@ -53,3 +60,57 @@ int pv_get_stat(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) (unsigned int)get_stat_val(stat)); } +/** + * + */ +int pv_parse_sr_version_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 3: + if(strncmp(in->s, "num", 3)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 4: + if(strncmp(in->s, "full", 4)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "hash", 4)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV version name %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_sr_version(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if(param==NULL) + return -1; + + switch(param->pvn.u.isname.name.n) + { + case 1: + return pv_get_strzval(msg, param, res, (char*)full_version); + case 2: + return pv_get_strzval(msg, param, res, (char*)ver_id); + default: + return pv_get_strzval(msg, param, res, (char*)ver_version); + } +} + diff --git a/modules_k/pv/pv_stats.h b/modules_k/pv/pv_stats.h index 7ddeae3..b0356ea 100644 --- a/modules_k/pv/pv_stats.h +++ b/modules_k/pv/pv_stats.h @@ -33,4 +33,7 @@ int pv_parse_stat_name(pv_spec_p sp, str *in); int pv_get_stat(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_sr_version_name(pv_spec_p sp, str *in); +int pv_get_sr_version(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + #endif

12 years, 4 months

git:master: core: added pv_get_strzval(...) helper function for pv

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5a9340a2309e7689da4d34eeeef12b0bed2f6e09 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a9340a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 16 20:24:02 2012 +0200 core: added pv_get_strzval(...) helper function for pv --- pvapi.c | 15 +++++++++++++++ pvar.h | 2 ++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/pvapi.c b/pvapi.c index d1ebfe6..957086f 100644 --- a/pvapi.c +++ b/pvapi.c @@ -457,6 +457,21 @@ int pv_get_strval(struct sip_msg *msg, pv_param_t *param, } /** + * convert strz to pv_value_t + */ +int pv_get_strzval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, char *sval) +{ + if(res==NULL) + return -1; + + res->rs.s = sval; + res->rs.len = strlen(sval); + res->flags = PV_VAL_STR; + return 0; +} + +/** * convert str-int to pv_value_t (type is str) */ int pv_get_strintval(struct sip_msg *msg, pv_param_t *param, diff --git a/pvar.h b/pvar.h index df83e69..eaa7556 100644 --- a/pvar.h +++ b/pvar.h @@ -216,6 +216,8 @@ int pv_get_sintval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, int sival); int pv_get_strval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, str *sval); +int pv_get_strzval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, char *sval); int pv_get_strintval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, str *sval, int ival); int pv_get_intstrval(struct sip_msg *msg, pv_param_t *param,

12 years, 4 months

git:master: Makefile.defs: version set to 3.4.0-dev3

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e5b1b1ec11406cb91eb809d618b132bf8a5f808a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5b1b1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 16 18:18:04 2012 +0200 Makefile.defs: version set to 3.4.0-dev3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 3ba10d7..b9718fd 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory debugger switcher # 0 - off (release mode)

12 years, 4 months

Memory fragmentation

by Paul Pankhurst

We now seem to be experiencing problems with Kamailio running out of memory after a period of time running our soak test. After dumping the shared memory I can see that there is no memory leak, but the problem is that memory is hugely fragmented with all the free blocks being less that 10k in size, which is too small for the tcp buffer it is trying to allocate memory for. We've noticed that there is a new kamailio runtime option mem_join that by default is 0. Was the previous default dehaviour the equivalent to this being set to 1? Thanks Paul

12 years, 4 months

git:master: Process CANCEL before in-dialog requests. This prevents issues with some devices sending buggy CANCEL with To-tag when cancelling an initial INVITE .

by Inaki Baz Castillo

Module: sip-router Branch: master Commit: 8a7a06f4d9c78f6da0558806d988c817fd6d0018 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a7a06f… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Thu Aug 16 16:17:51 2012 +0200 Process CANCEL before in-dialog requests. This prevents issues with some devices sending buggy CANCEL with To-tag when cancelling an initial INVITE. --- etc/kamailio.cfg | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index f4eaa4f..efcce99 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -452,11 +452,6 @@ request_route { # NAT detection route(NATDETECT); - # handle requests within SIP dialogs - route(WITHINDLG); - - ### only initial requests (no To tag) - # CANCEL processing if (is_method("CANCEL")) { @@ -465,6 +460,11 @@ request_route { exit; } + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) + t_check_trans(); # authentication

12 years, 4 months

git:master: Add Record-Route for in-dialog NOTIFY as per RFC 6665.

by Inaki Baz Castillo

Module: sip-router Branch: master Commit: d661028060369e702f5882b6492040bd71fb900a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d661028… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Thu Aug 16 16:13:50 2012 +0200 Add Record-Route for in-dialog NOTIFY as per RFC 6665. --- etc/kamailio.cfg | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 03b5f43..f4eaa4f 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -574,10 +574,14 @@ route[WITHINDLG] { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } - if ( is_method("ACK") ) { + else if ( is_method("ACK") ) { # ACK is forwarded statelessy route(NATMANAGE); } + else if ( is_method("NOTIFY") ) { + # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + record_route(); + } route(RELAY); } else { if (is_method("SUBSCRIBE") && uri == myself) {

12 years, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012