- sr-dev - kamailio.org

git:5.4:1b517a7e: dialog: ignore 408 on keepalive with cseq 0
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: 1b517a7e560f20331aa94accca813825e0e0ff0b URL: https://github.com/kamailio/kamailio/commit/1b517a7e560f20331aa94accca81382… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:28:19+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all (cherry picked from commit 7aa8056a5e3a9804133cb9ff79640d8116be63da) (cherry picked from commit 6d71c9399027f2ed41cd6eae576d862440bd4fd4) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/1b517a7e560f20331aa94accca81382… Patch: https://github.com/kamailio/kamailio/commit/1b517a7e560f20331aa94accca81382… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d48d139965..809834527f 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -271,6 +271,12 @@ void dlg_ka_cb_all(struct cell* t, int type, struct tmcb_params* ps, int dir) LM_DBG("skip updating non-confirmed dialogs\n"); goto done; } + if(ps->code==408 && (dlg->cseq[dir].len==0 + || (dlg->cseq[dir].len==1 && dlg->cseq[dir].s[0]=='\0'))) { + LM_DBG("ignore 408 for %s cseq 0\n", + ((dir==DLG_CALLER_LEG)?"caller":"callee")); + goto done; + } tend = 0; if(dir==DLG_CALLER_LEG) { dlg->ka_src_counter++;

1 0

git:5.4:0675c3eb: presence: set correct type for local_log_facility modparam
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: 0675c3eb0fa95e19532cf812585f1eb021829dbc URL: https://github.com/kamailio/kamailio/commit/0675c3eb0fa95e19532cf812585f1eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:28:43+02:00 presence: set correct type for local_log_facility modparam (cherry picked from commit 5f4662a95a97d5224bf03745a9a354a41925706c) (cherry picked from commit 5bc7e1d636b617839f697838e326347b19cb0fcc) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/0675c3eb0fa95e19532cf812585f1eb… Patch: https://github.com/kamailio/kamailio/commit/0675c3eb0fa95e19532cf812585f1eb… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

1 0

git:5.4:1142d547: [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+
by Daniel-Constantin Mierla 26 May '21

26 May '21

Module: kamailio Branch: 5.4 Commit: 1142d5470d40801743af2fd9e27213bae6c394f4 URL: https://github.com/kamailio/kamailio/commit/1142d5470d40801743af2fd9e27213b… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:25:25+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. (cherry picked from commit 27904530d1f8efd26e2b96fa5f18a3aad887919b) (cherry picked from commit 1c7a8459f1a5b0f4d96f3908a301b599d5e24dc3) --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/1142d5470d40801743af2fd9e27213b… Patch: https://github.com/kamailio/kamailio/commit/1142d5470d40801743af2fd9e27213b… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index a8859c4a31..22897075c7 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -55,8 +55,12 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); * ECDHE is enabled only on OpenSSL 1.0.0e and later. * See http://www.openssl.org/news/secadv_20110906.txt * for details. + * Also, copied from _ssl.c of Python for correct initialization. + * Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use + * prime256v1 by default. This is Apache mod_ssl's initialization + * policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; @@ -65,11 +69,15 @@ static void setup_ecdh(SSL_CTX *ctx) return; } +#if defined(SSL_CTX_set_ecdh_auto) + SSL_CTX_set_ecdh_auto(ctx, 1); +#else ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); SSL_CTX_set_tmp_ecdh(ctx, ecdh); EC_KEY_free(ecdh); +#endif } #endif @@ -670,7 +678,7 @@ static int set_cipher_list(tls_domain_t* d) tls_domain_str(d), cipher_list); return -1; } -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) setup_ecdh(d->ctx[i]); #endif #ifndef OPENSSL_NO_DH

1 0

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

git:master:061a66f8: cfg_rpc: removed history and svn id
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 061a66f88a91bc3e05224ef95043ebe4fec16dd1 URL: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-15T08:58:27+02:00 cfg_rpc: removed history and svn id --- Modified: src/modules/cfg_rpc/Makefile Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… Patch: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… --- diff --git a/src/modules/cfg_rpc/Makefile b/src/modules/cfg_rpc/Makefile index a7a980d873..d4e58b4c92 100644 --- a/src/modules/cfg_rpc/Makefile +++ b/src/modules/cfg_rpc/Makefile @@ -1,5 +1,5 @@ # cfg_rpc module makefile -# +# # WARNING: do not run this directly, it should be run by the main Makefile include ../../Makefile.defs diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index e31429f713..30c72e6083 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2007 iptelorg GmbH * * This file is part of ser, a free SIP server. @@ -24,9 +22,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History - * ------- - * 2007-12-03 Initial version (Miklos) */ #include "../../core/sr_module.h"

1 0

git:master:696d5b90: pv: added $ccp(gname.vname) variable
by Daniel-Constantin Mierla 14 May '21

14 May '21

Module: kamailio Branch: master Commit: 696d5b909f02fa34ccdc0b388dcaac7381eb32ca URL: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:41:29+02:00 pv: added $ccp(gname.vname) variable - get the config custom parameter value - direct access without running through select variable --- 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/696d5b909f02fa34ccdc0b388dcaac7… Patch: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7…

1 0

git:master:899a1048: core: cfg - added cfg_get_group_id to the config var framework api
by Daniel-Constantin Mierla 14 May '21

14 May '21

Module: kamailio Branch: master Commit: 899a10489e14a834267fcfbba36cc5aacdf45633 URL: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:32:31+02:00 core: cfg - added cfg_get_group_id to the config var framework api --- Modified: src/core/cfg/cfg.c Modified: src/core/cfg/cfg.h --- Diff: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… Patch: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 488d72f35a..80e3fe3e55 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -285,3 +285,39 @@ void **cfg_get_handle(char *gname) return group->handle; } + + +/* Set the group_id pointer based on the group string. + * The string is either "group_name", or "group_name[group_id]" + * *group_id is set to null in the former case. + * Warning: changes the group string + */ +int cfg_get_group_id(str *group, unsigned int **group_id) +{ + static unsigned int id; + str s; + + if (!group->s || (group->s[group->len-1] != ']')) { + *group_id = NULL; + return 0; + } + + s.s = group->s + group->len - 2; + s.len = 0; + while ((s.s > group->s) && (*s.s != '[')) { + s.s--; + s.len++; + } + if (s.s == group->s) /* '[' not found */ + return -1; + group->len = s.s - group->s; + s.s++; + if (!group->len || !s.len) + return -1; + if (str2int(&s, &id)) + return -1; + + *group_id = &id; + return 0; +} + diff --git a/src/core/cfg/cfg.h b/src/core/cfg/cfg.h index b3c5a1ba29..19cb824055 100644 --- a/src/core/cfg/cfg.h +++ b/src/core/cfg/cfg.h @@ -102,4 +102,7 @@ int cfg_new_ginst(char *group_name, unsigned int group_id); /*! \brief returns the handle of a cfg group */ void **cfg_get_handle(char *gname); +/*! \brief get the id of a cfg group */ +int cfg_get_group_id(str *group, unsigned int **group_id); + #endif /* _CFG_H */

1 0

git:master:9fcb5710: cfg-rpc: get_group_id() pints to cfg_get_group_id()
by Daniel-Constantin Mierla 14 May '21

14 May '21

Module: kamailio Branch: master Commit: 9fcb5710e01b61c91df85bcf144cbda68b730ae0 URL: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:33:33+02:00 cfg-rpc: get_group_id() pints to cfg_get_group_id() --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… Patch: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index 2cab2a47cd..e31429f713 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -54,34 +54,7 @@ static int mod_init(void) * *group_id is set to null in the former case. * Warning: changes the group string */ -static int get_group_id(str *group, unsigned int **group_id) -{ - static unsigned int id; - str s; - - if (!group->s || (group->s[group->len-1] != ']')) { - *group_id = NULL; - return 0; - } - - s.s = group->s + group->len - 2; - s.len = 0; - while ((s.s > group->s) && (*s.s != '[')) { - s.s--; - s.len++; - } - if (s.s == group->s) /* '[' not found */ - return -1; - group->len = s.s - group->s; - s.s++; - if (!group->len || !s.len) - return -1; - if (str2int(&s, &id)) - return -1; - - *group_id = &id; - return 0; -} +#define get_group_id(group, group_id) cfg_get_group_id(group, group_id) static const char* rpc_set_now_doc[2] = { "Set the value of a configuration variable and commit the change immediately",

1 0

[kamailio/kamailio] is_first_hop() not processing FQDN in RR header in a case of reply (#2732)
by Igor Olhovskiy 13 May '21

13 May '21

### Description In the case of using FQDN in `listen = ... advertise ... ` FQDN is populated in the `Record-Route` header. In this case `is_first_hop()` function is not returning true even if `FQDN == myself` in replies. #### Reproduction Add FQND in advertise and check `is_first_hop()` result in a case of reply #### Log Messages ``` siputils [sipops.c:185]: is_first_hop(): uri host is not an ip address ``` ### Possible Solutions Not use `is_first_hop()` in the case of reply/FQDN in advertising. ### Additional Information version: kamailio 5.4.4 (x86_64/linux) e16352 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_BLACKLIST, 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: e16352 compiled on 09:50:10 May 7 2021 with gcc 4.8.5 * **Operating System**: ``` # uname -a Linux fe-0513-2-dev 3.10.0-1160.21.1.el7.x86_64 #1 SMP Tue Mar 16 18:28:22 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` https://github.com/kamailio/kamailio/blob/02240711239149e2f5c4890a70ab158d1… -- 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/2732

2 4

[kamailio/kamailio] Topos: critical error after upgrade to 5.5 (#2734)
by Boris Korzun 13 May '21

13 May '21

### Description I've faced a critical error in the log after upgrade to 5.5 on _topos_ module. ### Troubleshooting It looks like _ki_tps_set_context()_ tries to free incorrectly defined variable __tps_context_value_. #### Reproduction ``` loadmodule "topos.so" modparam("topos", "storage", "db") modparam("topos", "db_url", DBURL_PRIMARY) modparam("topos", "sanity_checks", 1) modparam("topos", "branch_expire", 300) modparam("topos", "dialog_expire", 7200) modparam("topos", "clean_interval", 120) ``` #### Log Messages ``` 20:59:43.951476 kamailio 81412 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 20:59:58.925224 kamailio 81413 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:13.930896 kamailio 81414 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:28.929303 kamailio 81415 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:43.925256 kamailio 81416 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:58.925535 kamailio 81417 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:01:13.925081 kamailio 81418 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:01:28.925306 kamailio 81419 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring ``` ### Additional Information ``` version: kamailio 5.5.0 (x86_64/freebsd) 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, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: d4c1a1 compiled on 13:02:36 May 13 2021 with cc FreeBSD clang version 10.0.1 (git@github.com:llvm/llvm-project.git llvmorg-10.0.1-0-gef32c611aa2) ``` * **Operating System**: FreeBSD 13 -- 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/2734

2 2

git:5.5:6a5a61bf: core: xavp - safety checks for name len
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: 5.5 Commit: 6a5a61bfab80116338f6a9c91ed7ec5f7b98923b URL: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:55:06+02:00 core: xavp - safety checks for name len (cherry picked from commit d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Patch: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b11b99929d..036a5ffbe1 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1579,7 +1579,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1812,7 +1812,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1939,7 +1939,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -2022,7 +2022,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2315,7 +2315,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

1 0

git:5.5:d2fd064a: topos: init xavp and context modparams to str null
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: 5.5 Commit: d2fd064af771df2ffe6c7a78c05d75facdfa50bf URL: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:55:14+02:00 topos: init xavp and context modparams to str null (cherry picked from commit 5e3f7e1557d90a3e6f40eff41cc0b0bb317ab544) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… Patch: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index ba58920a6c..498cc8defe 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -107,13 +107,13 @@ str _tps_contact_host = str_init(""); int _tps_contact_mode = 0; str _tps_cparam_name = str_init("tps"); -str _tps_xavu_cfg = str_init(""); -str _tps_xavu_field_acontact = str_init(""); -str _tps_xavu_field_bcontact = str_init(""); -str _tps_xavu_field_contact_host = str_init(""); +str _tps_xavu_cfg = STR_NULL; +str _tps_xavu_field_acontact = STR_NULL; +str _tps_xavu_field_bcontact = STR_NULL; +str _tps_xavu_field_contact_host = STR_NULL; -str _tps_context_param = str_init(""); -str _tps_context_value = str_init(""); +str _tps_context_param = STR_NULL; +str _tps_context_value = STR_NULL; sanity_api_t scb; @@ -247,7 +247,8 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC)<0) return -1; - if (_tps_contact_mode == 2 && (_tps_xavu_field_acontact.len <= 0 + if (_tps_contact_mode == 2 && (_tps_xavu_cfg.len <= 0 + || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," " but a_contact or b_contact xavu fields not defined\n");

1 0

git:5.5:5bc7e1d6: presence: set correct type for local_log_facility modparam
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: 5.5 Commit: 5bc7e1d636b617839f697838e326347b19cb0fcc URL: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:54:57+02:00 presence: set correct type for local_log_facility modparam (cherry picked from commit 5f4662a95a97d5224bf03745a9a354a41925706c) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… Patch: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

1 0

git:master:5e3f7e15: topos: init xavp and context modparams to str null
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: master Commit: 5e3f7e1557d90a3e6f40eff41cc0b0bb317ab544 URL: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:53:18+02:00 topos: init xavp and context modparams to str null --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… Patch: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index ba58920a6c..498cc8defe 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -107,13 +107,13 @@ str _tps_contact_host = str_init(""); int _tps_contact_mode = 0; str _tps_cparam_name = str_init("tps"); -str _tps_xavu_cfg = str_init(""); -str _tps_xavu_field_acontact = str_init(""); -str _tps_xavu_field_bcontact = str_init(""); -str _tps_xavu_field_contact_host = str_init(""); +str _tps_xavu_cfg = STR_NULL; +str _tps_xavu_field_acontact = STR_NULL; +str _tps_xavu_field_bcontact = STR_NULL; +str _tps_xavu_field_contact_host = STR_NULL; -str _tps_context_param = str_init(""); -str _tps_context_value = str_init(""); +str _tps_context_param = STR_NULL; +str _tps_context_value = STR_NULL; sanity_api_t scb; @@ -247,7 +247,8 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC)<0) return -1; - if (_tps_contact_mode == 2 && (_tps_xavu_field_acontact.len <= 0 + if (_tps_contact_mode == 2 && (_tps_xavu_cfg.len <= 0 + || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," " but a_contact or b_contact xavu fields not defined\n");

1 0

git:master:46080a1f: pv: added $rpl(cntrr) - count record-route headers in reply
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: master Commit: 46080a1f2c8aca4e9b187d62f0c3e74e0e29f3ad URL: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T10:49:19+02:00 pv: added $rpl(cntrr) - count record-route headers in reply --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… Patch: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 472c63f205..0493c23c08 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -41,6 +41,7 @@ #include "../../core/parser/parse_hname2.h" #include "../../core/parser/parse_content.h" #include "../../core/parser/parse_refer_to.h" +#include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_rpid.h" #include "../../core/parser/parse_diversion.h" #include "../../core/parser/parse_ppi_pai.h" @@ -3773,6 +3774,8 @@ int pv_parse_rpl_attrs_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "dport", 5)==0) sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "cntrr", 5)==0) + sp->pvp.pvn.u.isname.name.n = 21; else goto error; break; case 6: @@ -3813,6 +3816,7 @@ int pv_get_rpl_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) str sproto = STR_NULL; unsigned int port = 0; hdr_field_t *hf = NULL; + unsigned int hcnt = 0; if(param==NULL) { return pv_get_null(msg, param, res); @@ -3877,18 +3881,37 @@ int pv_get_rpl_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 20: /* count of via */ if (parse_headers(msg, HDR_EOH_F, 0)<0) { LM_DBG("failed to parse sip headers\n"); - return pv_get_uintval(msg, param, res, 0); + return pv_get_null(msg, param, res); } - port = 0; + hcnt = 0; for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { if(hf->type==HDR_VIA_T) { via_body_t *vb; for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { - port++; + hcnt++; } } } - return pv_get_uintval(msg, param, res, port); + return pv_get_uintval(msg, param, res, hcnt); + case 21: /* count of record-route */ + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_null(msg, param, res); + } + hcnt = 0; + for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { + if(hf->type == HDR_RECORDROUTE_T) { + rr_t *rrb; + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { + hcnt++; + } + } + } + return pv_get_uintval(msg, param, res, hcnt); default: return pv_get_null(msg, param, res);

1 0

git:master:d22d812d: core: xavp - safety checks for name len
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: master Commit: d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072 URL: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:41:40+02:00 core: xavp - safety checks for name len --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… Patch: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b11b99929d..036a5ffbe1 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1579,7 +1579,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1812,7 +1812,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1939,7 +1939,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -2022,7 +2022,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2315,7 +2315,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

1 0

git:master:5f4662a9: presence: set correct type for local_log_facility modparam
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: 5f4662a95a97d5224bf03745a9a354a41925706c URL: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T18:14:29+02:00 presence: set correct type for local_log_facility modparam --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… Patch: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

1 0

git:5.5:9fe76d00: secsipid: docs - set GO111MODULE=off in installation example
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: 9fe76d00f32aa3adfb0bfb2c7cbe325681089037 URL: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:52+02:00 secsipid: docs - set GO111MODULE=off in installation example (cherry picked from commit ecc8a34dae44883b125ae7a3da59d4a332e0b48c) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… Patch: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index d9d622af17..1e22e371fb 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -318,7 +318,7 @@ request_route { <section id="secsipid.s.installation"> <title>Installation</title> <para> - The module needs "secsipdi_proc.so" module thatdepends on "libsecsipid", + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the @@ -334,6 +334,7 @@ request_route { <title>Libsecsipid Usage</title> <programlisting format="linespecific"> ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -351,6 +352,10 @@ make install ... </programlisting> </example> + <para> + For more details about compilation and installation of libsecsipid, see: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> </section> </chapter>

1 0

git:5.5:b57ab055: usrloc: unnecessary periodic db queries cancelled
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: b57ab05589b1982df456b39bf8f26359e73a63cc URL: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… Author: korayvt <koray.vatansever(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:14+02:00 usrloc: unnecessary periodic db queries cancelled (cherry picked from commit 42bc79b3b617632b6f83e1352b5cb8266706d7c0) --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… Patch: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 44ce3c6376..252bb8bde0 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -960,7 +960,9 @@ int synchronize_all_udomains(int istart, int istep) res |= db_timer_udomain(ptr->d); } } - ul_ka_db_records((unsigned int)istart); + if (ul_ka_mode != ULKA_NONE) { + ul_ka_db_records((unsigned int)istart); + } } else { for( ptr=_ksr_ul_root ; ptr ; ptr=ptr->next) { mem_timer_udomain(ptr->d, istart, istep); diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 9d96b2d7a6..204ddfd29f 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1094,8 +1094,10 @@ int db_timer_udomain(udomain_t* _d) db_val_t vals[3]; int key_num = 2; - /* call contact expired call back for a domain before deleting database rows */ - udomain_contact_expired_cb(ul_dbh, _d); + /* If contact-expired callback exists, run it for a domain before deleting database rows */ + if (exists_ulcb_type(UL_CONTACT_EXPIRE)) { + udomain_contact_expired_cb(ul_dbh, _d); + } keys[0] = &ul_expires_col; ops[0] = "<";

1 0

git:5.5:c1fad6fd: tcpops: use fixup_igp_all() instead of fixup_igp_null()
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: c1fad6fd1c05e86f974c3771ba246ee2e05abf45 URL: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:26+02:00 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters (cherry picked from commit 02240711239149e2f5c4890a70ab158d10fa8187) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… Patch: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index b2d2fbe7dd..23036fd771 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -78,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1,

1 0

git:5.5:6d71c939: dialog: ignore 408 on keepalive with cseq 0
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: 6d71c9399027f2ed41cd6eae576d862440bd4fd4 URL: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:05+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all (cherry picked from commit 7aa8056a5e3a9804133cb9ff79640d8116be63da) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… Patch: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d48d139965..809834527f 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -271,6 +271,12 @@ void dlg_ka_cb_all(struct cell* t, int type, struct tmcb_params* ps, int dir) LM_DBG("skip updating non-confirmed dialogs\n"); goto done; } + if(ps->code==408 && (dlg->cseq[dir].len==0 + || (dlg->cseq[dir].len==1 && dlg->cseq[dir].s[0]=='\0'))) { + LM_DBG("ignore 408 for %s cseq 0\n", + ((dir==DLG_CALLER_LEG)?"caller":"callee")); + goto done; + } tend = 0; if(dir==DLG_CALLER_LEG) { dlg->ka_src_counter++;

1 0

git:master:c441c922: pv: added $rpl(key) variable
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: c441c9226635fb825096080029be7ba2d3ba8132 URL: https://github.com/kamailio/kamailio/commit/c441c9226635fb825096080029be7ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T13:14:12+02:00 pv: added $rpl(key) variable - return attributes of the sip reply that is processed at that moment - the key can be: - duri - SIP URI corresponding to the destination address where the reply is going to be sent based on 2nd via - dhost - host part of duri - dport - port part of duri - dproto - proto of duri - dprotoid - proto id of duri - cntvia - number of via header bodies --- 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/c441c9226635fb825096080029be7ba… Patch: https://github.com/kamailio/kamailio/commit/c441c9226635fb825096080029be7ba…

1 0

git:master:600c2cf5: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 12 May '21

12 May '21

Module: kamailio Branch: master Commit: 600c2cf5c7349fc924b53199280baba8bdd329e7 URL: https://github.com/kamailio/kamailio/commit/600c2cf5c7349fc924b53199280baba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-12T08:46:14+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/600c2cf5c7349fc924b53199280baba… Patch: https://github.com/kamailio/kamailio/commit/600c2cf5c7349fc924b53199280baba… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index c96b7830c6..b42915943b 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -299,7 +299,7 @@ request_route { 5. Installation - The module needs "secsipdi_proc.so" module thatdepends on + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the libsecsipid is @@ -313,6 +313,7 @@ request_route { Example 1.11. Libsecsipid Usage ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -328,3 +329,6 @@ make install # make modules modules=src/modules/secsipid_proc # make modules modules=src/modules/secsipid ... + + For more details about compilation and installation of libsecsipid, + see: https://github.com/asipto/secsipidx.

1 0

git:master:ecc8a34d: secsipid: docs - set GO111MODULE=off in installation example
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: ecc8a34dae44883b125ae7a3da59d4a332e0b48c URL: https://github.com/kamailio/kamailio/commit/ecc8a34dae44883b125ae7a3da59d4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T08:32:37+02:00 secsipid: docs - set GO111MODULE=off in installation example --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ecc8a34dae44883b125ae7a3da59d4a… Patch: https://github.com/kamailio/kamailio/commit/ecc8a34dae44883b125ae7a3da59d4a… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index d9d622af17..1e22e371fb 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -318,7 +318,7 @@ request_route { <section id="secsipid.s.installation"> <title>Installation</title> <para> - The module needs "secsipdi_proc.so" module thatdepends on "libsecsipid", + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the @@ -334,6 +334,7 @@ request_route { <title>Libsecsipid Usage</title> <programlisting format="linespecific"> ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -351,6 +352,10 @@ make install ... </programlisting> </example> + <para> + For more details about compilation and installation of libsecsipid, see: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> </section> </chapter>

1 0

git:master:71d7d583: core: kemi - exported KSR.pv.geti("pv")
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: 71d7d5835dd256201f50d14d7c7285f7d2881bb6 URL: https://github.com/kamailio/kamailio/commit/71d7d5835dd256201f50d14d7c7285f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T08:15:33+02:00 core: kemi - exported KSR.pv.geti("pv") - return integer value of the pv, trying to convert if its value is string --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/71d7d5835dd256201f50d14d7c7285f… Patch: https://github.com/kamailio/kamailio/commit/71d7d5835dd256201f50d14d7c7285f… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0932339996..324e7cd6cf 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2855,6 +2855,47 @@ static sr_kemi_xval_t* sr_kemi_pv_getvn (sip_msg_t *msg, str *pvn, int xival) return sr_kemi_pv_get_valx (msg, pvn, NULL, xival, 1); } +/** + * + */ +static int sr_kemi_pv_geti (sip_msg_t *msg, str *pvn) +{ + pv_spec_t *pvs; + pv_value_t val; + int vi; + + LM_DBG("pv get: %.*s\n", pvn->len, pvn->s); + vi = pv_locate_name(pvn); + if(vi != pvn->len) { + LM_WARN("invalid pv [%.*s] (%d/%d)\n", pvn->len, pvn->s, vi, pvn->len); + return 0; + } + pvs = pv_cache_get(pvn); + if(pvs==NULL) { + LM_WARN("cannot get pv spec for [%.*s]\n", pvn->len, pvn->s); + return 0; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(msg, pvs, &val) != 0) { + LM_WARN("unable to get pv value for [%.*s]\n", pvn->len, pvn->s); + return 0; + } + if(val.flags&PV_VAL_NULL) { + return 0; + } + if(val.flags&(PV_TYPE_INT|PV_VAL_INT)) { + return val.ri; + } + if(val.ri!=0) { + return val.ri; + } + vi = 0; + str2sint(&val.rs, &vi); + + return vi; +} + /** * */ @@ -3003,6 +3044,11 @@ static sr_kemi_t _sr_kemi_pv[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pv"), str_init("geti"), + SR_KEMIP_INT, sr_kemi_pv_geti, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pv"), str_init("getvn"), SR_KEMIP_XVAL, sr_kemi_pv_getvn, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] Setting notifier_processes to 1 or more seems to cause memory leak (#2733)
by Amit Nir 11 May '21

11 May '21

Hello, We use Kamailio with KAZOO. We have set notifier_processes as follows: modparam("presence", "notifier_processes", 1) A value of 1 or greater seems to be required to avoid race conditions when multiple notify's need to be sent. We've noticed noticed what seems to be a memory leak in Kamailio process. After several days, Kamailio will crash after consuming all system memory. I have not found any other reports of this happening to others. Does this seem familiar to anyone? -- 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/2733

2 5

git:master:ca886ffa: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 11 May '21

11 May '21

Module: kamailio Branch: master Commit: ca886ffa64db8cc209dcc7098ffb69902464da72 URL: https://github.com/kamailio/kamailio/commit/ca886ffa64db8cc209dcc7098ffb699… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-11T17:31:12+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/ca886ffa64db8cc209dcc7098ffb699… Patch: https://github.com/kamailio/kamailio/commit/ca886ffa64db8cc209dcc7098ffb699… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index a1aeae393c..453179d5a1 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -449,8 +449,9 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") Inserting the call-id in the internal list, which is checked when further replies arrive. Any 183 reply that is received during the - timeout value will be converted to a 180 message. Please note that you - need to set a positive timeout value in order to use this function. + timeout value will be converted to a 180 message with removed SDP body. + Please note that you need to set a positive ring_timeout value in order + to use this function. The function returns TRUE on success, and FALSE during processing failures.

1 0

git:master:212840c3: siptuils: small doc extension for ring filter functionality
by Henning Westerholt 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 212840c367e4b2945bb105e1fd087543f7fdf316 URL: https://github.com/kamailio/kamailio/commit/212840c367e4b2945bb105e1fd08754… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-11T15:24:01Z siptuils: small doc extension for ring filter functionality --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/212840c367e4b2945bb105e1fd08754… Patch: https://github.com/kamailio/kamailio/commit/212840c367e4b2945bb105e1fd08754… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 5764c152d4..8e7140385d 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -281,8 +281,9 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") <para> Inserting the call-id in the internal list, which is checked when further replies arrive. Any 183 reply that is received during the - timeout value will be converted to a 180 message. Please note that you - need to set a positive timeout value in order to use this function. + timeout value will be converted to a 180 message with removed SDP body. + Please note that you need to set a positive ring_timeout value in order + to use this function. </para> <para> The function returns TRUE on success, and FALSE during processing failures.

1 0

git:master:9c2fea2d: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 9c2fea2df70e3fe609324a9d868efe9998bcda10 URL: https://github.com/kamailio/kamailio/commit/9c2fea2df70e3fe609324a9d868efe9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-11T15:46:16+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/9c2fea2df70e3fe609324a9d868efe9… Patch: https://github.com/kamailio/kamailio/commit/9c2fea2df70e3fe609324a9d868efe9… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 87d3ecf9e4..a1aeae393c 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -96,7 +96,7 @@ Gabriel Vasile 4.30. is_reply() 4.31. is_gruu([uri]) 4.32. is_supported(option) - 4.33. is_first_hop() + 4.33. is_first_hop([mode]) 4.34. sip_p_charging_vector(flags) 4.35. contact_param_encode(pname, saddr) 4.36. contact_param_decode(pname) @@ -217,7 +217,7 @@ Chapter 1. Admin Guide 4.30. is_reply() 4.31. is_gruu([uri]) 4.32. is_supported(option) - 4.33. is_first_hop() + 4.33. is_first_hop([mode]) 4.34. sip_p_charging_vector(flags) 4.35. contact_param_encode(pname, saddr) 4.36. contact_param_decode(pname) @@ -438,7 +438,7 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.30. is_reply() 4.31. is_gruu([uri]) 4.32. is_supported(option) - 4.33. is_first_hop() + 4.33. is_first_hop([mode]) 4.34. sip_p_charging_vector(flags) 4.35. contact_param_encode(pname, saddr) 4.36. contact_param_decode(pname) @@ -994,24 +994,37 @@ if(is_gruu()) { ... } if (is_supported("outbound")) { ... } ... -4.33. is_first_hop() +4.33. is_first_hop([mode]) The function returns true if the proxy is first hop after the original - sender. For incoming SIP requests, it means there is only one Via - header. For incoming SIP replies, it means that top Record-Route URI is - 'myself' and source address is not matching it (to avoid detecting in - case of local loops). The detection is done only when Record-Route has - an IP address in its URI (for a domain, it returns -1/false). + sender based on a best effort estimation by checking Via and + Record-Route headers. + + For incoming SIP requests, it means there is only one Via header. + + For incoming SIP replies, if mode==0, it means that top Record-Route + URI is 'myself' and source address is not matching local IP (to avoid + detecting in case of local loops). Therefore for mode==0 the detection + is done only when Record-Route has an IP address in its URI (for a + domain, it returns -1/false). If mode==1, then the check of local IP is + no longer done, only if top Record-Route is myself, returning true also + if there is a domain, assuming that is expected no looping can happen + based on config rules. Note that it does not detect spirals, which can have the condition for replies true also in the case of additional SIP reply reception. + Parameter mode is optional and can be an integer or a varaible holding + an integer. If not provided, the behaviour is like mode==0. + This function can be used from ANY_ROUTE. Example 1.42. is_first_hop() usage ... if(is_first_hop()) { ... } ... +if(is_first_hop_mode("1")) { ... } +... 4.34. sip_p_charging_vector(flags)

1 0

git:master:425ba921: siputils: docs - updates to is_first_hop() for mode parameter
by Daniel-Constantin Mierla 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 425ba921288c8d5a6ae3076287d0cf39c735a8fd URL: https://github.com/kamailio/kamailio/commit/425ba921288c8d5a6ae3076287d0cf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-11T15:38:14+02:00 siputils: docs - updates to is_first_hop() for mode parameter --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/425ba921288c8d5a6ae3076287d0cf3… Patch: https://github.com/kamailio/kamailio/commit/425ba921288c8d5a6ae3076287d0cf3… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 4667e42f63..5764c152d4 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1169,22 +1169,35 @@ if (is_supported("outbound")) { ... } </section> <section id="siputils.f.is_first_hop"> <title> - <function moreinfo="none">is_first_hop()</function> + <function moreinfo="none">is_first_hop([mode])</function> </title> <para> The function returns true if the proxy is first hop after the - original sender. For incoming SIP requests, it means there is only - one Via header. For incoming SIP replies, it means that top - Record-Route URI is 'myself' and source address is not matching it - (to avoid detecting in case of local loops). The detection is done - only when Record-Route has an IP address in its URI (for a domain, - it returns -1/false). + original sender based on a best effort estimation by checking Via + and Record-Route headers. + </para> + <para> + For incoming SIP requests, it means there is only one Via header. + </para> + <para> + For incoming SIP replies, if mode==0, it means that top Record-Route + URI is 'myself' and source address is not matching local IP (to avoid + detecting in case of local loops). Therefore for mode==0 the detection + is done only when Record-Route has an IP address in its URI (for a domain, + it returns -1/false). If mode==1, then the check of local IP is no + longer done, only if top Record-Route is myself, returning true also if + there is a domain, assuming that is expected no looping can happen + based on config rules. </para> <para> Note that it does not detect spirals, which can have the condition for replies true also in the case of additional SIP reply reception. </para> <para> + Parameter mode is optional and can be an integer or a varaible holding + an integer. If not provided, the behaviour is like mode==0. + </para> + <para> This function can be used from ANY_ROUTE. </para> <example> @@ -1193,6 +1206,8 @@ if (is_supported("outbound")) { ... } ... if(is_first_hop()) { ... } ... +if(is_first_hop_mode("1")) { ... } +... </programlisting> </example> </section>

1 0

git:master:6045c62f: siputils: added optional mode parameter to is_first_hop()
by Daniel-Constantin Mierla 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 6045c62f4ebaf861cf725ea7c1e560b22f7a5379 URL: https://github.com/kamailio/kamailio/commit/6045c62f4ebaf861cf725ea7c1e560b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-11T15:16:36+02:00 siputils: added optional mode parameter to is_first_hop() - if set to 1, skip checking for loops - exported to kemi as is_first_hop_mode(int mode) --- Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/6045c62f4ebaf861cf725ea7c1e560b… Patch: https://github.com/kamailio/kamailio/commit/6045c62f4ebaf861cf725ea7c1e560b… --- diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index 95b1baa5d0..fb1040c6ba 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -140,12 +140,12 @@ int w_is_supported(sip_msg_t *msg, char *_option, char *p2) } -int is_first_hop(sip_msg_t *msg) +int is_first_hop_mode(sip_msg_t *msg, int mode) { int ret; rr_t* r = NULL; sip_uri_t puri; - struct ip_addr *ip; + struct ip_addr *ip = NULL; if(msg==NULL) return -1; @@ -180,10 +180,12 @@ int is_first_hop(sip_msg_t *msg) LM_DBG("failed to parse uri in first record-route header\n"); return -1; } - if (((ip = str2ip(&(puri.host))) == NULL) - && ((ip = str2ip6(&(puri.host))) == NULL)) { - LM_DBG("uri host is not an ip address\n"); - return -1; + if(mode==0) { + if (((ip = str2ip(&(puri.host))) == NULL) + && ((ip = str2ip6(&(puri.host))) == NULL)) { + LM_DBG("uri host is not an ip address\n"); + return -1; + } } ret = check_self(&puri.host, (puri.port.s)?puri.port_no:0, (puri.transport_val.s)?puri.proto:0); @@ -191,13 +193,15 @@ int is_first_hop(sip_msg_t *msg) LM_DBG("top record route uri is not myself\n"); return -1; } - if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) - && ((msg->rcv.src_port == puri.port_no) - || ((puri.port.len == 0) && (msg->rcv.src_port == 5060))) - && (puri.proto==msg->rcv.proto - || (puri.proto==0 && msg->rcv.proto==PROTO_UDP)) ) { - LM_DBG("source address matches top record route uri - loop\n"); - return -1; + if(mode==0) { + if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) + && ((msg->rcv.src_port == puri.port_no) + || ((puri.port.len == 0) && (msg->rcv.src_port == 5060))) + && (puri.proto==msg->rcv.proto + || (puri.proto==0 && msg->rcv.proto==PROTO_UDP)) ) { + LM_DBG("source address matches top record route uri - loop\n"); + return -1; + } } /* todo - check spirals */ return 1; @@ -206,6 +210,23 @@ int is_first_hop(sip_msg_t *msg) } } +int w_is_first_hop_mode(sip_msg_t *msg, char *p1mode, char *p2) +{ + int mode = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)p1mode, &mode)<0) { + LM_ERR("failed to get mode parameter\n"); + return -1; + } + + return is_first_hop_mode(msg, mode); +} + +int is_first_hop(sip_msg_t *msg) +{ + return is_first_hop_mode(msg, 0); +} + int w_is_first_hop(sip_msg_t *msg, char *p1, char *p2) { return is_first_hop(msg); diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 27ac0c035e..97d885c71c 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -40,5 +40,7 @@ int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2); int w_is_supported(sip_msg_t *msg, char *_option, char *p2); int w_is_first_hop(sip_msg_t *msg, char *p1, char *p2); int is_first_hop(sip_msg_t *msg); +int w_is_first_hop_mode(sip_msg_t *msg, char *p1mode, char *p2); +int is_first_hop_mode(sip_msg_t *msg, int mode); #endif diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 33a3c40a61..57ae9fb262 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -185,6 +185,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"is_first_hop", (cmd_function)w_is_first_hop, 0, 0, 0, ANY_ROUTE}, + {"is_first_hop", (cmd_function)w_is_first_hop, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"is_tel_number", (cmd_function)is_tel_number, 1, fixup_spve_null, 0, ANY_ROUTE}, {"is_numeric", (cmd_function)is_numeric, 1, fixup_spve_null, @@ -571,6 +573,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("is_first_hop_mode"), + SR_KEMIP_INT, is_first_hop_mode, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("is_uri"), SR_KEMIP_INT, ki_is_uri, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:cc2a9518: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 10 May '21

10 May '21

Module: kamailio Branch: master Commit: cc2a9518207e36b7b18aef5c8714f0c21da3dd95 URL: https://github.com/kamailio/kamailio/commit/cc2a9518207e36b7b18aef5c8714f0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-10T09:46:22+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/cc2a9518207e36b7b18aef5c8714f0c… Patch: https://github.com/kamailio/kamailio/commit/cc2a9518207e36b7b18aef5c8714f0c…

1 0

git:master:cd2abf6e: uac: exposed reg_use_domain via modparam
by Daniel-Constantin Mierla 10 May '21

10 May '21

Module: kamailio Branch: master Commit: cd2abf6e278539b31ebfd355acf841faf6121e25 URL: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:34:47+02:00 uac: exposed reg_use_domain via modparam - control if the lookup over username uses also domain --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… Patch: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 46503bf592..50873ef557 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -114,6 +114,7 @@ static int child_init(int rank); extern int reg_timer_interval; extern int _uac_reg_gc_interval; +extern int _uac_reg_use_domain; static pv_export_t mod_pvs[] = { { {"uac_req", sizeof("uac_req")-1}, PVT_OTHER, pv_get_uac_req, pv_set_uac_req, @@ -184,7 +185,8 @@ static param_export_t params[] = { {"reg_random_delay", INT_PARAM, &reg_random_delay }, {"reg_active", INT_PARAM, &reg_active_param }, {"reg_gc_interval", INT_PARAM, &_uac_reg_gc_interval }, - {"reg_hash_size", INT_PARAM, &reg_htable_size }, + {"reg_hash_size", INT_PARAM, &reg_htable_size }, + {"reg_use_domain", PARAM_INT, &_uac_reg_use_domain }, {"default_socket", PARAM_STR, &uac_default_socket}, {"event_callback", PARAM_STR, &uac_event_callback}, {0, 0, 0} diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c36ee8ac82..1ea1b62135 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -116,7 +116,7 @@ static reg_ht_t *_reg_htable = NULL; static reg_ht_t *_reg_htable_gc = NULL; static gen_lock_t *_reg_htable_gc_lock = NULL; -int reg_use_domain = 0; +int _uac_reg_use_domain = 0; int reg_timer_interval = 90; int reg_retry_interval = 0; int reg_htable_size = 4; @@ -1630,7 +1630,7 @@ int uac_reg_lookup(struct sip_msg *msg, str *src, pv_spec_t *dst, int mode) LM_ERR("failed to parse uri\n"); return -2; } - reg = reg_ht_get_byuser(&puri.user, (reg_use_domain)?&puri.host:NULL); + reg = reg_ht_get_byuser(&puri.user, (_uac_reg_use_domain)?&puri.host:NULL); if(reg==NULL) { LM_DBG("no user: %.*s\n", src->len, src->s); @@ -1673,7 +1673,7 @@ int uac_reg_status(struct sip_msg *msg, str *src, int mode) LM_ERR("failed to parse uri\n"); return -1; } - reg = reg_ht_get_byuser(&puri.user, (reg_use_domain)?&puri.host:NULL); + reg = reg_ht_get_byuser(&puri.user, (_uac_reg_use_domain)?&puri.host:NULL); if(reg==NULL) { LM_DBG("no user: %.*s\n", src->len, src->s); @@ -1717,7 +1717,7 @@ int uac_reg_request_to(struct sip_msg *msg, str *src, unsigned int mode) reg = reg_ht_get_byuuid(src); break; case 1: - if(reg_use_domain) + if(_uac_reg_use_domain) { if (parse_uri(src->s, src->len, &puri)!=0) {

1 0

git:master:ec600414: uac: docs for reg_use_domain parameter
by Daniel-Constantin Mierla 10 May '21

10 May '21

Module: kamailio Branch: master Commit: ec600414a3ba01e641beda6c11201b7185c879db URL: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:39:16+02:00 uac: docs for reg_use_domain parameter --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… Patch: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 52362af1e3..b6184a6daa 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -582,6 +582,24 @@ modparam("uac", "reg_active", 0) <programlisting format="linespecific"> ... modparam("uac", "reg_gc_interval", 60) +... + </programlisting> + </example> + </section> + <section id="uac.p.reg_use_domain"> + <title><varname>reg_use_domain</varname> (int)</title> + <para> + If set to 1, domain part of URIs is used by functions doing + lookup on user name. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>reg_use_domain</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("uac", "reg_use_domain", 1) ... </programlisting> </example> @@ -647,8 +665,6 @@ end </programlisting> </example> </section> - - </section> <section>

1 0

git:master:ea3ca819: uac: renamed parameter for kemi uac_reg_lookup_uri()
by Daniel-Constantin Mierla 10 May '21

10 May '21

Module: kamailio Branch: master Commit: ea3ca819bc07fed6b40bd6cc8f6f147dac66d9ca URL: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:28:31+02:00 uac: renamed parameter for kemi uac_reg_lookup_uri() - be suggestive of its purpose in the index docs --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… Patch: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index c7e181dc7c..46503bf592 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -684,7 +684,7 @@ static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst) return uac_reg_lookup(msg, &sval, dpv, 1); } -static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) +static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* suri, str* sdst) { pv_spec_t *dpv = NULL; dpv = pv_cache_get(sdst); @@ -692,7 +692,7 @@ static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) LM_ERR("cannot get pv spec for [%.*s]\n", sdst->len, sdst->s); return -1; } - return uac_reg_lookup(msg, userid, dpv, 1); + return uac_reg_lookup(msg, suri, dpv, 1); } static int w_uac_reg_status(struct sip_msg* msg, char* src, char* p2)

1 0

[kamailio/kamailio] tspops: failed tcp_keepalive_enable (#2730)
by sergey-safarov 09 May '21

09 May '21

### Description Cannot use `tcp_keepalive_enable` function on master branch. #### Reproduction Create config file like ``` listen=udp:127.0.0.1:5060 loadmodule "pv.so" loadmodule "tcpops.so" #modparam("http_client", "httpcon", "http://example.com=>http://example.com"); request_route { tcp_keepalive_enable("22", "60", "5", "2"); } ``` and then start Kamailio #### Log Messages ``` [root@sbc-a0 config]# kamailio -ddd -DD -E -f /tmp/test.cfg 0(30164) INFO: <core> [main.c:2139]: main(): private (per process) memory: 8388608 bytes 0(30164) DEBUG: <core> [core/mem/q_malloc.c:199]: qm_malloc_init(): QM_OPTIMIZE=16384, /ROUNDTO=2048 0(30164) DEBUG: <core> [core/mem/q_malloc.c:201]: qm_malloc_init(): QM_HASH_SIZE=2099, qm_block size=235152 0(30164) DEBUG: <core> [core/mem/q_malloc.c:203]: qm_malloc_init(): qm_malloc_init(0xffff8d5c0010, 8388608), start=0xffff8d5c0010 0(30164) DEBUG: <core> [core/mem/q_malloc.c:212]: qm_malloc_init(): size= 8388608, init_overhead=235256 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5_6 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5_6_0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d60)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70da0)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d00)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d40)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d20)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[0] to 0 0(30164) DEBUG: <core> [core/pvapi.c:2146]: pv_init_buffer(): PV print buffer initialized to [40][8192] 0(30164) DEBUG: <core> [main.c:2460]: main(): read 4025707099 from /dev/urandom 0(30164) DEBUG: <core> [main.c:2466]: main(): seeding PRNG with 1351243300 0(30164) DEBUG: <core> [core/rand/cryptorand.c:36]: cryptorand_seed(): seeding cryptorand generator with 1351243300 0(30164) DEBUG: <core> [core/rand/fortuna/random.c:154]: system_reseed(): cryptographic PRNG reseed done with 32 bytes 0(30164) DEBUG: <core> [core/rand/fortuna/random.c:175]: sr_add_entropy(): additional 4 bytes entropy added to cryptographic PRNG 0(30164) DEBUG: <core> [main.c:2471]: main(): test random numbers 1639832327 574986100 3505011376 2068663732 0(30164) DEBUG: <core> [core/cfg.y:1860]: yyparse(): loading module pv.so 0(30164) DEBUG: <core> [core/sr_module.c:510]: ksr_locate_module(): found module to load </usr/lib64/kamailio/modules/pv.so> 0(30164) DEBUG: <core> [core/sr_module.c:560]: load_module(): trying to load </usr/lib64/kamailio/modules/pv.so> 0(30164) DEBUG: <core> [core/kemi.c:3062]: sr_kemi_modules_add(): adding core module 0(30164) DEBUG: <core> [core/kemi.c:3066]: sr_kemi_modules_add(): adding pv module 0(30164) DEBUG: <core> [core/kemi.c:3070]: sr_kemi_modules_add(): adding hdr module 0(30164) DEBUG: <core> [core/kemi.c:3084]: sr_kemi_modules_add(): adding module: pvx 0(30164) DEBUG: <core> [core/sr_module.c:288]: register_module(): register PV from: pv 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: MOD_pv 0(30164) DEBUG: <core> [core/cfg.y:1860]: yyparse(): loading module tcpops.so 0(30164) DEBUG: <core> [core/sr_module.c:510]: ksr_locate_module(): found module to load </usr/lib64/kamailio/modules/tcpops.so> 0(30164) DEBUG: <core> [core/sr_module.c:560]: load_module(): trying to load </usr/lib64/kamailio/modules/tcpops.so> 0(30164) DEBUG: <core> [core/kemi.c:3084]: sr_kemi_modules_add(): adding module: tcpops 0(30164) DEBUG: <core> [core/sr_module.c:288]: register_module(): register PV from: tcpops 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: MOD_tcpops 0(30164) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type24, i/count 0/2: type 9(9)/ data (nil) 0(30164) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type24, i/count 1/2: type 3(3)/ data (nil) 0(30164) DEBUG: <core> [core/sr_module.c:710]: find_mod_export_record(): found export of <tcp_keepalive_enable> in module tcpops [/usr/lib64/kamailio/modules/tcpops.so] 0(30164) DEBUG: <core> [core/mem/shm.c:100]: shm_core_pools_init(): preparing to initialize shm core pools 0(30164) DEBUG: <core> [core/mem/q_malloc.c:199]: qm_malloc_init(): QM_OPTIMIZE=16384, /ROUNDTO=2048 0(30164) DEBUG: <core> [core/mem/q_malloc.c:201]: qm_malloc_init(): QM_HASH_SIZE=2099, qm_block size=235152 0(30164) DEBUG: <core> [core/mem/q_malloc.c:203]: qm_malloc_init(): qm_malloc_init(0xffff89470000, 67108864), start=0xffff89470000 0(30164) DEBUG: <core> [core/mem/q_malloc.c:212]: qm_malloc_init(): size= 67108864, init_overhead=235256 0(30164) DEBUG: <core> [core/ppcfg.c:233]: pp_ifdef_level_check(): same number of pairing preprocessor directives #!IF[N]DEF - #!ENDIF 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[core:receive-parse-error] to 1 0(30164) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost.localdomain:5060) vs. (1:localhost:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4:5060) vs. (1:localhost.localdomain:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4:5060) vs. (1:localhost:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost4:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost.localdomain:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost:5060) Listening on udp: 127.0.0.1:5060 Aliases: udp: localhost4.localdomain4:5060 udp: localhost4:5060 udp: localhost.localdomain:5060 udp: localhost:5060 0(30164) DEBUG: <core> [core/mem/pkg.c:108]: pkg_print_manager(): pkg - using memory manager: q_malloc 0(30164) DEBUG: <core> [core/mem/shm.c:300]: shm_print_manager(): shm - using memory manager: q_malloc 0(30164) DEBUG: <core> [core/cfg/cfg.c:173]: cfg_declare(): new config group has been registered: 'core' (num=57, size=228) 0(30164) DEBUG: <core> [core/cfg/cfg.c:173]: cfg_declare(): new config group has been registered: 'tcp' (num=27, size=108) 0(30164) DEBUG: <core> [core/timer.c:239]: init_timer(): starting with *ticks=1894875476 0(30164) DEBUG: <core> [core/timer.c:280]: init_timer(): timer_list between 0xffff894a9fd8 and 0xffff894edfd8 0(30164) DEBUG: <core> [core/pt.c:139]: register_procs(): registering new processes: 0 (old) + 1 (new) = 1 (total) 0(30164) INFO: <core> [core/tcp_main.c:4983]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(30164) DEBUG: <core> [core/daemonize.c:207]: enable_dumpable(): trying enable core dumping... 0(30164) DEBUG: <core> [core/daemonize.c:224]: enable_dumpable(): core dumping is enabled now (1)... 0(30164) DEBUG: <core> [core/daemonize.c:583]: set_core_dump(): core dump limits set to 18446744073709551615 0(30164) DEBUG: <core> [core/async_task.c:137]: async_task_init(): start initializing asynk task framework 0(30164) DEBUG: <core> [core/sr_module.c:931]: init_mod(): pv 0(30164) DEBUG: <core> [core/sr_module.c:931]: init_mod(): tcpops 0(30164) DEBUG: tcpops [tcpops_mod.c:137]: mod_init(): TCP keepalive module loaded. 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:closed] to 2 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:timeout] to 3 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:reset] to 4 0(30164) DEBUG: <core> [core/pt.c:100]: init_pt(): registering new processes: 1 (old) + 12 (new) = 13 (total) 0(30164) INFO: <core> [main.c:3030]: main(): processes (at least): 13 - shm size: 67108864 - pkg size: 8388608 0(30164) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing tcp_keepalive_enable() 0(30164) ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/tmp/test.cfg:9 error -1 while trying to fix configuration 0(30164) DEBUG: <core> [core/sr_module.c:823]: destroy_modules(): starting modules destroy phase 0(30164) DEBUG: tcpops [tcpops_mod.c:171]: mod_destroy(): TCP keepalive module unloaded. 0(30164) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 0(30164) DEBUG: <core> [core/mem/shm.c:288]: shm_destroy_manager(): destroying memory manager: q_malloc 0(30164) DEBUG: <core> [core/mem/q_malloc.c:1186]: qm_shm_lock_destroy(): destroying the shared memory lock 0(30164) DEBUG: <core> [core/mem/pkg.c:97]: pkg_destroy_manager(): destroying memory manager: q_malloc ``` ### Additional Information current master on CentOS8 -- 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/2730

2 4

git:master:02240711: tcpops: use fixup_igp_all() instead of fixup_igp_null()
by Daniel-Constantin Mierla 08 May '21

08 May '21

Module: kamailio Branch: master Commit: 02240711239149e2f5c4890a70ab158d10fa8187 URL: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-08T23:30:22+02:00 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… Patch: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index b2d2fbe7dd..23036fd771 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -78,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1,

1 0

[kamailio/kamailio] lost: dynamic HELD url resolving (#2574)
by sergey-safarov 07 May '21

07 May '21

### Description According to design logic HELD request need to send a carrier LIS server. Now lost module sends this request to the preconfigured server via `http_client/httpcon` param. I prefer to use dynamic LIS server discovery according to [rfc7216#section-4](https://tools.ietf.org/html/rfc7216#section-4) and [rfc5986#section-4](https://tools.ietf.org/html/rfc5986#section-4). So dynamic LIS discovery works as: 1. Kamailio send reverse `.in-addr.arpa.` or `.ip6.arpa.` DNS request and caller host DNS name; 2. Kamailio send `LIS:HELD` NAPTR request for a resolved caller hostname and LIS server. 3. Kamailio send HELD request for resolved LIS address. So do get working dynamic LIS discovery required to implement two DNS requests. If any DNS request will fail, then `lost_held_query` function returns an error code. To define required dynamic LIS discovery I suggest use an empty string ("") or NULL value ($null) as the first ("con") function param. This feature request for discussion with lost module author (Wolfgang Kampichler @wkampich) and other interest devs. The ticket may be closed at any time. -- 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/2574

3 5

git:master:22f0d9e1: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 07 May '21

07 May '21

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

1 0

[kamailio/kamailio] username based lookup in uac_reg_lookup (#2714)
by Surendra Tiwari 07 May '21

07 May '21

### Description Currently uac_reg_lookup don't have provision to pass the mode parameter but its implement in core fuction: https://github.com/kamailio/kamailio/blob/951c9ac9adaccc1c35e152593cb3c2e7f… This should be imported to kemi as well as cfg function.  ### Expected behavior lookup in uacreg should be supported using username based also, currently uuid based support is only there. #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` 5.4.5 ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2714

2 2

git:master:7cee6518: uac: added uac_reg_lookup_uri() - do lookup for user in the uri
by Daniel-Constantin Mierla 07 May '21

07 May '21

Module: kamailio Branch: master Commit: 7cee6518421ed16b715d32a8b2ff6d222eac038b URL: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:00:34+02:00 uac: added uac_reg_lookup_uri() - do lookup for user in the uri --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Patch: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 5f0a3ad635..c7e181dc7c 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -102,6 +102,7 @@ static int w_restore_to(struct sip_msg* msg, char* p1, char* p2); static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); static int w_uac_auth_mode(struct sip_msg* msg, char* pmode, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_status(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); static int w_uac_reg_enable(struct sip_msg* msg, char* pfilter, char* pval); @@ -142,6 +143,8 @@ static cmd_export_t cmds[]={ {"uac_req_send", (cmd_function)w_uac_req_send, 0, 0, 0, ANY_ROUTE}, {"uac_reg_lookup", (cmd_function)w_uac_reg_lookup, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE }, + {"uac_reg_lookup_uri", (cmd_function)w_uac_reg_lookup_uri, 2, fixup_spve_pvar, + fixup_free_spve_pvar, ANY_ROUTE }, {"uac_reg_status", (cmd_function)w_uac_reg_status, 1, fixup_spve_null, 0, ANY_ROUTE }, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, @@ -666,6 +669,32 @@ static int ki_uac_reg_lookup(sip_msg_t* msg, str* userid, str* sdst) return uac_reg_lookup(msg, userid, dpv, 0); } +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst) +{ + pv_spec_t *dpv; + str sval; + + if(fixup_get_svalue(msg, (gparam_t*)src, &sval)<0) { + LM_ERR("cannot get the uuid parameter\n"); + return -1; + } + + dpv = (pv_spec_t*)dst; + + return uac_reg_lookup(msg, &sval, dpv, 1); +} + +static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) +{ + pv_spec_t *dpv = NULL; + dpv = pv_cache_get(sdst); + if(dpv==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", sdst->len, sdst->s); + return -1; + } + return uac_reg_lookup(msg, userid, dpv, 1); +} + static int w_uac_reg_status(struct sip_msg* msg, char* src, char* p2) { str sval; @@ -827,6 +856,11 @@ static sr_kemi_t sr_kemi_uac_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("uac"), str_init("uac_reg_lookup_uri"), + SR_KEMIP_INT, ki_uac_reg_lookup_uri, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("uac"), str_init("uac_reg_status"), SR_KEMIP_INT, ki_uac_reg_status, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:624da2b7: uac: docs for uac_reg_lookup_uri()
by Daniel-Constantin Mierla 07 May '21

07 May '21

Module: kamailio Branch: master Commit: 624da2b7deb2539064be70a7566783fd36a15886 URL: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:09:11+02:00 uac: docs for uac_reg_lookup_uri() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Patch: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 352d038ea2..52362af1e3 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1005,6 +1005,31 @@ if(uac_reg_lookup("$rU", "$ru")) { lookup("location"); } +... + </programlisting> + </example> + </section> + <section id="uac.f.uac_reg_lookup_uri"> + <title> + <function moreinfo="none">uac_reg_lookup_uri(uri, dst)</function> + </title> + <para> + This function sets the PV dst to SIP URI that correspond to the URI user + in uac registrations table. The uri can contain pseudo-variables and + dst must be the name of a pseudo-variable. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>uac_reg_lookup_uri</function> usage</title> + <programlisting format="linespecific"> +... + +if(uac_reg_lookup("$var(uri)", "$ru")) +{ + lookup("location"); +} ... </programlisting> </example>

1 0

git:master:7aa8056a: dialog: ignore 408 on keepalive with cseq 0
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: master Commit: 7aa8056a5e3a9804133cb9ff79640d8116be63da URL: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T12:27:05+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… Patch: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d48d139965..809834527f 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -271,6 +271,12 @@ void dlg_ka_cb_all(struct cell* t, int type, struct tmcb_params* ps, int dir) LM_DBG("skip updating non-confirmed dialogs\n"); goto done; } + if(ps->code==408 && (dlg->cseq[dir].len==0 + || (dlg->cseq[dir].len==1 && dlg->cseq[dir].s[0]=='\0'))) { + LM_DBG("ignore 408 for %s cseq 0\n", + ((dir==DLG_CALLER_LEG)?"caller":"callee")); + goto done; + } tend = 0; if(dir==DLG_CALLER_LEG) { dlg->ka_src_counter++;

1 0

[kamailio/kamailio] lwsc: failed build on Fedora 33 (#2727)
by sergey-safarov 06 May '21

06 May '21

``` LD (gcc) [M app_lua_sr.so] app_lua_sr.so CC (gcc) [M lwsc.so] lwsc_mod.o lwsc_mod.c: In function 'lwsc_get_endpoint': lwsc_mod.c:533:13: error: 'struct lws_context_creation_info' has no member named 'ws_ping_pong_interval' 533 | ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ | ^ make[2]: *** [../../Makefile.rules:100: lwsc_mod.o] Error 1 make[1]: *** [Makefile:511: modules] Error 1 make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.5.0/src' make: *** [Makefile:34: every-module] Error 2 ``` -- 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/2727

2 6

git:5.5:4a4835e1: lwsc: set ws_ping_pong_interval only for libwebsockets 3.x
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: 5.5 Commit: 4a4835e122bb3a53d2a1794640e1dec66736a897 URL: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T11:39:33+02:00 lwsc: set ws_ping_pong_interval only for libwebsockets 3.x (cherry picked from commit 048ed4210d52fb817ae6b03756d95e9b25899330) --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… Patch: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 17eb0ca30a..a6985acb6d 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -529,7 +529,7 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.protocols = ep->protocols; ep->crtinfo.gid = -1; ep->crtinfo.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 3 +#if LWS_LIBRARY_VERSION_MAJOR == 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ #endif /* 1 internal and 1 (+ 1 http2 nwsi) */

1 0

git:master:048ed421: lwsc: set ws_ping_pong_interval only for libwebsockets 3.x
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: master Commit: 048ed4210d52fb817ae6b03756d95e9b25899330 URL: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T11:37:58+02:00 lwsc: set ws_ping_pong_interval only for libwebsockets 3.x --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… Patch: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 17eb0ca30a..a6985acb6d 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -529,7 +529,7 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.protocols = ep->protocols; ep->crtinfo.gid = -1; ep->crtinfo.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 3 +#if LWS_LIBRARY_VERSION_MAJOR == 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ #endif /* 1 internal and 1 (+ 1 http2 nwsi) */

1 0

git:5.5:4f930b76: lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723
by Wolfgang Kampichler 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 4f930b7618e874a651083c5e4de55d9ed0027bf3 URL: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T21:53:43+02:00 lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723 - lost_get_pai_header(): parsing method update lost_get_from_header(): parsing method update - memset(): fixed number of bytes to be filled (unrelated) (cherry picked from commit 791672393aeba320fd1608746fb61e9a96e19d06) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9… Patch: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9…

1 0

git:5.5:e96c3517: lost: change in the method for parsing the From header in lost_get_from_header() related to #2723
by Wolfgang Kampichler 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: e96c35170ebb2b01fb25c4e9f422119696924086 URL: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T21:53:12+02:00 lost: change in the method for parsing the From header in lost_get_from_header() related to #2723 (cherry picked from commit fe6923cd8e995c400fc1838304c95142cc00273e) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… Patch: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index bcb045f451..beb1d2e932 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,9 +442,10 @@ p_lost_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) str hdr = STR_NULL; p_lost_geolist_t list = NULL; + *items = 0; + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse SIP headers\n"); - *items = 0; return list; } @@ -481,8 +482,8 @@ char *lost_get_pai_header(struct sip_msg *msg, int *lgth) *lgth = 0; - if(parse_headers(msg, HDR_PAI_F, 0) == -1) { - LM_ERR("could not parse P-A-I header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } @@ -640,34 +641,53 @@ int lost_get_nameinfo(char *ip, str *name, int flag) */ char *lost_get_from_header(struct sip_msg *msg, int *lgth) { - to_body_t *f_body; + struct hdr_field *hf; + to_body_t *from_body; char *res = NULL; *lgth = 0; - if(parse_headers(msg, HDR_FROM_F, 0) == -1) { - LM_ERR("failed to parse From header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } - if(msg->from == NULL || get_from(msg) == NULL) { - LM_ERR("From header not found\n"); - return res; - } - f_body = get_from(msg); + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type == HDR_FROM_T) { - LM_DBG("From body: [%.*s]\n", f_body->body.len, f_body->body.s); + LM_DBG("From body: [%.*s]\n", hf->body.len, hf->body.s); - res = (char *)pkg_malloc((f_body->uri.len + 1) * sizeof(char)); - if(res == NULL) { - PKG_MEM_ERROR; - return res; - } else { - memset(res, 0, f_body->uri.len + 1); - memcpy(res, f_body->uri.s, f_body->uri.len + 1); - res[f_body->uri.len] = '\0'; + /* first, get some memory */ + from_body = pkg_malloc(sizeof(to_body_t)); + if(from_body == NULL) { + PKG_MEM_ERROR; + return res; + } + /* parse From body */ + memset(from_body, 0, sizeof(to_body_t)); + parse_to(hf->body.s, hf->body.s + hf->body.len + 1, from_body); + if(from_body->error == PARSE_ERROR) { + LM_ERR("bad From header\n"); + pkg_free(from_body); + return res; + } + if(from_body->error == PARSE_OK) { + res = (char *)pkg_malloc( + (from_body->uri.len + 1) * sizeof(char)); + if(res == NULL) { + PKG_MEM_ERROR; + pkg_free(from_body); + return res; + } else { + memset(res, 0, from_body->uri.len + 1); + memcpy(res, from_body->uri.s, from_body->uri.len + 1); + res[from_body->uri.len] = '\0'; + pkg_free(from_body); - *lgth = strlen(res); + *lgth = strlen(res); + } + } + } } return res;

1 0

[kamailio/kamailio] Default config and options for Kamailio 5.5.0 (#2719)
by Daniel-Constantin Mierla 05 May '21

05 May '21

With several days before releasing v5.5.0, let's see if there is any tuning that should be done to default kamailio.cfg. Note that the proposals and discussions must focus around current config, if any loaded module should have different values for parameters, if the routing blocks should be adjusted to cope better with common use cases. This is not for asking refactoring or adding major changes/features. In such cases, the option is to make PR to add to `misc/examples/` (new files or to existing files). >From the discussions done for 5.4.0, the next were considered for the future, however I haven't seen much activity on the community forums related to them during past months, so I am not sure they worth at this moment, but let list them for a starting point: * keepalive to be done with usrloc module to get round trip timer, etc * dlgs module loaded to see the basic stats about active calls -- 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/2719

2 3

[kamailio/kamailio] usrloc: cancel unnecessary db queries (#2726)
by korayvt 05 May '21

05 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  It looks like the db query is made before checking the configuration parameters for the following features: - internal keep-alive mechanism - contact-expired callback execution For example, although keepalive mode is turned off, the location table is periodically queried. This is also true when there is no usrloc:contact-expired route. In this commit, checks are added before these two db queries. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2726 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Merge pull request #2 from kamailio/master * Merge pull request #3 from kamailio/master * usrloc: unnecessary periodic db queries cancelled -- File Changes -- M src/modules/usrloc/dlist.c (4) M src/modules/usrloc/udomain.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2726.patch https://github.com/kamailio/kamailio/pull/2726.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/2726

2 2

git:master:42bc79b3: usrloc: unnecessary periodic db queries cancelled
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 42bc79b3b617632b6f83e1352b5cb8266706d7c0 URL: https://github.com/kamailio/kamailio/commit/42bc79b3b617632b6f83e1352b5cb82… Author: korayvt <koray.vatansever(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T20:53:48+02:00 usrloc: unnecessary periodic db queries cancelled --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/42bc79b3b617632b6f83e1352b5cb82… Patch: https://github.com/kamailio/kamailio/commit/42bc79b3b617632b6f83e1352b5cb82… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 44ce3c6376..252bb8bde0 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -960,7 +960,9 @@ int synchronize_all_udomains(int istart, int istep) res |= db_timer_udomain(ptr->d); } } - ul_ka_db_records((unsigned int)istart); + if (ul_ka_mode != ULKA_NONE) { + ul_ka_db_records((unsigned int)istart); + } } else { for( ptr=_ksr_ul_root ; ptr ; ptr=ptr->next) { mem_timer_udomain(ptr->d, istart, istep); diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 9d96b2d7a6..204ddfd29f 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1094,8 +1094,10 @@ int db_timer_udomain(udomain_t* _d) db_val_t vals[3]; int key_num = 2; - /* call contact expired call back for a domain before deleting database rows */ - udomain_contact_expired_cb(ul_dbh, _d); + /* If contact-expired callback exists, run it for a domain before deleting database rows */ + if (exists_ulcb_type(UL_CONTACT_EXPIRE)) { + udomain_contact_expired_cb(ul_dbh, _d); + } keys[0] = &ul_expires_col; ops[0] = "<";

1 0

git:master:c294dbf8: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 05 May '21

05 May '21

Module: kamailio Branch: master Commit: c294dbf84807c62f7bf519f4117b6e44b2e36070 URL: https://github.com/kamailio/kamailio/commit/c294dbf84807c62f7bf519f4117b6e4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-05T20:46:11+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c294dbf84807c62f7bf519f4117b6e4… Patch: https://github.com/kamailio/kamailio/commit/c294dbf84807c62f7bf519f4117b6e4…

1 0

[kamailio/kamailio] uac: Add reg_hash_size parameter (#2725)
by Alex Hermann 05 May '21

05 May '21

Allow configuring the hash table size. The default(4) is hardly usable on anything but a test system.   #### 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) - [x] 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 - [x] 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/2725 -- Commit Summary -- * uac: Add reg_hash_size parameter -- File Changes -- M src/modules/uac/doc/uac_admin.xml (20) M src/modules/uac/uac.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2725.patch https://github.com/kamailio/kamailio/pull/2725.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/2725

2 2

git:master:880a14a6: uac: Add reg_hash_size parameter
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 880a14a6f45af27001ec348e9b44134915bcbeb7 URL: https://github.com/kamailio/kamailio/commit/880a14a6f45af27001ec348e9b44134… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T20:45:23+02:00 uac: Add reg_hash_size parameter Allow configuring the hash table size. The default(4) is hardly usable on anything but a test system. --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/880a14a6f45af27001ec348e9b44134… Patch: https://github.com/kamailio/kamailio/commit/880a14a6f45af27001ec348e9b44134… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index c8271974a3..352d038ea2 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -459,6 +459,26 @@ modparam("uac", "reg_random_delay", 300) </example> </section> + <section id="uac.p.reg_hash_size"> + <title><varname>reg_hash_size</varname> (int)</title> + <para> + The number of entries of the hash table used by uac_reg to store the + registration records is 2^hash_size. For hash_size=4, the number of + slots of the hash table is 16. + </para> + <para> + <emphasis>Default value is <quote>4</quote> (16 slots).</emphasis> + </para> + <example> + <title>Set <varname>reg_hash_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("uac", "reg_hash_size", 10) +... + </programlisting> + </example> + </section> + <section id="uac.p.reg_db_table"> <title><varname>reg_db_table</varname> (string)</title> <para> diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 486fed2894..5f0a3ad635 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -181,6 +181,7 @@ static param_export_t params[] = { {"reg_random_delay", INT_PARAM, &reg_random_delay }, {"reg_active", INT_PARAM, &reg_active_param }, {"reg_gc_interval", INT_PARAM, &_uac_reg_gc_interval }, + {"reg_hash_size", INT_PARAM, &reg_htable_size }, {"default_socket", PARAM_STR, &uac_default_socket}, {"event_callback", PARAM_STR, &uac_event_callback}, {0, 0, 0}

1 0

git:5.4:0572c819: tm: lw parser - fix matching To header in lw_get_hf_name()
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.4 Commit: 0572c8192d26702fc0ac21ae76cbf81fbad91126 URL: https://github.com/kamailio/kamailio/commit/0572c8192d26702fc0ac21ae76cbf81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T18:57:57+02:00 tm: lw parser - fix matching To header in lw_get_hf_name() (cherry picked from commit 4ab6e05df56afb7802a2cd125e89b9282a1c6c85) (cherry picked from commit 33db4ffc558b7a9d4c291c929b9e73b3cf8b16f0) --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/0572c8192d26702fc0ac21ae76cbf81… Patch: https://github.com/kamailio/kamailio/commit/0572c8192d26702fc0ac21ae76cbf81… --- diff --git a/src/modules/tm/lw_parser.c b/src/modules/tm/lw_parser.c index d13ec58311..6f48304f53 100644 --- a/src/modules/tm/lw_parser.c +++ b/src/modules/tm/lw_parser.c @@ -188,9 +188,11 @@ char *lw_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) case 't': /* To */ if(LOWER_BYTE(*(p + 1)) == 'o') { - p += 2; - *type = HDR_TO_T; - break; + if((*(p + 2) == ' ') || (*(p + 2) == ':')) { + p += 2; + *type = HDR_TO_T; + break; + } } if((*(p + 1) == ' ') || (*(p + 1) == ':')) { p++;

1 0

git:5.5:33db4ffc: tm: lw parser - fix matching To header in lw_get_hf_name()
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 33db4ffc558b7a9d4c291c929b9e73b3cf8b16f0 URL: https://github.com/kamailio/kamailio/commit/33db4ffc558b7a9d4c291c929b9e73b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T18:57:11+02:00 tm: lw parser - fix matching To header in lw_get_hf_name() (cherry picked from commit 4ab6e05df56afb7802a2cd125e89b9282a1c6c85) --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/33db4ffc558b7a9d4c291c929b9e73b… Patch: https://github.com/kamailio/kamailio/commit/33db4ffc558b7a9d4c291c929b9e73b… --- diff --git a/src/modules/tm/lw_parser.c b/src/modules/tm/lw_parser.c index d13ec58311..6f48304f53 100644 --- a/src/modules/tm/lw_parser.c +++ b/src/modules/tm/lw_parser.c @@ -188,9 +188,11 @@ char *lw_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) case 't': /* To */ if(LOWER_BYTE(*(p + 1)) == 'o') { - p += 2; - *type = HDR_TO_T; - break; + if((*(p + 2) == ' ') || (*(p + 2) == ':')) { + p += 2; + *type = HDR_TO_T; + break; + } } if((*(p + 1) == ' ') || (*(p + 1) == ':')) { p++;

1 0

git:master:4ab6e05d: tm: lw parser - fix matching To header in lw_get_hf_name()
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 4ab6e05df56afb7802a2cd125e89b9282a1c6c85 URL: https://github.com/kamailio/kamailio/commit/4ab6e05df56afb7802a2cd125e89b92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T18:56:39+02:00 tm: lw parser - fix matching To header in lw_get_hf_name() --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4ab6e05df56afb7802a2cd125e89b92… Patch: https://github.com/kamailio/kamailio/commit/4ab6e05df56afb7802a2cd125e89b92… --- diff --git a/src/modules/tm/lw_parser.c b/src/modules/tm/lw_parser.c index d13ec58311..6f48304f53 100644 --- a/src/modules/tm/lw_parser.c +++ b/src/modules/tm/lw_parser.c @@ -188,9 +188,11 @@ char *lw_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) case 't': /* To */ if(LOWER_BYTE(*(p + 1)) == 'o') { - p += 2; - *type = HDR_TO_T; - break; + if((*(p + 2) == ' ') || (*(p + 2) == ':')) { + p += 2; + *type = HDR_TO_T; + break; + } } if((*(p + 1) == ' ') || (*(p + 1) == ':')) { p++;

1 0

git:master:79167239: lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723
by Wolfgang Kampichler 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 791672393aeba320fd1608746fb61e9a96e19d06 URL: https://github.com/kamailio/kamailio/commit/791672393aeba320fd1608746fb61e9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T18:40:05+02:00 lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723 - lost_get_pai_header(): parsing method update lost_get_from_header(): parsing method update - memset(): fixed number of bytes to be filled (unrelated) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/791672393aeba320fd1608746fb61e9… Patch: https://github.com/kamailio/kamailio/commit/791672393aeba320fd1608746fb61e9…

1 0

Kamailio v5.5.0 Released - new major version is out
by Daniel-Constantin Mierla 05 May '21

05 May '21

Kamailio v5.5.0 is out – it comes with 6 new modules and a considerable set of improvements touching again more than 80 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-5-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.5.0 brings more flexibility and optimizations across many components, enhancements to distributed message queue (dmq module), load balancer, http client, STIR/SHAKEN support, IMS/VoLTE, rtpengine and tls as well as to make available more functions to KEMI interface ... just to list only a few here. Enjoy Kamailio v5.5.0! Thank you for flying Kamailio! Stay safe and healthy! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

callid reparsing in replies when topoh is loaded
by David Escartín 05 May '21

05 May '21

Hello We have seen that in cases when callee sends a callid starting by "!!:", which is also the default callid_prefix value, we do see that when reading the $ci in the onreply routes it's changed for example like this from Call-ID !!:Y5HfD54-DIKfL56nz5TIYIioYVznLb1ID5TUYf1oz8zBYCl0LCllD9loDbD* to Call-ID \xA6\xF3\xF1\xFE\xFD:\xFEUq\xCA\xFD\xAB:\xF2\xA5\xA6Wۤ\x83\xABʫe\xFE\xF2\x87\xA7\e[;ã\xA5\xAC\xC1ɬ\xF3\xFD|\xDB\xFE\xAF in that call we are actually not doing topology hiding, so we are dropping the message on the topoh:msg-outgoing event route This seems to cause to send that weird callid in the messages. I guess that change should not be done. Could you please take a look? thanks and best regards david escartin sonoc -- <http://www.sonoc.io/> David Escartín NOC engineer *www.sonoc.io* <http://www.sonoc.io/> [image: LinkedIn] <https://www.linkedin.com/company/sonoc> [image: Twitter] <https://twitter.com/sonoc_> [image: Facebook] <https://www.facebook.com/SONOCio/> This e-mail is for the exclusive use of its recipients and may contain business secrets or other confidential or privileged information. Any unauthorised use, copying, publication or distribution of this e-mail is strictly prohibited. If you are not the intended recipient, please inform us immediately by replying to this e-mail and delete it, including any attachments or copies on your system. In accordance with the GDPR (EU) 2016/679 and the LOPDGDD 3/2018, we inform you that this e-mail address and/or any other personal data you have provided us with will be treated by SONOC with absolute confidentiality and with the only purpose of providing you with the requested services, due to your condition as a client, supplier or because you have requested information from us at any time. These data will only be kept for as long as required to comply with legal obligations. You can exercise your rights at any time by sending an e-mail to: *dataprotection(a)sonoc.io* <dataprotection(a)sonoc.io>*.* <dataprotection(a)sonoc.io>

1 1

git:5.5:d4c1a11a: ChangeLog: content updated for v5.5.0
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: d4c1a11aefb0192c1cb829959ef3a70b84cd7cbd URL: https://github.com/kamailio/kamailio/commit/d4c1a11aefb0192c1cb829959ef3a70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:59:03+02:00 ChangeLog: content updated for v5.5.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/d4c1a11aefb0192c1cb829959ef3a70… Patch: https://github.com/kamailio/kamailio/commit/d4c1a11aefb0192c1cb829959ef3a70…

1 0

git:5.5:8fda0163: pkg/kamailio/deb: version set 5.5.0
by Victor Seva 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 8fda0163b93d4f94b0398c529a90db300a1187f8 URL: https://github.com/kamailio/kamailio/commit/8fda0163b93d4f94b0398c529a90db3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-05T10:33:42+02:00 pkg/kamailio/deb: version set 5.5.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/8fda0163b93d4f94b0398c529a90db3… Patch: https://github.com/kamailio/kamailio/commit/8fda0163b93d4f94b0398c529a90db3…

1 0

git:5.5:03339e97: Makefile.defs: version set to 5.5.0
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 03339e971ed3c9a9d79812d346805db6eeb2c98a URL: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:29:41+02:00 Makefile.defs: version set to 5.5.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… Patch: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 86476f4d97..6b24118a9c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.5:cbdf8d8c: pkg: version set to 5.5.0 for rpm and alpine specs
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: cbdf8d8c4c142dba78fd767986f54620a306e077 URL: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:23:47+02:00 pkg: version set to 5.5.0 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… Patch: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f23ad03308..e5f39653d1 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.0 +pkgver=5.5.0 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 4f5a833a57..3928c1c596 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 5.5.0 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.5:b2d6fefe: ndb_cassandra: update include paths as expected by thrift lib package
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: b2d6fefef14d20fc9291bfff5f959860895a7bff URL: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:34+02:00 ndb_cassandra: update include paths as expected by thrift lib package (cherry picked from commit 3511e0a975395a14f48fe5b6d60435315f7638dc) --- Modified: src/modules/ndb_cassandra/Cassandra.h Modified: src/modules/ndb_cassandra/cassandra_types.h Modified: src/modules/ndb_cassandra/thrift_wrapper.cpp --- Diff: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… Patch: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… --- diff --git a/src/modules/ndb_cassandra/Cassandra.h b/src/modules/ndb_cassandra/Cassandra.h index 6e453d742e..210d7a9234 100644 --- a/src/modules/ndb_cassandra/Cassandra.h +++ b/src/modules/ndb_cassandra/Cassandra.h @@ -6,7 +6,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/src/modules/ndb_cassandra/cassandra_types.h b/src/modules/ndb_cassandra/cassandra_types.h index 9150a5c0dd..1aaa871a4b 100644 --- a/src/modules/ndb_cassandra/cassandra_types.h +++ b/src/modules/ndb_cassandra/cassandra_types.h @@ -6,10 +6,10 @@ #ifndef cassandra_TYPES_H #define cassandra_TYPES_H -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> diff --git a/src/modules/ndb_cassandra/thrift_wrapper.cpp b/src/modules/ndb_cassandra/thrift_wrapper.cpp index 6f40241a59..0c6c4e4aa3 100644 --- a/src/modules/ndb_cassandra/thrift_wrapper.cpp +++ b/src/modules/ndb_cassandra/thrift_wrapper.cpp @@ -1,11 +1,11 @@ -#include "Thrift.h" -#include "transport/TSocket.h" -#include "transport/TTransport.h" -#include "transport/TBufferTransports.h" -#include "protocol/TProtocol.h" -#include "protocol/TBinaryProtocol.h" -#include "Cassandra.h" +#include <thrift/Thrift.h> +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TBufferTransports.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include "Cassandra.h" #include "thrift_wrapper.h" using namespace std;

1 0

git:5.5:ff2ff19a: siptrace: debug messages on net data callbacks
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: ff2ff19af7087e188d3b7c100f80db2c8c534ca9 URL: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:06+02:00 siptrace: debug messages on net data callbacks (cherry picked from commit 95f3b4dea5d3f0d57ba79c8e8cd34d2ab30c7193) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… Patch: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 4648340d73..012644bfa0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2141,9 +2141,12 @@ int siptrace_net_data_recv(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); } @@ -2269,9 +2272,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); }

1 0

git:5.5:06921b71: ndb_cassandra: Makefile - use pkg-config if available
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 06921b71ee42a8c88229595a619d3390d0090b75 URL: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:23+02:00 ndb_cassandra: Makefile - use pkg-config if available (cherry picked from commit 4b9fe7b72f8d9b53dbae24eb7bd269d527642f71) --- Modified: src/modules/ndb_cassandra/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… Patch: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… --- diff --git a/src/modules/ndb_cassandra/Makefile b/src/modules/ndb_cassandra/Makefile index 6046eaf186..97e08542c4 100644 --- a/src/modules/ndb_cassandra/Makefile +++ b/src/modules/ndb_cassandra/Makefile @@ -9,11 +9,25 @@ LD=g++ auto_gen= NAME=ndb_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib - -DEFS += -I${THRIFT_DIR} -LIBS += -L${LIB_DIR} thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBTHRIFT = $(shell $(BUILDER) --exists thrift > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBTHRIFT),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + THRIFT_INC = $(shell $(BUILDER) --cflags thrift) + DEFS += $(THRIFT_INC) + LIBS += $(shell $(BUILDER) --libs thrift) +else + THRIFT_INC = -I/usr/local/include + DEFS += $(THRIFT_INC) + LIBS += -L/usr/local/lib thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +endif CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing @@ -22,18 +36,18 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ thrift_wrapper.o: thrift_wrapper.cpp thrift_wrapper.h @echo "Compiling $<" $(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ -ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o +ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o

1 0

git:5.5:2d259465: tcpops: use fixup function from core, remove internal wrapper
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 2d259465de5224dae4afe533d6ed7b104c59762e URL: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:12:55+02:00 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports (cherry picked from commit 12fca1c369b6698cace66de171dcb166be8ae831) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… Patch: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 82d9889355..b2d2fbe7dd 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -61,7 +61,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2); static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); -static int fixup_numpv(void** param, int param_no); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); @@ -79,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1, @@ -522,14 +521,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2) return ki_tcpops_enable_closed_event(msg); } -/** - * - */ -static int fixup_numpv(void** param, int param_no) -{ - return fixup_igp_null(param, 1); -} - /** * */

1 0

git:master:4b9fe7b7: ndb_cassandra: Makefile - use pkg-config if available
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 4b9fe7b72f8d9b53dbae24eb7bd269d527642f71 URL: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T09:12:25+02:00 ndb_cassandra: Makefile - use pkg-config if available --- Modified: src/modules/ndb_cassandra/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… Patch: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… --- diff --git a/src/modules/ndb_cassandra/Makefile b/src/modules/ndb_cassandra/Makefile index 6046eaf186..97e08542c4 100644 --- a/src/modules/ndb_cassandra/Makefile +++ b/src/modules/ndb_cassandra/Makefile @@ -9,11 +9,25 @@ LD=g++ auto_gen= NAME=ndb_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib - -DEFS += -I${THRIFT_DIR} -LIBS += -L${LIB_DIR} thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBTHRIFT = $(shell $(BUILDER) --exists thrift > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBTHRIFT),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + THRIFT_INC = $(shell $(BUILDER) --cflags thrift) + DEFS += $(THRIFT_INC) + LIBS += $(shell $(BUILDER) --libs thrift) +else + THRIFT_INC = -I/usr/local/include + DEFS += $(THRIFT_INC) + LIBS += -L/usr/local/lib thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +endif CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing @@ -22,18 +36,18 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ thrift_wrapper.o: thrift_wrapper.cpp thrift_wrapper.h @echo "Compiling $<" $(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ -ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o +ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o

1 0

git:master:3511e0a9: ndb_cassandra: update include paths as expected by thrift lib package
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 3511e0a975395a14f48fe5b6d60435315f7638dc URL: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T09:23:15+02:00 ndb_cassandra: update include paths as expected by thrift lib package --- Modified: src/modules/ndb_cassandra/Cassandra.h Modified: src/modules/ndb_cassandra/cassandra_types.h Modified: src/modules/ndb_cassandra/thrift_wrapper.cpp --- Diff: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… Patch: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… --- diff --git a/src/modules/ndb_cassandra/Cassandra.h b/src/modules/ndb_cassandra/Cassandra.h index 6e453d742e..210d7a9234 100644 --- a/src/modules/ndb_cassandra/Cassandra.h +++ b/src/modules/ndb_cassandra/Cassandra.h @@ -6,7 +6,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/src/modules/ndb_cassandra/cassandra_types.h b/src/modules/ndb_cassandra/cassandra_types.h index 9150a5c0dd..1aaa871a4b 100644 --- a/src/modules/ndb_cassandra/cassandra_types.h +++ b/src/modules/ndb_cassandra/cassandra_types.h @@ -6,10 +6,10 @@ #ifndef cassandra_TYPES_H #define cassandra_TYPES_H -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> diff --git a/src/modules/ndb_cassandra/thrift_wrapper.cpp b/src/modules/ndb_cassandra/thrift_wrapper.cpp index 6f40241a59..0c6c4e4aa3 100644 --- a/src/modules/ndb_cassandra/thrift_wrapper.cpp +++ b/src/modules/ndb_cassandra/thrift_wrapper.cpp @@ -1,11 +1,11 @@ -#include "Thrift.h" -#include "transport/TSocket.h" -#include "transport/TTransport.h" -#include "transport/TBufferTransports.h" -#include "protocol/TProtocol.h" -#include "protocol/TBinaryProtocol.h" -#include "Cassandra.h" +#include <thrift/Thrift.h> +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TBufferTransports.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include "Cassandra.h" #include "thrift_wrapper.h" using namespace std;

1 0

The plan for releasing Kamailio v5.5.0
by Daniel-Constantin Mierla 05 May '21

05 May '21

Hello, after almost 4 weeks since development was frozen, it is time to plan releasing the next major stable version, respectively 5.5.0, therefore I propose to do it on Wednesday, May 5, 2021. The branch 5.5 was already created about one week ago, several doc resources were published (core/variables/transformations/rpcs/stats cookbooks, alphabetic indexes, ...). If anyone is testing an upgrade from branch 5.4 to 5.5 and encounters changes that should be done in Kamailio config, add notes about at: * https://www.kamailio.org/wiki/install/upgrade/5.4.x-to-5.5.0 Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:fe6923cd: lost: change in the method for parsing the From header in lost_get_from_header() related to #2723
by Wolfgang Kampichler 04 May '21

04 May '21

Module: kamailio Branch: master Commit: fe6923cd8e995c400fc1838304c95142cc00273e URL: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-04T23:24:53+02:00 lost: change in the method for parsing the From header in lost_get_from_header() related to #2723 --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… Patch: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index bcb045f451..beb1d2e932 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,9 +442,10 @@ p_lost_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) str hdr = STR_NULL; p_lost_geolist_t list = NULL; + *items = 0; + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse SIP headers\n"); - *items = 0; return list; } @@ -481,8 +482,8 @@ char *lost_get_pai_header(struct sip_msg *msg, int *lgth) *lgth = 0; - if(parse_headers(msg, HDR_PAI_F, 0) == -1) { - LM_ERR("could not parse P-A-I header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } @@ -640,34 +641,53 @@ int lost_get_nameinfo(char *ip, str *name, int flag) */ char *lost_get_from_header(struct sip_msg *msg, int *lgth) { - to_body_t *f_body; + struct hdr_field *hf; + to_body_t *from_body; char *res = NULL; *lgth = 0; - if(parse_headers(msg, HDR_FROM_F, 0) == -1) { - LM_ERR("failed to parse From header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } - if(msg->from == NULL || get_from(msg) == NULL) { - LM_ERR("From header not found\n"); - return res; - } - f_body = get_from(msg); + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type == HDR_FROM_T) { - LM_DBG("From body: [%.*s]\n", f_body->body.len, f_body->body.s); + LM_DBG("From body: [%.*s]\n", hf->body.len, hf->body.s); - res = (char *)pkg_malloc((f_body->uri.len + 1) * sizeof(char)); - if(res == NULL) { - PKG_MEM_ERROR; - return res; - } else { - memset(res, 0, f_body->uri.len + 1); - memcpy(res, f_body->uri.s, f_body->uri.len + 1); - res[f_body->uri.len] = '\0'; + /* first, get some memory */ + from_body = pkg_malloc(sizeof(to_body_t)); + if(from_body == NULL) { + PKG_MEM_ERROR; + return res; + } + /* parse From body */ + memset(from_body, 0, sizeof(to_body_t)); + parse_to(hf->body.s, hf->body.s + hf->body.len + 1, from_body); + if(from_body->error == PARSE_ERROR) { + LM_ERR("bad From header\n"); + pkg_free(from_body); + return res; + } + if(from_body->error == PARSE_OK) { + res = (char *)pkg_malloc( + (from_body->uri.len + 1) * sizeof(char)); + if(res == NULL) { + PKG_MEM_ERROR; + pkg_free(from_body); + return res; + } else { + memset(res, 0, from_body->uri.len + 1); + memcpy(res, from_body->uri.s, from_body->uri.len + 1); + res[from_body->uri.len] = '\0'; + pkg_free(from_body); - *lgth = strlen(res); + *lgth = strlen(res); + } + } + } } return res;

1 0

git:master:95f3b4de: siptrace: debug messages on net data callbacks
by Daniel-Constantin Mierla 04 May '21

04 May '21

Module: kamailio Branch: master Commit: 95f3b4dea5d3f0d57ba79c8e8cd34d2ab30c7193 URL: https://github.com/kamailio/kamailio/commit/95f3b4dea5d3f0d57ba79c8e8cd34d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-04T14:09:27+02:00 siptrace: debug messages on net data callbacks --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/95f3b4dea5d3f0d57ba79c8e8cd34d2… Patch: https://github.com/kamailio/kamailio/commit/95f3b4dea5d3f0d57ba79c8e8cd34d2… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 4648340d73..012644bfa0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2141,9 +2141,12 @@ int siptrace_net_data_recv(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); } @@ -2269,9 +2272,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); }

1 0

git:master:12fca1c3: tcpops: use fixup function from core, remove internal wrapper
by Daniel-Constantin Mierla 04 May '21

04 May '21

Module: kamailio Branch: master Commit: 12fca1c369b6698cace66de171dcb166be8ae831 URL: https://github.com/kamailio/kamailio/commit/12fca1c369b6698cace66de171dcb16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-04T14:09:27+02:00 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/12fca1c369b6698cace66de171dcb16… Patch: https://github.com/kamailio/kamailio/commit/12fca1c369b6698cace66de171dcb16… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 82d9889355..b2d2fbe7dd 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -61,7 +61,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2); static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); -static int fixup_numpv(void** param, int param_no); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); @@ -79,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1, @@ -522,14 +521,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2) return ki_tcpops_enable_closed_event(msg); } -/** - * - */ -static int fixup_numpv(void** param, int param_no) -{ - return fixup_igp_null(param, 1); -} - /** * */

1 0

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

03 May '21

Module: kamailio Branch: 5.3 Commit: febeef975013eacc53e6b11766b7058f408282fc URL: https://github.com/kamailio/kamailio/commit/febeef975013eacc53e6b11766b7058… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-04T01:01:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/febeef975013eacc53e6b11766b7058… Patch: https://github.com/kamailio/kamailio/commit/febeef975013eacc53e6b11766b7058… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 74344a83c1..fcb315391b 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -705,7 +705,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -731,9 +731,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.18. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:5.4:e0c60cf1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 May '21

03 May '21

Module: kamailio Branch: 5.4 Commit: e0c60cf12d465323bcf06899683b2b59dba7295c URL: https://github.com/kamailio/kamailio/commit/e0c60cf12d465323bcf06899683b2b5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-04T01:01:22+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/e0c60cf12d465323bcf06899683b2b5… Patch: https://github.com/kamailio/kamailio/commit/e0c60cf12d465323bcf06899683b2b5… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 6a1ae76b9f..87d3ecf9e4 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -761,7 +761,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -787,9 +787,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.20. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:5.3:09b510ad: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: 5.3 Commit: 09b510adbef121f94739d1fcf46bd92baf80ea77 URL: https://github.com/kamailio/kamailio/commit/09b510adbef121f94739d1fcf46bd92… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:47:43-04:00 siputils: update docs for encode/decode_contact functions (cherry picked from commit bf73b0d72177828e3c35f0fe318f7ef654c89b6b) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/09b510adbef121f94739d1fcf46bd92… Patch: https://github.com/kamailio/kamailio/commit/09b510adbef121f94739d1fcf46bd92… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index d7ef042486..139c99903a 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -740,7 +740,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -784,9 +784,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

git:5.4:ea1239e5: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: 5.4 Commit: ea1239e57190da34b3043de3c8266a004554146e URL: https://github.com/kamailio/kamailio/commit/ea1239e57190da34b3043de3c8266a0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:44:48-04:00 siputils: update docs for encode/decode_contact functions (cherry picked from commit bf73b0d72177828e3c35f0fe318f7ef654c89b6b) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ea1239e57190da34b3043de3c8266a0… Patch: https://github.com/kamailio/kamailio/commit/ea1239e57190da34b3043de3c8266a0… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 880105792a..4667e42f63 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -796,7 +796,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -840,9 +840,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

git:5.5:2b9dc471: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 2b9dc4713d85b1367631871205547aaf25a822a1 URL: https://github.com/kamailio/kamailio/commit/2b9dc4713d85b1367631871205547aa… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:44:00-04:00 siputils: update docs for encode/decode_contact functions (cherry picked from commit bf73b0d72177828e3c35f0fe318f7ef654c89b6b) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2b9dc4713d85b1367631871205547aa… Patch: https://github.com/kamailio/kamailio/commit/2b9dc4713d85b1367631871205547aa… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 880105792a..4667e42f63 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -796,7 +796,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -840,9 +840,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

git:master:ff4eea76: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 03 May '21

03 May '21

Module: kamailio Branch: master Commit: ff4eea76a523851772da574437f99a9348578db4 URL: https://github.com/kamailio/kamailio/commit/ff4eea76a523851772da574437f99a9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-04T00:31:09+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/ff4eea76a523851772da574437f99a9… Patch: https://github.com/kamailio/kamailio/commit/ff4eea76a523851772da574437f99a9… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 6a1ae76b9f..87d3ecf9e4 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -761,7 +761,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -787,9 +787,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.20. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:master:bf73b0d7: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: master Commit: bf73b0d72177828e3c35f0fe318f7ef654c89b6b URL: https://github.com/kamailio/kamailio/commit/bf73b0d72177828e3c35f0fe318f7ef… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:20:05-04:00 siputils: update docs for encode/decode_contact functions --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bf73b0d72177828e3c35f0fe318f7ef… Patch: https://github.com/kamailio/kamailio/commit/bf73b0d72177828e3c35f0fe318f7ef… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 880105792a..4667e42f63 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -796,7 +796,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -840,9 +840,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

[kamailio/kamailio] lost: resolve geolocation url using POST (#2641)
by sergey-safarov 03 May '21

03 May '21

### Description According [RFC5985](https://tools.ietf.org/html/rfc5985) > The POST method is the only method REQUIRED for HELD. If a LIS chooses to support GET or HEAD, it SHOULD consider the kind of application doing the GET. So not all LIS servers support the GET method and only the POST method always present. Also [rfc6753#section-3.2](https://tools.ietf.org/html/rfc6753#section-3.2) > An HTTP GET request to a HELD URI produces a HELD response as if the following HELD request had been sent using HTTP POST: <locationRequest xmlns="urn:ietf:params:xml:ns:geopriv:held"> <locationType exact="false"> geodetic civic </locationType> </locationRequest> ### Expected behavior Dereference Geolocation URLs using POST method with content according [rfc6753#section-3.2](https://tools.ietf.org/html/rfc6753#section-3.2) -- 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/2641

3 9

git:5.5:27520fa3: pkg/kamailio/deb: version set 5.5.0~rc0
by Victor Seva 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 27520fa3293d45d9e407bc42f39d1d31e94c69d6 URL: https://github.com/kamailio/kamailio/commit/27520fa3293d45d9e407bc42f39d1d3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-03T16:46:12+02:00 pkg/kamailio/deb: version set 5.5.0~rc0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/27520fa3293d45d9e407bc42f39d1d3… Patch: https://github.com/kamailio/kamailio/commit/27520fa3293d45d9e407bc42f39d1d3…

2 2

git:5.5:29edc511: pkg/kamailio/deb: version set 5.5.0~rc1
by Victor Seva 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 29edc5113c5e398e427026f88bea2877cdb94fab URL: https://github.com/kamailio/kamailio/commit/29edc5113c5e398e427026f88bea287… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-03T17:44:23+02:00 pkg/kamailio/deb: version set 5.5.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/29edc5113c5e398e427026f88bea287… Patch: https://github.com/kamailio/kamailio/commit/29edc5113c5e398e427026f88bea287…

1 0

[kamailio/kamailio] kamailio Crash on qm_debug_check_frag() (#2607)
by aatif218 03 May '21

03 May '21

**Description** facing crashes the server, raised by qm_debug_check_frag(). **Troubleshooting** The error message: Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdc31f360, fd 31166 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbcbf232a8, fd 31326 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbd990b9e8, fd 31327 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbd89cd1d8, fd 31360 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbcf0bab28, fd 31434 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbc6e031b0, fd 31471 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdb7fd598, fd 31472 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdeb334c8, fd 31494 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbddee6de8, fd 31524 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdb91ef70, fd 31576 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbc76a1da8, fd 31690 Jan 23 12:27:31 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 31327, not in [0, 2054) Jan 23 12:27:31 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 31360, not in [0, 2054) Jan 23 12:27:31 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 31434, not in [0, 2054) Jan 23 12:28:09 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2809]: ALERT: <core> [main.c:777]: handle_sigs(): child process 2858 exited by a signal 6 Jan 23 12:28:09 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2809]: ALERT: <core> [main.c:780]: handle_sigs(): core was generated Jan 23 12:28:09 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2809]: CRITICAL: <core> [core/mem/q_malloc.c:138]: qm_debug_check_frag(): BUG: qm: fragm. 0x7fdbd7e8a0e8 (address 0x7fdbd7e8a120) end overwritten (5fd4cd2e, abcdefed)! Memory allocator was called from core: core/usr_avp.c:626. Fragment marked by core: core/usr_avp.c:175. Exec from core/mem/q_malloc.c:511. The output from GDB: GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-110.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/local/fep-kamailio/sbin/kamailio...done. [New LWP 2809] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/fep-kamailio/sbin/kamailio -f /usr/local/fep-kamailio/etc/kamailio/k'. Program terminated with signal 6, Aborted. #0 0x00007fde7acbf277 in raise () from /lib64/libc.so.6 Missing separate debuginfos, use: debuginfo-install cyrus-sasl-lib-2.1.26-21.el7.x86_64 glibc-2.17-222.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-19.el7.x86_64 libcom_err-1.42.9-12.el7_5.x86_64 libcurl-7.29.0-54.el7.x86_64 libgcc-4.8.5-36.el7_6.1.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-12.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libstdc++-4.8.5-36.el7_6.1.x86_64 libunistring-0.9.3-9.el7.x86_64 nspr-4.21.0-1.el7.x86_64 nss-3.44.0-4.el7.x86_64 nss-softokn-freebl-3.44.0-5.el7.x86_64 nss-util-3.44.0-3.el7.x86_64 openldap-2.4.44-5.el7.x86_64 openssl-libs-1.0.2k-12.el7.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-17.el7.x86_64 (gdb) bt #0 0x00007fde7acbf277 in raise () from /lib64/libc.so.6 #1 0x00007fde7acc0968 in abort () from /lib64/libc.so.6 #2 0x00000000006d7c95 in qm_debug_check_frag (qm=0x7fdbc25ae000, f=0x7fdbd7e8a0e8, file=0x817155 "core: core/usr_avp.c", line=626, efile=0x83f7c5 "core/mem/q_malloc.c", eline=511) at core/mem/q_malloc.c:140 #3 0x00000000006db99e in qm_free (qmp=0x7fdbc25ae000, p=0x7fdbd7e8a120, file=0x817155 "core: core/usr_avp.c", func=0x8189a0 <__FUNCTION__.8526> "destroy_avp_list_unsafe", line=626, mname=0x817150 "core") at core/mem/q_malloc.c:511 #4 0x00000000005e7ede in destroy_avp_list_unsafe (list=0x7fdbd7e8a950) at core/usr_avp.c:626 #5 0x00007fde38d4bd8f in free_cell_helper (dead_cell=0x7fdbd7e8a750, silent=1, fname=0x7fde38e4267f "h_table.c", fline=466) at h_table.c:255 #6 0x00007fde38d4c9e1 in free_hash_table () at h_table.c:466 #7 0x00007fde38df9cd0 in tm_shutdown () at t_funcs.c:88 #8 0x0000000000581960 in destroy_modules () at core/sr_module.c:746 #9 0x000000000041cda7 in cleanup (show_status=1) at main.c:563 #10 0x000000000041e682 in shutdown_children (sig=15, show_status=1) at main.c:706 #11 0x0000000000421715 in handle_sigs () at main.c:806 #12 0x000000000042b9a7 in main_loop () at main.c:1817 #13 0x0000000000433b96 in main (argc=9, argv=0x7ffea05cd2c8) at main.c:2856 (gdb) bt full #0 0x00007fde7acbf277 in raise () from /lib64/libc.so.6 No symbol table info available. #1 0x00007fde7acc0968 in abort () from /lib64/libc.so.6 No symbol table info available. #2 0x00000000006d7c95 in qm_debug_check_frag (qm=0x7fdbc25ae000, f=0x7fdbd7e8a0e8, file=0x817155 "core: core/usr_avp.c", line=626, efile=0x83f7c5 "core/mem/q_malloc.c", eline=511) at core/mem/q_malloc.c:140 p = 0x7ffea05cc3b0 __FUNCTION__ = "qm_debug_check_frag" #3 0x00000000006db99e in qm_free (qmp=0x7fdbc25ae000, p=0x7fdbd7e8a120, file=0x817155 "core: core/usr_avp.c", func=0x8189a0 <__FUNCTION__.8526> "destroy_avp_list_unsafe", line=626, mname=0x817150 "core") at core/mem/q_malloc.c:511 qm = 0x7fdbc25ae000 f = 0x7fdbd7e8a0e8 size = 408 next = 0x7fdbd7e8a5c8 prev = 0x7fdbd7e8a1d8 __FUNCTION__ = "qm_free" #4 0x00000000005e7ede in destroy_avp_list_unsafe (list=0x7fdbd7e8a950) at core/usr_avp.c:626 avp = 0x7fdbd7e8a080 foo = 0x7fdbd7e8a120 __FUNCTION__ = "destroy_avp_list_unsafe" #5 0x00007fde38d4bd8f in free_cell_helper (dead_cell=0x7fdbd7e8a750, silent=1, fname=0x7fde38e4267f "h_table.c", fline=466) at h_table.c:255 b = 0x0 i = 1 rpl = 0x0 tt = 0x0 foo = 0x7fde34a5df80 <__FUNCTION__.7259> cbs = 0x0 cbs_tmp = 0x7fde388fe570 __FUNCTION__ = "free_cell_helper" #6 0x00007fde38d4c9e1 in free_hash_table () at h_table.c:466 p_cell = 0x7fdbd7e8a750 tmp_cell = 0x7fdbc27e3060 i = 40845 __FUNCTION__ = "free_hash_table" #7 0x00007fde38df9cd0 in tm_shutdown () at t_funcs.c:88 __FUNCTION__ = "tm_shutdown" #8 0x0000000000581960 in destroy_modules () at core/sr_module.c:746 t = 0x7fde3c51e4c0 foo = 0x7fde3c51e020 __FUNCTION__ = "destroy_modules" #9 0x000000000041cda7 in cleanup (show_status=1) at main.c:563 memlog = 0 __FUNCTION__ = "cleanup" #10 0x000000000041e682 in shutdown_children (sig=15, show_status=1) at main.c:706 __FUNCTION__ = "shutdown_children" #11 0x0000000000421715 in handle_sigs () at main.c:806 chld = 0 chld_status = 134 any_chld_stopped = 1 memlog = -1027733624 __FUNCTION__ = "handle_sigs" #12 0x000000000042b9a7 in main_loop () at main.c:1817 i = 10 pid = 2893 si = 0x0 si_desc = "udp receiver child=9 sock=10.50.7.18:5060\000:0:0:1]:5060\000:5060)\000\000\000\004\000\000\000\000\000\000\000\000\340Z\302\333\177\000\000\000\000\000\000\000\000\000\000 \006\276\302\333\177\000\000`\315\\\240\376\177\000\000\220\006\276\302\333\177\000\000r\fb3\336\177\000\000P\246\222<\336\177\000" nrprocs = 10 woneinit = 1 __FUNCTION__ = "main_loop" #13 0x0000000000433b96 in main (argc=9, argv=0x7ffea05cd2c8) at main.c:2856 **Additional Information** Kamailio Version - output of Kamailio -v version: kamailio 5.4.2 (x86_64/linux) f8885c 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_BLACKLIST, 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: f8885c compiled on 04:30:53 Dec 16 2020 with gcc 4.8.5 **Operating System:** NAME="CentOS Linux" VERSION="7 (Core)" ID="centos" **Note:** It looks similar to the following issue https://github.com/kamailio/kamailio/issues/2503 -- 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/2607

2 5

[kamailio/kamailio] [Feature] RFC 8898 support (#2669)
by Grzegorz Kapkowski 03 May '21

03 May '21

### Description Hi, is there anyone working on adding support for [RFC 8898](https://tools.ietf.org/html/rfc8898) and do you know of any clients that already implement it or are working towards supporting it? How could I go about starting such effort? ### RFC 8898 Third-Party Token-Based Authentication and Authorization for Session Initiation Protocol (SIP) Abstract This document defines the "Bearer" authentication scheme for the Session Initiation Protocol (SIP) and a mechanism by which user authentication and SIP registration authorization is delegated to a third party, using the OAuth 2.0 framework and OpenID Connect Core 1.0. This document updates RFC 3261 to provide guidance on how a SIP User Agent Client (UAC) responds to a SIP 401/407 response that contains multiple WWW-Authenticate/Proxy-Authenticate header fields. ... -- 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/2669

3 5

[kamailio/kamailio] DNS destination resolution failure when too many SRV records (#2651)
by jklingenmeyer 03 May '21

03 May '21

### Description DNS core resolver fails in returning a valid IP when there are too many SRV results in the DNS reply. It acts like if no records were found, so request is not relayed and a 478 reply is generated instead (in the example of a DNS name in $ru or $du). ### Troubleshooting #### Reproduction It is easy to reproduce with DNS failover + NAPTR enabled (cf parameters used far below) and with such DNS records: ``` # dig +short NAPTR ko.sip.provider.com 50 30 "S" "SIP+D2U" "" _sip._udp.ko.sip.provider.com. # dig +short SRV _sip._udp.ko.sip.provider.com. 10 10 5060 endpoint-01.k0.sip.provider.com. 10 10 5060 endpoint-02.k0.sip.provider.com. 10 10 5060 endpoint-03.k0.sip.provider.com. 10 10 5060 endpoint-04.k0.sip.provider.com. 10 10 5060 endpoint-05.k0.sip.provider.com. 10 10 5060 endpoint-06.k0.sip.provider.com. 10 10 5060 endpoint-07.k0.sip.provider.com. 10 10 5060 endpoint-08.k0.sip.provider.com. 10 10 5060 endpoint-09.k0.sip.provider.com. # Each SRV result above has a corresponding # 'A' record so that command below gives a correct IP: # dig +short A endpoint-01.k0.sip.provider.com. ``` To reproduce, relay a request towards it, like: `$du="sip:ko.sip.provider.com"` #### Debugging data One interesting thing is that Kamailio behaves exactly the same as the `sip-dig` tool. But `sip-dig` seems to be limited on the DNS reply size it can handle (cf my comment below about the RFC). Does Kamailio have this same kind of limitation regarding DNS resolution? #### Log Messages ##### Failure example: with 9 SRV records ``` DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (ko.sip.provider.com(26), 35), h=275 DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff6a20f0000, 0x7ff6a27777d8), called from core: core/dns_cache.c: dns_destroy_entry(151) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff6a27777a0 alloc'ed from core: core/dns_cache.c: dns_cache_mk_rd_entry(1110) DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 58) called from core: core/resolve.c: get_record(862) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 64) returns address 0x7ff72363d8f8 frag. 0x7ff72363d8c0 (size=64) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 92) called from core: core/resolve.c: dns_naptr_parser(405) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 96) returns address 0x7ff72363d9a0 frag. 0x7ff72363d968 (size=96) on 1 -th hit DEBUG: <core> [core/resolve.c:984]: get_record(): skipping 0 NS (p=0x558fb300dba7, end=0x558fb300dba7) DEBUG: <core> [core/resolve.c:997]: get_record(): parsing 0 ARs (p=0x558fb300dba7, end=0x558fb300dba7) DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 216) called from core: core/dns_cache.c: dns_cache_mk_rd_entry(1110) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 216) returns address 0x7ff6a27748a8 frag. 0x7ff6a2774870 (size=232) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff72363d9a0), called from core: core/resolve.c: free_rdata_list(678) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff72363d968 alloc'ed from core: core/resolve.c: dns_naptr_parser(405) DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff72363d8f8), called from core: core/resolve.c: free_rdata_list(679) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff72363d8c0 alloc'ed from core: core/resolve.c: get_record(862) DEBUG: <core> [core/dns_cache.c:1633]: dns_get_related(): (0x7ff6a27748a8 (ko.sip.provider.com, 35), 35, *(nil)) (0) DEBUG: <core> [core/dns_cache.c:739]: dns_cache_add_unsafe(): adding ko.sip.provider.com(26) 35 (flags=0) at 275 DEBUG: <core> [core/dns_cache.c:2614]: dns_naptr_sip_iterate(): found a valid sip NAPTR rr _sip._udp.ko.sip.provider.com, proto 1 DEBUG: <core> [core/resolve.c:1182]: naptr_choose(): o:-1 w:-1 p:0, o:50 w:30 p:1 DEBUG: <core> [core/resolve.c:1197]: naptr_choose(): changed DEBUG: <core> [core/dns_cache.c:2625]: dns_naptr_sip_iterate(): choosed NAPTR rr _sip._udp.ko.sip.provider.com, proto 1 tried: 0x0 DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (_sip._udp.ko.sip.provider.com(36), 33), h=989 DEBUG: <core> [core/dns_cache.c:3041]: dns_srv_resolve_ip(): ("_sip._udp.ko.sip.provider.com", 0, 0), ret=-5, ip= DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (_sip._udp.ko.sip.provider.com(36), 33), h=989 DEBUG: <core> [core/dns_cache.c:3041]: dns_srv_resolve_ip(): ("_sip._udp.ko.sip.provider.com", 0, 0), ret=-5, ip= DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (_sip._tcp.ko.sip.provider.com(36), 33), h=772 DEBUG: <core> [core/dns_cache.c:3041]: dns_srv_resolve_ip(): ("_sip._tcp.ko.sip.provider.com", 0, 0), ret=-5, ip= DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (_sips._tcp.ko.sip.provider.com(37), 33), h=786 DEBUG: <core> [core/dns_cache.c:3041]: dns_srv_resolve_ip(): ("_sips._tcp.ko.sip.provider.com", 0, 0), ret=-5, ip= DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (ko.sip.provider.com(26), 1), h=275 DEBUG: <core> [core/dns_cache.c:2803]: dns_a_resolve(): (ko.sip.provider.com, 0) returning -7 DEBUG: <core> [core/dns_cache.c:3167]: dns_srv_sip_resolve(): (ko.sip.provider.com, 0, 0), ip, ret=-7 ERROR: tm [ut.h:284]: uri2dst2(): failed to resolve "ko.sip.provider.com" :unresolvable A or AAAA request (-7) ``` ##### Comparison with a working example (only 3 SRV records) ``` DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (ok.sip.provider.com(26), 35), h=275 DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 58) called from core: core/resolve.c: get_record(862) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 64) returns address 0x7ff723613ff8 frag. 0x7ff723613fc0 (size=64) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 92) called from core: core/resolve.c: dns_naptr_parser(405) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 96) returns address 0x7ff7236140a0 frag. 0x7ff723614068 (size=96) on 1 -th hit DEBUG: <core> [core/resolve.c:984]: get_record(): skipping 0 NS (p=0x558fb300dba7, end=0x558fb300dba7) DEBUG: <core> [core/resolve.c:997]: get_record(): parsing 0 ARs (p=0x558fb300dba7, end=0x558fb300dba7) DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 216) called from core: core/dns_cache.c: dns_cache_mk_rd_entry(1110) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 216) returns address 0x7ff6a27755b8 frag. 0x7ff6a2775580 (size=376) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff7236140a0), called from core: core/resolve.c: free_rdata_list(678) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff723614068 alloc'ed from core: core/resolve.c: dns_naptr_parser(405) DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff723613ff8), called from core: core/resolve.c: free_rdata_list(679) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff723613fc0 alloc'ed from core: core/resolve.c: get_record(862) DEBUG: <core> [core/dns_cache.c:1633]: dns_get_related(): (0x7ff6a27755b8 (ok.sip.provider.com, 35), 35, *(nil)) (0) DEBUG: <core> [core/dns_cache.c:739]: dns_cache_add_unsafe(): adding ok.sip.provider.com(26) 35 (flags=0) at 275 DEBUG: <core> [core/dns_cache.c:2614]: dns_naptr_sip_iterate(): found a valid sip NAPTR rr _sip._udp.ok.sip.provider.com, proto 1 DEBUG: <core> [core/resolve.c:1182]: naptr_choose(): o:-1 w:-1 p:0, o:50 w:30 p:1 DEBUG: <core> [core/resolve.c:1197]: naptr_choose(): changed DEBUG: <core> [core/dns_cache.c:2625]: dns_naptr_sip_iterate(): choosed NAPTR rr _sip._udp.ok.sip.provider.com, proto 1 tried: 0x0 DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (_sip._udp.ok.sip.provider.com(36), 33), h=989 DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 68) called from core: core/resolve.c: get_record(862) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 72) returns address 0x7ff723613ff8 frag. 0x7ff723613fc0 (size=72) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 46) called from core: core/resolve.c: dns_srv_parser(318) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 48) returns address 0x7ff7236140a8 frag. 0x7ff723614070 (size=48) on 1 -th hit DEBUG: <core> [core/resolve.c:984]: get_record(): skipping 0 NS (p=0x558fb300dbb4, end=0x558fb300dbb4) DEBUG: <core> [core/resolve.c:997]: get_record(): parsing 0 ARs (p=0x558fb300dbb4, end=0x558fb300dbb4) DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 176) called from core: core/dns_cache.c: dns_cache_mk_rd_entry(1110) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 176) returns address 0x7ff6a2775900 frag. 0x7ff6a27758c8 (size=176) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff7236140a8), called from core: core/resolve.c: free_rdata_list(678) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff723614070 alloc'ed from core: core/resolve.c: dns_srv_parser(318) DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff723613ff8), called from core: core/resolve.c: free_rdata_list(679) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff723613fc0 alloc'ed from core: core/resolve.c: get_record(862) DEBUG: <core> [core/dns_cache.c:1633]: dns_get_related(): (0x7ff6a2775900 (_sip._udp.ok.sip.provider.com, 33), 33, *(nil)) (0) DEBUG: <core> [core/dns_cache.c:739]: dns_cache_add_unsafe(): adding _sip._udp.ok.sip.provider.com(36) 33 (flags=0) at 989 DEBUG: <core> [core/dns_cache.c:2222]: dns_srv_get_nxt_rr(): (0x7ff6a2775900, 0, 0, 1457300027): selected 0/1 in grp. 0 (rand_w=0, rr=0x7ff6a2775968 rd=0x7ff6a2775980 p=10 w=10 rsum=10) DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (endpoint.ok.sip.provider.com(38), 1), h=530 DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 70) called from core: core/resolve.c: get_record(862) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 72) returns address 0x7ff723613ff8 frag. 0x7ff723613fc0 (size=72) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff7234f4010, 4) called from core: core/resolve.c: dns_a_parser(474) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff7234f4010, 8) returns address 0x7ff7236140a8 frag. 0x7ff723614070 (size=8) on 1 -th hit DEBUG: <core> [core/resolve.c:984]: get_record(): skipping 0 NS (p=0x558fb300db8e, end=0x558fb300db8e) DEBUG: <core> [core/resolve.c:997]: get_record(): parsing 0 ARs (p=0x558fb300db8e, end=0x558fb300db8e) DEBUG: <core> [core/mem/q_malloc.c:374]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 136) called from core: core/dns_cache.c: dns_cache_mk_rd_entry(1110) DEBUG: <core> [core/mem/q_malloc.c:419]: qm_malloc(): qm_malloc(0x7ff6a20f0000, 136) returns address 0x7ff6a2775a18 frag. 0x7ff6a27759e0 (size=136) on 1 -th hit DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff7236140a8), called from core: core/resolve.c: free_rdata_list(678) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff723614070 alloc'ed from core: core/resolve.c: dns_a_parser(474) DEBUG: <core> [core/mem/q_malloc.c:482]: qm_free(): qm_free(0x7ff7234f4010, 0x7ff723613ff8), called from core: core/resolve.c: free_rdata_list(679) DEBUG: <core> [core/mem/q_malloc.c:526]: qm_free(): freeing frag. 0x7ff723613fc0 alloc'ed from core: core/resolve.c: get_record(862) DEBUG: <core> [core/dns_cache.c:1633]: dns_get_related(): (0x7ff6a2775a18 (endpoint.ok.sip.provider.com, 1), 1, *(nil)) (0) DEBUG: <core> [core/dns_cache.c:739]: dns_cache_add_unsafe(): adding endpoint.ok.sip.provider.com(38) 1 (flags=0) at 530 DEBUG: <core> [core/dns_cache.c:2803]: dns_a_resolve(): (endpoint.ok.sip.provider.com, 0) returning 0 DEBUG: <core> [core/dns_cache.c:3041]: dns_srv_resolve_ip(): ("_sip._udp.ok.sip.provider.com", 0, 0), ret=0, ip=[RESOLVED_IP] DEBUG: <core> [core/dns_cache.c:3241]: dns_naptr_sip_resolve(): (ok.sip.provider.com, 0, 0), srv0, ret=0 ``` ### Possible Solutions I had a quick look inside the code and did not find any limitation about a maximum number of records. There are some max defined in `dns_cache.c` but I did not found a relation between them and my issue. Could there be a limitation in result size? Here is what I got from my RFCs reading regarding that: * Extract from **RFC 2782 DNS RR** (mentioned in RFC 3263 as being the RFC to follow for implementing DNS in SIP): > Currently there's a practical limit of 512 bytes for DNS replies. > Until all resolvers can handle larger responses, domain administrators are strongly advised to keep their SRV replies below 512 bytes. There is a RFC about how to deal with truncated messages: > If a truncated response comes back from an SRV query, the rules described in RFC 2181 (https://tools.ietf.org/html/rfc2181#page-11) shall apply. ### Additional Information * **Kamailio Version** - kamailio 5.3.8 ``` dns_try_naptr=yes dns_tcp_pref = 1 dns_udp_pref = 1 dns_tls_pref = 1 dns_srv_lb=yes use_dns_failover=yes use_dns_cache=yes dns_cache_max_ttl=30 ``` * **Operating System**: Debian 9.13 on Docker Thanks -- 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/2651

3 6

[kamailio/kamailio] Wrong Record-Route and Via header fields when TCP is used (#2033)
by leonid-xorcom 03 May '21

03 May '21

### Description Kamailio server has two legs that are connected to different networks. I'm using Kamailio v.5.2.3 and the "enable_double_rr" is implicitly set to "1". The leg "A" IP address is 10.28.80.1 The leg "B" IP address is 192.168.9.103 The call is initiated from 10.28.80.47 According to the "rr" module documentation, function record_route() should insert two "Record_Route" header fields when a request is accepted on one leg is should go out via the second leg. This works as expected in case of UDP protocol: INVITE sip:2601@192.168.0.178:49162;transport=udp SIP/2.0 Record-Route: <sip:192.168.9.103;r2=on;lr;did=e2c.a191> Record-Route: <sip:10.28.80.1;r2=on;lr;did=e2c.a191> Via: SIP/2.0/UDP 192.168.9.103;branch=z9hG4bKcfa5.d64ecbd87d5315b5993c4ccf16f86537.0 Via: SIP/2.0/UDP 10.28.80.47:5060;rport=5060;branch=z9hG4bK3a9e9a4d But when the TCP protocol is used AND "listen" parameters are defined: listen=udp:10.28.80.1:5060 listen=tcp:10.28.80.1:5060 listen=udp:192.168.9.103:5060 listen=tcp:192.168.9.103:5060 then the outbound message looks like this: INVITE sip:2601@192.168.0.178:48758;transport=tcp SIP/2.0 Record-Route: <sip:10.28.80.1;transport=tcp;lr;did=bcd.72f> Via: SIP/2.0/TCP 10.28.80.1;branch=z9hG4bKb9ca.26ea08654c9dbc32bb0dc6e3b6f92d45.0;i=3 Via: SIP/2.0/TCP 10.28.80.47:5060;rport=33976;branch=z9hG4bK5291fab1 There are two problems there: a) only one Record-Route with leg "A" is inserted b) the added "Via" header field contains the leg "A" IP address instead of expected leg "B" IP address (192.168.9.103). In the LAN trace, I see that in reality the message was sent from leg "B". IMPORTANT: The problem occurs only when the "listen" parameters are defined in the Kamailio configuration. When the "listens" are not configured then everything works correctly. ### Troubleshooting #### Reproduction #### Debugging Data #### Log Messages http://updates.xorcom.com/~xorcom/kam-tcp-problem.tar.gz The archive contains the following files: * syslog-bad.log and bad.cap - Kamailio log and tcpdump trace of a call when the problem occurs * syslog-good.log and good.cap - Kamailio log and tcpdump trace of a call when the problem doesn't occur #### SIP Traffic ### Possible Solutions ### Additional Information kamailio -v version: kamailio 5.2.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, 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: unknown compiled with gcc 7.3.0 ***Operating System**: Ubuntu 18.0.4 -- 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/2033

3 13

git:5.5:39143255: lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function()
by Wolfgang Kampichler 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 39143255145ba6387cb001be4c70decfd3811aec URL: https://github.com/kamailio/kamailio/commit/39143255145ba6387cb001be4c70dec… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-03T12:33:00+02:00 lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function() - error variable was set to 0 (clean up) before return. Lost functions now returns 500 in case of LOST/HELD server error, or 400 in case of internal error, otherwise 2xx. (cherry picked from commit 201c219a5496924e701cc2b17fb0a439ee530813) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/39143255145ba6387cb001be4c70dec… Patch: https://github.com/kamailio/kamailio/commit/39143255145ba6387cb001be4c70dec…

1 0

git:5.5:e7b17ec5: lost: response code fix in lost_held_dereference()
by Wolfgang Kampichler 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: e7b17ec5e334ac07303f341e3128645aa569069a URL: https://github.com/kamailio/kamailio/commit/e7b17ec5e334ac07303f341e3128645… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-03T12:33:45+02:00 lost: response code fix in lost_held_dereference() - HELD response check returning 200: received 200OK but nothing found (shall not happen) 201: received 200OK and loc reference found 202: received 200OK and value found (pidf-lo) 203: receiced 200OK and value + reference found (pidf-lo) (cherry picked from commit 79c6bae4af6c9c9c392b05928ca72afb14ccfbf6) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/e7b17ec5e334ac07303f341e3128645… Patch: https://github.com/kamailio/kamailio/commit/e7b17ec5e334ac07303f341e3128645… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index c50b70bbad..711c3732bf 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -723,8 +723,8 @@ int lost_held_dereference(struct sip_msg *_m, char *_url, char *_pidf, /* check content and set response code * + 0 nothing found: return 200 - * + 1 value found: return 201 - * + 2 reference found: return 202 + * + 1 reference found: return 201 + * + 2 value found: return 202 * + 3 value and reference found: return 203 */ ret += lost_check_HeldResponse(root); diff --git a/src/modules/lost/response.h b/src/modules/lost/response.h index ef509d2266..991f82ac6e 100644 --- a/src/modules/lost/response.h +++ b/src/modules/lost/response.h @@ -56,8 +56,8 @@ #define ERRORS_NODE (const char *)"errors" -#define HELD_RESPONSE_VALUE 1 -#define HELD_RESPONSE_REFERENCE 2 +#define HELD_RESPONSE_REFERENCE 1 +#define HELD_RESPONSE_VALUE 2 typedef struct lost_list {

1 0

git:5.5:d69c0362: lost: lost_held_dereference() documentation added and code comment corrected
by Wolfgang Kampichler 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: d69c03625fad8c41eb18e23ee928b9f679140ef6 URL: https://github.com/kamailio/kamailio/commit/d69c03625fad8c41eb18e23ee928b9f… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-03T12:34:35+02:00 lost: lost_held_dereference() documentation added and code comment corrected (cherry picked from commit ae13686c80b03693ee2195d38a8c8eb0ede0d0dc) --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/d69c03625fad8c41eb18e23ee928b9f… Patch: https://github.com/kamailio/kamailio/commit/d69c03625fad8c41eb18e23ee928b9f… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 7f4597632b..f8065770d9 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -429,9 +429,23 @@ xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va </para></listitem> </itemizedlist> <para> - The return value is 200 on success, 400 if an internal error occured, or 500 if an - error code is returned in the HELD response. + The return value is 200..203 on success, 400 if an internal error occured, or 500 if an + error code is returned in the HELD response. Success codes in detail are as follows: </para> + <itemizedlist> + <listitem><para> + <emphasis>200</emphasis> - received 200 OK, but neither location-info nor locationURI element found + </para></listitem> + <listitem><para> + <emphasis>201</emphasis> - received 200 OK with locationURI (aka Location-by-Reference) + </para></listitem> + <listitem><para> + <emphasis>202</emphasis> - received 200 OK with location-info element (aka Location-by-Value) + </para></listitem> + <listitem><para> + <emphasis>203</emphasis> - received 200 OK with location-info and locationURI element + </para></listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index caa86732ed..cc6d65ad2a 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -1006,8 +1006,8 @@ p_lost_fsr_t lost_parse_findServiceResponse(str ret) * lost_check_HeldResponse(node) * does a quick check of HELD dereference response and returns ... * 0: neither location value nor reference found - * 1: location value found - * 2: location reference found + * 1: location reference found + * 2: location value found * 3: location value and reference found * multiple occurences are ignored */

1 0

git:master:2058676d: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 03 May '21

03 May '21

Module: kamailio Branch: master Commit: 2058676daacc2feded18b872bd53c0514710d4bb URL: https://github.com/kamailio/kamailio/commit/2058676daacc2feded18b872bd53c05… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-03T11:16:14+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/2058676daacc2feded18b872bd53c05… Patch: https://github.com/kamailio/kamailio/commit/2058676daacc2feded18b872bd53c05… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 14cf3b36a6..00fa5f2ceb 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -376,8 +376,15 @@ r(pidf)\n"); * pidf-lo - the PIDF-LO returned in the HELD locationRequest response * error - any error code returned in the HELD response - The return value is 200 on success, 400 if an internal error occured, - or 500 if an error code is returned in the HELD response. + The return value is 200..203 on success, 400 if an internal error + occured, or 500 if an error code is returned in the HELD response. + Success codes in detail are as follows: + * 200 - received 200 OK, but neither location-info nor locationURI + element found + * 201 - received 200 OK with locationURI (aka Location-by-Reference) + * 202 - received 200 OK with location-info element (aka + Location-by-Value) + * 203 - received 200 OK with location-info and locationURI element This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE.

1 0

[kamailio/kamailio] jwt: token may have a validity period (number of seconds) (#2722)
by Frédéric Gaisnon 03 May '21

03 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:  - [x ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a new parameter validity to jwt_generate(prvkey, alg, claims) in order to set a validity period for generated jwt token. I know branch 5.5 is almost released but I think that this functionality is very important for this new module and I hope it can be added to this release. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2722 -- Commit Summary -- * cplc: add a configuration route before redirected call (key: redirect_route) * pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within) * Merge branch 'master' of https://github.com/kamailio/kamailio * jwt: token may have a validity period (number of seconds) -- File Changes -- M src/modules/jwt/doc/jwt.xml (9) M src/modules/jwt/doc/jwt_admin.xml (5) M src/modules/jwt/jwt_mod.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2722.patch https://github.com/kamailio/kamailio/pull/2722.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/2722

2 3

git:master:ae13686c: lost: lost_held_dereference() documentation added and code comment corrected
by Wolfgang Kampichler 03 May '21

03 May '21

Module: kamailio Branch: master Commit: ae13686c80b03693ee2195d38a8c8eb0ede0d0dc URL: https://github.com/kamailio/kamailio/commit/ae13686c80b03693ee2195d38a8c8eb… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-03T11:00:41+02:00 lost: lost_held_dereference() documentation added and code comment corrected --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/ae13686c80b03693ee2195d38a8c8eb… Patch: https://github.com/kamailio/kamailio/commit/ae13686c80b03693ee2195d38a8c8eb… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 7f4597632b..f8065770d9 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -429,9 +429,23 @@ xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va </para></listitem> </itemizedlist> <para> - The return value is 200 on success, 400 if an internal error occured, or 500 if an - error code is returned in the HELD response. + The return value is 200..203 on success, 400 if an internal error occured, or 500 if an + error code is returned in the HELD response. Success codes in detail are as follows: </para> + <itemizedlist> + <listitem><para> + <emphasis>200</emphasis> - received 200 OK, but neither location-info nor locationURI element found + </para></listitem> + <listitem><para> + <emphasis>201</emphasis> - received 200 OK with locationURI (aka Location-by-Reference) + </para></listitem> + <listitem><para> + <emphasis>202</emphasis> - received 200 OK with location-info element (aka Location-by-Value) + </para></listitem> + <listitem><para> + <emphasis>203</emphasis> - received 200 OK with location-info and locationURI element + </para></listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index caa86732ed..cc6d65ad2a 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -1006,8 +1006,8 @@ p_lost_fsr_t lost_parse_findServiceResponse(str ret) * lost_check_HeldResponse(node) * does a quick check of HELD dereference response and returns ... * 0: neither location value nor reference found - * 1: location value found - * 2: location reference found + * 1: location reference found + * 2: location value found * 3: location value and reference found * multiple occurences are ignored */

1 0

git:5.5:6c6d4cb2: ChangeLog: updated content to prepare for 5.5.x series
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 6c6d4cb2823c5d9f1c02bbde695d8769cb87fb6c URL: https://github.com/kamailio/kamailio/commit/6c6d4cb2823c5d9f1c02bbde695d876… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T10:21:41+02:00 ChangeLog: updated content to prepare for 5.5.x series --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/6c6d4cb2823c5d9f1c02bbde695d876… Patch: https://github.com/kamailio/kamailio/commit/6c6d4cb2823c5d9f1c02bbde695d876…

1 0

git:5.5:d06a4f50: jwt: handle claims that have numeric values
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: d06a4f5096a3044c2d46a49adb1ff2ea38d2eba8 URL: https://github.com/kamailio/kamailio/commit/d06a4f5096a3044c2d46a49adb1ff2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:54+02:00 jwt: handle claims that have numeric values - values in between quotes are string always (cherry picked from commit c0532161f18cce514adaf2b5d784999319445911) --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d06a4f5096a3044c2d46a49adb1ff2e… Patch: https://github.com/kamailio/kamailio/commit/d06a4f5096a3044c2d46a49adb1ff2e… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 6426381efb..4a88c9f0dd 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -186,6 +186,7 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) param_t *pit = NULL; int ret = 0; jwt_t *jwt = NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0) { @@ -242,16 +243,30 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) iat = time(NULL); ret = jwt_add_grant_int(jwt, "iat", iat); + if(ret != 0) { + LM_ERR("failed to add iat grant\n"); + goto error; + } for (pit = params_list; pit; pit=pit->next) { if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_add_grant(jwt, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_add_grant_int(jwt, pit->name.s, lval); + } else { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s grant\n", pit->name.s); + goto error; + } } } ret = jwt_set_alg(jwt, valg, (unsigned char*)kdata.s, (size_t)kdata.len); - if (ret < 0) { + if (ret != 0) { LM_ERR("failed to set algorithm and key\n"); goto error; } @@ -324,6 +339,7 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, jwt_t *jwt = NULL; jwt_valid_t *jwt_valid = NULL; str sparams = STR_NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0 @@ -384,7 +400,17 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_valid_add_grant_int(jwt_valid, pit->name.s, lval); + } else { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s valid grant\n", pit->name.s); + goto error; + } } }

1 0

git:5.5:f7651222: jwt: more details about claims parameter format
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: f76512226f8db95b7ecd8c881475e2f53f2aa900 URL: https://github.com/kamailio/kamailio/commit/f76512226f8db95b7ecd8c881475e2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:45:02+02:00 jwt: more details about claims parameter format (cherry picked from commit 7d24a7afe02bf1f7c8ddddfcfc9f1c287296c996) --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f76512226f8db95b7ecd8c881475e2f… Patch: https://github.com/kamailio/kamailio/commit/f76512226f8db95b7ecd8c881475e2f… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index dba928b523..36d3d0d0f7 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -109,6 +109,10 @@ modparam("jwt", "key_mode", 1) <para> claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format). + The string values can be enclosed in single or double quotes. If a + value is not eclosed in between quotes, it is added as numeric + value if it is successfully converted to a long value, otherwise is + added as string value. </para> </listitem> </itemizedlist> @@ -120,7 +124,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... </programlisting> </example> @@ -151,7 +155,8 @@ modparam("jwt", "key_mode", 1) <listitem> <para> claims - the list of claims to be checked they are in the JWT, in the format - "name1=value1;name2=value2;..." (same as the SIP parameters format). + "name1=value1;name2=value2;..." (same as the SIP parameters format, + see also the description of claims parameter for jwt_generate()). </para> </listitem> <listitem> @@ -168,7 +173,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -206,7 +211,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ... </programlisting>

1 0

git:5.5:b5044dfe: topos_redis: store context field
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: b5044dfea4202b10040b42fa478177cbc3b0f2d0 URL: https://github.com/kamailio/kamailio/commit/b5044dfea4202b10040b42fa478177c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:45:10+02:00 topos_redis: store context field (cherry picked from commit a1a1b548e9362b2b478e0551042e86e294249ddc) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/b5044dfea4202b10040b42fa478177c… Patch: https://github.com/kamailio/kamailio/commit/b5044dfea4202b10040b42fa478177c… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index c2d43b4c33..0d21cbc2d1 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -78,6 +78,7 @@ str td_key_a_srcaddr = str_init("a_srcaddr"); str td_key_b_srcaddr = str_init("b_srcaddr"); str td_key_s_method = str_init("s_method"); str td_key_s_cseq = str_init("s_cseq"); +str td_key_x_context = str_init("x_context"); str tt_key_rectime = str_init("rectime"); str tt_key_a_callid = str_init("a_callid"); @@ -99,6 +100,7 @@ str tt_key_a_tag = str_init("a_tag"); str tt_key_b_tag = str_init("b_tag"); str tt_key_s_method = str_init("s_method"); str tt_key_s_cseq = str_init("s_cseq"); +str tt_key_x_context = str_init("x_context"); #define TPS_REDIS_SET_ARGSV(sval, argc, argv, argvlen) \ do { \ @@ -242,6 +244,8 @@ int tps_redis_insert_dialog(tps_data_t *td) TPS_REDIS_SET_ARGS(&td->s_method, argc, &td_key_s_method, argv, argvlen); TPS_REDIS_SET_ARGS(&td->s_cseq, argc, &td_key_s_cseq, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->x_context, argc, &td_key_x_context, argv, argvlen); + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); @@ -502,6 +506,8 @@ int tps_redis_insert_branch(tps_data_t *td) TPS_REDIS_SET_ARGS(&td->a_tag, argc, &tt_key_a_tag, argv, argvlen); TPS_REDIS_SET_ARGS(&td->b_tag, argc, &tt_key_b_tag, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->x_context, argc, &tt_key_x_context, argv, argvlen); + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); @@ -929,6 +935,9 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, } else if(skey.len==tt_key_b_tag.len && strncmp(skey.s, tt_key_b_tag.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->b_tag); + } else if(skey.len==tt_key_x_context.len + && strncmp(skey.s, tt_key_x_context.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->x_context); } else { LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); } @@ -1134,6 +1143,9 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) } else if(skey.len==td_key_s_cseq.len && strncmp(skey.s, td_key_s_cseq.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->s_cseq); + } else if(skey.len==td_key_x_context.len + && strncmp(skey.s, td_key_x_context.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->x_context); } else { LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); }

1 0

git:5.5:3f5c99f1: topos_redis: use initial transaction method for early dialog branch loading
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 3f5c99f1bb3bbfdfb84416e7850f379e7a151e15 URL: https://github.com/kamailio/kamailio/commit/3f5c99f1bb3bbfdfb84416e7850f379… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:35+02:00 topos_redis: use initial transaction method for early dialog branch loading (cherry picked from commit 824920d5b159d80ce3c241313bf647b5dbbf6661) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/3f5c99f1bb3bbfdfb84416e7850f379… Patch: https://github.com/kamailio/kamailio/commit/3f5c99f1bb3bbfdfb84416e7850f379… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index d63543dc38..c2d43b4c33 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -588,6 +588,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -622,12 +623,17 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat xuuid.len = sd->b_uuid.len - 1; } + if(md->s_method_id & (METHOD_SUBSCRIBE|METHOD_NOTIFY)) { + smethod.s = "SUBSCRIBE"; + smethod.len =9; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, - md->s_method.len, md->s_method.s, + smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, md->b_tag.len, md->b_tag.s, xuuid.len, xuuid.s); @@ -1161,15 +1167,11 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, return -1; } - if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 6)==0) { - if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert INVITE extra branch data\n"); - return -1; - } - } - if(md->s_method.len==9 && strncmp(md->s_method.s, "SUBSCRIBE", 9)==0) { + if(md->s_method_id==METHOD_INVITE + || md->s_method_id==METHOD_SUBSCRIBE) { if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert SUBSCRIBE extra branch data\n"); + LM_ERR("failed to insert %.*s extra initial branch data\n", + md->s_method.len, md->s_method.s); return -1; } }

1 0

git:5.5:238c9808: core: ut - functions to convert from str to long
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 238c9808d42186282d0983f1efff2f4b60c4fc2c URL: https://github.com/kamailio/kamailio/commit/238c9808d42186282d0983f1efff2f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:45+02:00 core: ut - functions to convert from str to long (cherry picked from commit 80c906d5418ece5e4a3e993cc632a0e6ae3d24be) --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/238c9808d42186282d0983f1efff2f4… Patch: https://github.com/kamailio/kamailio/commit/238c9808d42186282d0983f1efff2f4… --- diff --git a/src/core/ut.h b/src/core/ut.h index 4ab08024a7..61ff696e13 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -628,69 +628,88 @@ static inline void strlower(str* _s) } +#define str2unval(_s, _r) do { \ + int i; \ + if (_r == NULL) return -1; \ + *_r = 0; \ + if (_s == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + for(i = 0; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + return 0; \ + } while(0) + /* - * Convert a str into integer + * Convert an str to unsigned long */ -static inline int str2int(str* _s, unsigned int* _r) +static inline int str2ulong(str* _s, unsigned long* _r) { - int i; + str2unval(_s, _r); +} - if (_r == NULL) return -1; - *_r = 0; - if (_s == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; +/* + * Convert an str to unsigned integer + */ +static inline int str2int(str* _s, unsigned int* _r) +{ + str2unval(_s, _r); +} - for(i = 0; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } +#define str2snval(_s, _r) do { \ + int i; \ + int sign; \ + if (_s == NULL) return -1; \ + if (_r == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + *_r = 0; \ + sign = 1; \ + i = 0; \ + if (_s->s[0] == '+') { \ + i++; \ + } else if (_s->s[0] == '-') { \ + sign = -1; \ + i++; \ + } \ + for(; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + *_r *= sign; \ + return 0; \ + } while(0) - return 0; +/* + * Convert an str to signed long + */ +static inline int str2slong(str* _s, long* _r) +{ + str2snval(_s, _r); } + /* * Convert an str to signed integer */ static inline int str2sint(str* _s, int* _r) { - int i; - int sign; - - if (_s == NULL) return -1; - if (_r == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; - - *_r = 0; - sign = 1; - i = 0; - if (_s->s[0] == '+') { - i++; - } else if (_s->s[0] == '-') { - sign = -1; - i++; - } - for(; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } - *_r *= sign; - - return 0; + str2snval(_s, _r); } /* - * Convert a str into integer + * Convert an strz to integer */ static inline int strz2int(char* _s, unsigned int* _r) { @@ -713,7 +732,7 @@ static inline int strz2int(char* _s, unsigned int* _r) } /* - * Convert an str to signed integer + * Convert an strz to signed integer */ static inline int strz2sint(char* _s, int* _r) {

1 0

git:5.5:81b75b3b: topos_redis: use also stored record to get uuid for branch replies
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 81b75b3b2c2db25c65ee54b6cba02c4444926b27 URL: https://github.com/kamailio/kamailio/commit/81b75b3b2c2db25c65ee54b6cba02c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:24+02:00 topos_redis: use also stored record to get uuid for branch replies (cherry picked from commit 7b3a33d88ae3e3bbef88294720aa21ba34118b8e) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/81b75b3b2c2db25c65ee54b6cba02c4… Patch: https://github.com/kamailio/kamailio/commit/81b75b3b2c2db25c65ee54b6cba02c4…

1 0

git:5.5:d4523bab: topos_redis: use uuid for initial transaction indexing
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: d4523bab0499d1c927e13382ec492d9bc9f00fd7 URL: https://github.com/kamailio/kamailio/commit/d4523bab0499d1c927e13382ec492d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:09+02:00 topos_redis: use uuid for initial transaction indexing (cherry picked from commit 5707f9ef7f6a0d9b9bcd00ff85168b977591a30a) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/d4523bab0499d1c927e13382ec492d9… Patch: https://github.com/kamailio/kamailio/commit/d4523bab0499d1c927e13382ec492d9… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 5f0fda701e..78013993fe 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -314,6 +314,7 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) redisc_server_t *rsrv = NULL; redisReply *rrpl = NULL; unsigned long lval = 0; + str xuuid = str_init(""); if(td->x_vbranch1.len<=0) { LM_INFO("no via branch for this message\n"); @@ -331,13 +332,22 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(td->a_uuid.len>1) { + xuuid.s = td->a_uuid.s + 1; + xuuid.len = td->a_uuid.len - 1; + } else if(td->b_uuid.len>1) { + xuuid.s = td->b_uuid.s + 1; + xuuid.len = td->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE-128, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, td->s_method.len, td->s_method.s, td->a_callid.len, td->a_callid.s, - td->b_tag.len, td->b_tag.s); + td->b_tag.len, td->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE-128) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1; @@ -571,6 +581,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat redisReply *rrpl = NULL; str skey = STR_NULL; str sval = STR_NULL; + str xuuid = str_init(""); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -591,14 +602,23 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->a_uuid.len>1) { + xuuid.s = md->a_uuid.s + 1; + xuuid.len = md->a_uuid.len - 1; + } else if(md->b_uuid.len>1) { + xuuid.s = md->b_uuid.s + 1; + xuuid.len = md->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, md->s_method.len, md->s_method.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s); + md->b_tag.len, md->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1;

1 0

git:5.5:11642e96: rtpengine: extract call-id/from-tag/to-tag only from sip messages
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 11642e96f9a645ad7ec5a37f82c1fff1c8321f89 URL: https://github.com/kamailio/kamailio/commit/11642e96f9a645ad7ec5a37f82c1fff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:43:49+02:00 rtpengine: extract call-id/from-tag/to-tag only from sip messages - they can be provided via flags in function parameters - fix using functions in non-sip routing blocks (e.g., xhttp processing) (cherry picked from commit 0a2450e62d77020243530e18d93c9aa8181a5701) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/11642e96f9a645ad7ec5a37f82c1fff… Patch: https://github.com/kamailio/kamailio/commit/11642e96f9a645ad7ec5a37f82c1fff… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index a60de52a35..6f91c222b2 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2477,17 +2477,19 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ memset(&ng_flags, 0, sizeof(ng_flags)); - if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { - LM_ERR("can't get Call-Id field\n"); - return NULL; - } - if (get_to_tag(msg, &ng_flags.to_tag) == -1) { - LM_ERR("can't get To tag\n"); - return NULL; - } - if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { - LM_ERR("can't get From tag\n"); - return NULL; + if(IS_SIP(msg) || IS_SIP_REPLY(msg)) { + if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (get_to_tag(msg, &ng_flags.to_tag) == -1) { + LM_ERR("can't get To tag\n"); + return NULL; + } + if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } } if (bencode_buffer_init(bencbuf)) { LM_ERR("could not initialize bencode_buffer_t\n"); @@ -2535,6 +2537,18 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ if (parse_flags(&ng_flags, msg, &op, flags_str)) goto error; + if(!IS_SIP(msg) && !IS_SIP_REPLY(msg)) { + /* check required values */ + if (ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } + } + /* trickle ice sdp fragment? */ if (cont_type == 3) bencode_list_add_string(ng_flags.flags, "fragment");

1 0

git:5.5:52c7d2f4: tls: declare variable based on SSL_CTX_set_ecdh_auto
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 52c7d2f4d6704c7ea232808110fc09c17c90c4db URL: https://github.com/kamailio/kamailio/commit/52c7d2f4d6704c7ea232808110fc09c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:44:00+02:00 tls: declare variable based on SSL_CTX_set_ecdh_auto - fix unused variable warning introduced in previous commit (cherry picked from commit 41b5e9473d79409712d46fdbb5a0b943ab880aa7) --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/52c7d2f4d6704c7ea232808110fc09c… Patch: https://github.com/kamailio/kamailio/commit/52c7d2f4d6704c7ea232808110fc09c… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index c2231b0db0..b5160ec833 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -65,7 +65,9 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); #if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { +#if !defined(SSL_CTX_set_ecdh_auto) EC_KEY *ecdh; +#endif #if OPENSSL_VERSION_NUMBER < 0x010100000L if (SSLeay() < 0x1000005fL) {

1 0

git:5.5:33cf417e: msrp: destroy str array on error
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 33cf417e59b4c7f0e45b6258644bae364ad2e912 URL: https://github.com/kamailio/kamailio/commit/33cf417e59b4c7f0e45b6258644bae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T09:43:36+02:00 msrp: destroy str array on error - some code reformatting (cherry picked from commit 4695b48b23e22135049f67a6ef362e933a0cf337) --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/33cf417e59b4c7f0e45b6258644bae3… Patch: https://github.com/kamailio/kamailio/commit/33cf417e59b4c7f0e45b6258644bae3… --- 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:master:79c6bae4: lost: response code fix in lost_held_dereference()
by Wolfgang Kampichler 03 May '21

03 May '21

Module: kamailio Branch: master Commit: 79c6bae4af6c9c9c392b05928ca72afb14ccfbf6 URL: https://github.com/kamailio/kamailio/commit/79c6bae4af6c9c9c392b05928ca72af… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-03T09:24:15+02:00 lost: response code fix in lost_held_dereference() - HELD response check returning 200: received 200OK but nothing found (shall not happen) 201: received 200OK and loc reference found 202: received 200OK and value found (pidf-lo) 203: receiced 200OK and value + reference found (pidf-lo) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/79c6bae4af6c9c9c392b05928ca72af… Patch: https://github.com/kamailio/kamailio/commit/79c6bae4af6c9c9c392b05928ca72af… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index c50b70bbad..711c3732bf 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -723,8 +723,8 @@ int lost_held_dereference(struct sip_msg *_m, char *_url, char *_pidf, /* check content and set response code * + 0 nothing found: return 200 - * + 1 value found: return 201 - * + 2 reference found: return 202 + * + 1 reference found: return 201 + * + 2 value found: return 202 * + 3 value and reference found: return 203 */ ret += lost_check_HeldResponse(root); diff --git a/src/modules/lost/response.h b/src/modules/lost/response.h index ef509d2266..991f82ac6e 100644 --- a/src/modules/lost/response.h +++ b/src/modules/lost/response.h @@ -56,8 +56,8 @@ #define ERRORS_NODE (const char *)"errors" -#define HELD_RESPONSE_VALUE 1 -#define HELD_RESPONSE_REFERENCE 2 +#define HELD_RESPONSE_REFERENCE 1 +#define HELD_RESPONSE_VALUE 2 typedef struct lost_list {

1 0

new in Kamailio 5.5.x document updated
by Henning Westerholt 03 May '21

03 May '21

Hello, the "new in Kamailio 5.5.x" document has been updated. Again, a really impressive set of changes that lead to this release: Over 1350 commits have been done in the last development period from over 70 individual contributors. You find the document at the usual place in our wiki: https://www.kamailio.org/wiki/features/new-in-5.5.x Many thanks to everybody who contributed to Kamailio. Help in updating the documentation (e.g. core cookbook, pseudo-variable and transformation section) in the wiki is really welcome, as some content is probably still missing there. Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

2 1

git:master:26e3adfd: modules: readme files regenerated - jwt ... [skip ci]
by Kamailio Dev 03 May '21

03 May '21

Module: kamailio Branch: master Commit: 26e3adfd0af949cf6e611798ad02506d927a8c8f URL: https://github.com/kamailio/kamailio/commit/26e3adfd0af949cf6e611798ad02506… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-03T08:01:12+02:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/26e3adfd0af949cf6e611798ad02506… Patch: https://github.com/kamailio/kamailio/commit/26e3adfd0af949cf6e611798ad02506… --- diff --git a/src/modules/jwt/README b/src/modules/jwt/README index 7a7400a4b1..459f10a822 100644 --- a/src/modules/jwt/README +++ b/src/modules/jwt/README @@ -122,14 +122,17 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters - format). + format). The string values can be enclosed in single or double + quotes. If a value is not eclosed in between quotes, it is added as + numeric value if it is successfully converted to a long value, + otherwise is added as string value. This function can be used from ANY_ROUTE. Example 1.2. jwt_generate usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... 4.2. jwt_verify(pubkey, alg, claims, jwtval) @@ -142,7 +145,8 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be checked they are in the JWT, in the format "name1=value1;name2=value2;..." (same as the SIP - parameters format). + parameters format, see also the description of claims parameter for + jwt_generate()). * jwtval - the value of the JWT to verify This function can be used from ANY_ROUTE. @@ -150,7 +154,7 @@ modparam("jwt", "key_mode", 1) Example 1.3. jwt_verify usage ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -171,6 +175,6 @@ modparam("jwt", "key_mode", 1) Example 1.4. $jwt(name) usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ...

1 0

git:master:a1a1b548: topos_redis: store context field
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: master Commit: a1a1b548e9362b2b478e0551042e86e294249ddc URL: https://github.com/kamailio/kamailio/commit/a1a1b548e9362b2b478e0551042e86e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T08:00:32+02:00 topos_redis: store context field --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/a1a1b548e9362b2b478e0551042e86e… Patch: https://github.com/kamailio/kamailio/commit/a1a1b548e9362b2b478e0551042e86e… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index c2d43b4c33..0d21cbc2d1 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -78,6 +78,7 @@ str td_key_a_srcaddr = str_init("a_srcaddr"); str td_key_b_srcaddr = str_init("b_srcaddr"); str td_key_s_method = str_init("s_method"); str td_key_s_cseq = str_init("s_cseq"); +str td_key_x_context = str_init("x_context"); str tt_key_rectime = str_init("rectime"); str tt_key_a_callid = str_init("a_callid"); @@ -99,6 +100,7 @@ str tt_key_a_tag = str_init("a_tag"); str tt_key_b_tag = str_init("b_tag"); str tt_key_s_method = str_init("s_method"); str tt_key_s_cseq = str_init("s_cseq"); +str tt_key_x_context = str_init("x_context"); #define TPS_REDIS_SET_ARGSV(sval, argc, argv, argvlen) \ do { \ @@ -242,6 +244,8 @@ int tps_redis_insert_dialog(tps_data_t *td) TPS_REDIS_SET_ARGS(&td->s_method, argc, &td_key_s_method, argv, argvlen); TPS_REDIS_SET_ARGS(&td->s_cseq, argc, &td_key_s_cseq, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->x_context, argc, &td_key_x_context, argv, argvlen); + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); @@ -502,6 +506,8 @@ int tps_redis_insert_branch(tps_data_t *td) TPS_REDIS_SET_ARGS(&td->a_tag, argc, &tt_key_a_tag, argv, argvlen); TPS_REDIS_SET_ARGS(&td->b_tag, argc, &tt_key_b_tag, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->x_context, argc, &tt_key_x_context, argv, argvlen); + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); @@ -929,6 +935,9 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, } else if(skey.len==tt_key_b_tag.len && strncmp(skey.s, tt_key_b_tag.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->b_tag); + } else if(skey.len==tt_key_x_context.len + && strncmp(skey.s, tt_key_x_context.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->x_context); } else { LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); } @@ -1134,6 +1143,9 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) } else if(skey.len==td_key_s_cseq.len && strncmp(skey.s, td_key_s_cseq.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->s_cseq); + } else if(skey.len==td_key_x_context.len + && strncmp(skey.s, td_key_x_context.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->x_context); } else { LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); }

1 0

git:master:80c906d5: core: ut - functions to convert from str to long
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: master Commit: 80c906d5418ece5e4a3e993cc632a0e6ae3d24be URL: https://github.com/kamailio/kamailio/commit/80c906d5418ece5e4a3e993cc632a0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T08:00:32+02:00 core: ut - functions to convert from str to long --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/80c906d5418ece5e4a3e993cc632a0e… Patch: https://github.com/kamailio/kamailio/commit/80c906d5418ece5e4a3e993cc632a0e… --- diff --git a/src/core/ut.h b/src/core/ut.h index 4ab08024a7..61ff696e13 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -628,69 +628,88 @@ static inline void strlower(str* _s) } +#define str2unval(_s, _r) do { \ + int i; \ + if (_r == NULL) return -1; \ + *_r = 0; \ + if (_s == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + for(i = 0; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + return 0; \ + } while(0) + /* - * Convert a str into integer + * Convert an str to unsigned long */ -static inline int str2int(str* _s, unsigned int* _r) +static inline int str2ulong(str* _s, unsigned long* _r) { - int i; + str2unval(_s, _r); +} - if (_r == NULL) return -1; - *_r = 0; - if (_s == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; +/* + * Convert an str to unsigned integer + */ +static inline int str2int(str* _s, unsigned int* _r) +{ + str2unval(_s, _r); +} - for(i = 0; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } +#define str2snval(_s, _r) do { \ + int i; \ + int sign; \ + if (_s == NULL) return -1; \ + if (_r == NULL) return -1; \ + if (_s->len < 0) return -1; \ + if (_s->s == NULL) return -1; \ + *_r = 0; \ + sign = 1; \ + i = 0; \ + if (_s->s[0] == '+') { \ + i++; \ + } else if (_s->s[0] == '-') { \ + sign = -1; \ + i++; \ + } \ + for(; i < _s->len; i++) { \ + if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + *_r *= 10; \ + *_r += _s->s[i] - '0'; \ + } else { \ + return -1; \ + } \ + } \ + *_r *= sign; \ + return 0; \ + } while(0) - return 0; +/* + * Convert an str to signed long + */ +static inline int str2slong(str* _s, long* _r) +{ + str2snval(_s, _r); } + /* * Convert an str to signed integer */ static inline int str2sint(str* _s, int* _r) { - int i; - int sign; - - if (_s == NULL) return -1; - if (_r == NULL) return -1; - if (_s->len < 0) return -1; - if (_s->s == NULL) return -1; - - *_r = 0; - sign = 1; - i = 0; - if (_s->s[0] == '+') { - i++; - } else if (_s->s[0] == '-') { - sign = -1; - i++; - } - for(; i < _s->len; i++) { - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { - *_r *= 10; - *_r += _s->s[i] - '0'; - } else { - return -1; - } - } - *_r *= sign; - - return 0; + str2snval(_s, _r); } /* - * Convert a str into integer + * Convert an strz to integer */ static inline int strz2int(char* _s, unsigned int* _r) { @@ -713,7 +732,7 @@ static inline int strz2int(char* _s, unsigned int* _r) } /* - * Convert an str to signed integer + * Convert an strz to signed integer */ static inline int strz2sint(char* _s, int* _r) {

1 0

git:master:c0532161: jwt: handle claims that have numeric values
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: master Commit: c0532161f18cce514adaf2b5d784999319445911 URL: https://github.com/kamailio/kamailio/commit/c0532161f18cce514adaf2b5d784999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T08:00:32+02:00 jwt: handle claims that have numeric values - values in between quotes are string always --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c0532161f18cce514adaf2b5d784999… Patch: https://github.com/kamailio/kamailio/commit/c0532161f18cce514adaf2b5d784999… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 6426381efb..4a88c9f0dd 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -186,6 +186,7 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) param_t *pit = NULL; int ret = 0; jwt_t *jwt = NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0) { @@ -242,16 +243,30 @@ static int ki_jwt_generate(sip_msg_t* msg, str *key, str *alg, str *claims) iat = time(NULL); ret = jwt_add_grant_int(jwt, "iat", iat); + if(ret != 0) { + LM_ERR("failed to add iat grant\n"); + goto error; + } for (pit = params_list; pit; pit=pit->next) { if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_add_grant(jwt, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_add_grant_int(jwt, pit->name.s, lval); + } else { + ret = jwt_add_grant(jwt, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s grant\n", pit->name.s); + goto error; + } } } ret = jwt_set_alg(jwt, valg, (unsigned char*)kdata.s, (size_t)kdata.len); - if (ret < 0) { + if (ret != 0) { LM_ERR("failed to set algorithm and key\n"); goto error; } @@ -324,6 +339,7 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, jwt_t *jwt = NULL; jwt_valid_t *jwt_valid = NULL; str sparams = STR_NULL; + long lval = 0; if(key==NULL || key->s==NULL || alg==NULL || alg->s==NULL || claims==NULL || claims->s==NULL || claims->len<=0 @@ -384,7 +400,17 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, if(pit->name.len>0 && pit->body.len>0) { pit->name.s[pit->name.len] = '\0'; pit->body.s[pit->body.len] = '\0'; - jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + if(pit->body.s[-1] == '\"' || pit->body.s[-1] == '\'') { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } else if(str2slong(&pit->body, &lval)==0) { + ret = jwt_valid_add_grant_int(jwt_valid, pit->name.s, lval); + } else { + ret = jwt_valid_add_grant(jwt_valid, pit->name.s, pit->body.s); + } + if(ret != 0) { + LM_ERR("failed to add %s valid grant\n", pit->name.s); + goto error; + } } }

1 0

git:master:7d24a7af: jwt: more details about claims parameter format
by Daniel-Constantin Mierla 03 May '21

03 May '21

Module: kamailio Branch: master Commit: 7d24a7afe02bf1f7c8ddddfcfc9f1c287296c996 URL: https://github.com/kamailio/kamailio/commit/7d24a7afe02bf1f7c8ddddfcfc9f1c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-03T08:00:32+02:00 jwt: more details about claims parameter format --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d24a7afe02bf1f7c8ddddfcfc9f1c2… Patch: https://github.com/kamailio/kamailio/commit/7d24a7afe02bf1f7c8ddddfcfc9f1c2… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index dba928b523..36d3d0d0f7 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -109,6 +109,10 @@ modparam("jwt", "key_mode", 1) <para> claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format). + The string values can be enclosed in single or double quotes. If a + value is not eclosed in between quotes, it is added as numeric + value if it is successfully converted to a long value, otherwise is + added as string value. </para> </listitem> </itemizedlist> @@ -120,7 +124,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... </programlisting> </example> @@ -151,7 +155,8 @@ modparam("jwt", "key_mode", 1) <listitem> <para> claims - the list of claims to be checked they are in the JWT, in the format - "name1=value1;name2=value2;..." (same as the SIP parameters format). + "name1=value1;name2=value2;..." (same as the SIP parameters format, + see also the description of claims parameter for jwt_generate()). </para> </listitem> <listitem> @@ -168,7 +173,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -206,7 +211,7 @@ modparam("jwt", "key_mode", 1) <programlisting format="linespecific"> ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ... </programlisting>

1 0

git:master:201c219a: lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function()
by Wolfgang Kampichler 02 May '21

02 May '21

Module: kamailio Branch: master Commit: 201c219a5496924e701cc2b17fb0a439ee530813 URL: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-02T17:28:44+02:00 lost: error response fix in lost_function(), lost_held_dereference() and lost_held_function() - error variable was set to 0 (clean up) before return. Lost functions now returns 500 in case of LOST/HELD server error, or 400 in case of internal error, otherwise 2xx. --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43… Patch: https://github.com/kamailio/kamailio/commit/201c219a5496924e701cc2b17fb0a43…

1 0

git:master:824920d5: topos_redis: use initial transaction method for early dialog branch loading
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 824920d5b159d80ce3c241313bf647b5dbbf6661 URL: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T14:38:36+02:00 topos_redis: use initial transaction method for early dialog branch loading --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… Patch: https://github.com/kamailio/kamailio/commit/824920d5b159d80ce3c241313bf647b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index d63543dc38..c2d43b4c33 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -588,6 +588,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -622,12 +623,17 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat xuuid.len = sd->b_uuid.len - 1; } + if(md->s_method_id & (METHOD_SUBSCRIBE|METHOD_NOTIFY)) { + smethod.s = "SUBSCRIBE"; + smethod.len =9; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, - md->s_method.len, md->s_method.s, + smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, md->b_tag.len, md->b_tag.s, xuuid.len, xuuid.s); @@ -1161,15 +1167,11 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, return -1; } - if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 6)==0) { - if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert INVITE extra branch data\n"); - return -1; - } - } - if(md->s_method.len==9 && strncmp(md->s_method.s, "SUBSCRIBE", 9)==0) { + if(md->s_method_id==METHOD_INVITE + || md->s_method_id==METHOD_SUBSCRIBE) { if(tps_redis_insert_initial_method_branch(md, sd)<0) { - LM_ERR("failed to insert SUBSCRIBE extra branch data\n"); + LM_ERR("failed to insert %.*s extra initial branch data\n", + md->s_method.len, md->s_method.s); return -1; } }

1 0

git:master:7b3a33d8: topos_redis: use also stored record to get uuid for branch replies
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 7b3a33d88ae3e3bbef88294720aa21ba34118b8e URL: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T13:28:32+02:00 topos_redis: use also stored record to get uuid for branch replies --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b… Patch: https://github.com/kamailio/kamailio/commit/7b3a33d88ae3e3bbef88294720aa21b…

1 0

git:master:b798fda3: pkg: small spelling fix in comments
by Henning Westerholt 01 May '21

01 May '21

Module: kamailio Branch: master Commit: b798fda339b74e9595d2a5d44af9835ec196ca3e URL: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-01T08:17:28Z pkg: small spelling fix in comments --- Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/wheezy --- Diff: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… Patch: https://github.com/kamailio/kamailio/commit/b798fda339b74e9595d2a5d44af9835… --- diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 8b060e0956..27dc6c6122 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -91,7 +91,7 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ ${DIST}/control -# this removes python3 from Package: kamalio +# this removes python3 from Package: kamailio sed -i -e '/python3/d' ${DIST}/control # add that again sed -i '/lsb-base,/a \ python3,' ${DIST}/control diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 95180221f0..d08477b0ad 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -91,7 +91,7 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ ${DIST}/control -# this removes python3 from Package: kamalio +# this removes python3 from Package: kamailio sed -i -e '/python3/d' ${DIST}/control # add that again sed -i '/lsb-base,/a \ python3,' ${DIST}/control

1 0

topos_redis enhancement
by Juha Heinanen 01 May '21

01 May '21

Daniel, I studied a bit topos_redis source and noticed that it lacks x_context td and tt keys. Is there something else missing in order to make spirals work also when redis backend is in use? -- Juha

2 4

git:master:5707f9ef: topos_redis: use uuid for initial transaction indexing
by Daniel-Constantin Mierla 01 May '21

01 May '21

Module: kamailio Branch: master Commit: 5707f9ef7f6a0d9b9bcd00ff85168b977591a30a URL: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-01T08:07:08+02:00 topos_redis: use uuid for initial transaction indexing --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… Patch: https://github.com/kamailio/kamailio/commit/5707f9ef7f6a0d9b9bcd00ff85168b9… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 5f0fda701e..78013993fe 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -314,6 +314,7 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) redisc_server_t *rsrv = NULL; redisReply *rrpl = NULL; unsigned long lval = 0; + str xuuid = str_init(""); if(td->x_vbranch1.len<=0) { LM_INFO("no via branch for this message\n"); @@ -331,13 +332,22 @@ int tps_redis_insert_initial_method_branch(tps_data_t *td) memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(td->a_uuid.len>1) { + xuuid.s = td->a_uuid.s + 1; + xuuid.len = td->a_uuid.len - 1; + } else if(td->b_uuid.len>1) { + xuuid.s = td->b_uuid.s + 1; + xuuid.len = td->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE-128, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, td->s_method.len, td->s_method.s, td->a_callid.len, td->a_callid.s, - td->b_tag.len, td->b_tag.s); + td->b_tag.len, td->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE-128) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1; @@ -571,6 +581,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat redisReply *rrpl = NULL; str skey = STR_NULL; str sval = STR_NULL; + str xuuid = str_init(""); if(msg==NULL || md==NULL || sd==NULL) return -1; @@ -591,14 +602,23 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->a_uuid.len>1) { + xuuid.s = md->a_uuid.s + 1; + xuuid.len = md->a_uuid.len - 1; + } else if(md->b_uuid.len>1) { + xuuid.s = md->b_uuid.s + 1; + xuuid.len = md->b_uuid.len - 1; + } + rp = _tps_redis_cbuf; rkey.len = snprintf(rp, TPS_REDIS_DATA_SIZE, - "%.*s%.*s:%.*s:%.*s", + "%.*s%.*s:%.*s:%.*s:x%.*s", _tps_redis_bprefix.len, _tps_redis_bprefix.s, md->s_method.len, md->s_method.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s); + md->b_tag.len, md->b_tag.s, + xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len); return -1;

1 0

Development for v5.5.x is frozen
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Hello, the formal notification that the development for the next major version 5.5.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.5 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.5. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added in 5.5. Once the branch 5.5 is created, new features can be pushed again to master branch as usual. From that moment, the v5.5.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.5 is going to be built at: * https://www.kamailio.org/wiki/features/new-in-5.5.x Upgrade guidelines will be collected at: * https://www.kamailio.org/wiki/install/upgrade/5.4.x-to-5.5.0 Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.4.x to 5.4.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 4

[kamailio/kamailio] CORE_TLS option in 5.4 (#2720)
by Boris Korzun 30 Apr '21

30 Apr '21

### Description There's a `CORE_TLS` option in _Makefile.defs_. But Kamailio isn't build with the option. https://github.com/kamailio/kamailio/blob/cf105d5af78963759825f5eaf9feb767c… There is no `core/tls/tls_init.h` for include. ### Additional Information Kamailio 5.4.5 * **Operating System**: FreeBSD 12.2 -- 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/2720

2 2

git:5.5:19093d83: lost: Coverity Scan fixes
by Wolfgang Kampichler 30 Apr '21

30 Apr '21

Module: kamailio Branch: 5.5 Commit: 19093d837b94cabb6e1413fa0ff1786bfc06549f URL: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-30T12:26:27+02:00 lost: Coverity Scan fixes (cherry picked from commit 328000233928fa08095889fdca7d66acba5e5825) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786… Patch: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786…

1 0

git:5.5:f97b189d: lost: fixed possible resource leak inside lost_get_response_issues()
by Wolfgang Kampichler 30 Apr '21

30 Apr '21

Module: kamailio Branch: 5.5 Commit: f97b189d238bd63f80a4525c56501cd394b7d2f3 URL: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-30T12:26:53+02:00 lost: fixed possible resource leak inside lost_get_response_issues() (cherry picked from commit a1bbe035f1a1acc11f86d27fdc0adef1b1a3d010) --- Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… Patch: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index b3389448b8..6eb13e8260 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -573,39 +573,53 @@ p_lost_issue_t lost_get_response_issues(xmlNodePtr node) cur = node->children; while(cur) { if(cur->type == XML_ELEMENT_NODE) { - /* get a new response type element */ + /* get a new response type object */ issue = lost_new_response_type(); if(issue == NULL) { /* didn't get it ... return */ break; } - /* parse properties */ - issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + /* get issue type */ tmp.s = (char *)cur->name; tmp.len = strlen((char *)cur->name); + /* copy issue type to object */ + len = 0; if(tmp.len > 0 && tmp.s != NULL) { issue->type = lost_copy_string(tmp, &len); } - if(len > 0) { + if(len == 0) { + /* issue type not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parse source property */ + len = 0; + issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + if(len == 0) { + /* source property not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } - LM_DBG("###\t[%s]\n", issue->type); + LM_DBG("###\t[%s]\n", issue->type); - if(issue->info != NULL) { - issue->info->text = lost_get_property(cur, PROP_MSG, &len); - issue->info->lang = lost_get_property(cur, PROP_LANG, &len); - } - /* get a new list element */ - new = lost_new_response_issues(); - if(new == NULL) { - /* didn't get it, delete response type element ... return */ - lost_delete_response_type(&issue); /* clean up */ - break; - } - /* append to list */ - new->issue = issue; - new->next = list; - list = new; + /* type and source property found ... parse text and copy */ + if(issue->info != NULL) { + issue->info->text = lost_get_property(cur, PROP_MSG, &len); + issue->info->lang = lost_get_property(cur, PROP_LANG, &len); } + /* get a new list element */ + new = lost_new_response_issues(); + if(new == NULL) { + /* didn't get it, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parsing done, append object to list */ + new->issue = issue; + new->next = list; + list = new; + /* get next element */ cur = cur->next; }

1 0

git:master:41b5e947: tls: declare variable based on SSL_CTX_set_ecdh_auto
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Module: kamailio Branch: master Commit: 41b5e9473d79409712d46fdbb5a0b943ab880aa7 URL: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:53:47+02:00 tls: declare variable based on SSL_CTX_set_ecdh_auto - fix unused variable warning introduced in previous commit --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… Patch: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index c2231b0db0..b5160ec833 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -65,7 +65,9 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); #if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { +#if !defined(SSL_CTX_set_ecdh_auto) EC_KEY *ecdh; +#endif #if OPENSSL_VERSION_NUMBER < 0x010100000L if (SSLeay() < 0x1000005fL) {

1 0

git:master:0a2450e6: rtpengine: extract call-id/from-tag/to-tag only from sip messages
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Module: kamailio Branch: master Commit: 0a2450e62d77020243530e18d93c9aa8181a5701 URL: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:31:34+02:00 rtpengine: extract call-id/from-tag/to-tag only from sip messages - they can be provided via flags in function parameters - fix using functions in non-sip routing blocks (e.g., xhttp processing) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… Patch: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index a60de52a35..6f91c222b2 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2477,17 +2477,19 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ memset(&ng_flags, 0, sizeof(ng_flags)); - if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { - LM_ERR("can't get Call-Id field\n"); - return NULL; - } - if (get_to_tag(msg, &ng_flags.to_tag) == -1) { - LM_ERR("can't get To tag\n"); - return NULL; - } - if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { - LM_ERR("can't get From tag\n"); - return NULL; + if(IS_SIP(msg) || IS_SIP_REPLY(msg)) { + if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (get_to_tag(msg, &ng_flags.to_tag) == -1) { + LM_ERR("can't get To tag\n"); + return NULL; + } + if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } } if (bencode_buffer_init(bencbuf)) { LM_ERR("could not initialize bencode_buffer_t\n"); @@ -2535,6 +2537,18 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ if (parse_flags(&ng_flags, msg, &op, flags_str)) goto error; + if(!IS_SIP(msg) && !IS_SIP_REPLY(msg)) { + /* check required values */ + if (ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } + } + /* trickle ice sdp fragment? */ if (cont_type == 3) bencode_list_add_string(ng_flags.flags, "fragment");

1 0

git:master:4695b48b: msrp: destroy str array on error
by Daniel-Constantin Mierla 30 Apr '21

30 Apr '21

Module: kamailio Branch: master Commit: 4695b48b23e22135049f67a6ef362e933a0cf337 URL: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:03:10+02:00 msrp: destroy str array on error - some code reformatting --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… Patch: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… --- 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

[kamailio/kamailio] Random crashes on tls_server.c:tls_h_tcpconn_clean_f() (#2638)
by Boris Korzun 29 Apr '21

29 Apr '21

### Description We've random crashes (approx one occurrence per day) on tls_h_tcpconn_clean_f(). ### Troubleshooting #### Reproduction The crash appears **sometimes** on closing TLS session (it doesn't have to be gracefully) initiated by remote edge. #### Debugging Data ``` (lldb) target create "/usr/local/sbin/kamailio" --core "/var/coredump/986/kamailio.51059.core" Core file '/var/coredump/986/kamailio.51059.core' (x86_64) was loaded. (lldb) bt * thread #1, name = 'kamailio', stop reason = signal SIGSEGV * frame #0: 0x0000000800a13cd4 libc.so.7`__je_large_dalloc(tsdn=0x0000000800d1a090, extent=0x0000000000000000) at jemalloc_large.c:346 frame #1: 0x0000000800a3acb7 libc.so.7`__free [inlined] rtree_leaf_elm_lookup(tsdn=0x0000000800d1a090, rtree=<unavailable>, rtree_ctx=<unavailable>, key=<unavailable>, dependent=true, init_missing=false) at rtree.h:337:6 frame #2: 0x0000000800a3acb2 libc.so.7`__free [inlined] rtree_read(tsdn=0x0000000800d1a090, rtree=<unavailable>, rtree_ctx=<unavailable>, key=<unavailable>, dependent=true) at rtree.h:406 frame #3: 0x0000000800a3acb2 libc.so.7`__free [inlined] rtree_extent_read(tsdn=0x0000000800d1a090, rtree=<unavailable>, rtree_ctx=<unavailable>, key=<unavailable>, dependent=true) at rtree.h:418 frame #4: 0x0000000800a3acb2 libc.so.7`__free [inlined] iealloc(tsdn=0x0000000800d1a090, ptr=0x00000008235782f0) at jemalloc_internal_inlines_b.h:82 frame #5: 0x0000000800a3acb2 libc.so.7`__free [inlined] arena_dalloc(tsdn=0x0000000800d1a090, ptr=0x00000008235782f0, tcache=0x0000000800cf4c80, alloc_ctx=<unavailable>, slow_path=false) at arena_inlines_b.h:236 frame #6: 0x0000000800a3ac91 libc.so.7`__free [inlined] idalloctm(tsdn=0x0000000800d1a090, ptr=0x00000008235782f0, tcache=0x0000000800cf4c80, alloc_ctx=<unavailable>, is_internal=false, slow_path=false) at jemalloc_internal_inlines_c.h:118 frame #7: 0x0000000800a3ac91 libc.so.7`__free [inlined] ifree(tsd=<unavailable>, ptr=0x00000008235782f0, tcache=0x0000000800cf4c80, slow_path=false) at jemalloc_jemalloc.c:2226 frame #8: 0x0000000800a3ac91 libc.so.7`__free(ptr=<unavailable>) at jemalloc_jemalloc.c:2382 frame #9: 0x0000000800d9ed0b libthr.so.3`_thr_rwlock_destroy(rwlock=<unavailable>) at thr_rwlock.c:136:3 frame #10: 0x00000008027feba3 libcrypto.so.111`CRYPTO_THREAD_lock_free(lock=0x0000000802e87e20) at threads_pthread.c:107:5 frame #11: 0x00000008027ec676 libcrypto.so.111`BIO_free(a=0x0000000802e88920) at bio_lib.c:136:5 frame #12: 0x00000008027ed572 libcrypto.so.111`BIO_free_all(bio=0x0000000000000000) at bio_lib.c:691:9 frame #13: 0x0000000802540d0b libssl.so.111`SSL_free(s=0x0000000802e799a8) at ssl_lib.c:1160:5 frame #14: 0x0000000802482fdd tls.so`tls_h_tcpconn_clean_f(c=0x0000000802e93270) at tls_server.c:655:3 frame #15: 0x0000000000618bd8 kamailio`_tcpconn_free(c=0x0000000802e93270) at tcp_main.c:1528:58 frame #16: 0x0000000000659534 kamailio`tcpconn_put_destroy(tcpconn=0x0000000802e93270) at tcp_main.c:3269:3 frame #17: 0x0000000000668966 kamailio`handle_tcp_child(tcp_c=0x00000008014dcf68, fd_i=-1) at tcp_main.c:3706:5 frame #18: 0x000000000065b7e9 kamailio`handle_io(fm=0x00000008014e6110, ev=1, idx=-1) at tcp_main.c:4523:8 frame #19: 0x0000000000644502 kamailio`io_wait_loop_kqueue(h=0x00000000008dbf50, t=5, repeat=0) at io_wait.h:1187:9 frame #20: 0x000000000063cb62 kamailio`tcp_main_loop at tcp_main.c:4824:5 frame #21: 0x00000000002e973a kamailio`main_loop at main.c:1779:5 frame #22: 0x00000000002f7650 kamailio`main(argc=7, argv=0x00007fffffffec68) at main.c:2856:6 frame #23: 0x00000000002d1af0 kamailio`_start(ap=<unavailable>, cleanup=<unavailable>) at crt1.c:76:7 ``` All backtraces are differ from other on frames downed SSL_free() (frame #13 on the backtrace). #### Log Messages ``` 17:40:34.305319 51059 - - DEBUG: <core> [core/io_wait.h:600]: io_watch_del(): DBG: io_watch_del (0x8dbf50, 55, -1, 0x0) fd_no=46 called 17:40:34.30536351059 - - DEBUG: <core> [core/tcp_main.c:4457]: handle_tcpconn_ev(): sending to child, events 11 17:40:34.305382 51059 - - DEBUG: <core> [core/tcp_main.c:4130]: send2child(): selected tcp worker idx:5 proc:30 pid:51056 for activity on [tls:91.217.xx.yy:5070], 0x802e93270 17:40:34.305430 51059 - - DEBUG: <core> [core/io_wait.h:600]: io_watch_del(): DBG: io_watch_del (0x8dbf50, 56, -1, 0x0) fd_no=45 called 17:40:34.305446 51059 - - DEBUG: <core> [core/tcp_main.c:4457]: handle_tcpconn_ev(): sending to child, events 11 17:40:34.305461 51059 - - DEBUG: <core> [core/tcp_main.c:4130]: send2child(): selected tcp worker idx:6 proc:31 pid:51057 for activity on [tls:91.217.xx.yy:5070], 0x802ea7430 17:40:34.305678 51059 - - DEBUG: <core> [core/tcp_main.c:3560]: handle_tcp_child(): reader response= 802e93270, -1 from 5 17:40:34.305700 51059 - - DEBUG: tls [tls_server.c:683]: tls_h_tcpconn_close_f(): Closing SSL connection 0x802e9b3a8 17:40:35.024013 51026 - - ALERT: <core> [main.c:777]: handle_sigs(): child process 51059 exited by a signal 11 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.4.3 (x86_64/freebsd) e19ae3 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, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, 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, select, kqueue. id: e19ae3 compiled on 14:45:07 Feb 11 2021 with cc FreeBSD clang version 10.0.1 (git@github.com:llvm/llvm-project.git llvmorg-10.0.1-0-gef32c611aa2) ``` * **Operating System**: ``` FreeBSD 12.2-STABLE r369029 OpenSSL 1.1.1i-freebsd 8 Dec 2020 ``` -- 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/2638

5 11

git: new commits in branch 5.5
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

- URL: https://github.com/kamailio/kamailio/commit/5513825a246cff4e5144ed2e83bd010… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:07+02:00 topos: use context to load stored branch attributes only for requests (cherry picked from commit 5d661eaa92461f3b43c433ec32653c4f89bb818e) - URL: https://github.com/kamailio/kamailio/commit/0326fec293da66797fa13ae0a07e3e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:34+02:00 topos: reset context on msg received callback (cherry picked from commit fb777b0e9bf2f87ea8cb1b0134fbfcc625121ad4) - URL: https://github.com/kamailio/kamailio/commit/314436b2110396a5cb069ea093f8d82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:49+02:00 topos: uniform processing for requests during early dialog - requests that are handled during 1xx state, like PRACK, UPDATE, BYE (cherry picked from commit 72cc3d46c39791d50927508114bdd1faa4a83f4c) - URL: https://github.com/kamailio/kamailio/commit/b371e7f9be73368d2bb5b9a6deeeb17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:06+02:00 topos: safety handling of onsend data (cherry picked from commit 975a61c89b2440fba737758cce3ab08000811b02) - URL: https://github.com/kamailio/kamailio/commit/fc90e4c06c5df8c8a9d5cd615923c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:15+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments (cherry picked from commit 764d5be0c44036bb4b86f841588fb0df3b4bb834) - URL: https://github.com/kamailio/kamailio/commit/1e235b0b5981c309e663cee2ef6f452… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:34+02:00 topos: simplified tps_dlg_message_update() (cherry picked from commit 7e5c4c30d2f0bbed2b566d46e5141b6abba315e7) - URL: https://github.com/kamailio/kamailio/commit/d3575aa72d779e11fd8cfebc7060647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:49+02:00 topos: load associated early dialog transaction using also uuid (cherry picked from commit 94e8988769662a5ae68e30847eef133d50ec5431) - URL: https://github.com/kamailio/kamailio/commit/f201ea9f86561e9d07fa7ac07b356f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:02+02:00 topos: check if event field exists for NOTIFY (cherry picked from commit 317ddc9efa2f11f0fe3787e9ab462550724954ed) - URL: https://github.com/kamailio/kamailio/commit/d5e4e026cf6efc19f155f3adddb1429… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:13+02:00 topos: restore checks on uri and sip_params for tps_dlg_message_update() - use define for expected min len safety checks (cherry picked from commit 1d6736d16ab3a83b77d6c7be3f9689c7fbfccf28) - URL: https://github.com/kamailio/kamailio/commit/22e201fa57f7e2be7a9718b97b550a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:26+02:00 topos: increase the number of db keys for query when using uuid for branch - debug message to print a/b uuid (cherry picked from commit fb5ab20123a07afdfaf96197db25d76f8dda0683) - URL: https://github.com/kamailio/kamailio/commit/8c75a148451b9e2d1c60e67e9b3dfaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:40+02:00 topos: explicitely set the db match operator and value type for uuid (cherry picked from commit e279f2f464ab05e1a2821d6e2d9e673fe145fbf2) - URL: https://github.com/kamailio/kamailio/commit/bf57721508c810334c966bab79f2ac3… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-29T15:00:37+02:00 mohqueue: fixed compiler warning about array initialization (cherry picked from commit c7781edcb37a35193ccdb9414183919aaa614d3a) - URL: https://github.com/kamailio/kamailio/commit/9dc8f5170a22e4318e1b1ac3f3f0dba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:00:46+02:00 ims_ipsec_pcscf: initialize variable to fix warnings (cherry picked from commit afff18592998cb14561cf4fd95acd1b4866fd994) - URL: https://github.com/kamailio/kamailio/commit/884dc8babeb285d2c36239d2941dcb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:00:55+02:00 textops: check for msg headers field in case is used for non-sip traffic (cherry picked from commit 48200f3e9ca9f5e5a05de440eefc23f7265b5268) - URL: https://github.com/kamailio/kamailio/commit/3b2f5081df6450aac425c344e11ce4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:01:05+02:00 core: kemi - parse headers before insert operation (cherry picked from commit 7bf0081102a5755c3282e7f01a0f45e160fdda0f) - URL: https://github.com/kamailio/kamailio/commit/e55ecc6412997b55569f3b626a681ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:01:16+02:00 msrp: check return code for str explode (cherry picked from commit addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e) - URL: https://github.com/kamailio/kamailio/commit/1c7a8459f1a5b0f4d96f3908a301b59… Author: SPChan <shihping.chan(a)gmail.com> Date: 2021-04-29T15:01:25+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. (cherry picked from commit 27904530d1f8efd26e2b96fa5f18a3aad887919b) - URL: https://github.com/kamailio/kamailio/commit/126be686df87f1f89edbdf4e5691636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:06:45+02:00 dispatcher: safety to avoid division by 0 for latency operations (cherry picked from commit cf105d5af78963759825f5eaf9feb767c047a49c) - URL: https://github.com/kamailio/kamailio/commit/e7d46be2813531b88782004dd6ddbca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:15:32+02:00 Makefile.defs: version set to 5.5.0-rc1

1 0

git:5.4:9e7c22a2: dispatcher: safety to avoid division by 0 for latency operations
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: 5.4 Commit: 9e7c22a21d57230180fd7c135128a30f47ea427d URL: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:50:12+02:00 dispatcher: safety to avoid division by 0 for latency operations - manual backporting of cf105d5af78963759825f5eaf9feb767c047a49c --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… Patch: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index aee5eb8ea6..8fd28c546c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2573,12 +2573,14 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } +#define _VOR1(v) ((v)?(v):1) + static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ - latency_stats->m2 -= latency_stats->m2/latency_stats->count; + latency_stats->m2 -= latency_stats->m2/_VOR1(latency_stats->count); } if (latency_stats->count == 1) { latency_stats->stdev = 0.0f; @@ -2601,10 +2603,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l float delta; float delta2; delta = latency - latency_stats->average; - latency_stats->average += delta/latency_stats->count; + latency_stats->average += delta/_VOR1(latency_stats->count); delta2 = latency - latency_stats->average; latency_stats->m2 += ((double)delta)*delta2; - latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); + latency_stats->stdev = sqrt(latency_stats->m2 / _VOR1(latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { @@ -2697,7 +2699,7 @@ int ds_update_latency(int group, str *address, int code) ds_latency_stats_t *latency_stats = &ds_dest->latency_stats; congestion_ms = latency_stats->estimate - latency_stats->average; /* We multiply by 2^4 to keep enough precision */ - active_weight = (total_congestion_ms << 4) / congestion_ms; + active_weight = (total_congestion_ms << 4) / _VOR1(congestion_ms); if (ds_dest->attrs.rweight != active_weight) { apply_rweights = 1; ds_dest->attrs.rweight = active_weight;

1 0

git:master:cf105d5a: dispatcher: safety to avoid division by 0 for latency operations
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: cf105d5af78963759825f5eaf9feb767c047a49c URL: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:47:36+02:00 dispatcher: safety to avoid division by 0 for latency operations --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… Patch: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 80944e4b05..78ece3fffe 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2733,7 +2733,8 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } -void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count) { +void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count) +{ latency_stats->stdev = 0.0f; latency_stats->m2 = 0.0f; latency_stats->max = latency; @@ -2743,14 +2744,17 @@ void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int coun latency_stats->count = count; } -static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { +#define _VOR1(v) ((v)?(v):1) + +static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) +{ int training_count = 10000; /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ - latency_stats->m2 -= latency_stats->m2/latency_stats->count; + latency_stats->m2 -= latency_stats->m2/_VOR1(latency_stats->count); } if (latency_stats->count == 1) @@ -2771,10 +2775,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l float delta; float delta2; delta = latency - latency_stats->average; - latency_stats->average += delta/latency_stats->count; + latency_stats->average += delta/_VOR1(latency_stats->count); delta2 = latency - latency_stats->average; latency_stats->m2 += ((double)delta)*delta2; - latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); + latency_stats->stdev = sqrt(latency_stats->m2 / _VOR1(latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { @@ -2793,7 +2797,8 @@ typedef struct congestion_control_state { int apply_rweights; } congestion_control_state_t; -int ds_update_weighted_congestion_control(congestion_control_state_t *cc, int weight, ds_latency_stats_t *latency_stats) +int ds_update_weighted_congestion_control(congestion_control_state_t *cc, + int weight, ds_latency_stats_t *latency_stats) { int active_weight = 0; int congestion_ms = latency_stats->estimate - latency_stats->average; @@ -2894,7 +2899,7 @@ int ds_update_latency(int group, str *address, int code) ds_latency_stats_t *latency_stats = &ds_dest->latency_stats; congestion_ms = latency_stats->estimate - latency_stats->average; /* We multiply by 2^4 to keep enough precision */ - active_weight = (cc.total_congestion_ms << 4) / congestion_ms; + active_weight = (cc.total_congestion_ms << 4) / _VOR1(congestion_ms); if (ds_dest->attrs.rweight != active_weight) { cc.apply_rweights = 1; ds_dest->attrs.rweight = active_weight;

1 0

git:master:d139cf26: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: d139cf261147c96451454b27a4a3dbaa0a226636 URL: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-29T11:31:19+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… Patch: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index a699336f53..d7da3a8bf7 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -31,7 +31,8 @@ Daniel-Constantin Mierla 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 4. Functions @@ -55,9 +56,10 @@ Daniel-Constantin Mierla 1.4. Set rotate parameter 1.5. Set folder parameter 1.6. Set fprefix parameter - 1.7. Set event_callback parameter - 1.8. sipdump_send usage - 1.9. sipdump.enable usage + 1.7. Set fage parameter + 1.8. Set event_callback parameter + 1.9. sipdump_send usage + 1.10. sipdump.enable usage Chapter 1. Admin Guide @@ -77,7 +79,8 @@ Chapter 1. Admin Guide 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 4. Functions @@ -138,7 +141,8 @@ Chapter 1. Admin Guide 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 3.1. enable (int) @@ -215,13 +219,26 @@ modparam("sipdump", "folder", "/run/kamailio") modparam("sipdump", "fprefix", "ksipdump-") ... -3.7. event_callback (str) +3.7. fage (int) + + Age of created files (in seconds) to be removed if they become older. + Cleanup is done on a timer routine running every 600 seconds. + + Default value is 0 (no cleanup of created files). + + Example 1.7. Set fage parameter +... +# cleanup files older than two days +modparam("sipdump", "fage", 172800) +... + +3.8. event_callback (str) Name of the KEMI function to be executed instead of the event route. Default value is not set. - Example 1.7. Set event_callback parameter + Example 1.8. Set event_callback parameter ... modparam("sipdump", "event_callback", "ksr_sipdump_event") ... @@ -246,7 +263,7 @@ end This function can be used from ANY_ROUTE. - Example 1.8. sipdump_send usage + Example 1.9. sipdump_send usage ... sipdump_send("cfg"); ... @@ -264,7 +281,7 @@ sipdump_send("cfg"); This function can be used from ANY_ROUTE. - Example 1.9. sipdump.enable usage + Example 1.10. sipdump.enable usage ... kamcmd sipdump.enable kamcmd sipdump.enable 1

1 0

git:master:945b6455: sipdump: new param fage - set file age for clean up
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: 945b6455ed8ce9e3de528588cb45aa70728d4430 URL: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T11:17:10+02:00 sipdump: new param fage - set file age for clean up - older files than fage created by sipdump are deleted on a timer routine running every 600 seconds - default value is 0 (no cleanup) - value is in seconds --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… Patch: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 54b5c47484..9b733dad66 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -26,6 +26,10 @@ #include <string.h> #include <time.h> #include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <dirent.h> +#include <errno.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" @@ -49,9 +53,12 @@ static str sipdump_folder = str_init("/tmp"); static str sipdump_fprefix = str_init("kamailio-sipdump-"); int sipdump_mode = SIPDUMP_MODE_WTEXT; static str sipdump_event_callback = STR_NULL; +static int sipdump_fage = 0; static int sipdump_event_route_idx = -1; +static void sipdump_storage_clean(unsigned int ticks, void* param); + static int mod_init(void); static int child_init(int); static void mod_destroy(void); @@ -78,6 +85,7 @@ static param_export_t params[]={ {"rotate", PARAM_INT, &sipdump_rotate}, {"folder", PARAM_STR, &sipdump_folder}, {"fprefix", PARAM_STR, &sipdump_fprefix}, + {"fage", PARAM_INT, &sipdump_fage}, {"mode", PARAM_INT, &sipdump_mode}, {"event_callback", PARAM_STR, &sipdump_event_callback}, @@ -148,6 +156,12 @@ static int mod_init(void) register_basic_timers(1); } + if(sipdump_fage>0) { + if(sr_wtimer_add(sipdump_storage_clean, NULL, 600)<0) { + return -1; + } + } + sr_event_register_cb(SREV_NET_DATA_IN, sipdump_msg_received); sr_event_register_cb(SREV_NET_DATA_OUT, sipdump_msg_sent); @@ -430,6 +444,79 @@ int sipdump_msg_sent(sr_event_param_t *evp) return 0; } +/** + * + */ +static void sipdump_storage_clean(unsigned int ticks, void* param) +{ + DIR *dlist = NULL; + struct stat fstatbuf; + struct dirent *dentry = NULL; + str fname = STR_NULL; + char *cwd = NULL; + time_t tnow; + int fcount = 0; + + if(sipdump_folder.s==NULL || sipdump_folder.len<=0 + || sipdump_fprefix.s==NULL || sipdump_fprefix.len<=0) { + return; + } + cwd = getcwd(NULL, 0); + if(cwd==NULL) { + LM_ERR("getcwd failed\n"); + return; + } + if ((chdir(sipdump_folder.s)==-1)) { + LM_ERR("chdir to [%s] failed\n", sipdump_folder.s); + free(cwd); + return; + } + + dlist = opendir(sipdump_folder.s); + if (dlist==NULL) { + LM_ERR("unable to read directory [%s]\n", sipdump_folder.s); + goto done; + } + + tnow = time(NULL); + while ((dentry = readdir(dlist))) { + fname.s = dentry->d_name; + fname.len = strlen(fname.s); + + /* ignore '.' and '..' */ + if(fname.len==1 && strcmp(fname.s, ".")==0) { continue; } + if(fname.len==2 && strcmp(fname.s, "..")==0) { continue; } + + if(fname.len<=sipdump_fprefix.len + || strncmp(fname.s, sipdump_fprefix.s, sipdump_fprefix.len)!=0) { + continue; + } + if(lstat(fname.s, &fstatbuf) == -1) { + LM_ERR("stat failed on [%s]\n", fname.s); + continue; + } + if (S_ISREG(fstatbuf.st_mode)) { + /* check last modification time */ + if ((tnow - sipdump_fage) > fstatbuf.st_mtime) { + LM_DBG("deleting [%s]\n", fname.s); + unlink (fname.s); + fcount++; + } + } + } + closedir(dlist); + if(fcount>0) { + LM_DBG("deleted %d files\n", fcount); + } + +done: + if((chdir(cwd)==-1)) { + LM_ERR("chdir to [%s] failed\n", cwd); + goto done; + } + free(cwd); +} + /** * */

1 0

git:master:cf067586: sipdump: docs for fage parameter
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: cf067586bf5c147aa955d3ba7d3a875a2e376329 URL: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T11:23:39+02:00 sipdump: docs for fage parameter --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… Patch: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 7e642f6010..301b667d80 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -195,6 +195,27 @@ modparam("sipdump", "folder", "/run/kamailio") ... modparam("sipdump", "fprefix", "ksipdump-") ... +</programlisting> + </example> + </section> + <section id="sipdump.p.fage"> + <title><varname>fage</varname> (int)</title> + <para> + Age of created files (in seconds) to be removed if they become older. + Cleanup is done on a timer routine running every 600 seconds. + </para> + <para> + <emphasis> + Default value is 0 (no cleanup of created files). + </emphasis> + </para> + <example> + <title>Set <varname>fage</varname> parameter</title> + <programlisting format="linespecific"> +... +# cleanup files older than two days +modparam("sipdump", "fage", 172800) +... </programlisting> </example> </section>

1 0

Default config and options for Kamailio 5.5.0
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Hello, I opened a tracker issue to discuss about default kamailio.cfg to be shipped with upcoming new major version 5.5.0: * https://github.com/kamailio/kamailio/issues/2719 Add your comments on the tracker, to have everyting in a single place -- this message is to notify about on mailing list, not intended to discuss here. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

[kamailio/kamailio] TLS Client Verification OpenSSL 1.1.1(P-256) to OpenSSL 1.0.2 (P-521) is failing (#2716)
by space88man 29 Apr '21

29 Apr '21

### Description I am connecting two kamailio (5.4.5) using TLS with client cert verification. When one side is OpenSSL 1.1.1 (CentOS 8) + P-256 cert and the other side is OpenSSL 1.0.2 (CentOS 7) + P-521 cert *and* `cipher_list` is set(e.g., `DEFAULT`), the ClientHello fails because the only supported curve sent is P-256 (server has P-521). ### Troubleshooting 1. If `cipher_list` is *not* set at all in `[client:defaut]`l, then the ClientHello sends 4 supported EC groups and the handshake succeeds. 2 . If `cipher_list` is set in `[client:defaut]` (e.g. `DEFAULT` or `ANY`) then the ClientHello sends only 1 supported EC group P-256 (I guess because the client is using a P-256 cert), then the handshake will fail. #### Reproduction 1. Connect two kamailos one on CentOS 8 sending SIP to one on CentOS 7, enable TLS, with client cert verification. Put a P-256 cert on CentOS 8 and a P-521 cert on CentOS 7. #### Debugging Data 1. `cipher_list` is not set: TLS ClientHello Supported Groups is 4 groups: secp256r1 secp521r1 secp384r1 secp256k1 2. `cipher_list` is set to `DEFAULT`: TLS ClientHello Supported Groups is 1 group: secp256r1. #### Log Messages ``` ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:1408A0C1:SSL routines:ssl3_get_client_hello:no shared cipher ``` #### SIP Traffic NA - couldn't complete TLS handshake so no SIP was transferred. ### Possible Solutions 1. Don't set cipher_list at all; the moment you set cipher_list to anything(`ANY`, `DEFAULT` etc), the ClientHello will narrow the supported groups to P-256 and the server will reject. I have a thought: does `setup_ecdh()` in `tls_domain.c` behave differently on OpenSSL 1.1.1? Maybe it is forcing the handshake to send only the curve of the client. ### Additional Information 1. kamailio version is 5.4.5 2. Must be OpenSSL 1.1.1 to OpenSSL 1.0.2. BTW in the reverse direction P-521 CentOS 7 to P-256 CentOS 8 doesn't encounter this issue. -- 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/2716

2 4

[kamailio/kamailio] [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ (#2717)
by space88man 29 Apr '21

29 Apr '21

Address GH #2716. Also see https://bugs.python.org/issue29697.   #### 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) - [ ] 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 #2716 #### Description For OpenSSL 1.1.x initialization of EC SSL contexts has changed — we should be using the < 1.0.2 technique on OpenSSL 1.1+. This addresses a corner case where TLS server with P-256 cert would not handshake with a TLS client presenting a P-521 cert. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2717 -- Commit Summary -- * [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ -- File Changes -- M src/modules/tls/tls_domain.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2717.patch https://github.com/kamailio/kamailio/pull/2717.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/2717

2 2

git:master:27904530: [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: 27904530d1f8efd26e2b96fa5f18a3aad887919b URL: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:32:13+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Patch: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index ab45fa7136..c2231b0db0 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -57,8 +57,12 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); * ECDHE is enabled only on OpenSSL 1.0.0e and later. * See http://www.openssl.org/news/secadv_20110906.txt * for details. + * Also, copied from _ssl.c of Python for correct initialization. + * Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use + * prime256v1 by default. This is Apache mod_ssl's initialization + * policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; @@ -69,11 +73,15 @@ static void setup_ecdh(SSL_CTX *ctx) } #endif +#if defined(SSL_CTX_set_ecdh_auto) + SSL_CTX_set_ecdh_auto(ctx, 1); +#else ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); SSL_CTX_set_tmp_ecdh(ctx, ecdh); EC_KEY_free(ecdh); +#endif } #endif @@ -691,7 +699,7 @@ static int set_cipher_list(tls_domain_t* d) tls_domain_str(d), cipher_list); return -1; } -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) setup_ecdh(d->ctx[i]); #endif #ifndef OPENSSL_NO_DH

1 0

git:master:addb6a88: msrp: check return code for str explode
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e URL: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:25:49+02:00 msrp: check return code for str explode --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Patch: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… --- 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:master:a1bbe035: lost: fixed possible resource leak inside lost_get_response_issues()
by Wolfgang Kampichler 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: a1bbe035f1a1acc11f86d27fdc0adef1b1a3d010 URL: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-28T17:22:58+02:00 lost: fixed possible resource leak inside lost_get_response_issues() --- Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Patch: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index b3389448b8..6eb13e8260 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -573,39 +573,53 @@ p_lost_issue_t lost_get_response_issues(xmlNodePtr node) cur = node->children; while(cur) { if(cur->type == XML_ELEMENT_NODE) { - /* get a new response type element */ + /* get a new response type object */ issue = lost_new_response_type(); if(issue == NULL) { /* didn't get it ... return */ break; } - /* parse properties */ - issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + /* get issue type */ tmp.s = (char *)cur->name; tmp.len = strlen((char *)cur->name); + /* copy issue type to object */ + len = 0; if(tmp.len > 0 && tmp.s != NULL) { issue->type = lost_copy_string(tmp, &len); } - if(len > 0) { + if(len == 0) { + /* issue type not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parse source property */ + len = 0; + issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + if(len == 0) { + /* source property not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } - LM_DBG("###\t[%s]\n", issue->type); + LM_DBG("###\t[%s]\n", issue->type); - if(issue->info != NULL) { - issue->info->text = lost_get_property(cur, PROP_MSG, &len); - issue->info->lang = lost_get_property(cur, PROP_LANG, &len); - } - /* get a new list element */ - new = lost_new_response_issues(); - if(new == NULL) { - /* didn't get it, delete response type element ... return */ - lost_delete_response_type(&issue); /* clean up */ - break; - } - /* append to list */ - new->issue = issue; - new->next = list; - list = new; + /* type and source property found ... parse text and copy */ + if(issue->info != NULL) { + issue->info->text = lost_get_property(cur, PROP_MSG, &len); + issue->info->lang = lost_get_property(cur, PROP_LANG, &len); } + /* get a new list element */ + new = lost_new_response_issues(); + if(new == NULL) { + /* didn't get it, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parsing done, append object to list */ + new->issue = issue; + new->next = list; + list = new; + /* get next element */ cur = cur->next; }

1 0

git:master:48200f3e: textops: check for msg headers field in case is used for non-sip traffic
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: 48200f3e9ca9f5e5a05de440eefc23f7265b5268 URL: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T15:57:05+02:00 textops: check for msg headers field in case is used for non-sip traffic --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Patch: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 3d90e97a90..2998906051 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3401,7 +3401,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, int len; str s0; - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

1 0

git:master:7bf00811: core: kemi - parse headers before insert operation
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: 7bf0081102a5755c3282e7f01a0f45e160fdda0f URL: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T16:06:50+02:00 core: kemi - parse headers before insert operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Patch: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ba0b435dce..0932339996 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2143,6 +2143,11 @@ static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) if(txt==NULL || txt->s==NULL || msg==NULL) return -1; + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { + LM_ERR("error while parsing message\n"); + return -1; + } + LM_DBG("insert hf: %.*s\n", txt->len, txt->s); hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { @@ -2188,7 +2193,7 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) return -1; } - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

1 0

git:master:afff1859: ims_ipsec_pcscf: initialize variable to fix warnings
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: afff18592998cb14561cf4fd95acd1b4866fd994 URL: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T13:28:05+02:00 ims_ipsec_pcscf: initialize variable to fix warnings --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Patch: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 10841c74b2..45e82ddf3e 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -681,8 +681,8 @@ static int delete_unused_sa_cb(const struct nlmsghdr *nlh, void *data) void *cp; str received_host; ip_addr_t received_host_addr; - ipsec_t ipsec; - + ipsec_t ipsec = {0}; + cp = ((struct del_tunnels*)data)->contacts; while (1) { memcpy(&(received_host.len), cp, sizeof(received_host.len)); @@ -1080,4 +1080,4 @@ int delete_unused_tunnels() free(buf); return 0; -} \ No newline at end of file +}

1 0

[kamailio/kamailio] build warnings (#2710)
by sergey-safarov 27 Apr '21

27 Apr '21

**missing braces around initializer** *mohq_funcs.c:2163* ``` LD (gcc) [M matrix.so] matrix.so CC (gcc) [M mohqueue.so] mohq_locks.o CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c: In function 'send_rtp_answer': mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { } CC (gcc) [M mohqueue.so] mohq_db.o CC (gcc) [M mohqueue.so] mohqueue_mod.o make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M mohqueue.so] mohqueue.so CC (gcc) [M msilo.so] msfuncs.o CC (gcc) [M msilo.so] msilo.o ``` **"_POSIX_C_SOURCE" redefined** ``` CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] apy_kemi_export.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi_export.c:30: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi_export.c:26: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] mod_Core.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi.c:25: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi.c:21: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] python_msgobj.o CC (gcc) [M app_python.so] mod_Router.o CC (gcc) [M app_python.so] app_python_mod. ``` -- 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/2710

3 14

git:master:c7781edc: mohqueue: fixed compiler warning about array initialization
by Sergey Safarov 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: c7781edcb37a35193ccdb9414183919aaa614d3a URL: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-27T13:00:35+03:00 mohqueue: fixed compiler warning about array initialization --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Patch: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index dd9f105bfc..1f72c58c5a 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -2160,7 +2160,9 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; +fparam_t pzflag [1] = { + {"", FPARAM_STRING, {pflagbuf}, 0} +}; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

1 0

git:5.5:6b9ecb08: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: 5.5 Commit: 6b9ecb0856a881144546fea6d3cbd8a3dc668b81 URL: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T10:00:41+02:00 dispatcher: docs - set xmlns for include tags (cherry picked from commit 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47) --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Patch: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… --- 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 45f93a3121..0ac1a430e6 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> @@ -2215,7 +2212,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> @@ -2231,7 +2228,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:f3cf66fa: dmq: docs - fix section id for dmq.remove rpc command
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: 5.5 Commit: f3cf66fafaba73b245b5e8179c290da936f6418e URL: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T10:00:28+02:00 dmq: docs - fix section id for dmq.remove rpc command (cherry picked from commit 2c473f7c2eccf4ef79f23f9cecd122e861395a00) --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… Patch: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index ebc6f44e1a..661fd4b847 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -522,7 +522,7 @@ modparam("dmq", "ping_interval", 90) </programlisting> </example> </section> - <section id="dmq.r.list_nodes"> + <section id="dmq.r.remove"> <title>dmq.remove</title> <para> Remove a DMQ node by address.

1 0

git:master:3f25ef01: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47 URL: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T09:59:29+02:00 dispatcher: docs - set xmlns for include tags --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… Patch: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… --- 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 45f93a3121..0ac1a430e6 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> @@ -2215,7 +2212,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> @@ -2231,7 +2228,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:master:2c473f7c: dmq: docs - fix section id for dmq.remove rpc command
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: 2c473f7c2eccf4ef79f23f9cecd122e861395a00 URL: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T09:51:30+02:00 dmq: docs - fix section id for dmq.remove rpc command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… Patch: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index ebc6f44e1a..661fd4b847 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -522,7 +522,7 @@ modparam("dmq", "ping_interval", 90) </programlisting> </example> </section> - <section id="dmq.r.list_nodes"> + <section id="dmq.r.remove"> <title>dmq.remove</title> <para> Remove a DMQ node by address.

1 0

git:master:764d5be0: core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 764d5be0c44036bb4b86f841588fb0df3b4bb834 URL: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T11:22:20+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Patch: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 94f972eae9..fb786ba635 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;

2 2

git:master:e279f2f4: topos: explicitely set the db match operator and value type for uuid
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: e279f2f464ab05e1a2821d6e2d9e673fe145fbf2 URL: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:58:39+02:00 topos: explicitely set the db match operator and value type for uuid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Patch: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 2d611402c8..6e88b35af3 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1148,20 +1148,32 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.len>0) { if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; }

1 0

git:master:fb5ab201: topos: increase the number of db keys for query when using uuid for branch
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: fb5ab20123a07afdfaf96197db25d76f8dda0683 URL: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:51:55+02:00 topos: increase the number of db keys for query when using uuid for branch - debug message to print a/b uuid --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Patch: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 852a19aaa2..854d2cdbc6 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -826,6 +826,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) } lkey = msg->callid->body; + LM_DBG("callid [%.*s] - a_uuid [%.*s] - b_uuid [%.*s]\n", lkey.len, lkey.s, + mtsd.a_uuid.len, ((mtsd.a_uuid.len>0)?mtsd.a_uuid.s:""), + mtsd.b_uuid.len, ((mtsd.b_uuid.len>0)?mtsd.b_uuid.s:"")); tps_storage_lock_get(&lkey); diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index caff16c5ee..2d611402c8 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1149,17 +1149,21 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } } }

1 0

git:master:1d6736d1: topos: restore checks on uri and sip_params for tps_dlg_message_update()
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 1d6736d16ab3a83b77d6c7be3f9689c7fbfccf28 URL: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:49:42+02:00 topos: restore checks on uri and sip_params for tps_dlg_message_update() - use define for expected min len safety checks --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Patch: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index cbf8b3c9f3..852a19aaa2 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -309,17 +309,18 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) str tuuid = STR_NULL; int ret; +#define TPS_TUUID_MIN_LEN 10 + if(parse_sip_msg_uri(msg)<0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.sip_params.len<10) { - LM_DBG("not an expected %s format\n", (ctmode==0)?"user":"param"); - return 1; - } - if (ctmode == 1 || ctmode == 2) { + if(msg->parsed_uri.sip_params.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected param format\n"); + return 1; + } /* find the r-uri parameter */ ret = tps_get_param_value(&msg->parsed_uri.params, &_tps_cparam_name, &tuuid); @@ -332,6 +333,10 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return 1; } } else { + if(msg->parsed_uri.user.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected user format\n"); + return 1; + } tuuid = msg->parsed_uri.user; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev