sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
228 discussions

git:master:7f4d7725: textopsx: return false on iterator end of headers
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 7f4d7725a55379ef0e7ee5c5a2050d3b1d4565bc URL: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:06+02:00 textopsx: return false on iterator end of headers --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Patch: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index ee220fbb82..d3295bf02c 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -93,7 +93,7 @@ static int pv_get_hf_iterator_hbody(sip_msg_t *msg, pv_param_t *param, static pv_export_t mod_pvs[] = { { {"hfitname", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hname, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, - { {"hfitbody", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, + { {"hfitbody", sizeof("hfitbody")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -1924,6 +1924,10 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); return -1; } + if(_hf_iterators[k].eoh == 1) { + return -1; + } + if(_hf_iterators[k].it == NULL) { _hf_iterators[k].it = msg->headers; } else { @@ -1931,6 +1935,7 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) } if(_hf_iterators[k].it == NULL) { _hf_iterators[k].eoh = 1; + return -1; } return 1; }

1 0

git:master:89d5a275: textopsx: docs for hdr iterator functions
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 89d5a2754e962c0f0bec59591b327d356999efbc URL: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:06+02:00 textopsx: docs for hdr iterator functions --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… Patch: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 0980e4060b..f9c388016e 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -482,5 +482,87 @@ if (@hf_value_exists.supported.path == "1") { </programlisting> </example> </section> + <section id="textopsx.f.hf_iterator_start"> + <title> + <function moreinfo="none">hf_iterator_start(iname)</function> + </title> + <para> + Start an iterator for headers in the current SIP message. + The parameter iname is used to identify the iterator. There + can be up to 4 iterators at the same time, with different name. + </para> + <para> + The parameter can be a dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_start</function> usage</title> + <programlisting format="linespecific"> +... +hf_iterator_start("i1"); +... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_end"> + <title> + <function moreinfo="none">hf_iterator_end(iname)</function> + </title> + <para> + Close the iterator identified by iname parameter. The iname value + must be the same used for sht_iterator_start(). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_end</function> usage</title> + <programlisting format="linespecific"> +... +hf_iterator_end("i1"); +... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_next"> + <title> + <function moreinfo="none">textopsx.f.hf_iterator_next(iname)</function> + </title> + <para> + Move the iterator to the next header. It must + be called also after sht_iterator_start() to get the first + header. + </para> + <para> + The return code is false when there is no other header in the list. + </para> + <para> + The item name and value are accessible via variables: + $hfitname(iname) and $hfitbody(iname). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_next</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + xlog("hdr[$hfitname(i1)] is: $hfitbody(i1)\n"); + } + hf_iterator_end("i1"); +... +</programlisting> + </example> + </section> </section>

1 0

git:master:ba3ce508: textopsx: added functions and variables to iterate headers list
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: ba3ce5081bc31019bec6de8aecffc1b5a601c308 URL: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:05+02:00 textopsx: added functions and variables to iterate headers list --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b… Patch: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b…

1 0

Build kamailio 5.3.1 db_mysql module with percona.
by Andrey Deykunov 07 Jul '21

07 Jul '21

Hi, We have kamailio server v. 5.3.1 with db_mysql.so built with our old mysql library 5.1.41. Now I'm trying to build it with libperconaclient20. I've tried many variants of build configuration, but every time I got errors when kamailio stops or starts, such: *2021-07-06T06:01:20.943809-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'reading authorization packet', system error: 112021-07-06T06:01:20.946591-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool2021-07-06T06:01:20.947224-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: auth_db [auth_db_mod.c:159]: child_init(): unable to connect to the database2021-07-06T06:01:20.947592-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [core/sr_module.c:806]: init_mod_child(): error while initializing module auth_db (/var/lib/ums/lib64/kamailio/modules/auth_db.so) (idx: 5 rank: 5 desc: [udpreceiver child=4 sock=64.78.52.86:5060 <http://64.78.52.86:5060>])* or *2021-07-06T06:18:43.159744-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[30954]: CRITICAL: <core> [core/mem/q_malloc.c:150]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(0, 0)[0x7fd5c6c85bc8:0x7fd5c6c85c00]! Memory allocator was calledfrom core: db_res.c:114. Fragment marked by db_mysql: km_my_con.c:75. Exec from core/mem/q_malloc.c:391.* Is there some specific way to build kamailio with percona? Thanks, Andrey

2 1

git:master:c950c401: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: c950c40119ff81a8dacec2f4ba697ce080459a7f URL: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-07T08:01:20+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce… Patch: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce…

1 0

git:master:5a473493: nathelper: docs - fixed copy/paste extra tags
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 5a473493189acc93705c78c1966a9eae0e80fef0 URL: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T07:51:31+02:00 nathelper: docs - fixed copy/paste extra tags --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… Patch: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c6d398b218..832e324819 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -723,7 +723,6 @@ fix_nated_register(); and D-URI ($du). For replies, it compares host and port in 2nd Via with received and rport parameters. </para></listitem> - <listitem><para> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of

1 0

git:master:77071eb1: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 77071eb11c735cb04b4adf084808c5d46bdca20d URL: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-06T20:46:19+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d… Patch: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d…

1 0

git:master:fb0bb3f4: nathelper: docs for nat uac test 512
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: fb0bb3f49efe51bbab03911923b737f037b9cd44 URL: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:53:39+02:00 nathelper: docs for nat uac test 512 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… Patch: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 39e61e6856..c6d398b218 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -717,6 +717,13 @@ fix_nated_register(); from source IP address. It will work also with multiple connection address lines. </para></listitem> + <listitem><para> + <emphasis>512</emphasis> - Test if the target addresses are different + or over websocket. For requests, it compares host and port in R-URI ($rU) + and D-URI ($du). For replies, it compares host and port in 2nd Via + with received and rport parameters. + </para></listitem> + <listitem><para> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of

1 0

git:master:ce95734c: nathelper: new nat test (512) based on target addresses
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: ce95734c97e8443facf224a1833f67a78ab67d21 URL: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:08:50+02:00 nathelper: new nat test (512) based on target addresses - return true if the target proto is ws or wss - return true if the target addresses are different - for requests it compares r-uri with d-uri - for replies compares 2nd Via host and port with received and rport --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… Patch: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index df9a5bce2c..bdf1b7777a 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -101,6 +101,7 @@ MODULE_VERSION #define NAT_UAC_TEST_WS 0x40 #define NAT_UAC_TEST_C_PORT 0x80 #define NAT_UAC_TEST_SDP_CLINE 0x100 +#define NAT_UAC_TEST_DEST 0x200 #define DEFAULT_NATPING_STATE 1 @@ -1540,6 +1541,125 @@ static int via_1918(struct sip_msg *msg) return (is1918addr(&(msg->via1->host)) == 1) ? 1 : 0; } +/* + * test if destination address is different than R-URI/2nd Via + * - ws/wss target is true + */ +static int nh_test_destination(sip_msg_t *msg) +{ + str rhost = STR_NULL; + int rport = 0; + str dhost = STR_NULL; + int dport = 0; + sip_uri_t pduri; + ip_addr_t *rhostip = NULL; + ip_addr_t *dhostip = NULL; + + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) { + if(parse_headers(msg, HDR_VIA2_F, 0)==-1) { + LM_DBG("no 2nd via parsed\n"); + return 0; + } + if((msg->via2==0) || (msg->via2->error!=PARSE_OK)) { + return -1; + } + if(msg->via2->proto==PROTO_WSS || msg->via2->proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + if(msg->via2->rport && msg->via2->rport->value.s + && msg->via2->rport->value.len>0) { + if(str2sint(&msg->via2->rport->value, &dport)<0) { + LM_ERR("invalid rport value\n"); + return -1; + } + } + if(dport!=0) { + rport = GET_SIP_PORT(msg->via2->port, msg->via2->proto); + if(dport != rport) { + /* ports are different */ + return 1; + } + } + if(!msg->via2->received) { + /* no received param - going to Via host */ + return 0; + } + dhost = msg->via2->received->value; + rhost = msg->via2->host; + } else { + if(msg->dst_uri.s==NULL || msg->dst_uri.len<=0) { + /* no destination uri - target is r-uri */ + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ + && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + if(msg->parsed_uri.proto==PROTO_WSS + || msg->parsed_uri.proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + return 0; + } + if(parse_uri(msg->dst_uri.s, msg->dst_uri.len, &pduri)!=0) { + LM_ERR("failed to parse dst uri [%.*s]\n", + msg->dst_uri.len, msg->dst_uri.s); + return -1; + } + if(pduri.proto==PROTO_WSS || pduri.proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ + && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + dport = GET_SIP_PORT(pduri.port_no, pduri.proto); + rport = GET_SIP_PORT(msg->parsed_uri.port_no, msg->parsed_uri.proto); + if(dport != rport) { + /* ports are different */ + return 1; + } + dhost = pduri.host; + rhost = msg->parsed_uri.host; + } + if(dhost.s==NULL || dhost.len<=0) { + return 0; + } + dhostip = str2ipx(&dhost); + rhostip = str2ipx(&rhost); + if(dhostip==NULL && rhostip==NULL) { + /* both are hostnames - do str comparison */ + if(rhost.s==NULL || rhost.len<=0) { + return 0; + } + if(rhost.len != dhost.len) { + /* different in length */ + return 1; + } + if(memcmp(rhost.s, dhost.s, dhost.len)!=0) { + /* different in content */ + return 1; + } + return 0; + } + if(dhostip==NULL || rhostip==NULL) { + /* different in content */ + return 1; + } + if(ip_addr_cmp(dhostip, rhostip)) { + /* same ip addresses */ + return 0; + } + /* different ip addresses */ + return 1; +} + static int nat_uac_test(struct sip_msg *msg, int tests) { /* return true if any of the NAT-UAC tests holds */ @@ -1599,6 +1719,13 @@ static int nat_uac_test(struct sip_msg *msg, int tests) if((tests & NAT_UAC_TEST_SDP_CLINE) && (test_sdp_cline(msg) > 0)) return 1; + /** + * test if destination address is different than R-URI/2ndVia + * - ws/wss target is true + */ + if((tests & NAT_UAC_TEST_DEST) && (nh_test_destination(msg) > 0)) + return 1; + /* no test succeeded */ return -1; }

1 0

git:master:23589c70: pv: use macro to get port based on proto
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 23589c70353af794e83d9a7a6070ba3cc1666811 URL: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:08:00+02:00 pv: use macro to get port based on proto --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… Patch: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 475b1cdc3e..ecce3156e7 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -704,7 +704,7 @@ int pv_get_nh_reply(struct sip_msg *msg, pv_param_t *param, host = msg->via2->host; } if(port==0) { - port = (msg->via2->port)?msg->via2->port:SIP_PORT; + port = GET_SIP_PORT(msg->via2->port, msg->via2->proto); } switch(param->pvn.u.isname.name.n) {

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 July 2021