sr-dev February 2011

sr-dev@lists.kamailio.org

22 participants
124 discussions

git:master: modules_k/nathelper: add_contact_alias adds <> s around contact URI

by Juha Heinanen

Module: sip-router Branch: master Commit: 3ff9594a30eff2d18e6ea0595c5f82f878eaca1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ff9594… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 26 10:37:30 2010 +0200 modules_k/nathelper: add_contact_alias adds <>s around contact URI Make sure that Contact URI is surrounded by <> when adding ;alias parameter. Otherwise, ;alias parameter may be interpreted as header parameter, because the syntax seems to be ambiguous. (cherry picked from commit f5ef15fee0c3bf09adf2506effa0895f72af9034) --- modules_k/nathelper/nathelper.c | 69 +++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 51c1086..52c5e5f 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -786,7 +786,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) struct lump *anchor; struct sip_uri uri; struct ip_addr *ip; - char *param, *at, *port, *start; + char *lt, *gt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -816,25 +816,63 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return 2; } - /* Add alias param */ + /* Check if function has been called already */ if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } + + /* Check if Contact URI needs to be enclosed in <>s */ + lt = gt = param = NULL; + at = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (at == NULL) { + lt = (char*)pkg_malloc(1); + if (!lt) { + LM_ERR("no pkg memory left for lt sign\n"); + goto err; + } + *lt = '<'; + anchor = anchor_lump(msg, msg->contact->body.s - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for beginning of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, lt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \"<\" failed\n"); + goto err; + } + gt = (char*)pkg_malloc(1); + if (!gt) { + LM_ERR("no pkg memory left for gt sign\n"); + goto err; + } + *gt = '>'; + anchor = anchor_lump(msg, msg->contact->body.s + + msg->contact->body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for end of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, gt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \">\" failed\n"); + goto err; + } + } + + /* Create ;alias param */ param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); - return -1; + goto err; } at = param; append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { - pkg_free(param); LM_ERR("failed to copy source ip\n"); - return -1; + goto err; } at = at + ip_len; append_chr(at, '~'); @@ -842,9 +880,8 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { - pkg_free(param); LM_ERR("invalid transport protocol\n"); - return -1; + goto err; } append_chr(at, msg->rcv.proto + '0'); param_len = at - param; @@ -854,18 +891,24 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } else { start = uri.host.s + uri.host.len; } + + /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { - pkg_free(param); - LM_ERR("anchor_lump failed\n"); - return -1; + LM_ERR("anchor_lump for ;alias param failed\n"); + goto err; } if (insert_new_lump_after(anchor, param, param_len, 0) == 0) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(param); - return -1; + LM_ERR("insert_new_lump_after for ;alias param failed\n"); + goto err; } return 1; + + err: + if (lt) pkg_free(lt); + if (gt) pkg_free(gt); + if (param) pkg_free(param); + return -1; }

13 years, 3 months

git:master: modules/tm: new implementation of load_contacts()/next_contacts ()

by Juha Heinanen

Module: sip-router Branch: master Commit: e973bbe5e7310861f77b17ce0afaf1cca35fe48a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e973bbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 28 15:38:41 2010 +0300 modules/tm: new implementation of load_contacts()/next_contacts() - Simpler implementation of load_contacts()/next_contacts() functions based on recent changes related to Request-URI handling. - Function next_contacts() does not anymore set any timers. Check contact_avp and call t_set_fr() before calling t_relay() instead. - Removed fr_timer_next module parameter, because it is not needed anymore. --- modules/tm/README | 255 ++++++++++++++------------------------ modules/tm/doc/functions.xml | 51 +++----- modules/tm/doc/params.xml | 73 ----------- modules/tm/doc/tm.xml | 15 +-- modules/tm/t_serial.c | 279 ++++++++++++------------------------------ modules/tm/tm.c | 1 - 6 files changed, 190 insertions(+), 484 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e97…

13 years, 4 months

lockup("location") doesn't find a "sip" registration if RURI scheme is "sips"

by Iñaki Baz Castillo

Hi, "sip:alice@domain.org" is registered in Kamailio. If the proxy receives a request for "sips:alice@domain.org" and invokes "lookup(location)" the function doesn't retrieve the registration of alice. But it should: RFC 5630 section 3.3: When used as the Request-URI of a request, the SIPS scheme signifies that each hop over which the request is forwarded, until the request reaches the SIP entity responsible for the domain portion of the Request-URI, must be secured with TLS; once it reaches the domain in question it is handled in accordance with local security and routing policy, quite possibly using TLS for any last hop to a UAS. When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. Note the last phrase: When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. This is, the entire path *until* the proxy responsible for the domain in the RURI must be secure (TLS) but it's not required (local policy) that the destination proxy dellivers the request to the destination user using TLS. So IMHO lockup(location) should not inspect the registration schema. Am I wrong? -- Iñaki Baz Castillo <ibc(a)aliax.net>

13 years, 6 months

question about module function arguments

by Juha Heinanen

i understood that module functions can now have an arbitrary number of string, int and pseudo var arguments, where string arguments can possibly also contain pseudo variables. some time ago i asked an example on how this is done, but didn't get any reply. so i'll try again. for example, allow_trusted function is now defined like this: {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, how can i add a third argument to the function without needing to define yet another fixup_pvar_pvar_something? -- juha

13 years, 8 months

Re: [sr-dev] planning release of v3.1.2

by Bernhard Suttner

Hi, whats about: http://sip-router.org/tracker/index.php?do=details&task_id=108 I think that some users are trying to register to an asterisk system. Or does somebody have a solution for that? A new release would be nice!!! Thanks in advance. Best regards, Bernhard ----- Original Message ----- From: Daniel-Constantin Mierla [mailto:miconda@gmail.com] To: kamailio [mailto:sr-users@lists.sip-router.org], sr-dev [mailto:sr-dev@lists.sip-router.org] Sent: Fri, 28 Jan 2011 20:15:50 +0100 Subject: [sr-dev] planning release of v3.1.2 > Hello, > > I think it is time to release v3.1.2, first date that comes in my mind > is next Thursday if everyone feels it is enough time to take care of > backporting any fix he/she did and it is not yet there. That will > provide us a fresh release for the FOSDEM event. If not, then maybe the > other week, Tuesday, so the participants at the Kamailio Devel training > in Barcelona can practice on it. > > Soon after we should plan also a release for previous stable, branch 3.0. > > Anyone having other options? > > Thanks, > Daniel > > -- > Daniel-Constantin Mierla > http://www.asipto.com > > > _______________________________________________ > sr-dev mailing list > sr-dev(a)lists.sip-router.org > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >

13 years, 9 months

PATCH: fix ser_stun.[hc]

by Alfred E. Heggestad

Hi, I have tested the STUN code in sip-router (enabled by make STUN=1) and it became quite clear that this code is based on old I-D's and probably not tested/used against SIP outbound clients implemented according to RFC 5626 this patch fixes some issues, removing the Fingerprint check which is not needed, and fixing the XOR scrambling of XOR-MAPPED-ADDRESS. please review it carefully and apply to your GIT tree if you are happy with it. Signed-Off-By: Alfred E. Heggestad <aeh(a)db.org> --

13 years, 9 months

git:3.1: kamdbctl: create uacreg table

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: cdede927ae9fff0f2cb7b2e65173d00dc2eee8c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdede92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 20:32:09 2011 +0100 kamdbctl: create uacreg table - uacreg table was not created by kamdbctl (cherry picked from commit 1c82d0a422482298b0ae5da299fccd98d67fd6f9) --- utils/kamctl/kamdbctl.base | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 85d8fa2..acc7d4a 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -36,8 +36,9 @@ STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber location re_grp trusted address missed_calls usr_preferences aliases silo dialog dispatcher dialplan} -EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute - carrier_name domain_name carrierfailureroute userblacklist globalblacklist htable purplemap} +EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy + carrierroute carrier_name domain_name carrierfailureroute userblacklist + globalblacklist htable purplemap uacreg} PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap pua rls_presentity rls_watchers} @@ -65,7 +66,8 @@ STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions registrar usrloc msilo alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher dialplan} -EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute userblacklist htable purple} +EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute + userblacklist htable purple uac} ############################################################

13 years, 9 months

git:3.1: uac(k): proper documentation for remote server registration

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 203e6a5c7bea0d2d388beeeda4e1121fa38da5f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=203e6a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 20:50:52 2011 +0100 uac(k): proper documentation for remote server registration - the feature was shortly mentioned without proper details of how to use - discovered upon discution with Ovidiu Sas (cherry picked from commit 28e604d16ef4dadc5368804a277c695453c9cf9f) --- modules_k/uac/README | 86 +++++++++++++++++++++++++------- modules_k/uac/doc/uac_admin.xml | 104 +++++++++++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 21 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=203…

13 years, 9 months

git:master: uac(k): proper documentation for remote server registration

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 28e604d16ef4dadc5368804a277c695453c9cf9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28e604d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 20:50:52 2011 +0100 uac(k): proper documentation for remote server registration - the feature was shortly mentioned without proper details of how to use - discovered upon discution with Ovidiu Sas --- modules_k/uac/README | 86 +++++++++++++++++++++++++------- modules_k/uac/doc/uac_admin.xml | 104 +++++++++++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 21 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=28e…

13 years, 9 months

git:master: kamdbctl: create uacreg table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1c82d0a422482298b0ae5da299fccd98d67fd6f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c82d0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 28 20:32:09 2011 +0100 kamdbctl: create uacreg table - uacreg table was not created by kamdbctl --- utils/kamctl/kamdbctl.base | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 85d8fa2..acc7d4a 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -36,8 +36,9 @@ STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber location re_grp trusted address missed_calls usr_preferences aliases silo dialog dispatcher dialplan} -EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute - carrier_name domain_name carrierfailureroute userblacklist globalblacklist htable purplemap} +EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy + carrierroute carrier_name domain_name carrierfailureroute userblacklist + globalblacklist htable purplemap uacreg} PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap pua rls_presentity rls_watchers} @@ -65,7 +66,8 @@ STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions registrar usrloc msilo alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher dialplan} -EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute userblacklist htable purple} +EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute + userblacklist htable purple uac} ############################################################

13 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2011