sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
421 discussions

git:master:91c30dc8: nat_traversal: docs for contact_match parameter
by Daniel-Constantin Mierla 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: 91c30dc8650d778851fcf439904557bc7363fcc4 URL: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-04T09:59:06+02:00 nat_traversal: docs for contact_match parameter --- Modified: src/modules/nat_traversal/doc/nat_traversal_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… Patch: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… --- diff --git a/src/modules/nat_traversal/doc/nat_traversal_admin.xml b/src/modules/nat_traversal/doc/nat_traversal_admin.xml index f5e8ef00f5..1143e4a90b 100644 --- a/src/modules/nat_traversal/doc/nat_traversal_admin.xml +++ b/src/modules/nat_traversal/doc/nat_traversal_admin.xml @@ -493,6 +493,36 @@ modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: &kamailio;\r\n <programlisting format="linespecific"> ... modparam("nat_traversal", "keepalive_state_file", "/run/kamailio/keepalive_state") +... + </programlisting> + </example> + </section> + + <section> + <title><varname>contact_match</varname> (integer)</title> + <para> + Control how to match the contact URIs between requests and replies. + </para> + <para> + If set to 0, do string comparison. Use this mode when the contact URI + is not changed by registrar or proxy servers. + </para> + <para> + If set to 1, do light URI comparison (match URI type, user, host, + port and proto). Use this mode when the contact URI can be changed + by registrar or proxy servers (e.g., new parameters added, or the + order of parameters changed). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Setting the <varname>contact_match</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nat_traversal", "contact_match", 1) ... </programlisting> </example>

1 0

git:master:531f2551: nat_traversal: new marameter contact_match
by Daniel-Constantin Mierla 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: 531f2551affb06e71cbabbeba0e3174900e69aab URL: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-04T09:59:06+02:00 nat_traversal: new marameter contact_match - if set to 0 (default), match request-reply contacts with string comparison (behaviour so far) - if set to 1, use light uri comparison ( match uri type, user, host, port and proto ) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174… Patch: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 709b9032cd..27dbf2736d 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -59,6 +59,7 @@ #include "../../core/data_lump.h" #include "../../core/mod_fix.h" #include "../../core/script_cb.h" +#include "../../core/strutils.h" #include "../../core/timer_proc.h" #include "../../core/parser/msg_parser.h" #include "../../core/parser/parse_from.h" @@ -246,6 +247,7 @@ bool have_dlg_api = false; static int dialog_flag = -1; static unsigned dialog_default_timeout = 12 * 3600; // 12 hours +static int natt_contact_match = 0; stat_var *keepalive_endpoints = 0; stat_var *registered_endpoints = 0; @@ -287,6 +289,8 @@ static param_export_t parameters[] = { {"keepalive_extra_headers", PARAM_STRING, &keepalive_params.extra_headers}, {"keepalive_state_file", PARAM_STRING, &keepalive_state_file}, + {"contact_match", PARAM_INT, &natt_contact_match}, + {0, 0, 0} }; @@ -897,7 +901,11 @@ static time_t get_register_expire( r_contact_body = (contact_body_t *)r_hdr->parsed; for(r_contact = r_contact_body->contacts; r_contact; r_contact = r_contact->next) { - if(STR_MATCH_STR(contact->uri, r_contact->uri)) { + if((natt_contact_match==0 + && STR_MATCH_STR(contact->uri, r_contact->uri)) + || (natt_contact_match==1 + && cmp_uri_light_str(&contact->uri, + &r_contact->uri)==0)){ expires_param = r_contact->expires; if(expires_param && expires_param->body.len && str2int(&expires_param->body, &exp) == 0) @@ -1760,6 +1768,10 @@ static int mod_init(void) int *param; modparam_t type; + if(natt_contact_match!=0) { + natt_contact_match = 1; + } + if(keepalive_interval <= 0) { LM_NOTICE( "keepalive functionality is disabled from the configuration\n");

1 0

git:master:d1584cff: core: functions for light comparison of uri values
by Daniel-Constantin Mierla 04 Apr '20

04 Apr '20

Module: kamailio Branch: master Commit: d1584cff4766d45147cc3ed88da91ab691437799 URL: https://github.com/kamailio/kamailio/commit/d1584cff4766d45147cc3ed88da91ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-04T09:59:06+02:00 core: functions for light comparison of uri values - match uri type, user, host, port and proto, but skip params matching --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/d1584cff4766d45147cc3ed88da91ab… Patch: https://github.com/kamailio/kamailio/commit/d1584cff4766d45147cc3ed88da91ab… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 7df31727cb..e106dfe713 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -496,13 +496,13 @@ int cmp_str_params(str *s1, str *s2) } /** - * Compare SIP URI as per RFC3261, 19.1.4 + * Compare SIP URI in light mode or as per RFC3261, 19.1.4 * return: * - 0: match * - >0: no match * - <0: error */ -int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) +int cmp_uri_mode(struct sip_uri *uri1, struct sip_uri *uri2, int cmode) { if(uri1->type!=uri2->type) return 1; @@ -520,6 +520,13 @@ int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) return 1; if(cmpi_str(&uri1->host, &uri2->host)!=0) return 1; + if(cmode == 1) { + /* compare mode light - proto should be the same for match */ + if(uri1->proto == uri2->proto) { + return 0; + } + return 1; + } /* if no params, we are done */ if(uri1->params.len==0 && uri2->params.len==0) return 0; @@ -548,6 +555,30 @@ int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) return cmp_str_params(&uri1->params, &uri2->params); } +/** + * Compare SIP URI as per RFC3261, 19.1.4 (match also params) + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) +{ + return cmp_uri_mode(uri1, uri2, 0); +} + +/** + * Compare SIP URI light - uri type, user, host, port and proto match + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri_light(struct sip_uri *uri1, struct sip_uri *uri2) +{ + return cmp_uri_mode(uri1, uri2, 1); +} + /** * return: * - 0: match @@ -567,6 +598,25 @@ int cmp_uri_str(str *s1, str *s2) return cmp_uri(&uri1, &uri2); } +/** + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri_light_str(str *s1, str *s2) +{ + struct sip_uri uri1; + struct sip_uri uri2; + + /* todo: parse uri and compare the parts */ + if(parse_uri(s1->s, s1->len, &uri1)!=0) + return -1; + if(parse_uri(s2->s, s2->len, &uri2)!=0) + return -1; + return cmp_uri_light(&uri1, &uri2); +} + /** * Compare SIP AoR * - match user, host and port (if port missing, assume 5060) diff --git a/src/core/strutils.h b/src/core/strutils.h index 8b20f72e44..4747f898fd 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -45,6 +45,7 @@ int cmpi_str(str *s1, str *s2); int cmp_hdrname_str(str *s1, str *s2); int cmp_hdrname_strzn(str *s1, char *s2, size_t n); int cmp_uri_str(str *s1, str *s2); +int cmp_uri_light_str(str *s1, str *s2); int cmp_aor_str(str *s1, str *s2); /* str regexp replace */

1 0

git:master:5e484f16: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: 5e484f1677363ae3fd791911e8ed78ba40ccc81d URL: https://github.com/kamailio/kamailio/commit/5e484f1677363ae3fd791911e8ed78b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-03T09:01:17+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/5e484f1677363ae3fd791911e8ed78b… Patch: https://github.com/kamailio/kamailio/commit/5e484f1677363ae3fd791911e8ed78b…

1 0

git:master:e900d05f: corex: docs for new functions to set send socket by name
by Daniel-Constantin Mierla 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: e900d05fba75314ac769aceb637c0a3f61eb8f8b URL: https://github.com/kamailio/kamailio/commit/e900d05fba75314ac769aceb637c0a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-03T08:48:17+02:00 corex: docs for new functions to set send socket by name --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e900d05fba75314ac769aceb637c0a3… Patch: https://github.com/kamailio/kamailio/commit/e900d05fba75314ac769aceb637c0a3… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 0b1d587e7b..98c51f1470 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -556,6 +556,33 @@ resetxflag("1"); ... set_send_socket("udp:127.0.0.1:5060"); ... +</programlisting> + </example> + </section> + <section id="corex.f.set_send_socket_name"> + <title><function moreinfo="none">set_send_socket_name(sname)</function></title> + <para> + Set the socket for sending out. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>sname</emphasis> - the name of the local socket + (listen address). Can be a static string or contain + pseudo-variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>set_send_socket_name</function> usage</title> + <programlisting format="linespecific"> +... +set_send_socket_name("sock1"); +... </programlisting> </example> </section> @@ -583,6 +610,33 @@ set_send_socket("udp:127.0.0.1:5060"); ... set_recv_socket("udp:127.0.0.1:5060"); ... +</programlisting> + </example> + </section> + <section id="corex.f.set_recv_socket_name"> + <title><function moreinfo="none">set_recv_socket_name(sname)</function></title> + <para> + Switch local socket used for receiving the message. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>sname</emphasis> - the name of the local socket + (listen address). Can be a static string or contain + pseudo-variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>set_recv_socket_name</function> usage</title> + <programlisting format="linespecific"> +... +set_recv_socket_name("sock1"); +... </programlisting> </example> </section>

1 0

git:master:c6c6e032: corex: functions to set socket by name
by Daniel-Constantin Mierla 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: c6c6e0326b1b4db856e25a485e13235b10b440f4 URL: https://github.com/kamailio/kamailio/commit/c6c6e0326b1b4db856e25a485e13235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-03T08:42:59+02:00 corex: functions to set socket by name --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c6c6e0326b1b4db856e25a485e13235… Patch: https://github.com/kamailio/kamailio/commit/c6c6e0326b1b4db856e25a485e13235…

1 0

git:master:6a7aa746: kamctl: try to locate rpc fifo file in /var/run/ or /run/ folders
by Daniel-Constantin Mierla 03 Apr '20

03 Apr '20

Module: kamailio Branch: master Commit: 6a7aa74663a25b52651bc39e986849c62c8a50f4 URL: https://github.com/kamailio/kamailio/commit/6a7aa74663a25b52651bc39e986849c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-03T08:40:10+02:00 kamctl: try to locate rpc fifo file in /var/run/ or /run/ folders - cope better with old or non-linux systems --- Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/6a7aa74663a25b52651bc39e986849c… Patch: https://github.com/kamailio/kamailio/commit/6a7aa74663a25b52651bc39e986849c… --- diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index e8fe93f99d..743f15bc4d 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -23,7 +23,11 @@ fi ### parameters # if [ -z "$RPCFIFOPATH" ]; then - RPCFIFOPATH=/run/kamailio/kamailio_rpc.fifo + if [ -p "/var/run/kamailio/kamailio_rpc.fifo" ]; then + RPCFIFOPATH=/var/run/kamailio/kamailio_rpc.fifo + else + RPCFIFOPATH=/run/kamailio/kamailio_rpc.fifo + fi fi #

1 0

git:master:5acc7c8a: rr: try to enforce send socket using name in Route URI params
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 5acc7c8a21599fed0b30df18fefaea3a80a02854 URL: https://github.com/kamailio/kamailio/commit/5acc7c8a21599fed0b30df18fefaea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T15:09:36+02:00 rr: try to enforce send socket using name in Route URI params - done when sockname_mode=1; if param not found or no socket matching found, then it tries the classic socket lookup --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/5acc7c8a21599fed0b30df18fefaea3… Patch: https://github.com/kamailio/kamailio/commit/5acc7c8a21599fed0b30df18fefaea3… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 28bc700941..4605ba09ad 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -36,6 +36,7 @@ #include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" +#include "../../core/parser/parse_param.h" #include "../../core/mem/mem.h" #include "../../core/dset.h" #include "loose.h" @@ -61,6 +62,7 @@ static msg_ctx_id_t routed_msg_id = {0}; static str routed_params = {0,0}; extern int rr_force_send_socket; +extern int rr_sockname_mode; /*! * \brief Test whether we are processing pre-loaded route set by looking at the To tag @@ -749,7 +751,44 @@ static inline int after_strict(struct sip_msg* _m) static inline void rr_do_force_send_socket(sip_msg_t *_m, sip_uri_t *puri, rr_t* rt, int rr2on) { - socket_info_t *si; + socket_info_t *si = NULL; + param_hooks_t phooks; + param_t* plist = NULL; + param_t *pit=NULL; + str s; + + + if(rr_sockname_mode!=0 && puri->params.len>0) { + s = puri->params; + if(s.s[s.len-1]==';') { + s.len--; + } + if (parse_params(&s, CLASS_ANY, &phooks, &plist)<0) { + LM_ERR("bad sip uri parameters: %.*s\n", s.len, s.s); + return; + } + for (pit = plist; pit; pit=pit->next) { + if (pit->name.len==SOCKNAME_PARAM_LEN + && strncasecmp(pit->name.s, SOCKNAME_PARAM, + SOCKNAME_PARAM_LEN)==0) { + if(pit->body.len>0) { + si = ksr_get_socket_by_name(&pit->body); + if(si != NULL) { + LM_DBG("found socket with name: %.*s\n", + pit->body.len, pit->body.s); + set_force_socket(_m, si); + free_params(plist); + return; + } else { + LM_DBG("failed to find socket with name: %.*s\n", + pit->body.len, pit->body.s); + } + } + } + } + LM_DBG("use of sockname parameter enabled, but failed to find it\n"); + free_params(plist); + } if ((si = grep_sock_info(&puri->host, puri->port_no?puri->port_no:proto_default_port(puri->proto),

1 0

git:master:bfe48633: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: bfe48633516aa30d3b8ac0cfb4d166b21e6246c9 URL: https://github.com/kamailio/kamailio/commit/bfe48633516aa30d3b8ac0cfb4d166b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-02T14:31:10+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/bfe48633516aa30d3b8ac0cfb4d166b… Patch: https://github.com/kamailio/kamailio/commit/bfe48633516aa30d3b8ac0cfb4d166b…

1 0

git:master:9a35ca71: rr: docs for sockname_mode param
by Daniel-Constantin Mierla 02 Apr '20

02 Apr '20

Module: kamailio Branch: master Commit: 9a35ca7155a390b1d64feed629601e82e35e1650 URL: https://github.com/kamailio/kamailio/commit/9a35ca7155a390b1d64feed629601e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-02T14:25:22+02:00 rr: docs for sockname_mode param --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a35ca7155a390b1d64feed629601e8… Patch: https://github.com/kamailio/kamailio/commit/9a35ca7155a390b1d64feed629601e8… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 01bee1b451..bdb78291b6 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -313,6 +313,26 @@ modparam("rr", "ignore_sips", 1) </programlisting> </example> </section> + <section id="rr.p.sockname_mode"> + <title><varname>sockname_mode</varname> (int)</title> + <para> + If set to 1, the Record-Route URI is built to contain socket name in 'sn' + parameter. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>sockname_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rr", "sockname_mode", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020