- sr-dev - kamailio.org

git:5.5:6bf1c6af: core: ppcfg - clone value for substdef
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 6bf1c6af774f6b26597e639e90ce7cb584b626a3 URL: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:30+02:00 core: ppcfg - clone value for substdef - GH #2788 (cherry picked from commit 56d41f6238f39d0046c97527abcb23b8dd7924be) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… Patch: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a5aa1d3e28..73c0a2ef3c 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "str_list.h" #include "dprint.h" #include "ppcfg.h" @@ -44,6 +45,7 @@ typedef struct _pp_subst_rule { static pp_subst_rule_t *pp_subst_rules_head = NULL; static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; +static str_list_t *_ksr_substdef_strlist = NULL; int pp_subst_add(char *data) { @@ -94,6 +96,7 @@ int pp_substdef_add(char *data, int mode) str defvalue; str newval; sip_msg_t *fmsg; + str_list_t *sb; if(pp_subst_add(data)<0) { LM_ERR("subst rule cannot be added\n"); @@ -146,7 +149,12 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - defvalue = newval; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; } } if(pp_define_set(defvalue.len, defvalue.s,

1 0

git:5.5:65249c18: core: fix building quoted value for #!subsdefs
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 65249c184f5fd54b3ea16edbda518ac7ff442d86 URL: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:42+02:00 core: fix building quoted value for #!subsdefs (cherry picked from commit 879f8c4e52ab7f7f489107f18e2c80795c788bdd) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Patch: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index ff8096d9f2..a6115a7599 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2049,11 +2049,12 @@ int pp_define_set(int len, char *text, int mode) pp_defines[ppos].value.len = len; pp_defines[ppos].value.s = text; - LM_DBG("### setting define ID [%.*s] value [%.*s]\n", + LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s, pp_defines[ppos].value.len, - pp_defines[ppos].value.s); + pp_defines[ppos].value.s, + mode); return 0; } diff --git a/src/core/cfg.y b/src/core/cfg.y index be0a664dce..5b205fd230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2213,9 +2213,9 @@ event_route_stm: preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, KSR_PPDEF_NORMAL)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } - | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS STRING { if(pp_substdef_add($2, KSR_PPDEF_QUOTED)<0) YYERROR; } | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 73c0a2ef3c..67391557f8 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "pvapi.h" #include "str_list.h" #include "dprint.h" @@ -149,25 +150,40 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); - return -1; + if(mode!=KSR_PPDEF_QUOTED) { + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } else { + defvalue = newval; } - defvalue = sb->s; } } - if(pp_define_set(defvalue.len, defvalue.s, - (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { + if(mode==KSR_PPDEF_QUOTED) { + if(pv_get_buffer_size() < defvalue.len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defvalue.s, defvalue.len); + newval.s[defvalue.len + 1] = '"'; + newval.s[defvalue.len + 2] = '\0'; + newval.len = defvalue.len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); goto error; } - if(mode==1) { - defvalue.s++; - defvalue.len -= 2; - *(defvalue.s-1) = c; - defvalue.s[defvalue.len] = c; - } LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, defvalue.len, defvalue.s, mode); diff --git a/src/main.c b/src/main.c index a391f57afb..7630fcfeff 100644 --- a/src/main.c +++ b/src/main.c @@ -2330,7 +2330,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdef parameter\n"); goto error; } - if(pp_substdef_add(optarg, 0)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_NORMAL)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } @@ -2340,7 +2340,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdefs parameter\n"); goto error; } - if(pp_substdef_add(optarg, 1)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_QUOTED)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; }

1 0

git:master:0d06e164: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 0d06e164efa720d91d49995585e80c9082ce3b21 URL: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T14:02:28+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… Patch: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… --- diff --git a/src/core/config.h b/src/core/config.h index e012e98edf..b71a15e7a8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -91,7 +91,7 @@ #define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) -#define MAX_WARNING_LEN 256 +#define MAX_WARNING_LEN 1024 #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1)

1 0

git:master:9ec9d9ce: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 9ec9d9ceb0b69d46d5a4d90a86b1185951feb9d4 URL: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-12T08:16:23+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Patch: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index e290fc172f..a72249f1be 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -37,6 +37,7 @@ Daniel-Constantin Mierla 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -64,7 +65,8 @@ Daniel-Constantin Mierla 1.16. hf_iterator_start usage 1.17. hf_iterator_end usage 1.18. hf_iterator_next usage - 1.19. @hf_value select usage + 1.19. hf_iterator_rm usage + 1.20. @hf_value select usage Chapter 1. Admin Guide @@ -91,6 +93,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -128,6 +131,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 2.1. msg_apply_changes() @@ -470,6 +474,25 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.19. hf_iterator_rm(iname) + + Remove the header at the current iterator position. + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.19. hf_iterator_rm usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -505,7 +528,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.19. @hf_value select usage + Example 1.20. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:4a4b8047: textopsx: docs for hf_iterator_rm()
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 4a4b8047b4b46b003bc0b12b737ca956658d18cb URL: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:06:07+02:00 textopsx: docs for hf_iterator_rm() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Patch: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index f9c388016e..c1c5fd5f64 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -561,6 +561,34 @@ hf_iterator_end("i1"); } hf_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_rm"> + <title> + <function moreinfo="none">hf_iterator_rm(iname)</function> + </title> + <para> + Remove the header at the current iterator position. + </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_rm</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... </programlisting> </example> </section>

1 0

git:master:adc3bc18: textopsx: added hf_iterator_rm()
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: adc3bc18477108fc976182a2efe5d1e314bac795 URL: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:02:07+02:00 textopsx: added hf_iterator_rm() - remove the header at the current iterator position --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Patch: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 362cbee0e1..ec3e1afb75 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -76,6 +76,7 @@ static int assign_hf_value2_fixup(void **param, int param_no); static int w_hf_iterator_start(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_next(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2); +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2); static int bind_textopsx(textopsx_api_t *tob); @@ -136,6 +137,8 @@ static cmd_export_t cmds[] = { fixup_free_spve_null, ANY_ROUTE}, {"hf_iterator_end", w_hf_iterator_end, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"hf_iterator_rm", w_hf_iterator_rm, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"bind_textopsx", (cmd_function)bind_textopsx, 1, 0, 0, ANY_ROUTE}, @@ -1993,6 +1996,67 @@ static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2) return ki_hf_iterator_end(msg, &iname); } +/** + * + */ +static int ki_hf_iterator_index(sip_msg_t *msg, str *iname) +{ + int i; + int k; + + k = -1; + for(i=0; i<HF_ITERATOR_SIZE; i++) { + if(_hf_iterators[i].name.len>0) { + if(_hf_iterators[i].name.len==iname->len + && strncmp(_hf_iterators[i].name.s, iname->s, iname->len)==0) { + k = i; + break; + } + } + } + if(k==-1) { + LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); + return -1; + } + + return k; +} + +/** + * + */ +static int ki_hf_iterator_rm(sip_msg_t *msg, str *iname) +{ + int k; + sr_lump_t *anchor; + + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + return -1; + } + anchor = del_lump(msg, _hf_iterators[k].it->name.s - msg->buf, + _hf_iterators[k].it->len, 0); + if (anchor==0) { + LM_ERR("cannot remove hdr %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + return 1; +} + +/** + * + */ +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2) +{ + str iname = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)piname, &iname)<0) { + LM_ERR("failed to get iterator name\n"); + return -1; + } + return ki_hf_iterator_rm(msg, &iname); +} + /** * */ @@ -2606,6 +2670,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_rm"), + SR_KEMIP_INT, ki_hf_iterator_rm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

range transformation or var
by Brandon Armstead 11 Jul '21

11 Jul '21

Is there a way to generate a random number between min and max currently? i.e. $var(rand) = $rand(0, 5) // generates a random int between 0 and 5? This could be useful for in configuration weighting / load distribution without a dispatcher module. Thanks!

2 2

git:master:56e93559: textopsx: hf iterator functions exported to kemi
by Daniel-Constantin Mierla 10 Jul '21

10 Jul '21

Module: kamailio Branch: master Commit: 56e935595a60e2c7c5c92fa8438941ea68436c23 URL: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-10T06:47:19+02:00 textopsx: hf iterator functions exported to kemi --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Patch: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index d3295bf02c..362cbee0e1 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2591,6 +2591,21 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_start"), + SR_KEMIP_INT, ki_hf_iterator_start, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_end"), + SR_KEMIP_INT, ki_hf_iterator_end, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_next"), + SR_KEMIP_INT, ki_hf_iterator_next, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

Kamailio websocket state FINWAIT1 after switchover
by Shahid Hussain 09 Jul '21

09 Jul '21

Hi !., Kamailio websocket state is going into FINWAIT1 without sending FIN message out when we do service kamailio restart. I have a Primary and Secondary node configured. When I perform switchover socket status is going into FINWAIT1 state without sending FIN to the client hence client status is showing established, This is happening 90+% of times but does work sometimes. AT Kamailio: [root@localhost ~]# netstat -tunelap | grep 41034 tcp 0 1 172.27.45.198:9040 172.27.6.98:41034 FIN_WAIT1 0 0 - [root@localhost ~]# AT Nginx (client): root@meet:~# netstat -tunelap | grep 9040 tcp 0 0 172.27.6.98:41034 172.27.45.198:9040 ESTABLISHED 33 763106 1322/nginx: worker root@meet:~# Thanks, Shahid

2 2

git:master:4c6abaf9: topos: fix missing xavu_field_contact_host evaluation for contact_mode 0
by Henning Westerholt 08 Jul '21

08 Jul '21

Module: kamailio Branch: master Commit: 4c6abaf9066aebbd304391dd6730cad7ee592611 URL: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-08T14:57:27Z topos: fix missing xavu_field_contact_host evaluation for contact_mode 0 - fix missing xavu_field_contact_host evaluation for contact_mode 0 - it works currently only for contact_mode 1 and 2, but not for default mode --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Patch: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6e88b35af3..b94a960340 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -411,13 +411,23 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, *td->cp = '@'; td->cp++; - if (_tps_contact_host.len) { - /* using configured hostname in the contact header */ - memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); - td->cp += _tps_contact_host.len; + /* contact_host xavu takes preference */ + if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { + vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, + &_tps_xavu_field_contact_host); + } + if(vavu!=NULL && vavu->val.v.s.len>0) { + memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); + td->cp += vavu->val.v.s.len; } else { - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + if (_tps_contact_host.len) { + /* using configured hostname in the contact header */ + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } } if(puri.port.len>0) { *td->cp = ':';

1 0

git:5.5:557ac56a: core: str list - added function to insert a block string in list
by Daniel-Constantin Mierla 08 Jul '21

08 Jul '21

Module: kamailio Branch: 5.5 Commit: 557ac56a6ec6b4ca3d76a57ff8b21c64027791f2 URL: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:12+02:00 core: str list - added function to insert a block string in list (cherry picked from commit b92b931c26c199b756fd08e9c80cc9305469fd2b) --- Modified: src/core/str_list.c Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Patch: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… --- diff --git a/src/core/str_list.c b/src/core/str_list.c index f63b4c9151..207cee5bc3 100644 --- a/src/core/str_list.c +++ b/src/core/str_list.c @@ -13,13 +13,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions * @ingroup core * Module: @ref core @@ -32,7 +32,7 @@ /** * @brief Add a new allocated list element to an existing list - * + * * Add a new allocated list element to an existing list, the allocation is done * from the private memory pool * @param s input character @@ -43,18 +43,45 @@ */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) { - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { + struct str_list *nv; + nv = pkg_malloc(sizeof(struct str_list)); + if (!nv) { PKG_MEM_ERROR; return 0; } - new->s.s = s; - new->s.len = len; - new->next = 0; + nv->s.s = s; + nv->s.len = len; + nv->next = 0; - (*last)->next = new; - *last = new; + (*last)->next = nv; + *last = nv; *total += len; - return new; + return nv; +} + +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len) +{ + str_list_t *nv; + nv = pkg_mallocxz(sizeof(str_list_t) + (len+1)*sizeof(char)); + if (!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->s.s = (char*)nv + sizeof(str_list_t); + memcpy(nv->s.s, s, len); + nv->s.len = len; + nv->next = *head; + *head = nv; + + return nv; } diff --git a/src/core/str_list.h b/src/core/str_list.h index db3fa12887..1eac2578b0 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -51,4 +51,16 @@ typedef struct str_list { */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len); + #endif

2 3

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

07 Jul '21

Module: kamailio Branch: master Commit: 3a0a9292ec40d25f5246573d4a2a51838819d930 URL: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-07T12:46:15+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Patch: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index dbb27653a0..e290fc172f 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -34,6 +34,9 @@ Daniel-Constantin Mierla 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -58,7 +61,10 @@ Daniel-Constantin Mierla 1.13. include_hf_value usage 1.14. exclude_hf_value usage 1.15. hf_value_exists usage - 1.16. @hf_value select usage + 1.16. hf_iterator_start usage + 1.17. hf_iterator_end usage + 1.18. hf_iterator_next usage + 1.19. @hf_value select usage Chapter 1. Admin Guide @@ -82,6 +88,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -116,6 +125,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 2.1. msg_apply_changes() @@ -406,6 +418,58 @@ if (@hf_value_exists.supported.path == "1") { } ... +2.16. hf_iterator_start(iname) + + 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. + + The parameter can be a dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.16. hf_iterator_start usage +... +hf_iterator_start("i1"); +... + +2.17. hf_iterator_end(iname) + + Close the iterator identified by iname parameter. The iname value must + be the same used for sht_iterator_start(). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.17. hf_iterator_end usage +... +hf_iterator_end("i1"); +... + +2.18. textopsx.f.hf_iterator_next(iname) + + Move the iterator to the next header. It must be called also after + sht_iterator_start() to get the first header. + + The return code is false when there is no other header in the list. + + The item name and value are accessible via variables: $hfitname(iname) + and $hfitbody(iname). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.18. hf_iterator_next usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + xlog("hdr[$hfitname(i1)] is: $hfitbody(i1)\n"); + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -441,7 +505,7 @@ if (@hf_value_exists.supported.path == "1") { * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.16. @hf_value select usage + Example 1.19. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

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: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: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: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

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:b874f56b: core: parser - macro to get sip port based on proto
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: b874f56bcea104ce328e0cea19bc78cbf79749d6 URL: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:07:32+02:00 core: parser - macro to get sip port based on proto --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… Patch: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 61d9ac6185..1ff73a0b98 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -184,6 +184,15 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ (((m)->new_uri.s && (m)->new_uri.len) ? (&(m)->new_uri) : (&(m)->first_line.u.request.uri)) +/*! \brief + * Return the SIP port. + * - _port if _port!=0 + * - 5061 for _proto == TLS or WSS + * - 5060 for the other _proto + */ +#define GET_SIP_PORT(_port, _proto) ((_port==0)?((_proto==PROTO_TLS \ + || _proto==PROTO_WSS)?5061:5060):_port) + enum _uri_type{ERROR_URI_T=0, SIP_URI_T, SIPS_URI_T, TEL_URI_T, TELS_URI_T, URN_URI_T}; typedef enum _uri_type uri_type; enum _uri_flags{

1 0

[kamailio/kamailio] dead lock and 100% CPU ussage on shutdown (#2795)
by sergey-safarov 06 Jul '21

06 Jul '21

### Description When Kamailio child core generated, then Kamailio goes to shutdown. I observed a case when the Kamailio process shutdown process a deadlocked and not able to shutdown for a long time. #### Debugging Data ``` (gdb) bt #0 0x0000ffff8645b648 in sched_yield () from /lib64/libc.so.6 #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 #2 0x0000ffff80121630 in unlink_timers (t=0xffff84196738) at timer.h:363 #3 0x0000ffff80122488 in free_cell_helper (dead_cell=0xffff84196738, silent=1, fname=0xffff8022be70 "h_table.c", fline=466) at h_table.c:150 #4 0x0000ffff80124bac in free_hash_table () at h_table.c:466 #5 0x0000ffff801da5c0 in tm_shutdown () at t_funcs.c:88 #6 0x00000000005c8e08 in destroy_modules () at core/sr_module.c:830 #7 0x000000000041df3c in cleanup (show_status=1) at main.c:575 #8 0x000000000041ffd4 in shutdown_children (sig=15, show_status=1) at main.c:718 #9 0x0000000000423a90 in handle_sigs () at main.c:816 #10 0x0000000000433018 in main_loop () at main.c:1903 #11 0x000000000043de90 in main (argc=11, argv=0xfffffac1fb18) at main.c:3053 (gdb) f 1 #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 718 sched_yield(); /* wait for it to complete */ (gdb) list 713 tl->add_line, tl->del_calls, tl->del_func, 714 tl->del_file, tl->del_line, tl->init, tl->expires_no); 715 #endif 716 return -2; /* do nothing */ 717 } 718 sched_yield(); /* wait for it to complete */ 719 goto again; 720 } 721 if ((tl->next!=0)&&(tl->prev!=0)){ 722 _timer_rm_list(tl); /* detach */ (gdb) bt full #0 0x0000ffff8645b648 in sched_yield () from /lib64/libc.so.6 No symbol table info available. #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 ret = -1 __func__ = "timer_del_safe" #2 0x0000ffff80121630 in unlink_timers (t=0xffff84196738) at timer.h:363 i = 0 #3 0x0000ffff80122488 in free_cell_helper (dead_cell=0xffff84196738, silent=1, fname=0xffff8022be70 "h_table.c", fline=466) at h_table.c:150 b = 0x0 i = 65535 rpl = 0x0 tt = 0x0 foo = 0xffff80089b00 <__func__.11765> cbs = 0x0 cbs_tmp = 0xffff83817f88 __func__ = "free_cell_helper" #4 0x0000ffff80124bac in free_hash_table () at h_table.c:466 p_cell = 0xffff84196738 tmp_cell = 0xffff80606630 i = 33128 __func__ = "free_hash_table" #5 0x0000ffff801da5c0 in tm_shutdown () at t_funcs.c:88 __func__ = "tm_shutdown" #6 0x00000000005c8e08 in destroy_modules () at core/sr_module.c:830 t = 0xffff84c44808 foo = 0xffff84c44038 __func__ = "destroy_modules" #7 0x000000000041df3c in cleanup (show_status=1) at main.c:575 memlog = 435649383 __func__ = "cleanup" #8 0x000000000041ffd4 in shutdown_children (sig=15, show_status=1) at main.c:718 __func__ = "shutdown_children" #9 0x0000000000423a90 in handle_sigs () at main.c:816 chld = 0 chld_status = 139 any_chld_stopped = 1 memlog = 4403228 __func__ = "handle_sigs" #10 0x0000000000433018 in main_loop () at main.c:1903 i = 8 pid = 175104 si = 0x0 si_desc = "udp receiver child=7 sock=[2600:1f18:578:5703::c6]:5080\000\220\352Ą\377\377\000\000@\365\301\372\377\377\000\000\360\004)\205\377\377\000\000`\365\301\372\377\377\000\000p\365\301\372\377\377\000\000p\365\301\372\377\377\000\000@\365\301\372\377\377\000\000\320\377\377\377\200\377\377\377\000l\377\362g{\367\031" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #11 0x000000000043de90 in main (argc=11, argv=0xfffffac1fb18) at main.c:3053 cfg_stream = 0x177f02d0 c = -1 r = 0 tmp = 0xfffffac1fee1 "" tmp_len = 65535 port = 1 proto = 0 ahost = 0x0 aport = 0 options = 0x8ae128 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4190370820 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xffff863c0da8 <__libc_start_main+168> "" st = {st_dev = 25, st_ino = 18103, st_mode = 16832, st_nlink = 2, st_uid = 991, st_gid = 986, st_rdev = 0, __pad1 = 0, st_size = 60, st_blksize = 65536, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1624774599, tv_nsec = 29999981}, st_mtim = {tv_sec = 1625138047, tv_nsec = 607511242}, st_ctim = {tv_sec = 1625138047, tv_nsec = 607511242}, __glibc_reserved = {0, 0}} tbuf = "\000\000\000\000\000\000\000\000\000\000n\206\377\377\000\000\000\000\000\000\000\000\000\000\330\375q\206\377\377", '\000' <repeats 58 times>, "x\376q\206\377\377\000\000h\376q\206\377\377\000\000\b\376q\206\377\377\000\000(\376q\206\377\377\000\000\070\376q\206\377\377\000\000\250\376q\206\377\377\000\000\270\376q\206\377\377\000\000\310\376q\206\377\377\000\000H\376q\206\377\377\000\000X\376q\206\377\377", '\000' <repeats 18 times>, "\330\375q\206\377\377", '\000' <repeats 42 times>... option_index = 12 long_options = {{name = 0x8b04e8 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8ab520 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8b04f0 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8b04f8 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8b0500 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8b0510 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8b0520 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8b0530 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8b0540 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8b0550 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8b0560 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x8b0568 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8b0578 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals ret = -1 __func__ = "timer_del_safe" ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@bcf-e-3 ~]# kamailio -v version: kamailio 5.6.0-dev0 (aarch64/linux) f03900 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: f03900 compiled on 17:17:36 Jun 26 2021 with gcc 8.4.1 ``` Used master branch with customization. * **Operating System**: ``` [root@bcf-e-3 ~]# uname -a Linux bcf-e-3.la.cal911.net 4.18.0-305.3.1.el8.aarch64 #1 SMP Tue Jun 1 16:22:50 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@bcf-e-3 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2795

2 6

git:master:8762c56a: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 8762c56a1c78e4ba151ef9fb4290b3938c0c984f URL: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-06T10:01:24+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… Patch: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index baff8e8b32..da1da0331c 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -131,7 +131,6 @@ Sven Knoblich 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 2. Frequently Asked Questions @@ -188,7 +187,6 @@ Sven Knoblich 1.49. acc_log_request usage 1.50. acc_db_request usage 1.51. acc_db_request usage - 1.52. acc_diam_request usage Chapter 1. Admin Guide @@ -287,7 +285,6 @@ Chapter 1. Admin Guide 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 1. Overview @@ -298,9 +295,9 @@ Chapter 1. Admin Guide support for radius is enabled. There is some very early support of the Diameter protocol in the - “acc_diameter” module which will be deleted in coming releases. This - support is not up to date with the current Diameter protocols. If you - need Diameter support, please use the ims_charging module. + “acc_diameter” module, but is not up to date with the current Diameter + protocols. If you need Diameter support, please use the ims_charging + module. To account a transaction and to choose which set of backends to be used, the script writer just has to set some flags (see the module @@ -1326,7 +1323,6 @@ modparam("acc", "cdr_on_failed", 0) 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 7.1. acc_log_request(comment) @@ -1394,23 +1390,6 @@ acc_request("100 Received", "acc_$time(year)_$time(mon)"); acc_db_request("$var(code) $avp(reason)", "acc"); ... -7.4. acc_diam_request(comment) - - Like acc_log_request, acc_diam_request reports on a request. It reports - to the configured Diameter server. - - Meaning of the parameters is as follows: - * comment - Comment to be appended. The string can contain any number - of pseudo-variables. - - This function can be used from ANY_ROUTE. - - Example 1.52. acc_diam_request usage -... -acc_diam_request("Some comment"); -acc_diam_request("$var(code) Error: $avp(reason)"); -... - Chapter 2. Frequently Asked Questions 2.1. What happened with old log_fmt parameter

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev