sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:jason.penton/ims_ro_interface: Merge branch 'master' of ssh://git. sip-router.org/sip-router into ro_interface

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 5e456193f5a159a2e3d4ff2133b7a1824367201e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e45619… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Fri Mar 1 15:12:25 2013 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router into ro_interface ---

11 years, 9 months

git:jason.penton/ims_ro_interface: nathelper: add new option sipping_disable_bflag

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 6543308deaf3ac029ec7db06f7535883006b1f00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6543308… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Feb 27 11:17:03 2013 -0500 nathelper: add new option sipping_disable_bflag sipping_disable_bflag can be set on a per-registration basis to disable NAT pings completely --- modules/nathelper/README | 138 ++++++++++++++++------------- modules/nathelper/doc/nathelper_admin.xml | 22 +++++ modules/nathelper/nathelper.c | 6 ++ 3 files changed, 106 insertions(+), 60 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=654…

11 years, 9 months

git:jason.penton/ims_ro_interface: core: parser - function to proper handling multipart bodies with same content type

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 14cd92b9d708a0ceeb3f272eae3f61d1682e40a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14cd92b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Feb 25 11:19:15 2013 +0100 core: parser - function to proper handling multipart bodies with same content type - closes FS#170, based on a patch by Luis Martin --- parser/parse_body.c | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++ parser/parse_body.h | 11 ++ 2 files changed, 310 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=14c…

11 years, 9 months

git:jason.penton/ims_ro_interface: Makefile.defs: version set to 4.1.0-dev0

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: fdad0c0af80db6d6d539b4faa578518d3a7bb42b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fdad0c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Feb 27 09:22:14 2013 +0100 Makefile.defs: version set to 4.1.0-dev0 - master branch is open for adding new features to be part of v4.1.x --- Makefile.defs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index adff6c2..8749f6a 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -160,9 +160,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 4 -PATCHLEVEL = 0 +PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

11 years, 9 months

git:jason.penton/ims_ro_interface: siputils: completed the function to return RURI parameter value

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 104ba18eb9dded95be5359a5b80f714d12d5e894 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=104ba18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Sun Feb 24 20:04:51 2013 +0100 siputils: completed the function to return RURI parameter value - closes FS#238, based on a patch by Luis Martin --- modules/siputils/README | 225 +++++++++++++++++-------------- modules/siputils/checks.c | 50 +++++++ modules/siputils/checks.h | 5 + modules/siputils/doc/siputils_admin.xml | 29 ++++ modules/siputils/siputils.c | 39 ++++++ 5 files changed, 245 insertions(+), 103 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=104…

11 years, 9 months

git:pd/outbound: modules/registrar: updated module documentation

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 71c197dfe0b787a2abeadb730fda5241f294237c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71c197d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 1 11:41:18 2013 +0000 modules/registrar: updated module documentation - Added ruid parameter to unregister - Added missing attributes to $ulc() description --- modules/registrar/README | 99 ++++++++++++++++------------- modules/registrar/doc/registrar_admin.xml | 40 ++++++++++-- 2 files changed, 87 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=71c…

11 years, 9 months

git:pd/outbound: modules/registrar: added additional unregister() exported function to allow the removal of a specific contact

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 0a919692b299e2eb819f7c97fa218189849d4566 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a91969… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 1 11:19:42 2013 +0000 modules/registrar: added additional unregister() exported function to allow the removal of a specific contact - Contact is removed by using the ruid (unique ID for the location record) - Getting the ruid to use here is a problem still to be solved. --- modules/registrar/reg_mod.c | 26 +++++++++++++++++++++++++- modules/registrar/save.c | 35 +++++++++++++++++++++++++++++------ modules/registrar/save.h | 2 +- 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index d3fd4f2..586e3cc 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -94,6 +94,7 @@ static int w_lookup(struct sip_msg* _m, char* _d, char* _p2); static int w_lookup_branches(struct sip_msg* _m, char* _d, char* _p2); static int w_registered(struct sip_msg* _m, char* _d, char* _uri); static int w_unregister(struct sip_msg* _m, char* _d, char* _uri); +static int w_unregister2(struct sip_msg* _m, char* _d, char* _uri, char *_ruid); /*! \brief Fixup functions */ static int domain_fixup(void** param, int param_no); @@ -186,6 +187,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE }, {"unregister", (cmd_function)w_unregister, 2, unreg_fixup, 0, REQUEST_ROUTE| FAILURE_ROUTE }, + {"unregister", (cmd_function)w_unregister2, 3, unreg_fixup, 0, + REQUEST_ROUTE| FAILURE_ROUTE }, {"reg_fetch_contacts", (cmd_function)pv_fetch_contacts, 3, fetchc_fixup, 0, REQUEST_ROUTE| FAILURE_ROUTE }, @@ -501,7 +504,26 @@ static int w_unregister(struct sip_msg* _m, char* _d, char* _uri) return -1; } - return unregister(_m, (udomain_t*)_d, &uri); + return unregister(_m, (udomain_t*)_d, &uri, NULL); +} + +static int w_unregister2(struct sip_msg* _m, char* _d, char* _uri, char *_ruid) +{ + str uri = {0}; + str ruid = {0}; + if(fixup_get_svalue(_m, (gparam_p)_uri, &uri)!=0 || uri.len<=0) + { + LM_ERR("invalid uri parameter\n"); + return -1; + } + if(fixup_get_svalue(_m, (gparam_p)_ruid, &ruid)!=0 || ruid.len<=0) + { + LM_ERR("invalid ruid parameter\n"); + return -1; + } + + + return unregister(_m, (udomain_t*)_d, &uri, &ruid); } /*! \brief @@ -546,6 +568,8 @@ static int unreg_fixup(void** param, int param_no) return domain_fixup(param, 1); } else if (param_no == 2) { return fixup_spve_null(param, 1); + } else if (param_no == 3) { + return fixup_spve_null(param, 1); } return 0; } diff --git a/modules/registrar/save.c b/modules/registrar/save.c index d568334..f55c933 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -953,26 +953,49 @@ error: return 0; } -int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri) +int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) { str aor = {0, 0}; sip_uri_t *u; + urecord_t *r; + ucontact_t *c; u = parse_to_uri(_m); if(u==NULL) return -2; - if (extract_aor(_uri, &aor, NULL) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; } - if (star(_m, _d, &aor, &u->host) < 0) - { - LM_ERR("error unregistering user [%.*s]\n", aor.len, aor.s); - return -1; + if (_ruid == NULL) { + /* No ruid provided - remove all contacts for aor */ + + if (star(_m, _d, &aor, &u->host) < 0) + { + LM_ERR("error unregistering user [%.*s]\n", aor.len, aor.s); + return -1; + } + } else { + /* ruid provided - remove a specific contact */ + + ul.lock_udomain(_d, &aor); + if (ul.get_urecord_by_ruid(_d, ul.get_aorhash(&aor), + _ruid, r, c) != 0) { + ul.unlock_udomain(_d, &aor); + LM_WARN("AOR/Contact not found\n"); + return -1; + } + if (ul.delete_ucontact(r, c) != 0) { + ul.unlock_udomain(_d, &aor); + LM_WARN("could not delete contact\n"); + return -1; + } + ul.release_urecord(r); + ul.unlock_udomain(_d, &aor); } + return 1; } diff --git a/modules/registrar/save.h b/modules/registrar/save.h index 69e1352..c6aa928 100644 --- a/modules/registrar/save.h +++ b/modules/registrar/save.h @@ -47,7 +47,7 @@ * Process REGISTER request and save it's contacts */ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str* _uri); -int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri); +int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid); #endif /* SAVE_H */

11 years, 9 months

Outbound: removing contact for broken flow

by Peter Dunkley

Hello, I want to add a new function to the registrar module that will allow me to remove a contact from the location table when I receive a 430 from an edge proxy. I believe I can use the get_ucontact_by_instance() function from usrloc to remove the exact contact I want (based on contact address, sip.instance, and reg-id). However, at the point at which I have received a 430 from the edge proxy (in the failure_route[] on the registrar) I am not sure how I can determine the sip.instance and reg-id. As far as I can tell neither of these values is added to the request when the registrar:lookup() exported function is called. I don't want to just remove contacts based on address, or even address and sip.instance, because when outbound is used I will have multiple contacts with the same address and sip.instance values, with only the reg-id different. Does anyone have any suggestions as to how I can obtain this information in a failure_route[]? Regards, Peter

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013