- sr-dev - kamailio.org

git:5.4:cd8a871c: msrp: destroy str array on error
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: cd8a871c5a4c6446eddc48bd89bfe5cde89a6c21 URL: https://github.com/kamailio/kamailio/commit/cd8a871c5a4c6446eddc48bd89bfe5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:26:05+02:00 msrp: destroy str array on error - some code reformatting (cherry picked from commit 4695b48b23e22135049f67a6ef362e933a0cf337) (cherry picked from commit 33cf417e59b4c7f0e45b6258644bae364ad2e912) --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/cd8a871c5a4c6446eddc48bd89bfe5c… Patch: https://github.com/kamailio/kamailio/commit/cd8a871c5a4c6446eddc48bd89bfe5c… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 7defaf9353..c701d6a6ca 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -610,7 +610,7 @@ msrp_hdr_t *msrp_get_hdr_by_id(msrp_frame_t *mf, int hdrid) /** * */ -int msrp_explode_str(str **arr, str *in, str *del) +int msrp_explode_str(str_array_t *arr, str *in, str *del) { str *larr; int i; @@ -633,20 +633,20 @@ int msrp_explode_str(str **arr, str *in, str *del) } n++; - larr = pkg_malloc(n * sizeof(str)); + larr = pkg_mallocxz(n * sizeof(str)); if(larr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(larr, 0, n * sizeof(str)); k = 0; if(n==1) { larr[k].s = in->s; larr[k].len = in->len; - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -657,19 +657,23 @@ int msrp_explode_str(str **arr, str *in, str *del) { if(in->s[i]==del->s[j]) { - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } k++; - if(k<n) + if(k<n) { larr[k].s = in->s + i + 1; + } break; } } } - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -677,7 +681,7 @@ int msrp_explode_str(str **arr, str *in, str *del) /** * */ -int msrp_explode_strz(str **arr, str *in, char *del) +int msrp_explode_strz(str_array_t *arr, str *in, char *del) { str s; @@ -693,7 +697,7 @@ void msrp_str_array_destroy(void *data) return; arr = (str_array_t*)data; if(arr->list!=NULL) - pkg_free(arr->list); + pkg_free(arr->list); pkg_free(arr); } @@ -705,20 +709,19 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) str_array_t *arr; str s; - arr = pkg_malloc(sizeof(str_array_t)); + arr = pkg_mallocxz(sizeof(str_array_t)); if(arr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(arr, 0, sizeof(str_array_t)); s = hdr->body; trim(&s); - arr->size = msrp_explode_strz(&arr->list, &s, " "); - if(arr->size<0) + if(msrp_explode_strz(arr, &s, " ")<0) { LM_ERR("failed to explode\n"); + msrp_str_array_destroy(arr); return -1; } hdr->parsed.flags |= MSRP_DATA_SET;

1 0

git:5.4:bde591dc: msrp: check return code for str explode
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: bde591dc9507eaea0b744112d49ea01fbdf8f555 URL: https://github.com/kamailio/kamailio/commit/bde591dc9507eaea0b744112d49ea01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:24:32+02:00 msrp: check return code for str explode (cherry picked from commit addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e) (cherry picked from commit e55ecc6412997b55569f3b626a681eae0ca312df) --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/bde591dc9507eaea0b744112d49ea01… Patch: https://github.com/kamailio/kamailio/commit/bde591dc9507eaea0b744112d49ea01… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 4e5e67e130..7defaf9353 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -716,6 +716,11 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) s = hdr->body; trim(&s); arr->size = msrp_explode_strz(&arr->list, &s, " "); + if(arr->size<0) + { + LM_ERR("failed to explode\n"); + return -1; + } hdr->parsed.flags |= MSRP_DATA_SET; hdr->parsed.free_fn = msrp_str_array_destroy; hdr->parsed.data = arr;

1 0

git:5.4:b95e319d: core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: b95e319d006a38fcc6385d704de82e553f7c2236 URL: https://github.com/kamailio/kamailio/commit/b95e319d006a38fcc6385d704de82e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:23:45+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments (cherry picked from commit 764d5be0c44036bb4b86f841588fb0df3b4bb834) (cherry picked from commit fc90e4c06c5df8c8a9d5cd615923c09a93b5a810) --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/b95e319d006a38fcc6385d704de82e5… Patch: https://github.com/kamailio/kamailio/commit/b95e319d006a38fcc6385d704de82e5… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index b518bfab81..b0f7625a40 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -509,7 +509,7 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f, file, line); - if (f->u.is_free){ + if (unlikely(f->u.is_free)){ if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { LM_CRIT("BUG: freeing already freed pointer (%p)," " called from %s: %s(%d), first free %s: %s(%ld) - aborting\n", @@ -524,12 +524,13 @@ void qm_free(void* qmp, void* p) } MDBG("freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line); -#endif +#else if (unlikely(f->u.is_free)){ LM_INFO("freeing a free fragment (%p/%p) - ignore\n", f, p); return; } +#endif size=f->size; qm->used-=size;

1 0

git:5.4:cf1f5043: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: cf1f5043fd346a1106071cad2f5e294ce7e32fd9 URL: https://github.com/kamailio/kamailio/commit/cf1f5043fd346a1106071cad2f5e294… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:23:01+02:00 dispatcher: docs - set xmlns for include tags (cherry picked from commit 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47) (cherry picked from commit 6b9ecb0856a881144546fea6d3cbd8a3dc668b81) --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf1f5043fd346a1106071cad2f5e294… Patch: https://github.com/kamailio/kamailio/commit/cf1f5043fd346a1106071cad2f5e294… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 3888e5f281..af040e737d 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,12 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> +<book> <bookinfo> <title>DISPATCHER Module</title> <productname class="trade">&kamailioname;</productname> @@ -97,7 +94,7 @@ </bookinfo> <toc/> - <xi:include href="dispatcher_admin.xml"/> - <xi:include href="dispatcher_faq.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_faq.xml"/> </book> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 11fff9c7d6..30f32ca038 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - +  <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>  -<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title>&adminguide;</title> @@ -2170,7 +2167,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>dispatcher list file</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.list" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.list" parse="text"/> ... </programlisting> </example> @@ -2186,7 +2183,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>&kamailio; config script - sample dispatcher usage</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.cfg" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.cfg" parse="text"/> ... </programlisting> </example>

1 0

git:5.5:baea325a: core: ut - fixed str_casesearch()
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: baea325ab832a9f96e70c41f3aa542b7b99553fe URL: https://github.com/kamailio/kamailio/commit/baea325ab832a9f96e70c41f3aa542b… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:14:42+02:00 core: ut - fixed str_casesearch() - fixed str_casesearch() behaviour on text and needle were equal (cherry picked from commit c146ef490e1d7d35add7d3ee593f6d3d20e327ad) --- Modified: src/core/ut.c --- Diff: https://github.com/kamailio/kamailio/commit/baea325ab832a9f96e70c41f3aa542b… Patch: https://github.com/kamailio/kamailio/commit/baea325ab832a9f96e70c41f3aa542b… --- diff --git a/src/core/ut.c b/src/core/ut.c index 08edd2f24e..c3849fcc24 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -327,7 +327,7 @@ char *stre_search_strz(char *vstart, char *vend, char *needlez) char *str_casesearch(str *text, str *needle) { int i,j; - for(i=0;i<text->len-needle->len;i++) { + for(i=0;i<=text->len-needle->len;i++) { for(j=0;j<needle->len;j++) { if ( !((text->s[i+j]==needle->s[j]) || ( isalpha((int)text->s[i+j]) @@ -337,7 +337,7 @@ char *str_casesearch(str *text, str *needle) if (j==needle->len) return text->s+i; } - return 0; + return NULL; } /**

1 0

git:5.5:b62a773c: pike: fixed regression
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: b62a773c8f0c1daf1aa3d1cd57845d414eea5bac URL: https://github.com/kamailio/kamailio/commit/b62a773c8f0c1daf1aa3d1cd57845d4… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:14:54+02:00 pike: fixed regression - removed unnecessary NULL-return from mark_node() after previous commit (cherry picked from commit 79fbb7c6df5d4c742b1283b752c2df0f51e77f09) --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/b62a773c8f0c1daf1aa3d1cd57845d4… Patch: https://github.com/kamailio/kamailio/commit/b62a773c8f0c1daf1aa3d1cd57845d4… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index c0324c0476..1fe9227a5f 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -301,10 +301,6 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } - if(node==NULL) { - return NULL; - } - LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

git:5.5:60da6822: pv: proper increment to check escaped char for s.select
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: 60da6822803c04d55f0235984239afb188faef89 URL: https://github.com/kamailio/kamailio/commit/60da6822803c04d55f0235984239afb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:14:17+02:00 pv: proper increment to check escaped char for s.select (cherry picked from commit ffa19ffedeb8db8ac38a742ae8b686525fd906ea) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/60da6822803c04d55f0235984239afb… Patch: https://github.com/kamailio/kamailio/commit/60da6822803c04d55f0235984239afb… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 2f10f67080..517ce5342d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2752,8 +2752,8 @@ char* tr_parse_string(str* in, trans_t *t) tp->v.s.s = p; tp->v.s.len = 1; if(*p=='\\') { + p++; if(*p=='\\' || *p=='n' || *p=='r' || *p=='t') { - p++; tp->v.s.len = 2; } else { LM_ERR("unexpected escape char: %c\n", *p);

1 0

git:5.5:655518a9: core: clone define value to avoid losing the reference
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: 655518a94d413250c4b0246a5e91df7506a5427d URL: https://github.com/kamailio/kamailio/commit/655518a94d413250c4b0246a5e91df7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:14:33+02:00 core: clone define value to avoid losing the reference - impacted also by substdef - GH #2736 (cherry picked from commit 84055b2fe963e01a217149991dd1c8cbe8a8aeec) --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/655518a94d413250c4b0246a5e91df7… Patch: https://github.com/kamailio/kamailio/commit/655518a94d413250c4b0246a5e91df7… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 2b90fbb66a..ff8096d9f2 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1337,7 +1337,7 @@ IMPORTFILE "import_file" <DEFINE_DATA>\\{CR} { count(); ksr_cfg_print_part(yytext); } /* eat the escaped CR */ <DEFINE_DATA>{CR} { count(); ksr_cfg_print_part(yytext); - if (pp_define_set(strlen(s_buf.s), s_buf.s)) return 1; + if (pp_define_set(strlen(s_buf.s), s_buf.s, KSR_PPDEF_NORMAL)) return 1; memset(&s_buf, 0, sizeof(s_buf)); state = INITIAL; ksr_cfg_print_initial_state(); @@ -2007,7 +2007,7 @@ int pp_define(int len, const char *text) return 0; } -int pp_define_set(int len, char *text) +int pp_define_set(int len, char *text, int mode) { int ppos; @@ -2090,7 +2090,7 @@ int pp_define_env(const char *text, int len) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } - if(pp_define_set(defvalue.len, defvalue.s)<0) { + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_NORMAL)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; } diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 627402ba66..a5aa1d3e28 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -143,20 +143,14 @@ int pp_substdef_add(char *data, int mode) LM_ERR("cannot set define name\n"); goto error; } - if(mode==1) { - /* define the value enclosed in double quotes */ - *(defvalue.s-1) = '"'; - defvalue.s[defvalue.len] = '"'; - defvalue.s--; - defvalue.len += 2; - } if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { defvalue = newval; } } - if(pp_define_set(defvalue.len, defvalue.s)<0) { + if(pp_define_set(defvalue.len, defvalue.s, + (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { LM_ERR("cannot set define value\n"); goto error; } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 70627268b6..17b19380bc 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -25,6 +25,9 @@ #include "str.h" +#define KSR_PPDEF_NORMAL (0) /* define normal value */ +#define KSR_PPDEF_QUOTED (1<<0) /* define quoted value */ + typedef struct ksr_ppdefine { str name; str value; @@ -39,7 +42,7 @@ int pp_substdef_add(char *data, int mode); int pp_subst_run(char **data); int pp_define(int len, const char *text); -int pp_define_set(int len, char *text); +int pp_define_set(int len, char *text, int mode); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); int pp_define_env(const char * text, int len); diff --git a/src/main.c b/src/main.c index 71a024d5bb..a391f57afb 100644 --- a/src/main.c +++ b/src/main.c @@ -2264,7 +2264,7 @@ int main(int argc, char** argv) } if(p) { p++; - if(pp_define_set(strlen(p), p)<0) { + if(pp_define_set(strlen(p), p, KSR_PPDEF_NORMAL)<0) { fprintf(stderr, "error at define value: -A %s\n", optarg); goto error;

1 0

git:5.5:2273d7d8: pv: more details in err log message for s.select parsing
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: 2273d7d856b5c1fca1ec24fbb6ee249793ea6719 URL: https://github.com/kamailio/kamailio/commit/2273d7d856b5c1fca1ec24fbb6ee249… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:13:36+02:00 pv: more details in err log message for s.select parsing (cherry picked from commit 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/2273d7d856b5c1fca1ec24fbb6ee249… Patch: https://github.com/kamailio/kamailio/commit/2273d7d856b5c1fca1ec24fbb6ee249… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f93f126099..c9e7438b83 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2734,8 +2734,8 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid select transformation: %.*s!!\n", - in->len, in->s); + LM_ERR("invalid select transformation: %.*s (c:%c/%d - p:%d)!!\n", + in->len, in->s, *p, *p, (int)(p - in->s)); goto error; } goto done;

1 0

git:5.5:dbd8e389: snmpstats: Fix typo in MIB
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: dbd8e3899335eb8795763fd52b1f91aebfad1c92 URL: https://github.com/kamailio/kamailio/commit/dbd8e3899335eb8795763fd52b1f91a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:14:04+02:00 snmpstats: Fix typo in MIB Reported by arkadiam on Github (cherry picked from commit 7f017707c91659641ce9ca87ee4149b2e39379f7) --- Modified: src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB --- Diff: https://github.com/kamailio/kamailio/commit/dbd8e3899335eb8795763fd52b1f91a… Patch: https://github.com/kamailio/kamailio/commit/dbd8e3899335eb8795763fd52b1f91a… --- diff --git a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB index 3351a9e424..2aaddf01ca 100644 --- a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB +++ b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB @@ -562,7 +562,7 @@ KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN set the row-status to createAndGo. Then the client can do an SNMP GET on this table with the - aquired index. If the row-status is 'active', then the + acquired index. If the row-status is 'active', then the kamailioSIPRegUserIndex is the index into the kamailioSIPRegUserTable that has the specified URI (0 zero indicates no such URI). The client should then set the

1 0

git:5.5:efb164b7: pv: support escaped chars for s.select separator
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: efb164b78ac97d83c12846a35c60fa47fd2d984c URL: https://github.com/kamailio/kamailio/commit/efb164b78ac97d83c12846a35c60fa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:13:49+02:00 pv: support escaped chars for s.select separator - \\, \n, \r, \t (cherry picked from commit f2973cf0dce0de5c002ac8ee61ac7e829823ed0e) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/efb164b78ac97d83c12846a35c60fa4… Patch: https://github.com/kamailio/kamailio/commit/efb164b78ac97d83c12846a35c60fa4… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index c9e7438b83..2f10f67080 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -191,6 +191,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { int i, j, max; char *p, *s; + char c; str st, st2; pv_value_t v, w; time_t t; @@ -731,6 +732,28 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } i = v.ri; } + if(tp->next->v.s.len>1) { + switch(tp->next->v.s.s[1]) { + case '\\': + c = '\\'; + break; + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + default: + LM_ERR("invalid select escape char (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + } else { + c = tp->next->v.s.s[0]; + } val->flags = PV_VAL_STR; val->ri = 0; if(i<0) @@ -741,7 +764,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, i--; while(p>=val->rs.s) { - if(*p==tp->next->v.s.s[0]) + if(*p==c) { if(i==0) break; @@ -762,7 +785,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, p = s; while(p<val->rs.s+val->rs.len) { - if(*p==tp->next->v.s.s[0]) + if(*p==c) { if(i==0) break; @@ -2728,6 +2751,15 @@ char* tr_parse_string(str* in, trans_t *t) tp->type = TR_PARAM_STRING; tp->v.s.s = p; tp->v.s.len = 1; + if(*p=='\\') { + if(*p=='\\' || *p=='n' || *p=='r' || *p=='t') { + p++; + tp->v.s.len = 2; + } else { + LM_ERR("unexpected escape char: %c\n", *p); + goto error; + } + } t->params->next = tp; tp = 0; p++;

1 0

git:5.5:10c497f4: pv: remove verbose debug message
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.5 Commit: 10c497f48f2321267a02a891af027a228165510e URL: https://github.com/kamailio/kamailio/commit/10c497f48f2321267a02a891af027a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:13:01+02:00 pv: remove verbose debug message (cherry picked from commit 1334265846ebe6a06e7e139421778e960cb54c7a) --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/10c497f48f2321267a02a891af027a2… Patch: https://github.com/kamailio/kamailio/commit/10c497f48f2321267a02a891af027a2… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index ae2c6ce048..92e60f06ea 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -603,7 +603,6 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) s.s = slist->s; for(i=0; i<slist->len; i++) { - LM_DBG("==== %d = %c\n", i, slist->s[i]); sfound = 0; for(j=0; j<sep->len; j++) { if(slist->s[i]==sep->s[j]) {

1 0

[kamailio/kamailio] pike: fixed regression (#2744)
by Boris Korzun 26 May '21

26 May '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description There's an regression in 5.5 on `pike.so`. After c9dc0336a33a0ecfe776975be7fbfab8f3c91b48 the module has stopped to work. `mark_node()` had returned a NULL on every IP-address. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2744 -- Commit Summary -- * pike: fixed regression -- File Changes -- M src/modules/pike/ip_tree.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2744.patch https://github.com/kamailio/kamailio/pull/2744.diff -- 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/pull/2744

2 4

git:master:79fbb7c6: pike: fixed regression
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: master Commit: 79fbb7c6df5d4c742b1283b752c2df0f51e77f09 URL: https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:05:36+02:00 pike: fixed regression - removed unnecessary NULL-return from mark_node() after previous commit --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0… Patch: https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index c0324c0476..1fe9227a5f 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -301,10 +301,6 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } - if(node==NULL) { - return NULL; - } - LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

[kamailio/kamailio] Segfault start Kamailio 5.5 (#2736)
by ReznikovAlexei 26 May '21

26 May '21

### Description I am upgraded Kamailio from 5.4.5 to 5.5, but i have got segfault when I try start Kamailio with custom config, with default config Kamailio start work done. #### Reproduction /usr/sbin/kamailio -Ee -d -DD -P /var/run/kamailio/kamailio.pid -m 64 -M 32 -f /etc/kazoo/kamailio/kamailio.cfg -w /run/kamailio/ #### Debugging Data ``` [root@hostname ~]# gdb /usr/sbin/kamailio /run/kamailio/core.29437 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-120.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/usr/sbin/kamailio.debug...done. done. [New LWP 29437] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -Ee -d -DD -P /var/run/kamailio/kamailio.pid -m 64 -M 32 -f'. Program terminated with signal 11, Segmentation fault. #0 0x00007f31b5397d26 in __memcpy_ssse3_back () from /lib64/libc.so.6 Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.6-13.el7.x86_64 cyrus-sasl-lib-2.1.26-23.el7.x86_64 elfutils-libelf-0.176-5.el7.x86_64 elfutils-libs-0.176-5.el7.x86_64 glibc-2.17-323.el7_9.x86_64 jansson-2.10-1.el7.x86_64 json-c-0.11-4.el7_0.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-50.el7.x86_64 libattr-2.4.46-13.el7.x86_64 libcap-2.22-11.el7.x86_64 libcom_err-1.42.9-19.el7.x86_64 libcurl-7.29.0-59.el7_9.1.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-44.el7.x86_64 libidn-1.28-4.el7.x86_64 librabbitmq-0.8.0-3.el7.x86_64 libselinux-2.5-15.el7.x86_64 libssh2-1.8.0-4.el7.x86_64 libstdc++-4.8.5-44.el7.x86_64 libuuid-2.23.2-65.el7_9.1.x86_64 libxml2-2.9.1-6.el7.5.x86_64 mariadb-libs-5.5.68-1.el7.x86_64 nspr-4.25.0-2.el7_9.x86_64 nss-3.53.1-3.el7_9.x86_64 nss-softokn-freebl-3.53.1-6.el7_9.x86_64 nss-util-3.53.1-1.el7_9.x86_64 openldap-2.4.44-22.el7.x86_64 openssl-libs-1.0.2k-21.el7_9.x86_64 pcre-8.32-17.el7.x86_64 systemd-libs-219-78.el7_9.3.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-19.el7_9.x86_64 (gdb) (gdb) (gdb) (gdb) bt full #0 0x00007f31b5397d26 in __memcpy_ssse3_back () from /lib64/libc.so.6 No symbol table info available. #1 0x00007f31b2dcdfed in pv_parse_hdr_name (sp=0x7f31b38b27d0, in=0x7ffc78f0e1f0) at pv_core.c:3272 s = {s = 0x0, len = 29437} p = 0x0 nsp = 0x0 hdr = {type = 2029052412, name = {s = 0x7ffc78f0e200 "", len = -1282654080}, body = {s = 0x7ffc78f0e20c "\001", len = -1282725936}, len = 2029052384, parsed = 0x1006ccf31, next = 0x49500000001} __FUNCTION__ = "pv_parse_hdr_name" #2 0x000000000062ee65 in pv_parse_spec2 (in=0x7f31b38b27b8, e=0x7f31b38b27d0, silent=0) at core/pvapi.c:969 p = 0x7f31b38b283b ")[0])" s = {s = 0x7f31b38b2836 "X-CID)[0])", len = 5} pvname = {s = 0x7f31b38b2832 "hdr(X-CID)[0])", len = 3} pvstate = 2 tr = 0x0 pte = 0x7f31b32d3c30 n = 0 __FUNCTION__ = "pv_parse_spec2" #3 0x000000000062a71e in pv_cache_add (name=0x7ffc78f0e440) at core/pvapi.c:359 pvn = 0x7f31b38b27b8 pvid = 949637875 p = 0xffffffff000072fd <Address 0xffffffff000072fd out of bounds> __FUNCTION__ = "pv_cache_add" #4 0x000000000062bf56 in pv_spec_lookup (name=0x7ffc78f0e520, len=0x7ffc78f0e51c) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7f31b38c9db8 "$(hdr(X-CID)[0])", len = 16} __FUNCTION__ = "pv_spec_lookup" #5 0x000000000063241d in pv_parse_format (in=0x7ffc78f0e660, el=0x7f31b38b26a0) at core/pvapi.c:1194 p = 0x7f31b38c9db8 "$(hdr(X-CID)[0])" p0 = 0x280007e2a15 <Address 0x280007e2a15 out of bounds> n = 1 e = 0x7f31b38b2730 e0 = 0x0 s = {s = 0x7f31b38c9db8 "$(hdr(X-CID)[0])", len = 16} len = 16 __FUNCTION__ = "pv_parse_format" #6 0x000000000059faa1 in fix_param (type=256, param=0x7f31b38c9bf8) at core/sr_module.c:1214 p = 0x7f31b38b2690 name = {s = 0x7f31b38c9db8 "$(hdr(X-CID)[0])", len = 16} s = {s = 0x20 <Address 0x20 out of bounds>, len = -1282726872} num = 0 err = 32764 __FUNCTION__ = "fix_param" #7 0x00000000005a00d8 in fix_param_types (types=256, param=0x7f31b38c9bf8) at core/sr_module.c:1336 ret = 2029056944 t = 256 #8 0x0000000000657f66 in fixup_spve_null (param=0x7f31b38c9bf8, param_no=1) at core/mod_fix.c:564 ret = 0 fp = 0x0 __FUNCTION__ = "fixup_spve_null" #9 0x00007f31aa22bfac in fixup_hvalue_param (param=0x7f31b38c9bf8, param_no=2) at textopsx.c:622 No locals. #10 0x00007f31aa22cd49 in fixup_hname_str (param=0x7f31b38c9bf8, param_no=2) at textopsx.c:719 ---Type <return> to continue, or q <return> to quit--- No locals. #11 0x00007f31aa2345ef in append_hf_value_fixup (param=0x7f31b38c9bf8, param_no=2) at textopsx.c:1644 res = 0 __FUNCTION__ = "append_hf_value_fixup" #12 0x00000000006743c9 in fix_actions (a=0x7f31b38c9b80) at core/route.c:932 t = 0x7f31b38c9b80 p = 0x7f31b380c668 tmp = 0x7f31b38c5ae8 "" tmp_p = 0x7f31b38c9db8 ret = 0 i = 1 cmd = 0x7f31b32fb050 s = {s = 0x7ffc78f0eb70 "\360\355\360x\374\177", len = 7141887} he = 0x41c380 <_start> ip = {af = 3012334440, len = 32561, u = {addrl = {139851442459504, 8589934592}, addr32 = {3012334448, 32561, 0, 2}, addr16 = {37744, 45964, 32561, 0, 0, 0, 2, 0}, addr = "p\223\214\263\061\177\000\000\000\000\000\000\002\000\000"}} si = 0x7ffc78f0eb70 lval = 0x7f31b38c6418 rve = 0x41c380 <_start> err_rve = 0x642e38 <sr_event_exec+415> rve_type = 32764 err_type = 2029054464 expected_type = 32764 rv = 0x4651dc <fix_rval_expr+783> rve_param_no = 0 __FUNCTION__ = "fix_actions" #13 0x000000000066fd5b in fix_actions (a=0x7f31b38c9e38) at core/route.c:723 t = 0x7f31b38c9e38 p = 0x7ffc78f0ee40 tmp = 0xb5605380 <Address 0xb5605380 out of bounds> tmp_p = 0x7f31b38c6040 ret = 0 i = 2 cmd = 0x7f31b32fe998 s = {s = 0x7f31b3895f40 "LIS_REPLY", len = 9} he = 0x7ffc78f0ed10 ip = {af = 2029055136, len = 32764, u = {addrl = {7947659, 140722337541280}, addr32 = {7947659, 0, 2029055136, 32764}, addr16 = {17803, 121, 0, 0, 60576, 30960, 32764, 0}, addr = "\213Ey\000\000\000\000\000\240\354\360x\374\177\000"}} si = 0x100000400 lval = 0x7f31b3894c78 rve = 0x7f31b38c9368 err_rve = 0x0 rve_type = RV_INT err_type = RV_NONE expected_type = RV_NONE rv = 0x7f31b3896938 rve_param_no = 0 __FUNCTION__ = "fix_actions" #14 0x0000000000680d97 in fix_rl (rt=0xb9e5a0 <main_rt>) at core/route.c:2102 i = 104 ret = 0 #15 0x0000000000680dce in fix_rls () at core/route.c:2118 ---Type <return> to continue, or q <return> to quit--- ret = 0 #16 0x0000000000436704 in main (argc=14, argv=0x7ffc78f0f3b8) at main.c:3047 cfg_stream = 0x2a7d040 c = -1 r = 0 tmp = 0x7ffc78f0f850 "" tmp_len = 1472 port = 960 proto = 32561 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 539315467 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffc78f0f270 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 160, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621281263, tv_nsec = 948503600}, st_mtim = {tv_sec = 1621281245, tv_nsec = 465387888}, st_ctim = {tv_sec = 1621281245, tv_nsec = 465387888}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, { name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) (gdb) (gdb) info locals cfg_stream = 0x2a7d040 c = -1 r = 0 tmp = 0x7ffc78f0f850 "" tmp_len = 1472 port = 960 proto = 32561 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 539315467 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffc78f0f270 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 160, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621281263, tv_nsec = 948503600}, st_mtim = {tv_sec = 1621281245, tv_nsec = 465387888}, st_ctim = {tv_sec = 1621281245, tv_nsec = 465387888}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0x2a7d040 c = -1 r = 0 tmp = 0x7ffc78f0f850 "" tmp_len = 1472 port = 960 proto = 32561 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 539315467 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffc78f0f270 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 160, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621281263, tv_nsec = 948503600}, st_mtim = {tv_sec = 1621281245, tv_nsec = 465387888}, st_ctim = {tv_sec = 1621281245, tv_nsec = 465387888}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0x2a7d040 c = -1 r = 0 tmp = 0x7ffc78f0f850 "" tmp_len = 1472 port = 960 proto = 32561 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 539315467 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffc78f0f270 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 160, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621281263, tv_nsec = 948503600}, st_mtim = {tv_sec = 1621281245, tv_nsec = 465387888}, st_ctim = {tv_sec = 1621281245, tv_nsec = 465387888}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0x2a7d040 c = -1 r = 0 tmp = 0x7ffc78f0f850 "" tmp_len = 1472 port = 960 proto = 32561 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 539315467 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffc78f0f270 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 160, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621281263, tv_nsec = 948503600}, st_mtim = {tv_sec = 1621281245, tv_nsec = 465387888}, st_ctim = {tv_sec = 1621281245, tv_nsec = 465387888}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0x2a7d040 c = -1 r = 0 tmp = 0x7ffc78f0f850 "" tmp_len = 1472 port = 960 proto = 32561 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 539315467 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffc78f0f270 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 160, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621281263, tv_nsec = 948503600}, st_mtim = {tv_sec = 1621281245, tv_nsec = 465387888}, st_ctim = {tv_sec = 1621281245, tv_nsec = 465387888}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0x2a7d040 c = -1 r = 0 tmp = 0x7ffc78f0f850 "" tmp_len = 1472 port = 960 proto = 32561 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 539315467 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffc78f0f270 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 160, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621281263, tv_nsec = 948503600}, st_mtim = {tv_sec = 1621281245, tv_nsec = 465387888}, st_ctim = {tv_sec = 1621281245, tv_nsec = 465387888}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) list 1981 int main(int argc, char** argv) 1982 { 1983 1984 FILE* cfg_stream; 1985 int c,r; 1986 char *tmp; 1987 int tmp_len; 1988 int port; 1989 int proto; 1990 char *ahost = NULL; (gdb) ``` #### Log Messages ``` [root@hostname ~]# /usr/sbin/kamailio -Ee -d -DD -P /var/run/kamailio/kamailio.pid -m 64 -M 32 -f /etc/kazoo/kamailio/kamailio.cfg -w /run/kamailio/ 0(30249) INFO: tls [tls_init.c:503]: init_tls_compression(): disabling compression... 0(30249) ERROR: <core> [core/pvapi.c:924]: pv_parse_spec2(): error searching pvar "kzE" 0(30249) ERROR: <core> [core/pvapi.c:1128]: pv_parse_spec2(): wrong char [k/107] in [$(kzE{kz.json,From}{uri.user})] at [6 (4)] 0(30249) ERROR: <core> [core/pv_core.c:213]: pv_eval_str(): error in parsing src parameter 0(30249) ERROR: <core> [core/pvapi.c:924]: pv_parse_spec2(): error searching pvar "kzE" 0(30249) ERROR: <core> [core/pvapi.c:1128]: pv_parse_spec2(): wrong char [k/107] in [$(kzE{kz.json,Realm})] at [6 (4)] 0(30249) ERROR: <core> [core/pv_core.c:213]: pv_eval_str(): error in parsing src parameter 0(30249) ERROR: <core> [core/pvapi.c:924]: pv_parse_spec2(): error searching pvar "kzE" 0(30249) ERROR: <core> [core/pvapi.c:1128]: pv_parse_spec2(): wrong char [k/107] in [$(kzE{kz.json,Realm})] at [6 (4)] 0(30249) ERROR: <core> [core/pv_core.c:213]: pv_eval_str(): error in parsing src parameter 0(30249) ERROR: <core> [core/pvapi.c:924]: pv_parse_spec2(): error searching pvar "kzE" 0(30249) ERROR: <core> [core/pvapi.c:1128]: pv_parse_spec2(): wrong char [k/107] in [$(kzE{kz.json,Realm})] at [6 (4)] 0(30249) ERROR: <core> [core/pv_core.c:213]: pv_eval_str(): error in parsing src parameter 0(30249) ERROR: <core> [core/pvapi.c:924]: pv_parse_spec2(): error searching pvar "subs" 0(30249) ERROR: <core> [core/pvapi.c:1128]: pv_parse_spec2(): wrong char [t/116] in [$subs(to_user)] at [6 (5)] 0(30249) ERROR: <core> [core/pv_core.c:213]: pv_eval_str(): error in parsing src parameter 0(30249) INFO: pv [pv_shv.c:60]: shvar_init_locks(): locks array size 16 0(30249) INFO: mqueue [mqueue_mod.c:257]: mq_param(): mqueue param: [presence_last_notity|0] 0(30249) INFO: mqueue [mqueue_mod.c:257]: mq_param(): mqueue param: [node_track|0] 0(30249) INFO: mqueue [mqueue_mod.c:257]: mq_param(): mqueue param: [node_heartbeat|0] Listening on udp: myip1:5060 tcp: myip1:5060 Aliases: udp: myip1:5060 tcp: myip1:5060 0(30249) WARNING: <core> [core/daemonize.c:348]: daemonize(): pid file contains old pid, replacing pid 0(30249) NOTICE: nat_traversal [nat_traversal.c:1845]: mod_init(): keeping alive dialogs is disabled because the dialog module is not loaded 0(30249) NOTICE: regex [regex_mod.c:168]: mod_init(): 'file' parameter is not set, group matching disabled 0(30249) WARNING: tls [tls_init.c:796]: tls_h_mod_init_f(): openssl bug #1491 (crash/mem leaks on low memory) workaround enabled (on low memory tls operations will fail preemptively) with free memory thresholds 1024 and 1024 bytes Segmentation fault (core dumped) [root@hostname ~]# ``` ### Additional Information ``` [root@hostname ~]# kamailio -v version: kamailio 5.5.0 (x86_64/linux) d4c1a1 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, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES 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: d4c1a1 compiled on 07:50:25 May 6 2021 with gcc 4.8.5 ``` ``` [root@hostname ~]# rpm -qa | grep kamailio kamailio-presence-5.5.0-0.el7.centos.x86_64 kamailio-mysql-5.5.0-0.el7.centos.x86_64 kamailio-websocket-5.5.0-0.el7.centos.x86_64 kamailio-http_async_client-5.5.0-0.el7.centos.x86_64 kamailio-xmpp-5.5.0-0.el7.centos.x86_64 kamailio-utils-5.5.0-0.el7.centos.x86_64 kamailio-uuid-5.5.0-0.el7.centos.x86_64 kamailio-kazoo-5.5.0-0.el7.centos.x86_64 kamailio-http_client-5.5.0-0.el7.centos.x86_64 kamailio-xmlops-5.5.0-0.el7.centos.x86_64 kamailio-outbound-5.5.0-0.el7.centos.x86_64 kamailio-debuginfo-5.5.0-0.el7.centos.x86_64 kamailio-5.5.0-0.el7.centos.x86_64 kamailio-tls-5.5.0-0.el7.centos.x86_64 kamailio-regex-5.5.0-0.el7.centos.x86_64 kamailio-jansson-5.5.0-0.el7.centos.x86_64 ``` * **Operating System**:  ``` [root@hostname ~]# cat /etc/redhat-release CentOS Linux release 7.9.2009 (Core) ``` -- 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/2736

3 15

[kamailio/kamailio] core: ut - fixed str_casesearch() (#2743)
by Boris Korzun 25 May '21

25 May '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX #### Description There's an regression after 42228552b72267786561704f120e3da3aac5fd89 `pike.so` was affected by the commit. RPC `pike.top` and `pike.list` commands didn't work. `str_casesearch()` had returned NULL while text and needle were equal. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2743 -- Commit Summary -- * core: ut - fixed str_casesearch() -- File Changes -- M src/core/ut.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2743.patch https://github.com/kamailio/kamailio/pull/2743.diff -- 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/pull/2743

2 2

git:master:c146ef49: core: ut - fixed str_casesearch()
by Daniel-Constantin Mierla 25 May '21

25 May '21

Module: kamailio Branch: master Commit: c146ef490e1d7d35add7d3ee593f6d3d20e327ad URL: https://github.com/kamailio/kamailio/commit/c146ef490e1d7d35add7d3ee593f6d3… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-25T19:11:35+02:00 core: ut - fixed str_casesearch() - fixed str_casesearch() behaviour on text and needle were equal --- Modified: src/core/ut.c --- Diff: https://github.com/kamailio/kamailio/commit/c146ef490e1d7d35add7d3ee593f6d3… Patch: https://github.com/kamailio/kamailio/commit/c146ef490e1d7d35add7d3ee593f6d3… --- diff --git a/src/core/ut.c b/src/core/ut.c index 65143b3e9d..00254eba23 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -353,7 +353,7 @@ char *stre_search_strz(char *vstart, char *vend, char *needlez) char *str_casesearch(str *text, str *needle) { int i,j; - for(i=0;i<text->len-needle->len;i++) { + for(i=0;i<=text->len-needle->len;i++) { for(j=0;j<needle->len;j++) { if ( !((text->s[i+j]==needle->s[j]) || ( isalpha((int)text->s[i+j]) @@ -363,7 +363,7 @@ char *str_casesearch(str *text, str *needle) if (j==needle->len) return text->s+i; } - return 0; + return NULL; } /**

1 0

git:master:84055b2f: core: clone define value to avoid losing the reference
by Daniel-Constantin Mierla 25 May '21

25 May '21

Module: kamailio Branch: master Commit: 84055b2fe963e01a217149991dd1c8cbe8a8aeec URL: https://github.com/kamailio/kamailio/commit/84055b2fe963e01a217149991dd1c8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-25T10:24:23+02:00 core: clone define value to avoid losing the reference - impacted also by substdef - GH #2736 --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/84055b2fe963e01a217149991dd1c8c… Patch: https://github.com/kamailio/kamailio/commit/84055b2fe963e01a217149991dd1c8c… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 2b90fbb66a..ff8096d9f2 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1337,7 +1337,7 @@ IMPORTFILE "import_file" <DEFINE_DATA>\\{CR} { count(); ksr_cfg_print_part(yytext); } /* eat the escaped CR */ <DEFINE_DATA>{CR} { count(); ksr_cfg_print_part(yytext); - if (pp_define_set(strlen(s_buf.s), s_buf.s)) return 1; + if (pp_define_set(strlen(s_buf.s), s_buf.s, KSR_PPDEF_NORMAL)) return 1; memset(&s_buf, 0, sizeof(s_buf)); state = INITIAL; ksr_cfg_print_initial_state(); @@ -2007,7 +2007,7 @@ int pp_define(int len, const char *text) return 0; } -int pp_define_set(int len, char *text) +int pp_define_set(int len, char *text, int mode) { int ppos; @@ -2090,7 +2090,7 @@ int pp_define_env(const char *text, int len) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } - if(pp_define_set(defvalue.len, defvalue.s)<0) { + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_NORMAL)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; } diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 627402ba66..a5aa1d3e28 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -143,20 +143,14 @@ int pp_substdef_add(char *data, int mode) LM_ERR("cannot set define name\n"); goto error; } - if(mode==1) { - /* define the value enclosed in double quotes */ - *(defvalue.s-1) = '"'; - defvalue.s[defvalue.len] = '"'; - defvalue.s--; - defvalue.len += 2; - } if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { defvalue = newval; } } - if(pp_define_set(defvalue.len, defvalue.s)<0) { + if(pp_define_set(defvalue.len, defvalue.s, + (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { LM_ERR("cannot set define value\n"); goto error; } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 70627268b6..17b19380bc 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -25,6 +25,9 @@ #include "str.h" +#define KSR_PPDEF_NORMAL (0) /* define normal value */ +#define KSR_PPDEF_QUOTED (1<<0) /* define quoted value */ + typedef struct ksr_ppdefine { str name; str value; @@ -39,7 +42,7 @@ int pp_substdef_add(char *data, int mode); int pp_subst_run(char **data); int pp_define(int len, const char *text); -int pp_define_set(int len, char *text); +int pp_define_set(int len, char *text, int mode); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); int pp_define_env(const char * text, int len); diff --git a/src/main.c b/src/main.c index 71a024d5bb..a391f57afb 100644 --- a/src/main.c +++ b/src/main.c @@ -2264,7 +2264,7 @@ int main(int argc, char** argv) } if(p) { p++; - if(pp_define_set(strlen(p), p)<0) { + if(pp_define_set(strlen(p), p, KSR_PPDEF_NORMAL)<0) { fprintf(stderr, "error at define value: -A %s\n", optarg); goto error;

1 0

[kamailio/kamailio] ims_ipsec_pcscf: more algorithms, SA improvements (#2731)
by riccardv 24 May '21

24 May '21

- add aes-cbc, des-ede3-cbc ipsec encryption algoriyhms - improve nlmsg_seq choice for concurrent multi UEs Registrations at same time - before sending replies over IPsec check the existing of opened TCP sockets   #### Pre-Submission Checklist    - [v] Commit message has the format required by CONTRIBUTING guide - [v] Commits are split per component (core, individual modules, libs, utils, ...) - [v] Each component has a single commit (if not, squash them into one commit) - [v] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [v] Small bug fix (non-breaking change which fixes an issue) - [v] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [v] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2731 -- Commit Summary -- * ims_ipsec_pcscf: more algorithms, SA improvements -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (29) M src/modules/ims_ipsec_pcscf/ipsec.c (34) M src/modules/ims_ipsec_pcscf/ipsec.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2731.patch https://github.com/kamailio/kamailio/pull/2731.diff -- 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/pull/2731

4 16

git:master:de090680: ims_ipsec_pcscf: use ksr_clock_gettime()
by Henning Westerholt 24 May '21

24 May '21

Module: kamailio Branch: master Commit: de0906809bc265a24dd29aadf3b2f5bbd4a154f0 URL: https://github.com/kamailio/kamailio/commit/de0906809bc265a24dd29aadf3b2f5b… Author: riccardv <tafkap(a)gmx.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-24T22:28:06+02:00 ims_ipsec_pcscf: use ksr_clock_gettime() --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/de0906809bc265a24dd29aadf3b2f5b… Patch: https://github.com/kamailio/kamailio/commit/de0906809bc265a24dd29aadf3b2f5b… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 03474745b2..e874abaa34 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -104,7 +104,7 @@ static uint choose_nlmsg_seq (void) { static double Tini=0; struct timespec ts; - clock_gettime(CLOCK_REALTIME, &ts); + ksr_clock_gettime(&ts); return(1000*(ts.tv_sec - Tini + (ts.tv_nsec * 1E-9))); // us }

1 0

git:master:1c012890: ims_ipsec_pcscf: more algorithms, SA improvements
by Henning Westerholt 24 May '21

24 May '21

Module: kamailio Branch: master Commit: 1c012890fbe611ac1bcf78a6ae9009039d4aa417 URL: https://github.com/kamailio/kamailio/commit/1c012890fbe611ac1bcf78a6ae90090… Author: riccardv <tafkap(a)gmx.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-24T22:28:06+02:00 ims_ipsec_pcscf: more algorithms, SA improvements - add aes-cbc, des-ede3-cbc ipsec encryption algoriyhms - improve nlmsg_seq choice for concurrent multi UEs Registrations at same time - before sending replies over IPsec check the existing of opened TCP sockets --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h --- Diff: https://github.com/kamailio/kamailio/commit/1c012890fbe611ac1bcf78a6ae90090… Patch: https://github.com/kamailio/kamailio/commit/1c012890fbe611ac1bcf78a6ae90090…

1 0

git:master:ffa19ffe: pv: proper increment to check escaped char for s.select
by Daniel-Constantin Mierla 24 May '21

24 May '21

Module: kamailio Branch: master Commit: ffa19ffedeb8db8ac38a742ae8b686525fd906ea URL: https://github.com/kamailio/kamailio/commit/ffa19ffedeb8db8ac38a742ae8b6865… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-24T16:18:12+02:00 pv: proper increment to check escaped char for s.select --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ffa19ffedeb8db8ac38a742ae8b6865… Patch: https://github.com/kamailio/kamailio/commit/ffa19ffedeb8db8ac38a742ae8b6865… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 2f10f67080..517ce5342d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2752,8 +2752,8 @@ char* tr_parse_string(str* in, trans_t *t) tp->v.s.s = p; tp->v.s.len = 1; if(*p=='\\') { + p++; if(*p=='\\' || *p=='n' || *p=='r' || *p=='t') { - p++; tp->v.s.len = 2; } else { LM_ERR("unexpected escape char: %c\n", *p);

1 0

git:master:4b2428f7: cfg_rpc: use directly cfg_get_group_id()
by Daniel-Constantin Mierla 24 May '21

24 May '21

Module: kamailio Branch: master Commit: 4b2428f75a43cd5bbf2f5810be3c1220551402a2 URL: https://github.com/kamailio/kamailio/commit/4b2428f75a43cd5bbf2f5810be3c122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-24T16:18:12+02:00 cfg_rpc: use directly cfg_get_group_id() --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4b2428f75a43cd5bbf2f5810be3c122… Patch: https://github.com/kamailio/kamailio/commit/4b2428f75a43cd5bbf2f5810be3c122…

1 0

[kamailio/kamailio] snmpstats: mibs - fix typo in openserSIPRegUserLookupTable description (#2741)
by arkadiam 24 May '21

24 May '21

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2741 -- Commit Summary -- * Fix typo in openserSIPRegUserLookupTable description -- File Changes -- M src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2741.patch https://github.com/kamailio/kamailio/pull/2741.diff -- 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/pull/2741

2 3

git:master:7f017707: snmpstats: Fix typo in MIB
by Olle E. Johansson 24 May '21

24 May '21

Module: kamailio Branch: master Commit: 7f017707c91659641ce9ca87ee4149b2e39379f7 URL: https://github.com/kamailio/kamailio/commit/7f017707c91659641ce9ca87ee4149b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-05-24T08:27:22+02:00 snmpstats: Fix typo in MIB Reported by arkadiam on Github --- Modified: src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB --- Diff: https://github.com/kamailio/kamailio/commit/7f017707c91659641ce9ca87ee4149b… Patch: https://github.com/kamailio/kamailio/commit/7f017707c91659641ce9ca87ee4149b… --- diff --git a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB index 3351a9e424..2aaddf01ca 100644 --- a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB +++ b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB @@ -562,7 +562,7 @@ KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN set the row-status to createAndGo. Then the client can do an SNMP GET on this table with the - aquired index. If the row-status is 'active', then the + acquired index. If the row-status is 'active', then the kamailioSIPRegUserIndex is the index into the kamailioSIPRegUserTable that has the specified URI (0 zero indicates no such URI). The client should then set the

1 0

git:master:f2973cf0: pv: support escaped chars for s.select separator
by Daniel-Constantin Mierla 22 May '21

22 May '21

Module: kamailio Branch: master Commit: f2973cf0dce0de5c002ac8ee61ac7e829823ed0e URL: https://github.com/kamailio/kamailio/commit/f2973cf0dce0de5c002ac8ee61ac7e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-22T10:00:09+02:00 pv: support escaped chars for s.select separator - \\, \n, \r, \t --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/f2973cf0dce0de5c002ac8ee61ac7e8… Patch: https://github.com/kamailio/kamailio/commit/f2973cf0dce0de5c002ac8ee61ac7e8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index c9e7438b83..2f10f67080 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -191,6 +191,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { int i, j, max; char *p, *s; + char c; str st, st2; pv_value_t v, w; time_t t; @@ -731,6 +732,28 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } i = v.ri; } + if(tp->next->v.s.len>1) { + switch(tp->next->v.s.s[1]) { + case '\\': + c = '\\'; + break; + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + default: + LM_ERR("invalid select escape char (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + } else { + c = tp->next->v.s.s[0]; + } val->flags = PV_VAL_STR; val->ri = 0; if(i<0) @@ -741,7 +764,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, i--; while(p>=val->rs.s) { - if(*p==tp->next->v.s.s[0]) + if(*p==c) { if(i==0) break; @@ -762,7 +785,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, p = s; while(p<val->rs.s+val->rs.len) { - if(*p==tp->next->v.s.s[0]) + if(*p==c) { if(i==0) break; @@ -2728,6 +2751,15 @@ char* tr_parse_string(str* in, trans_t *t) tp->type = TR_PARAM_STRING; tp->v.s.s = p; tp->v.s.len = 1; + if(*p=='\\') { + if(*p=='\\' || *p=='n' || *p=='r' || *p=='t') { + p++; + tp->v.s.len = 2; + } else { + LM_ERR("unexpected escape char: %c\n", *p); + goto error; + } + } t->params->next = tp; tp = 0; p++;

1 0

git:master:02ad9e1b: pv: more details in err log message for s.select parsing
by Daniel-Constantin Mierla 22 May '21

22 May '21

Module: kamailio Branch: master Commit: 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64 URL: https://github.com/kamailio/kamailio/commit/02ad9e1b87f89b9456d0d85e16c2fe0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-22T10:00:09+02:00 pv: more details in err log message for s.select parsing --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/02ad9e1b87f89b9456d0d85e16c2fe0… Patch: https://github.com/kamailio/kamailio/commit/02ad9e1b87f89b9456d0d85e16c2fe0… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f93f126099..c9e7438b83 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2734,8 +2734,8 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid select transformation: %.*s!!\n", - in->len, in->s); + LM_ERR("invalid select transformation: %.*s (c:%c/%d - p:%d)!!\n", + in->len, in->s, *p, *p, (int)(p - in->s)); goto error; } goto done;

1 0

git:master:0e51ce10: modules/mohqueue: force RTP to follow SDP
by Robert Boisvert 19 May '21

19 May '21

Module: kamailio Branch: master Commit: 0e51ce1075f206a4441333f72c69fcc56f8d6855 URL: https://github.com/kamailio/kamailio/commit/0e51ce1075f206a4441333f72c69fcc… Author: Robert Boisvert <rdboisvert(a)gmail.com> Committer: Robert Boisvert <rdboisvert(a)gmail.com> Date: 2021-05-19T16:19:24-04:00 modules/mohqueue: force RTP to follow SDP - version 1.8 - use rtpproxy r flag to force RTP to follow SDP - fixed compiler warnings --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0e51ce1075f206a4441333f72c69fcc… Patch: https://github.com/kamailio/kamailio/commit/0e51ce1075f206a4441333f72c69fcc… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 1f72c58c5a..c46cb51a75 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -32,7 +32,7 @@ #define ALLOWHDR "Allow: INVITE, ACK, BYE, CANCEL, NOTIFY, PRACK" #define CLENHDR "Content-Length" #define SIPEOL "\r\n" -#define USRAGNT "Kamailio MOH Queue v1.7" +#define USRAGNT "Kamailio MOH Queue v1.8" /********** * local constants @@ -1075,10 +1075,11 @@ if (pmsg->allow) * send RTP offer **********/ +fparam_t rflag = {.orig="", .type=FPARAM_STRING, {.asciiz="r"}, .fixed=0}; mohq_debug (pcall->pmohq, "%sMaking offer for RTP link for call (%s) from queue (%s)", pfncname, pcall->call_from, pcall->pmohq->mohq_name); -if (pmod_data->fn_rtp_offer (pmsg, 0, 0) != 1) +if (pmod_data->fn_rtp_offer (pmsg, (char *) &rflag, 0) != 1) { if (pmod_data->psl->freply (pmsg, 486, presp_busy) < 0) { @@ -2160,9 +2161,8 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = { - {"", FPARAM_STRING, {pflagbuf}, 0} -}; +fparam_t zflag = {.orig="", .type=FPARAM_STRING, {.asciiz=pflagbuf}, .fixed=0}; +fparam_t *pzflag = &zflag; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

1 0

git:master:078041b0: cdp: switch to use ksr_clock_gettime() from core
by Daniel-Constantin Mierla 19 May '21

19 May '21

Module: kamailio Branch: master Commit: 078041b0145838b3d607810e68c3cc3d9165cd7f URL: https://github.com/kamailio/kamailio/commit/078041b0145838b3d607810e68c3cc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-19T08:23:16+02:00 cdp: switch to use ksr_clock_gettime() from core --- Modified: src/modules/cdp/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/078041b0145838b3d607810e68c3cc3… Patch: https://github.com/kamailio/kamailio/commit/078041b0145838b3d607810e68c3cc3… --- diff --git a/src/modules/cdp/routing.c b/src/modules/cdp/routing.c index dae24d7f61..34347caa26 100644 --- a/src/modules/cdp/routing.c +++ b/src/modules/cdp/routing.c @@ -34,11 +34,6 @@ * */ -#ifdef __OS_darwin -#include <mach/clock.h> -#include <mach/mach.h> -#endif - #include "routing.h" #include "config.h" #include "peermanager.h" @@ -50,26 +45,6 @@ extern dp_config *config; /**< Configuration for this diameter peer */ int gcount = 0; -/** - * portable implementation for clock_gettime(CLOCK_REALTIME, ts) - */ -int ser_clock_gettime(struct timespec *ts) -{ -#ifdef __OS_darwin - clock_serv_t cclock; - mach_timespec_t mts; - - /* OS X does not have clock_gettime, use clock_get_time */ - host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); - clock_get_time(cclock, &mts); - mach_port_deallocate(mach_task_self(), cclock); - ts->tv_sec = mts.tv_sec; - ts->tv_nsec = mts.tv_nsec; - return 0; -#else - return clock_gettime(CLOCK_REALTIME, ts); -#endif -} /** * Returns if the peer advertised support for an Application ID @@ -156,7 +131,7 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in } } - ser_clock_gettime(&time_spec); + ksr_clock_gettime(&time_spec); p->last_selected = (time_spec.tv_sec*1000000) + round(time_spec.tv_nsec / 1.0e3); // Convert nanoseconds to microseconds LM_DBG("chosen peer [%.*s]\n", p->fqdn.len, p->fqdn.s);

1 0

git:master:13342658: pv: remove verbose debug message
by Daniel-Constantin Mierla 19 May '21

19 May '21

Module: kamailio Branch: master Commit: 1334265846ebe6a06e7e139421778e960cb54c7a URL: https://github.com/kamailio/kamailio/commit/1334265846ebe6a06e7e139421778e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-19T08:23:16+02:00 pv: remove verbose debug message --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1334265846ebe6a06e7e139421778e9… Patch: https://github.com/kamailio/kamailio/commit/1334265846ebe6a06e7e139421778e9… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index ae2c6ce048..92e60f06ea 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -603,7 +603,6 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) s.s = slist->s; for(i=0; i<slist->len; i++) { - LM_DBG("==== %d = %c\n", i, slist->s[i]); sfound = 0; for(j=0; j<sep->len; j++) { if(slist->s[i]==sep->s[j]) {

1 0

git:master:d04edc01: core: ut - added ksr_clock_gettime()
by Daniel-Constantin Mierla 19 May '21

19 May '21

Module: kamailio Branch: master Commit: d04edc014e6077e9ffc1f3b8e73f24ab71f45728 URL: https://github.com/kamailio/kamailio/commit/d04edc014e6077e9ffc1f3b8e73f24a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-19T08:23:16+02:00 core: ut - added ksr_clock_gettime() - portable version for clock_gettime() --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/d04edc014e6077e9ffc1f3b8e73f24a… Patch: https://github.com/kamailio/kamailio/commit/d04edc014e6077e9ffc1f3b8e73f24a… --- diff --git a/src/core/ut.c b/src/core/ut.c index 08edd2f24e..65143b3e9d 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -32,6 +32,11 @@ #include <sys/utsname.h> /* uname() */ #include <libgen.h> +#ifdef __OS_darwin +/* portable clock_gettime() */ +#include <mach/clock.h> +#include <mach/mach.h> +#endif #include "ut.h" #include "mem/mem.h" @@ -150,6 +155,27 @@ time_t utc2local(time_t in) } +/** + * portable implementation for clock_gettime(CLOCK_REALTIME, ts) + */ +int ksr_clock_gettime(struct timespec *ts) +{ +#ifdef __OS_darwin + clock_serv_t cclock; + mach_timespec_t mts; + + /* OS X does not have clock_gettime, use clock_get_time */ + host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); + clock_get_time(cclock, &mts); + mach_port_deallocate(mach_task_self(), cclock); + ts->tv_sec = mts.tv_sec; + ts->tv_nsec = mts.tv_nsec; + return 0; +#else + return clock_gettime(CLOCK_REALTIME, ts); +#endif +} + /* * Return str as zero terminated string allocated * using pkg_malloc diff --git a/src/core/ut.h b/src/core/ut.h index 61ff696e13..f2173d3dcf 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1065,6 +1065,9 @@ time_t local2utc(time_t in); /* Convert time_t value in UTC to to value relative to local time zone */ time_t utc2local(time_t in); +/* Portable clock_gettime() */ +int ksr_clock_gettime(struct timespec *ts); + /* * Return str as zero terminated string allocated * using pkg_malloc

1 0

git:5.3:bc597081: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 18 May '21

18 May '21

Module: kamailio Branch: 5.3 Commit: bc5970811dc23ea0a01cb437688da731e44cc57f URL: https://github.com/kamailio/kamailio/commit/bc5970811dc23ea0a01cb437688da73… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-18T21:31:46+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/bc5970811dc23ea0a01cb437688da73… Patch: https://github.com/kamailio/kamailio/commit/bc5970811dc23ea0a01cb437688da73… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index da9ddbabcb..c6e2908a57 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -417,7 +417,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

1 0

git:5.4:0ef00531: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 18 May '21

18 May '21

Module: kamailio Branch: 5.4 Commit: 0ef00531926d77351f1202d18b5ffe1c071aef12 URL: https://github.com/kamailio/kamailio/commit/0ef00531926d77351f1202d18b5ffe1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-18T21:31:33+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/0ef00531926d77351f1202d18b5ffe1… Patch: https://github.com/kamailio/kamailio/commit/0ef00531926d77351f1202d18b5ffe1… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index da9ddbabcb..c6e2908a57 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -417,7 +417,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

1 0

git:master:6ad49854: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 18 May '21

18 May '21

Module: kamailio Branch: master Commit: 6ad49854e23e7642dbda01a74378e9e8d8eef622 URL: https://github.com/kamailio/kamailio/commit/6ad49854e23e7642dbda01a74378e9e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-18T21:16:17+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/6ad49854e23e7642dbda01a74378e9e… Patch: https://github.com/kamailio/kamailio/commit/6ad49854e23e7642dbda01a74378e9e… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index 4ccdd4bd06..280d79caa8 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -512,7 +512,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

1 0

git:5.3:9a381b67: xhttp_prom: fix small copy/paste typo in documentation
by Ovidiu Sas 18 May '21

18 May '21

Module: kamailio Branch: 5.3 Commit: 9a381b67709d051c3451c7822443540a4e8ef45f URL: https://github.com/kamailio/kamailio/commit/9a381b67709d051c3451c7822443540… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:04:42-04:00 xhttp_prom: fix small copy/paste typo in documentation (cherry picked from commit 2967a41f5537df81745a71226ba9e793ccbdd453) --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a381b67709d051c3451c7822443540… Patch: https://github.com/kamailio/kamailio/commit/9a381b67709d051c3451c7822443540… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index c098f2d382..278d51aac2 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -448,7 +448,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

1 0

git:5.4:f2dc57a7: xhttp_prom: fix small copy/paste typo in documentation
by Ovidiu Sas 18 May '21

18 May '21

Module: kamailio Branch: 5.4 Commit: f2dc57a75ddad30205dadc59c435e423e3ee669f URL: https://github.com/kamailio/kamailio/commit/f2dc57a75ddad30205dadc59c435e42… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:03:14-04:00 xhttp_prom: fix small copy/paste typo in documentation (cherry picked from commit 2967a41f5537df81745a71226ba9e793ccbdd453) --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2dc57a75ddad30205dadc59c435e42… Patch: https://github.com/kamailio/kamailio/commit/f2dc57a75ddad30205dadc59c435e42… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index c098f2d382..278d51aac2 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -448,7 +448,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

1 0

git:5.5:ef765d3f: xhttp_prom: fix small copy/paste typo in documentation
by Ovidiu Sas 18 May '21

18 May '21

Module: kamailio Branch: 5.5 Commit: ef765d3f4c9fb4bfa5949b2e10f208cd44c5e1db URL: https://github.com/kamailio/kamailio/commit/ef765d3f4c9fb4bfa5949b2e10f208c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:01:44-04:00 xhttp_prom: fix small copy/paste typo in documentation (cherry picked from commit 2967a41f5537df81745a71226ba9e793ccbdd453) --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef765d3f4c9fb4bfa5949b2e10f208c… Patch: https://github.com/kamailio/kamailio/commit/ef765d3f4c9fb4bfa5949b2e10f208c… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index eb331ab9c6..c35c44a024 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -566,7 +566,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

1 0

git:master:2967a41f: xhttp_prom: fix small copy/paste typo in documentation
by Ovidiu Sas 18 May '21

18 May '21

Module: kamailio Branch: master Commit: 2967a41f5537df81745a71226ba9e793ccbdd453 URL: https://github.com/kamailio/kamailio/commit/2967a41f5537df81745a71226ba9e79… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:00:23-04:00 xhttp_prom: fix small copy/paste typo in documentation --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2967a41f5537df81745a71226ba9e79… Patch: https://github.com/kamailio/kamailio/commit/2967a41f5537df81745a71226ba9e79… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index eb331ab9c6..c35c44a024 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -566,7 +566,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

1 0

[kamailio/kamailio] Segfault start Kamailio 5.5 #2 (#2738)
by ReznikovAlexei 18 May '21

18 May '21

### Description I am upgraded Kamailio from 5.4.5 to 5.5, but i have got segfault when I try start Kamailio with custom config, with default config Kamailio start work done. #### Reproduction /usr/sbin/kamailio -Ee -d -DD -P /var/run/kamailio/kamailio.pid -m 64 -M 32 -f /etc/kazoo/kamailio/kamailio.cfg -w /run/kamailio/ #### Debugging Data ``` [root@hostname kamailio]# gdb /usr/sbin/kamailio /run/kamailio/core.14281 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-120.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/usr/sbin/kamailio.debug...done. done. [New LWP 14281] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -Ee -d -DD -P /var/run/kamailio/kamailio.pid -m 64 -M 32 -f'. Program terminated with signal 11, Segmentation fault. #0 0x00007f3b29de7e96 in __memcpy_ssse3_back () from /lib64/libc.so.6 Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.6-13.el7.x86_64 cyrus-sasl-lib-2.1.26-23.el7.x86_64 elfutils-libelf-0.176-5.el7.x86_64 elfutils-libs-0.176-5.el7.x86_64 glibc-2.17-323.el7_9.x86_64 jansson-2.10-1.el7.x86_64 json-c-0.11-4.el7_0.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-50.el7.x86_64 libattr-2.4.46-13.el7.x86_64 libcap-2.22-11.el7.x86_64 libcom_err-1.42.9-19.el7.x86_64 libcurl-7.29.0-59.el7_9.1.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-44.el7.x86_64 libidn-1.28-4.el7.x86_64 librabbitmq-0.8.0-3.el7.x86_64 libselinux-2.5-15.el7.x86_64 libssh2-1.8.0-4.el7.x86_64 libstdc++-4.8.5-44.el7.x86_64 libuuid-2.23.2-65.el7_9.1.x86_64 libxml2-2.9.1-6.el7.5.x86_64 mariadb-libs-5.5.68-1.el7.x86_64 nspr-4.25.0-2.el7_9.x86_64 nss-3.53.1-3.el7_9.x86_64 nss-softokn-freebl-3.53.1-6.el7_9.x86_64 nss-util-3.53.1-1.el7_9.x86_64 openldap-2.4.44-22.el7.x86_64 openssl-libs-1.0.2k-21.el7_9.x86_64 pcre-8.32-17.el7.x86_64 systemd-libs-219-78.el7_9.3.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-19.el7_9.x86_64 (gdb) (gdb) bt full #0 0x00007f3b29de7e96 in __memcpy_ssse3_back () from /lib64/libc.so.6 No symbol table info available. #1 0x00007f3b2781dfed in pv_parse_hdr_name (sp=0x7f3b27ee6668, in=0x7ffe06ab4e40) at pv_core.c:3272 s = {s = 0x7f3b27f6f9b0 "\017", len = 111890060} p = 0x4000 <Address 0x4000 out of bounds> nsp = 0x0 hdr = {type = HDR_OTHER_T, name = {s = 0x7f3b27ee61e0 "\303\304\366';\177", len = 111889776}, body = {s = 0x44308c <rval_new_empty+87> "H\211E\300H\203}\300", len = 669935208}, len = 111889968, parsed = 0x7ffe06ab4e7c, next = 0x7ffe06ab4e80} __FUNCTION__ = "pv_parse_hdr_name" #2 0x000000000062ee65 in pv_parse_spec2 (in=0x7f3b27ee6650, e=0x7f3b27ee6668, silent=0) at core/pvapi.c:969 p = 0x7f3b27ee66df ")" s = {s = 0x7f3b27ee66cd "Subscription-State)", len = 18} pvname = {s = 0x7f3b27ee66c9 "hdr(Subscription-State)", len = 3} pvstate = 5 tr = 0x0 pte = 0x7f3b27d23c30 n = 0 __FUNCTION__ = "pv_parse_spec2" #3 0x000000000062a71e in pv_cache_add (name=0x7ffe06ab5090) at core/pvapi.c:359 pvn = 0x7f3b27ee6650 pvid = 454074875 p = 0xffffffff000037c9 <Address 0xffffffff000037c9 out of bounds> __FUNCTION__ = "pv_cache_add" #4 0x000000000062bf56 in pv_spec_lookup (name=0x7ffe06ab5170, len=0x7ffe06ab516c) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7f3b27f700fa "$hdr(Subscription-State)\n", len = 24} __FUNCTION__ = "pv_spec_lookup" #5 0x000000000063241d in pv_parse_format (in=0x7ffe06ab5280, el=0x7f3b27ee64c8) at core/pvapi.c:1194 p = 0x7f3b27f700fa "$hdr(Subscription-State)\n" p0 = 0x7f3b27f700e3 "|end|sent subscription $hdr(Subscription-State)\n" n = 2 e = 0x7f3b27ee65c8 e0 = 0x7f3b27ee6540 s = {s = 0x7f3b27f700fa "$hdr(Subscription-State)\n", len = 25} len = 24 __FUNCTION__ = "pv_parse_format" #6 0x00007f3b1e1cbd31 in xdbg_fixup_helper (param=0x7f3b27f6ca20, param_no=2, mode=0) at xlog.c:509 xm = 0x7f3b27ee64c8 s = {s = 0x7f3b27f700e0 "$ci|end|sent subscription $hdr(Subscription-State)\n", len = 51} __FUNCTION__ = "xdbg_fixup_helper" #7 0x00007f3b1e1cd07f in xlog_fixup_helper (param=0x7f3b27f6ca20, param_no=2, mode=0) at xlog.c:573 xlp = 0x7f3b27ee6400 s = {s = 0x7f3b27f71138 "L_DEBUG", len = 0} __FUNCTION__ = "xlog_fixup_helper" #8 0x00007f3b1e1cdf4c in xlog_fixup (param=0x7f3b27f6ca20, param_no=2) at xlog.c:617 __FUNCTION__ = "xlog_fixup" #9 0x00000000006743c9 in fix_actions (a=0x7f3b27f6c9a8) at core/route.c:932 t = 0x7f3b27f6c9a8 p = 0x7f3b1e1d1947 tmp = 0x7ffe06ab57a0 "\220X\253\006\376\177" tmp_p = 0x7f3b27f700e0 ret = 0 ---Type <return> to continue, or q <return> to quit--- i = 1 cmd = 0x7f3b27d4e8d8 s = {s = 0x7f3b27f69b0c "$subs(pres_uri)\n", len = 669940504} he = 0x41c380 <_start> ip = {af = 670481008, len = 32571, u = {addrl = {139892050293376, 8589934592}, addr32 = {670495360, 32571, 0, 2}, addr16 = {62080, 10230, 32571, 0, 0, 0, 2, 0}, addr = "\200\362\366';\177\000\000\000\000\000\000\002\000\000"}} si = 0x7ffe06ab5700 lval = 0x7f3b1e1cdf4c <xlog_fixup+924> rve = 0x7f3b27f69b1b err_rve = 0x7f3b1e1d1b4a rve_type = RV_NONE err_type = 8680369 expected_type = 32766 rv = 0x4655da <fix_rval_expr+1805> rve_param_no = 0 __FUNCTION__ = "fix_actions" #10 0x000000000066fd5b in fix_actions (a=0x7f3b27f7b640) at core/route.c:723 t = 0x7f3b27f7b640 p = 0x0 tmp = 0x7ffe06ab5a20 "\020[\253\006\376\177" tmp_p = 0x7f3b27f6c4c0 ret = 0 i = 2 cmd = 0x7f3b27d4e8d8 s = {s = 0x7f3b27f4c348 "\001", len = 14281} he = 0x41c380 <_start> ip = {af = 670469920, len = 32571, u = {addrl = {139892050275344, 8589934592}, addr32 = {670477328, 32571, 0, 2}, addr16 = {44048, 10230, 32571, 0, 0, 0, 2, 0}, addr = "\020\254\366';\177\000\000\000\000\000\000\002\000\000"}} si = 0x7ffe06ab5980 lval = 0x7f3b27f69fa0 rve = 0x7f3b27f6f9b0 err_rve = 0x0 rve_type = RV_INT err_type = 8680369 expected_type = 32766 rv = 0x4655da <fix_rval_expr+1805> rve_param_no = 0 __FUNCTION__ = "fix_actions" #11 0x000000000066fd92 in fix_actions (a=0x7f3b27f7b790) at core/route.c:727 t = 0x7f3b27f7b790 p = 0x7f3b282c7a68 tmp = 0x7f3b27eb6d08 "" tmp_p = 0x7f3b27f69ac0 ret = 0 i = 2 cmd = 0x7f3b27d4e8d8 s = {s = 0x7f3b27ea2560 "registrar", len = 9} he = 0x41c380 <_start> ip = {af = 670457200, len = 32571, u = {addrl = {139892050259904, 8589934592}, addr32 = {670461888, 32571, 0, 2}, addr16 = {28608, 10230, 32571, 0, 0, 0, 2, 0}, addr = "\300o\366';\177\000\000\000\000\000\000\002\000\000"}} si = 0x7ffe06ab5c00 lval = 0x7f3b27f68e90 rve = 0x7f3b27f6b340 ---Type <return> to continue, or q <return> to quit--- err_rve = 0x0 rve_type = RV_INT err_type = 111893136 expected_type = 32766 rv = 0x4655da <fix_rval_expr+1805> rve_param_no = 0 __FUNCTION__ = "fix_actions" #12 0x000000000066fd92 in fix_actions (a=0x7f3b27f658d8) at core/route.c:727 t = 0x7f3b27f7b8e0 p = 0x7ffe06ab5ed0 tmp = 0x2a055380 <Address 0x2a055380 out of bounds> tmp_p = 0x7f3b27eda940 ret = 0 i = 2 cmd = 0x7f3b27d4e8d8 s = {s = 0x7f3b283cebc0 "CUSTOM_BRANCH_HEADERS", len = 21} he = 0x7ffe06ab5da0 ip = {af = 111893808, len = 32766, u = {addrl = {7947659, 140729010314544}, addr32 = {7947659, 0, 111893808, 32766}, addr16 = {17803, 121, 0, 0, 23856, 1707, 32766, 0}, addr = "\213Ey\000\000\000\000\000\060]\253\006\376\177\000"}} si = 0x100000400 lval = 0x7f3b27f65ce0 rve = 0x7f3b27f676f0 err_rve = 0x0 rve_type = RV_INT err_type = RV_NONE expected_type = RV_NONE rv = 0x7f3b283cf948 rve_param_no = 0 __FUNCTION__ = "fix_actions" #13 0x0000000000680d97 in fix_rl (rt=0xb9e580 <event_rt>) at core/route.c:2102 i = 24 ret = 0 #14 0x0000000000680e46 in fix_rls () at core/route.c:2128 ret = 0 #15 0x0000000000436704 in main (argc=14, argv=0x7ffe06ab6448) at main.c:3047 cfg_stream = 0x2918040 c = -1 r = 0 tmp = 0x7ffe06ab6823 "" tmp_len = 1472 port = 960 proto = 32571 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 452880456 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffe06ab6300 ---Type <return> to continue, or q <return> to quit--- p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 140, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621343100, tv_nsec = 303103820}, st_mtim = {tv_sec = 1621343111, tv_nsec = 571168953}, st_ctim = {tv_sec = 1621343111, tv_nsec = 571168953}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, { name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) (gdb) info locals cfg_stream = 0x2918040 c = -1 r = 0 tmp = 0x7ffe06ab6823 "" tmp_len = 1472 port = 960 proto = 32571 ahost = 0x0 aport = 0 options = 0x7dd1e8 ":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 = 452880456 rfd = 4 debug_save = 1 debug_flag = 1 dont_fork_cnt = 2 n_lst = 0x7ffe06ab6300 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 10213, st_nlink = 2, st_mode = 16832, st_uid = 997, st_gid = 1000, __pad0 = 0, st_rdev = 0, st_size = 140, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1621343100, tv_nsec = 303103820}, st_mtim = { tv_sec = 1621343111, tv_nsec = 571168953}, st_ctim = {tv_sec = 1621343111, tv_nsec = 571168953}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7df5ff "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7da674 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7df604 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7df60a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7df610 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7df619 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7df623 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7df62d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7df638 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7df641 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, { name = 0x7df64c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7df652 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7df65c "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) (gdb) list 1981 int main(int argc, char** argv) 1982 { 1983 1984 FILE* cfg_stream; 1985 int c,r; 1986 char *tmp; 1987 int tmp_len; 1988 int port; 1989 int proto; 1990 char *ahost = NULL; ``` ### Additional Information I am used this configuration environment with some edit for start Kamailio. ``` https://github.com/2600hz/kazoo-configs-kamailio/tree/5.0/kamailio ``` -- 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/2738

2 4

git:5.5:aed9b8f0: lib/srdb1: schema - version set to 5 for uacreg table
by Daniel-Constantin Mierla 18 May '21

18 May '21

Module: kamailio Branch: 5.5 Commit: aed9b8f0d19eb6823223c6b95b730a046fa7ec37 URL: https://github.com/kamailio/kamailio/commit/aed9b8f0d19eb6823223c6b95b730a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-18T08:26:18+02:00 lib/srdb1: schema - version set to 5 for uacreg table (cherry picked from commit 8da9b7936c1be8b5c4df80d716344dfa4461b494) --- Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/aed9b8f0d19eb6823223c6b95b730a0… Patch: https://github.com/kamailio/kamailio/commit/aed9b8f0d19eb6823223c6b95b730a0… --- diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index 1da4d46f60..d4f5b89b50 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -9,7 +9,7 @@ <table id="uacreg" xmlns:db="http://docbook.org/ns/docbook"> <name>uacreg</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>

1 0

git:5.5:1f034bd2: kamctl: updated db generation scripts
by Daniel-Constantin Mierla 18 May '21

18 May '21

Module: kamailio Branch: 5.5 Commit: 1f034bd28373dbfcdc2894aea47e56c68e313976 URL: https://github.com/kamailio/kamailio/commit/1f034bd28373dbfcdc2894aea47e56c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-18T08:26:36+02:00 kamctl: updated db generation scripts (cherry picked from commit 58d5f06aacce6ba7bb26f7be928b9bf71d39f9c3) --- Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_redis/kamailio/uacreg Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/uacreg.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/1f034bd28373dbfcdc2894aea47e56c… Patch: https://github.com/kamailio/kamailio/commit/1f034bd28373dbfcdc2894aea47e56c…

1 0

git:5.5:59e7e30c: secsipid: clod dlopen handle on mod destroy
by Daniel-Constantin Mierla 18 May '21

18 May '21

Module: kamailio Branch: 5.5 Commit: 59e7e30cc20cd8269bb60483ac709d8b5a7ba916 URL: https://github.com/kamailio/kamailio/commit/59e7e30cc20cd8269bb60483ac709d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-18T08:26:03+02:00 secsipid: clod dlopen handle on mod destroy (cherry picked from commit 4752ad434c087ac3b11968e5241c61e9e1f903aa) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/59e7e30cc20cd8269bb60483ac709d8… Patch: https://github.com/kamailio/kamailio/commit/59e7e30cc20cd8269bb60483ac709d8… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 7553e8ede7..30357a235e 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -38,6 +38,8 @@ MODULE_VERSION +static void *_secsipid_dlhandle = NULL; + static int secsipid_expire = 300; static int secsipid_timeout = 5; @@ -107,6 +109,10 @@ struct module_exports exports = { */ static int mod_init(void) { + if(_secsipid_dlhandle!=0) { + dlclose(_secsipid_dlhandle); + _secsipid_dlhandle = NULL; + } return 0; } @@ -115,7 +121,6 @@ static int mod_init(void) */ static int child_init(int rank) { - void *handle = NULL; char *errstr = NULL; char *modpath = NULL; secsipid_proc_bind_f bind_f = NULL; @@ -135,16 +140,16 @@ static int child_init(int rank) /* for openbsd */ #define RTLD_NOW DL_LAZY #endif - handle = dlopen(modpath, RTLD_NOW); /* resolve all symbols now */ - if (handle==0) { + _secsipid_dlhandle = dlopen(modpath, RTLD_NOW); /* resolve all symbols now */ + if (_secsipid_dlhandle==0) { LM_ERR("could not open module <%s>: %s\n", modpath, dlerror()); goto error; } /* launch register */ - bind_f = (secsipid_proc_bind_f)dlsym(handle, "secsipid_proc_bind"); + bind_f = (secsipid_proc_bind_f)dlsym(_secsipid_dlhandle, "secsipid_proc_bind"); if (((errstr=(char*)dlerror())==NULL) && bind_f!=NULL) { /* version control */ - if (!ksr_version_control(handle, modpath)) { + if (!ksr_version_control(_secsipid_dlhandle, modpath)) { goto error; } /* no error - call it */

1 0

[kamailio/kamailio] Update uac-create.sql to reflect UACREG_TABLE_VERSION in uac_reg.h (#2735)
by cbxbiker61 18 May '21

18 May '21

Table version needs to be updated updated in uac-create.sql, to match uac_reg.h version 5. Version 5 reflects the addition of the contact_addr column. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2735 -- Commit Summary -- * Update uac-create.sql to reflect UACREG_TABLE_VERSION in uac_reg.h -- File Changes -- M utils/kamctl/db_sqlite/uac-create.sql (2) M utils/kamctl/mysql/uac-create.sql (2) M utils/kamctl/oracle/uac-create.sql (2) M utils/kamctl/postgres/uac-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2735.patch https://github.com/kamailio/kamailio/pull/2735.diff -- 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/pull/2735

2 2

git:master:58d5f06a: kamctl: updated db generation scripts
by Daniel-Constantin Mierla 18 May '21

18 May '21

Module: kamailio Branch: master Commit: 58d5f06aacce6ba7bb26f7be928b9bf71d39f9c3 URL: https://github.com/kamailio/kamailio/commit/58d5f06aacce6ba7bb26f7be928b9bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-18T08:18:12+02:00 kamctl: updated db generation scripts --- Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_redis/kamailio/uacreg Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/uacreg.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/58d5f06aacce6ba7bb26f7be928b9bf… Patch: https://github.com/kamailio/kamailio/commit/58d5f06aacce6ba7bb26f7be928b9bf…

1 0

git:master:8da9b793: lib/srdb1: schema - version set to 5 for uacreg table
by Daniel-Constantin Mierla 18 May '21

18 May '21

Module: kamailio Branch: master Commit: 8da9b7936c1be8b5c4df80d716344dfa4461b494 URL: https://github.com/kamailio/kamailio/commit/8da9b7936c1be8b5c4df80d716344df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-18T08:17:07+02:00 lib/srdb1: schema - version set to 5 for uacreg table --- Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/8da9b7936c1be8b5c4df80d716344df… Patch: https://github.com/kamailio/kamailio/commit/8da9b7936c1be8b5c4df80d716344df… --- diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index 1da4d46f60..d4f5b89b50 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -9,7 +9,7 @@ <table id="uacreg" xmlns:db="http://docbook.org/ns/docbook"> <name>uacreg</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>

1 0

[kamailio/kamailio] tm: t_suspend.c - t_continue_helper() - do not continue processing a reply if it's suspended again (#2721)
by Giacomo Vacca 17 May '21

17 May '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2721 -- Commit Summary -- * tm: t_suspend.c - do not t_continue with reply if suspended -- File Changes -- M src/modules/tm/t_suspend.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2721.patch https://github.com/kamailio/kamailio/pull/2721.diff -- 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/pull/2721

2 10

git:master:82096e8f: tm: t_suspend.c - t_continue_helper() - do not continue processing a reply if it's suspended again (#2721)
by GitHub 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 82096e8f0af7a0bc75fc76749f3a7fdb6e1b028d URL: https://github.com/kamailio/kamailio/commit/82096e8f0af7a0bc75fc76749f3a7fd… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-05-17T11:56:05+02:00 tm: t_suspend.c - t_continue_helper() - do not continue processing a reply if it's suspended again (#2721) * tm: t_suspend.c - do not t_continue with reply if suspended * tm: t_suspend.c - unlock t_continue and reset flag if suspended again * tm: t_reply.c - received_reply() done if suspended after route --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/82096e8f0af7a0bc75fc76749f3a7fd… Patch: https://github.com/kamailio/kamailio/commit/82096e8f0af7a0bc75fc76749f3a7fd… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index a46921cbfd..306ed8f872 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2653,6 +2653,11 @@ int reply_received( struct sip_msg *p_msg ) } #endif + if (t->flags & T_ASYNC_SUSPENDED) { + LM_DBG("Reply for suspended transaction, done.\n"); + goto done; + } + if (unlikely(p_msg->msg_flags&FL_RPL_SUSPENDED)) { /* suspended the reply (async) - no error */ goto done; diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 4c8de42ce6..04f906f53c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -404,6 +404,14 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, LM_DBG("restoring previous environment\n"); faked_env( t, 0, 1); + if (t->flags & T_ASYNC_SUSPENDED) { + LM_DBG("The transaction is suspended, so not continuing\n"); + t->flags &= ~T_ASYNC_CONTINUE; + UNLOCK_ASYNC_CONTINUE(t); + set_t(backup_T, backup_T_branch); + return 0; + } + /*lock transaction replies - will be unlocked when reply is relayed*/ LOCK_REPLIES( t ); if ( is_local(t) ) {

1 0

git:master:b09d4852: cfg_rpc: clang format
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: b09d485274a06a62264649b9fb20df84c0d6cff9 URL: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-15T09:19:55+02:00 cfg_rpc: clang format --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8… Patch: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8…

1 0

git:master:5d0f147b: pv: added function to set the value for $ccp(key)
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 5d0f147be45495cd836da4656ece5549f9859815 URL: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-16T12:23:02+02:00 pv: added function to set the value for $ccp(key) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… Patch: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 16460f9bb3..ea6dab4940 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -540,7 +540,7 @@ static pv_export_t mod_pvs[] = { pv_parse_ksr_attrs_name, 0, 0, 0 }, {{"rpl", (sizeof("rpl")-1)}, PVT_OTHER, pv_get_rpl_attrs, 0, pv_parse_rpl_attrs_name, 0, 0, 0}, - {{"ccp", (sizeof("ccp")-1)}, PVT_OTHER, pv_get_ccp_attrs, 0, + {{"ccp", (sizeof("ccp")-1)}, PVT_OTHER, pv_get_ccp_attrs, pv_set_ccp_attrs, pv_parse_ccp_attrs_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 15ab3acb48..2c4692fecc 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4057,3 +4057,54 @@ int pv_get_ccp_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("unknown type for variable [%.*s]\n", s.len, s.s); return pv_get_null(msg, param, res); } + +/** + * + */ +int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + str gname = STR_NULL; + str vname = STR_NULL; + unsigned int *grpid = NULL; + str s = STR_NULL; + char *sep = NULL; + + if(val == NULL || (val->flags&PV_VAL_NULL)) { + LM_WARN("ignoring null asignment\n"); + return 0; + } + + s = param->pvn.u.isname.name.s; + + sep = q_memrchr(s.s, '.', s.len); + if(sep==NULL) { + LM_ERR("invalid pv name [%.*s]\n", s.len, s.s); + return -1; + } + gname.s = s.s; + gname.len = sep - s.s; + vname.s = sep + 1; + vname.len = s.s + s.len - sep - 1; + + if (cfg_get_group_id(&gname, &grpid)) { + LM_ERR("wrong group syntax. Use either 'group', or 'group[id]'\n"); + return -1; + } + + LM_DBG("setting value for variable: %.*s.%.*s\n", gname.len, gname.s, + vname.len, vname.s); + + if(val->flags&PV_TYPE_INT) { + if(cfg_set_now_int(_pv_ccp_ctx, &gname, grpid, &vname, val->ri)) { + LM_ERR("failed to set int to the variable: [%.*s]\n", s.len, s.s); + return -1; + } + } else { + if(cfg_set_now_str(_pv_ccp_ctx, &gname, grpid, &vname, &val->rs)) { + LM_ERR("failed to set str to the variable: [%.*s]\n", s.len, s.s); + return -1; + } + } + return 0; +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 70ef3f155c..359fabf850 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -402,6 +402,8 @@ int pv_ccp_ctx_init(void); int pv_parse_ccp_attrs_name(pv_spec_p sp, str *in); int pv_get_ccp_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); #endif

1 0

git:master:4752ad43: secsipid: clod dlopen handle on mod destroy
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 4752ad434c087ac3b11968e5241c61e9e1f903aa URL: https://github.com/kamailio/kamailio/commit/4752ad434c087ac3b11968e5241c61e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-17T08:08:20+02:00 secsipid: clod dlopen handle on mod destroy --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4752ad434c087ac3b11968e5241c61e… Patch: https://github.com/kamailio/kamailio/commit/4752ad434c087ac3b11968e5241c61e… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 7553e8ede7..30357a235e 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -38,6 +38,8 @@ MODULE_VERSION +static void *_secsipid_dlhandle = NULL; + static int secsipid_expire = 300; static int secsipid_timeout = 5; @@ -107,6 +109,10 @@ struct module_exports exports = { */ static int mod_init(void) { + if(_secsipid_dlhandle!=0) { + dlclose(_secsipid_dlhandle); + _secsipid_dlhandle = NULL; + } return 0; } @@ -115,7 +121,6 @@ static int mod_init(void) */ static int child_init(int rank) { - void *handle = NULL; char *errstr = NULL; char *modpath = NULL; secsipid_proc_bind_f bind_f = NULL; @@ -135,16 +140,16 @@ static int child_init(int rank) /* for openbsd */ #define RTLD_NOW DL_LAZY #endif - handle = dlopen(modpath, RTLD_NOW); /* resolve all symbols now */ - if (handle==0) { + _secsipid_dlhandle = dlopen(modpath, RTLD_NOW); /* resolve all symbols now */ + if (_secsipid_dlhandle==0) { LM_ERR("could not open module <%s>: %s\n", modpath, dlerror()); goto error; } /* launch register */ - bind_f = (secsipid_proc_bind_f)dlsym(handle, "secsipid_proc_bind"); + bind_f = (secsipid_proc_bind_f)dlsym(_secsipid_dlhandle, "secsipid_proc_bind"); if (((errstr=(char*)dlerror())==NULL) && bind_f!=NULL) { /* version control */ - if (!ksr_version_control(handle, modpath)) { + if (!ksr_version_control(_secsipid_dlhandle, modpath)) { goto error; } /* no error - call it */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev