- sr-dev - kamailio.org

git:master:4a6aa75d: pkg/kamailio/obs: fixed packaging for RHEL 7 and RHEL 6 based dists [skip ci]
by Sergey Safarov 16 Aug '22

16 Aug '22

Module: kamailio Branch: master Commit: 4a6aa75dd1de4e33ba6ac3f1d770a1beed61e157 URL: https://github.com/kamailio/kamailio/commit/4a6aa75dd1de4e33ba6ac3f1d770a1b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T16:22:45+03:00 pkg/kamailio/obs: fixed packaging for RHEL 7 and RHEL 6 based dists [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/4a6aa75dd1de4e33ba6ac3f1d770a1b… Patch: https://github.com/kamailio/kamailio/commit/4a6aa75dd1de4e33ba6ac3f1d770a1b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6d87dad29f7..d759f162ef6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1833,8 +1833,14 @@ fi %dir %{_libdir}/kamailio/kamctl/dbtextdb %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py +%if 0%{?rhel} > 8 %dir %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__ %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__/*.pyc +%endif +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyc +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyo +%endif %{_mandir}/man5/* %{_mandir}/man8/*

1 0

git:5.6:b04f84ea: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: b04f84ea826a4c97cf7ba1804f29833aecc50fd3 URL: https://github.com/kamailio/kamailio/commit/b04f84ea826a4c97cf7ba1804f29833… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-16T12:16:46+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README Modified: src/modules/siputils/README Modified: src/modules/uac_redirect/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/b04f84ea826a4c97cf7ba1804f29833… Patch: https://github.com/kamailio/kamailio/commit/b04f84ea826a4c97cf7ba1804f29833… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 0b5abfb614c..e091d2018fc 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -731,9 +731,11 @@ if(is_rfc1918("$rd")) { 5.9. set_contact_alias([trim]) Adds an “;alias=ip~port~transport” parameter to the contact URI - containing the received ip, port, and transport protocol. The new - contact URI is immediately visible to other modules in the way the - fix_nated_contact() does it. + containing the received ip, port, and transport protocol. The update of + contact URI is signaled to a few other modules in the way the + fix_nated_contact() does it by using the internal flags. The new value + is not visible to pseudo-variables and it does not change the SIP + message buffer. Meaning of parameters: * trim - by default, set_contact_alias() will not detect and trim an diff --git a/src/modules/siputils/README b/src/modules/siputils/README index adc29cbd24f..51b9e42adc0 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -1002,7 +1002,7 @@ if (is_supported("outbound")) { ... } ... if(is_first_hop()) { ... } ... -if(is_first_hop_mode("1")) { ... } +if(is_first_hop("1")) { ... } ... 4.34. sip_p_charging_vector(flags) diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index 812755bc5d1..c016467df94 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -205,10 +205,12 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") 4.4. acc_function (string) Specifies the accounting function to be used. Just by defining this - parameter, the accounting support will not be enabled. Accounting may - only be enabled via two parameters set_accept_filter() scripting + parameter, the accounting is not done automatically, it has to be + requested via parameters of set_accept_filter() or other scripting function. + Set it to empty string in order to disable binding to acc module. + Its values may be: * acc_log_request * acc_db_request @@ -224,10 +226,7 @@ modparam("uac_redirect","acc_function","acc_db_request") 4.5. acc_db_table (string) Specifies the accounting table to be used if DB accounting was chosen - (acc_function was set to “acc_db_request”). Just by defining this - parameter, the accounting support will not be enabled. Accounting may - only be enabled via two parameters set_accept_filter() scripting - function. + (acc_function was set to “acc_db_request” or “acc_request”). The default value is “acc”. diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index 781ac413927..9a59c839aa1 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -131,11 +131,15 @@ Chapter 1. Admin Guide 3.2. Kamailio Core Settings - SIP requires a Content-Length header for TCP transport. But most HTTP - clients do not set the content length for normal GET requests. - Therefore, the core must be configured to allow incoming requests - without content length header: - * tcp_accept_no_cl=yes + Related core settings: + * tcp_accept_no_cl=yes - SIP requires the Content-Length header for + TCP transport. But most HTTP clients do not set the content length + for normal GET requests. Therefore, the core must be configured to + allow incoming requests without content length header. + * http_reply_parse=yes - various Kamailio modules may parse what it + is sent out (e.g., for replication, topology management). In such + case errors are printed if the outgoing message is not SIP and this + parameter is not set. 3.3. External Libraries or Applications

1 0

git:5.6:e07c2288: xhttp: docs - listed http_reply_parse core setting
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: e07c2288053a21f5fc758f359a60ffaceb687f35 URL: https://github.com/kamailio/kamailio/commit/e07c2288053a21f5fc758f359a60ffa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T12:00:47+02:00 xhttp: docs - listed http_reply_parse core setting (cherry picked from commit 36b0da00b9fc08be9e855d5dd4cc878b6e3c88bf) --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e07c2288053a21f5fc758f359a60ffa… Patch: https://github.com/kamailio/kamailio/commit/e07c2288053a21f5fc758f359a60ffa… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index 507283b90f4..f0e6d3fdeb8 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -85,13 +85,23 @@ <section> <title>&kamailio; Core Settings</title> <para> - SIP requires a Content-Length header for TCP transport. But most HTTP clients do not - set the content length for normal GET requests. Therefore, the core must be configured - to allow incoming requests without content length header: + Related core settings: <itemizedlist> <listitem> <para> - <emphasis>tcp_accept_no_cl=yes</emphasis> + <emphasis>tcp_accept_no_cl=yes</emphasis> - SIP requires the + Content-Length header for TCP transport. But most HTTP clients + do not set the content length for normal GET requests. Therefore, + the core must be configured to allow incoming requests without + content length header. + </para> + </listitem> + <listitem> + <para> + <emphasis>http_reply_parse=yes</emphasis> - various Kamailio + modules may parse what it is sent out (e.g., for replication, + topology management). In such case errors are printed if the + outgoing message is not SIP and this parameter is not set. </para> </listitem> </itemizedlist>

1 0

git:5.6:6b74c2a0: usrloc: do not send keepalives when destroying modules
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: 6b74c2a08a5a1f7dcd62bf8c3477b6bf1f51a4d3 URL: https://github.com/kamailio/kamailio/commit/6b74c2a08a5a1f7dcd62bf8c3477b6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:59:53+02:00 usrloc: do not send keepalives when destroying modules - GH #3207 (cherry picked from commit 939ceb3390b171b773eeb438b8fff72022e4f6f0) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/6b74c2a08a5a1f7dcd62bf8c3477b6b… Patch: https://github.com/kamailio/kamailio/commit/6b74c2a08a5a1f7dcd62bf8c3477b6b… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 5b1572483b..8808725849 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -33,6 +33,7 @@ #include "../../core/forward.h" #include "../../core/globals.h" #include "../../core/pvar.h" +#include "../../core/sr_module.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -110,6 +111,11 @@ int ul_ka_urecord(urecord_t *ur) if (ul_ka_mode == ULKA_NONE) { return 0; } + + if(likely(destroy_modules_phase()!=0)) { + return 0; + } + LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); tnow = time(NULL);

1 0

git:5.6:e8947f9e: uac_redirect: check if reason parameter ifs provided for get_redirects()
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: e8947f9e2a52dbbf5e255785a15b502d74613071 URL: https://github.com/kamailio/kamailio/commit/e8947f9e2a52dbbf5e255785a15b502… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T12:00:04+02:00 uac_redirect: check if reason parameter ifs provided for get_redirects() - cope properly with the common function used for the two function variants - GH #3197 (cherry picked from commit 3b1354e2fd26c06fa6bc5ddbee1a012507aa2ea5) --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/e8947f9e2a52dbbf5e255785a15b502… Patch: https://github.com/kamailio/kamailio/commit/e8947f9e2a52dbbf5e255785a15b502… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 76b7592b5a..9925621d0e 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -344,17 +344,19 @@ static int w_get_redirect2(struct sip_msg* msg, char *max_c, char *reason) { int n; unsigned short max; - str sreason; + str sreason = {0}; - if(fixup_get_svalue(msg, (gparam_t*)reason, &sreason)<0) { - LM_ERR("failed to get reason parameter\n"); - return -1; + if(reason!=NULL) { + if(fixup_get_svalue(msg, (gparam_t*)reason, &sreason)<0) { + LM_ERR("failed to get reason parameter\n"); + return -1; + } } msg_tracer( msg, 0); /* get the contacts */ max = (unsigned short)(long)max_c; - n = get_redirect(msg , (max>>8)&0xff, max&0xff, &sreason, bflags); + n = get_redirect(msg , (max>>8)&0xff, max&0xff, (reason)?&sreason:NULL, bflags); reset_filters(); /* reset the tracer */ msg_tracer( msg, 1);

1 0

git:5.6:88560506: core: fix ksr_version_control() for FreeBSD build
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: 88560506e42e0d127c2034b35397b29ee5909307 URL: https://github.com/kamailio/kamailio/commit/88560506e42e0d127c2034b35397b29… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T12:00:15+02:00 core: fix ksr_version_control() for FreeBSD build (cherry picked from commit a8769af4c3a497d0f6a81cff17861e566ffa87bc) --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/88560506e42e0d127c2034b35397b29… Patch: https://github.com/kamailio/kamailio/commit/88560506e42e0d127c2034b35397b29… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 2d787d7f9f..013598c2a7 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -347,6 +347,9 @@ int ksr_version_control(void *handle, char *path) char **m_flags; char* error; +#ifdef __FreeBSD__ + (void) dlerror(); +#endif m_ver=(char **)dlsym(handle, "module_version"); if ((error=(char *)dlerror())!=0) { LM_ERR("no version info in module <%s>: %s\n", path, error);

1 0

git:5.6:3e2cf002: dispatcher: check if packing address fails on removing via rpc
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: 3e2cf002f544c438a7bcdcff8986b0a28c5921a8 URL: https://github.com/kamailio/kamailio/commit/3e2cf002f544c438a7bcdcff8986b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:58:41+02:00 dispatcher: check if packing address fails on removing via rpc - GH #3199 (cherry picked from commit 13a4021914057ca66eaa91e2ea022e1827963b70) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/3e2cf002f544c438a7bcdcff8986b0a… Patch: https://github.com/kamailio/kamailio/commit/3e2cf002f544c438a7bcdcff8986b0a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d19098800a3..7d818538d61 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2680,6 +2680,11 @@ int ds_remove_dst(int group, str *address) setn = 0; dp = pack_dest(*address, 0, 0, NULL, 0); + if(dp==NULL) { + LM_ERR("failed to pack address: %d %.*s\n", group, + address->len, address->s); + return -1; + } filter_arg.setid = group; filter_arg.dest = dp; filter_arg.setn = &setn;

1 0

git:5.6:6ac1d7a7: sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209)
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: 6ac1d7a7cdb49fb8db4ff280c5159098b0b4284f URL: https://github.com/kamailio/kamailio/commit/6ac1d7a7cdb49fb8db4ff280c515909… Author: russagit <rustam.safargalin(a)sifox.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:59:15+02:00 sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209) (cherry picked from commit 9f3d1c274ad926e9640d0091c9702a34f8b2e539) --- Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/6ac1d7a7cdb49fb8db4ff280c515909… Patch: https://github.com/kamailio/kamailio/commit/6ac1d7a7cdb49fb8db4ff280c515909… --- diff --git a/src/modules/sipt/ss7_parser.c b/src/modules/sipt/ss7_parser.c index 30d85cdb1e2..eaac53e5ca0 100644 --- a/src/modules/sipt/ss7_parser.c +++ b/src/modules/sipt/ss7_parser.c @@ -570,7 +570,7 @@ int isup_get_generic_number_nai(unsigned char *buf, int len) if(offset != -1 && len-offset-2 > 1) { - return buf[offset+2] & 0x7F; + return buf[offset+3] & 0x7F; } return -1; } @@ -586,13 +586,13 @@ int isup_get_generic_number(unsigned char *buf, int len, char* sb_buf) if(offset != -1 && len-offset-2 > 1) { sbparamlen = (buf[offset+1] & 0xFF) - 2; - oddeven = (buf[offset+2] >> 7) & 0x1; + oddeven = (buf[offset+3] >> 7) & 0x1; while ((sbparamlen > 0) && (buf[offset] != 0)) { - sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+4+sb_j] & 0x0F)]; + sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+5+sb_j] & 0x0F)]; if(sbparamlen > 1 || oddeven == 0) { - sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+4+sb_j] >>4 & 0x0F)]; + sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+5+sb_j] >>4 & 0x0F)]; } sb_i=sb_i+2; sbparamlen--;

1 0

git:5.6:3086494d: uac_redirect: clarifications for acc_function mod param
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: 3086494d7fa1ada9ce5f3ed851610a2fc542656a URL: https://github.com/kamailio/kamailio/commit/3086494d7fa1ada9ce5f3ed851610a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:59:41+02:00 uac_redirect: clarifications for acc_function mod param (cherry picked from commit 7ef109e6cd1ce7ecbfa56c31ff7555275e59095f) --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3086494d7fa1ada9ce5f3ed851610a2… Patch: https://github.com/kamailio/kamailio/commit/3086494d7fa1ada9ce5f3ed851610a2… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 1388fc740a4..71a448a6ae7 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -211,11 +211,14 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") <section id="uac_redirect.p.acc_function"> <title><varname>acc_function</varname> (string)</title> <para> - Specifies the accounting function to be used. Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting function to be used. Just by defining + this parameter, the accounting is not done automatically, it has to + be requested via parameters of + <function moreinfo="none">set_accept_filter()</function> + or other scripting function. + </para> + <para> + Set it to empty string in order to disable binding to acc module. </para> <para> Its values may be: @@ -248,13 +251,9 @@ modparam("uac_redirect","acc_function","acc_db_request") <section id="uac_redirect.p.acc_db_table"> <title><varname>acc_db_table</varname> (string)</title> <para> - Specifies the accounting table to be used if DB accounting was - chosen (<varname>acc_function</varname> was set to - <quote>acc_db_request</quote>). Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting table to be used if DB accounting was + chosen (<varname>acc_function</varname> was set to + <quote>acc_db_request</quote> or <quote>acc_request</quote>). </para> <para> <emphasis>

1 0

git:5.6:f4d9be60: uac_redirect: test if the acc function is set before binding to acc module
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: f4d9be60489461f0903b8ca2d1e6248d1e0b0717 URL: https://github.com/kamailio/kamailio/commit/f4d9be60489461f0903b8ca2d1e6248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:55:41+02:00 uac_redirect: test if the acc function is set before binding to acc module - GH #3188 (cherry picked from commit e21df35840c7a85cf26a3005f718e5e37edeac8e) --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d9be60489461f0903b8ca2d1e6248… Patch: https://github.com/kamailio/kamailio/commit/f4d9be60489461f0903b8ca2d1e6248… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 1fd06c5b723..76b7592b5af 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -166,6 +166,10 @@ static int get_redirect_fixup(void** param, int param_no) *param=(void*)(long)( (((unsigned short)maxt)<<8) | maxb); } else if (param_no==2) { /* acc function loaded? */ + if (uacred_acc_fct_s.s==0 || uacred_acc_fct_s.s[0]=='\0') { + LM_ERR("acc support enabled, but no acc function defined\n"); + return E_UNSPEC; + } if (_uacred_accb.acc_request==NULL) { /* bind the ACC API */ if(acc_load_api(&_uacred_accb) < 0) { @@ -249,10 +253,12 @@ static int redirect_init(void) goto error; } - /* bind the ACC API */ - if(acc_load_api(&_uacred_accb) < 0) { - LM_ERR("cannot bind to ACC API\n"); - return -1; + if(uacred_acc_fct_s.s != 0 && uacred_acc_fct_s.s[0] != '\0') { + /* bind the ACC API */ + if(acc_load_api(&_uacred_accb) < 0) { + LM_ERR("cannot bind to ACC API\n"); + return -1; + } } /* init filter */

1 0

git:5.6:50a46d9b: siputils: fix typo for is_first_hope, related to gh #3200
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: 50a46d9b894a32c82697c4b49a68ececb881b3e5 URL: https://github.com/kamailio/kamailio/commit/50a46d9b894a32c82697c4b49a68ece… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:57:57+02:00 siputils: fix typo for is_first_hope, related to gh #3200 (cherry picked from commit ac75a033132740b06d5afcdc17c25d3c354e7d89) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/50a46d9b894a32c82697c4b49a68ece… Patch: https://github.com/kamailio/kamailio/commit/50a46d9b894a32c82697c4b49a68ece… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 73178847ad0..c2aef667e5a 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1178,7 +1178,7 @@ if (is_supported("outbound")) { ... } ... if(is_first_hop()) { ... } ... -if(is_first_hop_mode("1")) { ... } +if(is_first_hop("1")) { ... } ... </programlisting> </example>

1 0

git:5.6:f1bd6bb8: nathelper: docs - rephrased the remarks about set_contact_alias()
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: f1bd6bb8dec9db76acf697a7b1d177a2bfcfd7c1 URL: https://github.com/kamailio/kamailio/commit/f1bd6bb8dec9db76acf697a7b1d177a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:58:14+02:00 nathelper: docs - rephrased the remarks about set_contact_alias() (cherry picked from commit c009f27578e8df9aa77ab852325dad8dc710d6c8) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f1bd6bb8dec9db76acf697a7b1d177a… Patch: https://github.com/kamailio/kamailio/commit/f1bd6bb8dec9db76acf697a7b1d177a… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d0e8a18ea4c..a8828baa74f 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -878,8 +878,10 @@ if(is_rfc1918("$rd")) { <para> Adds an <quote>;alias=ip~port~transport</quote> parameter to the contact URI containing the received ip, port, and transport protocol. - The new contact URI is immediately visible to other modules in the - way the <function>fix_nated_contact()</function> does it. + The update of contact URI is signaled to a few other modules in the + way the <function>fix_nated_contact()</function> does it by using the + internal flags. The new value is not visible to pseudo-variables and it + does not change the SIP message buffer. </para> <para>Meaning of parameters:</para> <itemizedlist>

1 0

git:5.6:ca1e61ec: core: use memcpy and set end of string
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.6 Commit: ca1e61ec0453b9a4797ac7af88ac179d27e53685 URL: https://github.com/kamailio/kamailio/commit/ca1e61ec0453b9a4797ac7af88ac179… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:54:38+02:00 core: use memcpy and set end of string (cherry picked from commit 5cd4e817a24308b82fc3f631fb18f354dadf2b7e) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/ca1e61ec0453b9a4797ac7af88ac179… Patch: https://github.com/kamailio/kamailio/commit/ca1e61ec0453b9a4797ac7af88ac179… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c9dd89118d8..e3ae29bc147 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1502,7 +1502,8 @@ static int build_iface_list(void) } if(strlen(ifaces[index].name)==0 && strlen(name)>0) { - strncpy(ifaces[index].name, name, MAX_IF_LEN-1); + memcpy(ifaces[index].name, name, MAX_IF_LEN-1); + ifaces[index].name[MAX_IF_LEN-1] = '\0'; } ifaces[index].index = index;

1 0

git:master:1e4bf1dd: msrp: proper cmap insert when last item has greater citemid
by Daniel-Constantin Mierla 16 Aug '22

16 Aug '22

Module: kamailio Branch: master Commit: 1e4bf1dd7fbfc9d51f0e56e98472a42de781cdbd URL: https://github.com/kamailio/kamailio/commit/1e4bf1dd7fbfc9d51f0e56e98472a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T09:09:45+02:00 msrp: proper cmap insert when last item has greater citemid - condition for last item was processed first, resulting in improper order of items, GH #3215 --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/1e4bf1dd7fbfc9d51f0e56e98472a42… Patch: https://github.com/kamailio/kamailio/commit/1e4bf1dd7fbfc9d51f0e56e98472a42… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index 9764c0903f5..2fc6a8d740b 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -270,20 +270,21 @@ int msrp_cmap_save(msrp_frame_t *mf) } else { for(itb=_msrp_cmap_head->cslots[idx].first; itb; itb=itb->next) { - if(itb->citemid>it->citemid || itb->next==NULL) { - if(itb->next==NULL) { - itb->next=it; - it->prev = itb; + if(itb->citemid>it->citemid) { + /* insert before current item */ + it->next = itb; + if(itb->prev==NULL) { + _msrp_cmap_head->cslots[idx].first = it; } else { - it->next = itb; - if(itb->prev==NULL) { - _msrp_cmap_head->cslots[idx].first = it; - } else { - itb->prev->next = it; - } - it->prev = itb->prev; - itb->prev = it; + itb->prev->next = it; } + it->prev = itb->prev; + itb->prev = it; + break; + } else if(itb->next==NULL) { + /* insert after last item */ + itb->next=it; + it->prev = itb; break; } }

1 0

git:master:f1dcb649: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 15 Aug '22

15 Aug '22

Module: kamailio Branch: master Commit: f1dcb649cb779b2ccd14d18cad441d29653ffabd URL: https://github.com/kamailio/kamailio/commit/f1dcb649cb779b2ccd14d18cad441d2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-15T20:46:09+02:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/f1dcb649cb779b2ccd14d18cad441d2… Patch: https://github.com/kamailio/kamailio/commit/f1dcb649cb779b2ccd14d18cad441d2… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index 435db783fa..345b639e91 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -661,8 +661,6 @@ d in the user-agent header ($ua)"); Example 1.24. kamcmd secfilter.print ua ... -User-agent -========== { User-Agent: { Blacklisted: {

1 0

[kamailio/kamailio] Pepelux/secfilter (PR #3217)
by Jose Luis Verdeguer 15 Aug '22

15 Aug '22

#### 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) - [ ] 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  Fixed an error in an example in the docfile You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3217 -- Commit Summary -- * secfilter: machine-parsable data structure for RPC printing data * secfilter: updated samples [skip ci] * secfilter: fix examples [skip ci] -- File Changes -- M src/modules/secfilter/doc/secfilter_admin.xml (121) M src/modules/secfilter/secfilter_rpc.c (383) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3217.patch https://github.com/kamailio/kamailio/pull/3217.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3217 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3217(a)github.com>

1 1

git:master:8f30f438: secfilter: fix examples [skip ci]
by Jose Luis Verdeguer 15 Aug '22

15 Aug '22

Module: kamailio Branch: master Commit: 8f30f438f9ba6ab9a2d7bde1cfa4d186e2fe0d6f URL: https://github.com/kamailio/kamailio/commit/8f30f438f9ba6ab9a2d7bde1cfa4d18… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-08-15T20:33:29+02:00 secfilter: fix examples [skip ci] --- Modified: src/modules/secfilter/doc/secfilter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8f30f438f9ba6ab9a2d7bde1cfa4d18… Patch: https://github.com/kamailio/kamailio/commit/8f30f438f9ba6ab9a2d7bde1cfa4d18… --- diff --git a/src/modules/secfilter/doc/secfilter_admin.xml b/src/modules/secfilter/doc/secfilter_admin.xml index 9daa67d952..fff4ca3b2c 100644 --- a/src/modules/secfilter/doc/secfilter_admin.xml +++ b/src/modules/secfilter/doc/secfilter_admin.xml @@ -812,8 +812,6 @@ <programlisting format="linespecific"> ... -User-agent -========== { User-Agent: { Blacklisted: {

1 0

git:master:252562b8: modules: readme files regenerated - xhttp ... [skip ci]
by Kamailio Dev 15 Aug '22

15 Aug '22

Module: kamailio Branch: master Commit: 252562b8fce76cb01cde993b530509e89baae95a URL: https://github.com/kamailio/kamailio/commit/252562b8fce76cb01cde993b530509e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-15T20:31:14+02:00 modules: readme files regenerated - xhttp ... [skip ci] --- Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/252562b8fce76cb01cde993b530509e… Patch: https://github.com/kamailio/kamailio/commit/252562b8fce76cb01cde993b530509e… --- diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index 781ac41392..9a59c839aa 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -131,11 +131,15 @@ Chapter 1. Admin Guide 3.2. Kamailio Core Settings - SIP requires a Content-Length header for TCP transport. But most HTTP - clients do not set the content length for normal GET requests. - Therefore, the core must be configured to allow incoming requests - without content length header: - * tcp_accept_no_cl=yes + Related core settings: + * tcp_accept_no_cl=yes - SIP requires the Content-Length header for + TCP transport. But most HTTP clients do not set the content length + for normal GET requests. Therefore, the core must be configured to + allow incoming requests without content length header. + * http_reply_parse=yes - various Kamailio modules may parse what it + is sent out (e.g., for replication, topology management). In such + case errors are printed if the outgoing message is not SIP and this + parameter is not set. 3.3. External Libraries or Applications

1 0

git:master:36b0da00: xhttp: docs - listed http_reply_parse core setting
by Daniel-Constantin Mierla 15 Aug '22

15 Aug '22

Module: kamailio Branch: master Commit: 36b0da00b9fc08be9e855d5dd4cc878b6e3c88bf URL: https://github.com/kamailio/kamailio/commit/36b0da00b9fc08be9e855d5dd4cc878… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-15T20:18:02+02:00 xhttp: docs - listed http_reply_parse core setting --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/36b0da00b9fc08be9e855d5dd4cc878… Patch: https://github.com/kamailio/kamailio/commit/36b0da00b9fc08be9e855d5dd4cc878… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index 507283b90f4..f0e6d3fdeb8 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -85,13 +85,23 @@ <section> <title>&kamailio; Core Settings</title> <para> - SIP requires a Content-Length header for TCP transport. But most HTTP clients do not - set the content length for normal GET requests. Therefore, the core must be configured - to allow incoming requests without content length header: + Related core settings: <itemizedlist> <listitem> <para> - <emphasis>tcp_accept_no_cl=yes</emphasis> + <emphasis>tcp_accept_no_cl=yes</emphasis> - SIP requires the + Content-Length header for TCP transport. But most HTTP clients + do not set the content length for normal GET requests. Therefore, + the core must be configured to allow incoming requests without + content length header. + </para> + </listitem> + <listitem> + <para> + <emphasis>http_reply_parse=yes</emphasis> - various Kamailio + modules may parse what it is sent out (e.g., for replication, + topology management). In such case errors are printed if the + outgoing message is not SIP and this parameter is not set. </para> </listitem> </itemizedlist>

1 0

db_postgres / DB1_BLOB / sipcapture HOMER issue
by Daniel Pocock 15 Aug '22

15 Aug '22

Hi all, I was doing some tests with HOMER and a PostgreSQL backend The HOMER schema creates the msg column as varchar(1500) CREATE TABLE IF NOT EXISTS rtcp_capture ( id BIGSERIAL NOT NULL, date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, micro_ts bigint NOT NULL DEFAULT '0', correlation_id varchar(256) NOT NULL DEFAULT '', source_ip varchar(60) NOT NULL DEFAULT '', source_port integer NOT NULL DEFAULT 0, destination_ip varchar(60) NOT NULL DEFAULT '', destination_port integer NOT NULL DEFAULT 0, proto integer NOT NULL DEFAULT 0, family smallint DEFAULT NULL, type integer NOT NULL DEFAULT 0, node varchar(125) NOT NULL DEFAULT '', msg varchar(1500) NOT NULL DEFAULT '', PRIMARY KEY (id,date) ); The sipcapture.c source code says that msg is DB1_BLOB https://github.com/kamailio/kamailio/blob/master/src/modules/sipcapture/sip… db_keys[11] = &msg_column; db_vals[11].type = DB1_BLOB; db_vals[11].nul = 0; When the Kamailio PostgreSQL module db_postgres tries to store DB1_BLOB, it converts the message text into a hex string and stores that string like this: '0x7b2273656e6465725f696e666f726d6174696f6e223a7b226e74705f74696d657374616d705f736563223a3338333033312c226e74705f74696d657374616d705f75736563223a32333237332c226f6374657473223a3136343030302c227274705f74696d657374616d70223a323132353238323231342c227061636b657473223a313032357d2c2273737263223a323330343334323235382c2274797065223a3230302c227265706f72745f626c6f636b73223a5b7b22736f757263655f73737263223a333737363636373030392c22686967686573745f7365715f6e6f223a31363739332c226672616374696f6e5f6c6f7374223a302c2269615f6a6974746572223a31372c227061636b6574735f6c6f7374223a302c226c7372223a3837363937393735352c22646c7372223a35303234397d5d2c227265706f72745f636f756e74223a317d' I tried changing the msg column type to bytea (blob) and Kamailio is still doing the same thing, storing a hex string into the column. Then I changed the column back to varchar(1500) and I modified sipcapture.c to use DB1_STR. With this change it is working OK. However, I suspect that the support for DB1_BLOB conversions may need to be reviewed in src/modules/db_postgres/km_val.c Regards, Daniel -- https://danielpocock.com Follow with RSS: https://danielpocock.com/rss.xml

3 2

[kamailio/kamailio] [stirshaken] add identity header in reply messages or to a separate variable (#2770)
by sergei lavrov 14 Aug '22

14 Aug '22

### Description I'm unable to add the generated `Identity` value to reply message when `kamailio` acts as a redirect server and replies with `302 Moved Temporarily` instead of relaying `INVITE`. This code doesn't work, i.e. no `Identity` header in `302 Moved Temporarily` message: ``` if (stirshaken_add_identity($var(x5u), $var(attest), $var(origtn_val), $var(desttn_val), $var(origid)) == 1) { append_branch("sip:$rU@127.0.0.1:6060"); sl_send_reply("302", "Moved Temporarily"); exit; } ``` ### Expected behavior It would be nice if the `stirshaken_add_identity_*` functions would add the generated `Identity` header to the reply messages too, or store the generated `Identity` header in a separate variable, like `$identity`, for the future processing. -- 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/2770

4 10

git:master:c09ede1b: core: different logging for IPv4 and IPv6 for socket option setting
by Henning Westerholt 14 Aug '22

14 Aug '22

Module: kamailio Branch: master Commit: c09ede1ba7d600da37e7c0007f128a72b34250a4 URL: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-14T09:01:57Z core: different logging for IPv4 and IPv6 for socket option setting --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… Patch: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 1eefb13c42..7c501f0dab 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -336,13 +336,13 @@ int udp_init(struct socket_info* sock_info) if (addr->s.sa_family==AF_INET){ if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPV4 setsockopt: %s\n", strerror(errno)); goto error; } } else if (addr->s.sa_family==AF_INET6){ if(setsockopt(sock_info->socket, SOL_IPV6, IPV6_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv6 setsockopt: %s\n", strerror(errno)); goto error; } } @@ -354,7 +354,7 @@ int udp_init(struct socket_info* sock_info) optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv4 setsockopt: %s\n", strerror(errno)); goto error; } } else if (addr->s.sa_family==AF_INET6){ @@ -365,7 +365,7 @@ int udp_init(struct socket_info* sock_info) if(setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_MTU_DISCOVER, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv6 setsockopt: %s\n", strerror(errno)); goto error; } }

1 0

git:master:990bdfe5: core: also set pmtu_discovery core parameter for IPv6, GH #3141
by Henning Westerholt 14 Aug '22

14 Aug '22

Module: kamailio Branch: master Commit: 990bdfe56b9d8e2d2d297b87998065e137d4e203 URL: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-14T08:56:12Z core: also set pmtu_discovery core parameter for IPv6, GH #3141 - also set pmtu_discovery core parameter for IPv6 - based on a patch from Rick van Rein <rick(a)openfortress.nl> - probably to be extended further --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… Patch: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index bffdda1b01..1eefb13c42 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -329,22 +329,45 @@ int udp_init(struct socket_info* sock_info) } #if defined (__OS_linux) && defined(UDP_ERRORS) + /* Ask for the ability to recvmsg (...,MSG_ERRQUEUE) for immediate + * resend when hitting Path MTU limits. */ optval=1; /* enable error receiving on unconnected sockets */ - if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, + if (addr->s.sa_family==AF_INET){ + if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); - goto error; + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } + } else if (addr->s.sa_family==AF_INET6){ + if(setsockopt(sock_info->socket, SOL_IPV6, IPV6_RECVERR, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } } #endif #if defined (__OS_linux) - /* if pmtu_discovery=1 then set DF bit and do Path MTU discovery - * disabled by default */ - optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; - if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, - (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); - goto error; + if (addr->s.sa_family==AF_INET){ + /* If pmtu_discovery=1 then set DF bit and do Path MTU discovery + * disabled by default. Specific to IPv4. */ + optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; + if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } + } else if (addr->s.sa_family==AF_INET6){ + /* IPv6 never fragments but sends ICMPv6 Packet too Big, + * If pmtu_discovery=1 then set DF bit and do Path MTU discovery + * disabled by default. Specific to IPv6. */ + optval= (pmtu_discovery) ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; + if(setsockopt(sock_info->socket, IPPROTO_IPV6, + IPV6_MTU_DISCOVER, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } } #endif

1 0

git:master:43d92797: tls_wolfssl: wolfSSL â update to v5.4.0-stable
by S-P Chan 13 Aug '22

13 Aug '22

Module: kamailio Branch: master Commit: 43d927970f4be565284f53e986171eb3512c6b63 URL: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-08-13T21:52:30+08:00 tls_wolfssl: wolfSSL â update to v5.4.0-stable - the upstream commit also fixes GCC warnings so we don't have to workaround with -Wno-xxxxxx --- Modified: misc/external/wolfssl/wolfssl Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… Patch: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index e722c15be86..57aac1c50b4 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit e722c15be860794179082a05d09e6a90dc77ccf0 +Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8 diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index f6a27f7f34e..a04edc40b4d 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -23,7 +23,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC -Wno-error=array-bounds -Wno-error=stringop-overflow" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-aligndata=no \ --disable-shared --disable-examples \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \

1 0

git:master:9a35ce57: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: 9a35ce57270d259f60a116322d17a411c58bcb4f URL: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-12T16:31:16+02:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… Patch: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index 7cbabac6c8..435db783fa 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -663,67 +663,72 @@ d in the user-agent header ($ua)"); ... User-agent ========== -[+] Blacklisted - ----------- - 0001 -> friendly-scanner - 0002 -> pplsip - 0003 -> sipcli - 0004 -> sundayddr - 0005 -> iWar - 0006 -> sipsak - 0007 -> VaxSIPUserAgent - 0008 -> SimpleSIP - 0009 -> SIP Call - 0010 -> Ozeki - 0011 -> VoIPSec - 0012 -> SIPScan - 0013 -> Conaito - 0014 -> UsaAirport - 0015 -> PortSIP VoIP SDK - 0016 -> zxcvfdf11 - 0017 -> fdgddfg546df4g8d5f - -[+] Whitelisted - ----------- - 0001 -> my custom ua +{ + User-Agent: { + Blacklisted: { + Value: friendly-scanner + Value: pplsip + Value: sipcli + Value: sundayddr + Value: iWar + Value: sipsak + Value: VaxSIPUserAgent + Value: SimpleSIP + Value: SIP Call + Value: Ozeki + Value: VoIPSec + Value: SIPScan + Value: Conaito + Value: UsaAirport + Value: PortSIP VoIP SDK + Value: zxcvfdf11 + Value: fdgddfg546df4g8d5f + Value: siptest + Value: Nmap NSE + } + Whitelisted: { + Value: my custom ua + } + } +} ... 7.2. Statistics Example 1.25. kamcmd secfilter.stats ... -Blocked messages (blacklist) -============================ -[+] By user-agent : 1256 -[+] By country : 45 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 1 -[+] By IP address : 2552 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 316 -[+] By to user : 134 -[+] By contact user : 0 - -Allowed messages (whitelist) -============================ -[+] By user-agent : 0 -[+] By country : 478 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 0 -[+] By IP address : 0 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 0 -[+] By to user : 0 -[+] By contact user : 0 - -Other blocked messages -====================== -[+] Destinations : 0 -[+] SQL injection : 213 +{ + Blacklist: { + User-Agent: 1256 + Country: 45 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 1 + IP-Address: 2552 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 316 + To-User: 0134 + Contact-User: 0 + } + Whitelist: { + User-Agent: 0 + Country: 478 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 0 + IP-Address: 0 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 0 + To-User: 0 + Contact-User: 0 + } + Other: { + Destination: 0 + SQL-Injection: 213 + } +} ...

1 0

[kamailio/kamailio] secfilter: Wrong format on RPC response data (Issue #2992)
by Olle E. Johansson 12 Aug '22

12 Aug '22

secfilter RPC functions to get statistics use a console format to printing data, suitable for **kamcmd** but not for any RPC method. This should be converted to a machine-parsable data structure (much like dispatcher, usrloc and htable data dumps). -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2992 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2992(a)github.com>

2 3

[kamailio/kamailio] secfilter: machine-parsable data structure for RPC printing data (PR #3213)
by Jose Luis Verdeguer 12 Aug '22

12 Aug '22

#### 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/3213 -- Commit Summary -- * secfilter: machine-parsable data structure for RPC printing data -- File Changes -- M src/modules/secfilter/secfilter_rpc.c (383) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3213.patch https://github.com/kamailio/kamailio/pull/3213.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3213 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3213(a)github.com>

3 8

git:master:d5ef682e: secfilter: updated samples [skip ci]
by Jose Luis Verdeguer 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: d5ef682ebe98ca87021a8e2344bb94c75747f53e URL: https://github.com/kamailio/kamailio/commit/d5ef682ebe98ca87021a8e2344bb94c… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-08-12T16:18:48+02:00 secfilter: updated samples [skip ci] --- Modified: src/modules/secfilter/doc/secfilter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5ef682ebe98ca87021a8e2344bb94c… Patch: https://github.com/kamailio/kamailio/commit/d5ef682ebe98ca87021a8e2344bb94c… --- diff --git a/src/modules/secfilter/doc/secfilter_admin.xml b/src/modules/secfilter/doc/secfilter_admin.xml index ce7b6cea27a..9daa67d9523 100644 --- a/src/modules/secfilter/doc/secfilter_admin.xml +++ b/src/modules/secfilter/doc/secfilter_admin.xml @@ -814,29 +814,34 @@ ... User-agent ========== -[+] Blacklisted - ----------- - 0001 -> friendly-scanner - 0002 -> pplsip - 0003 -> sipcli - 0004 -> sundayddr - 0005 -> iWar - 0006 -> sipsak - 0007 -> VaxSIPUserAgent - 0008 -> SimpleSIP - 0009 -> SIP Call - 0010 -> Ozeki - 0011 -> VoIPSec - 0012 -> SIPScan - 0013 -> Conaito - 0014 -> UsaAirport - 0015 -> PortSIP VoIP SDK - 0016 -> zxcvfdf11 - 0017 -> fdgddfg546df4g8d5f - -[+] Whitelisted - ----------- - 0001 -> my custom ua +{ + User-Agent: { + Blacklisted: { + Value: friendly-scanner + Value: pplsip + Value: sipcli + Value: sundayddr + Value: iWar + Value: sipsak + Value: VaxSIPUserAgent + Value: SimpleSIP + Value: SIP Call + Value: Ozeki + Value: VoIPSec + Value: SIPScan + Value: Conaito + Value: UsaAirport + Value: PortSIP VoIP SDK + Value: zxcvfdf11 + Value: fdgddfg546df4g8d5f + Value: siptest + Value: Nmap NSE + } + Whitelisted: { + Value: my custom ua + } + } +} ... </programlisting> </example> @@ -850,40 +855,40 @@ User-agent <programlisting format="linespecific"> ... -Blocked messages (blacklist) -============================ -[+] By user-agent : 1256 -[+] By country : 45 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 1 -[+] By IP address : 2552 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 316 -[+] By to user : 134 -[+] By contact user : 0 - -Allowed messages (whitelist) -============================ -[+] By user-agent : 0 -[+] By country : 478 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 0 -[+] By IP address : 0 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 0 -[+] By to user : 0 -[+] By contact user : 0 - -Other blocked messages -====================== -[+] Destinations : 0 -[+] SQL injection : 213 +{ + Blacklist: { + User-Agent: 1256 + Country: 45 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 1 + IP-Address: 2552 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 316 + To-User: 0134 + Contact-User: 0 + } + Whitelist: { + User-Agent: 0 + Country: 478 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 0 + IP-Address: 0 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 0 + To-User: 0 + Contact-User: 0 + } + Other: { + Destination: 0 + SQL-Injection: 213 + } +} ... </programlisting> </example>

1 0

git:master:fe20e16b: secfilter: machine-parsable data structure for RPC printing data
by Jose Luis Verdeguer 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: fe20e16bf1e1656ef794699db345eefd3d1b8ac8 URL: https://github.com/kamailio/kamailio/commit/fe20e16bf1e1656ef794699db345eef… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-08-12T16:18:48+02:00 secfilter: machine-parsable data structure for RPC printing data --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/fe20e16bf1e1656ef794699db345eef… Patch: https://github.com/kamailio/kamailio/commit/fe20e16bf1e1656ef794699db345eef…

1 0

[kamailio/kamailio] build warnings (Issue #3208)
by sergey-safarov 12 Aug '22

12 Aug '22

``` CC (gcc) [kamailio] core/crypto/shautils.o CC (gcc) [kamailio] core/cfg/cfg.o CC (gcc) [kamailio] core/cfg/cfg_ctx.o core/cfg/cfg_ctx.c: In function 'cfg_update_defaults': core/cfg/cfg_ctx.c:287:28: warning: the comparison will always evaluate as 'true' for the pointer operand in '(unsigned char *)&ginst->vars + (sizetype)var->offset' must not be NULL [-Waddress] 287 | if(ginst->vars + var->offset) { | ^~~~~ CC (gcc) [kamailio] core/cfg/cfg_script.o CC (gcc) [kamailio] core/cfg/cfg_select.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3208 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3208(a)github.com>

2 2

git:master:26785f86: core/cfg: cast pointer to long to silent compiler warning
by Daniel-Constantin Mierla 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: 26785f866eeadc6944af83ae1a57e8ff100f60f5 URL: https://github.com/kamailio/kamailio/commit/26785f866eeadc6944af83ae1a57e8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-12T14:32:20+02:00 core/cfg: cast pointer to long to silent compiler warning - GH #3208 --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/26785f866eeadc6944af83ae1a57e8f… Patch: https://github.com/kamailio/kamailio/commit/26785f866eeadc6944af83ae1a57e8f… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index a1e761f3a21..a9f19464bec 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -284,7 +284,7 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, meta->array = array; clone_done = 1; } - if(ginst->vars + var->offset) { + if((unsigned long)ginst->vars + var->offset) { memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); } else { LM_ERR("invalid variable offset\n");

1 0

[kamailio/kamailio] Missing documentation of deprecated ring_insert_callid in siputils (Issue #3212)
by Niklas Larsson 12 Aug '22

12 Aug '22

### Description Upgraded to 5.6 from 5.5, looked through docs - and no mention of removal of ring_insert_callid - so upgrade failed. Found https://github.com/kamailio/kamailio/issues/2989 ### Possible Solutions Add documentation that the function is removed, and how to replace it with textops/htable and/or reply routes -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3212 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3212(a)github.com>

3 3

[kamailio/kamailio] Fix ksr_version_control() for FreeBSD build (PR #3184)
by Boris Korzun 12 Aug '22

12 Aug '22

#### 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 a problem after upgrade to 5.6 on FreeBSD. Kamailio isn't starting successful. ``` 14:19:20.540514 kamailio 40921 - - DEBUG: <core> [core/cfg.y:1964]: yyparse(): loading module tls.so 14:19:20.540893 kamailio 40921 - - DEBUG: <core> [core/sr_module.c:513]: ksr_locate_module(): found module to load </usr/local/lib/kamailio/modules/tls.so> 14:19:20.540912 kamailio 40921 - - DEBUG: <core> [core/sr_module.c:563]: load_module(): trying to load </usr/local/lib/kamailio/modules/tls.so> 14:19:20.543301 kamailio 40921 - - ERROR: <core> [core/sr_module.c:352]: ksr_version_control(): no version info in module </usr/local/lib/kamailio/modules/tls.so>: Undefined symbol "_nss_cache_cycle_prevention_function" ``` The problem is in `ksr_version_control()` probably. In FreeBSD environment it should to flush `dlerror` before call `dlsym()` - [dlopen(3)](https://www.freebsd.org/cgi/man.cgi?query=dlopen&sektion=3&a…at=html). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3184 -- Commit Summary -- * core: fix ksr_version_control() for FreeBSD build -- File Changes -- M src/core/sr_module.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3184.patch https://github.com/kamailio/kamailio/pull/3184.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3184 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3184(a)github.com>

2 2

git:master:a8769af4: core: fix ksr_version_control() for FreeBSD build
by Daniel-Constantin Mierla 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: a8769af4c3a497d0f6a81cff17861e566ffa87bc URL: https://github.com/kamailio/kamailio/commit/a8769af4c3a497d0f6a81cff17861e5… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-12T13:52:38+02:00 core: fix ksr_version_control() for FreeBSD build --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/a8769af4c3a497d0f6a81cff17861e5… Patch: https://github.com/kamailio/kamailio/commit/a8769af4c3a497d0f6a81cff17861e5… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 2d787d7f9f3..013598c2a76 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -347,6 +347,9 @@ int ksr_version_control(void *handle, char *path) char **m_flags; char* error; +#ifdef __FreeBSD__ + (void) dlerror(); +#endif m_ver=(char **)dlsym(handle, "module_version"); if ((error=(char *)dlerror())!=0) { LM_ERR("no version info in module <%s>: %s\n", path, error);

1 0

Large memory allocation on module startup
by kthulasizwe＠gmail.com 12 Aug '22

12 Aug '22

Hi Guys, I have recently modified a custom module, where I now shm_mallocxz 2MB, as part of module start up and this memory is not being used as yet. Previously, the would be smaller chunks(100 bytes at most) shm_malloced during message processing. I have observed significant runtime performance degradation from just this single change. I would appreciate any suggestions/thoughts you might have. Below are some the relevant details. OS:Alpine Linux RAM: 16GB Configured Shared memory: 4GB shm_force_alloc=1 Typical shared memory usage: 1.5GB System swapping is disabled, also observed during load testing that no mem is getting swapped.

2 6

[kamailio/kamailio] uac_redirect: segfault when calling get_redirects("1") [regression] (Issue #3197)
by Alex Hermann 12 Aug '22

12 Aug '22

Since updating to 5.6, Kamailio segfaults when calling `get_redirects("1")`. ``` #0 0x000055d12c93c527 in get_str_fparam (dst=dst@entry=0x7ffd246edfe0, msg=msg@entry=0x7f83973b6a80, param=0x0) at core/sr_module.c:1646 val = {n = 1, s = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 749136082}, re = 0x1} ret = <optimized out> avp = <optimized out> pv_val = {rs = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 749136082}, ri = 1, flags = 0} __func__ = "get_str_fparam" #1 0x00007f838d2f0a17 in w_get_redirect2 (msg=0x7f83973b6a80, max_c=0x0, reason=<optimized out>) at uac_redirect.c:337 n = <optimized out> max = <optimized out> sreason = {s = 0x1a <error: Cannot access memory at address 0x1a>, len = -828131391} __func__ = "w_get_redirect2" #2 0x000055d12c975624 in do_action (h=h@entry=0x7ffd246ee820, a=a@entry=0x7f83cedd3670, msg=msg@entry=0x7f83973b6a80) at core/action.c:1085 ret = <optimized out> v = <optimized out> ... ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3197 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3197(a)github.com>

4 5

git:master:3b1354e2: uac_redirect: check if reason parameter ifs provided for get_redirects()
by Daniel-Constantin Mierla 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: 3b1354e2fd26c06fa6bc5ddbee1a012507aa2ea5 URL: https://github.com/kamailio/kamailio/commit/3b1354e2fd26c06fa6bc5ddbee1a012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-12T09:16:24+02:00 uac_redirect: check if reason parameter ifs provided for get_redirects() - cope properly with the common function used for the two function variants - GH #3197 --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/3b1354e2fd26c06fa6bc5ddbee1a012… Patch: https://github.com/kamailio/kamailio/commit/3b1354e2fd26c06fa6bc5ddbee1a012… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 76b7592b5a..9925621d0e 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -344,17 +344,19 @@ static int w_get_redirect2(struct sip_msg* msg, char *max_c, char *reason) { int n; unsigned short max; - str sreason; + str sreason = {0}; - if(fixup_get_svalue(msg, (gparam_t*)reason, &sreason)<0) { - LM_ERR("failed to get reason parameter\n"); - return -1; + if(reason!=NULL) { + if(fixup_get_svalue(msg, (gparam_t*)reason, &sreason)<0) { + LM_ERR("failed to get reason parameter\n"); + return -1; + } } msg_tracer( msg, 0); /* get the contacts */ max = (unsigned short)(long)max_c; - n = get_redirect(msg , (max>>8)&0xff, max&0xff, &sreason, bflags); + n = get_redirect(msg , (max>>8)&0xff, max&0xff, (reason)?&sreason:NULL, bflags); reset_filters(); /* reset the tracer */ msg_tracer( msg, 1);

1 0

git:master:939ceb33: usrloc: do not send keepalives when destroying modules
by Daniel-Constantin Mierla 11 Aug '22

11 Aug '22

Module: kamailio Branch: master Commit: 939ceb3390b171b773eeb438b8fff72022e4f6f0 URL: https://github.com/kamailio/kamailio/commit/939ceb3390b171b773eeb438b8fff72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-11T21:49:22+02:00 usrloc: do not send keepalives when destroying modules - GH #3207 --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/939ceb3390b171b773eeb438b8fff72… Patch: https://github.com/kamailio/kamailio/commit/939ceb3390b171b773eeb438b8fff72… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 5b1572483b..8808725849 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -33,6 +33,7 @@ #include "../../core/forward.h" #include "../../core/globals.h" #include "../../core/pvar.h" +#include "../../core/sr_module.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -110,6 +111,11 @@ int ul_ka_urecord(urecord_t *ur) if (ul_ka_mode == ULKA_NONE) { return 0; } + + if(likely(destroy_modules_phase()!=0)) { + return 0; + } + LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); tnow = time(NULL);

1 0

git:master:40d0c0ef: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 40d0c0ef19439ba03822c1a875ea0461f3f1106b URL: https://github.com/kamailio/kamailio/commit/40d0c0ef19439ba03822c1a875ea046… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-10T22:46:19+02:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/40d0c0ef19439ba03822c1a875ea046… Patch: https://github.com/kamailio/kamailio/commit/40d0c0ef19439ba03822c1a875ea046… --- diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index 812755bc5d..c016467df9 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -205,10 +205,12 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") 4.4. acc_function (string) Specifies the accounting function to be used. Just by defining this - parameter, the accounting support will not be enabled. Accounting may - only be enabled via two parameters set_accept_filter() scripting + parameter, the accounting is not done automatically, it has to be + requested via parameters of set_accept_filter() or other scripting function. + Set it to empty string in order to disable binding to acc module. + Its values may be: * acc_log_request * acc_db_request @@ -224,10 +226,7 @@ modparam("uac_redirect","acc_function","acc_db_request") 4.5. acc_db_table (string) Specifies the accounting table to be used if DB accounting was chosen - (acc_function was set to “acc_db_request”). Just by defining this - parameter, the accounting support will not be enabled. Accounting may - only be enabled via two parameters set_accept_filter() scripting - function. + (acc_function was set to “acc_db_request” or “acc_request”). The default value is “acc”.

1 0

git:master:7ef109e6: uac_redirect: clarifications for acc_function mod param
by Daniel-Constantin Mierla 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 7ef109e6cd1ce7ecbfa56c31ff7555275e59095f URL: https://github.com/kamailio/kamailio/commit/7ef109e6cd1ce7ecbfa56c31ff75552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-10T22:39:03+02:00 uac_redirect: clarifications for acc_function mod param --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7ef109e6cd1ce7ecbfa56c31ff75552… Patch: https://github.com/kamailio/kamailio/commit/7ef109e6cd1ce7ecbfa56c31ff75552… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 1388fc740a4..71a448a6ae7 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -211,11 +211,14 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") <section id="uac_redirect.p.acc_function"> <title><varname>acc_function</varname> (string)</title> <para> - Specifies the accounting function to be used. Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting function to be used. Just by defining + this parameter, the accounting is not done automatically, it has to + be requested via parameters of + <function moreinfo="none">set_accept_filter()</function> + or other scripting function. + </para> + <para> + Set it to empty string in order to disable binding to acc module. </para> <para> Its values may be: @@ -248,13 +251,9 @@ modparam("uac_redirect","acc_function","acc_db_request") <section id="uac_redirect.p.acc_db_table"> <title><varname>acc_db_table</varname> (string)</title> <para> - Specifies the accounting table to be used if DB accounting was - chosen (<varname>acc_function</varname> was set to - <quote>acc_db_request</quote>). Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting table to be used if DB accounting was + chosen (<varname>acc_function</varname> was set to + <quote>acc_db_request</quote> or <quote>acc_request</quote>). </para> <para> <emphasis>

1 0

[kamailio/kamailio] Fix isup generic_number and generic_number_nai decoding (PR #3209)
by russagit 10 Aug '22

10 Aug '22

#### 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 ISUP parameter Generic Number has a different structure (offset+2 is a Number Quilifirer Indicator) than other numbers, so this fix addresses it's decoding bug You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3209 -- Commit Summary -- * Fix isup generic_number and generic_number_nai decoding -- File Changes -- M src/modules/sipt/ss7_parser.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3209.patch https://github.com/kamailio/kamailio/pull/3209.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3209 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3209(a)github.com>

2 2

git:master:9f3d1c27: sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209)
by Henning Westerholt 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 9f3d1c274ad926e9640d0091c9702a34f8b2e539 URL: https://github.com/kamailio/kamailio/commit/9f3d1c274ad926e9640d0091c9702a3… Author: russagit <rustam.safargalin(a)sifox.ru> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-10T09:23:57Z sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209) --- Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/9f3d1c274ad926e9640d0091c9702a3… Patch: https://github.com/kamailio/kamailio/commit/9f3d1c274ad926e9640d0091c9702a3… --- diff --git a/src/modules/sipt/ss7_parser.c b/src/modules/sipt/ss7_parser.c index 30d85cdb1e2..eaac53e5ca0 100644 --- a/src/modules/sipt/ss7_parser.c +++ b/src/modules/sipt/ss7_parser.c @@ -570,7 +570,7 @@ int isup_get_generic_number_nai(unsigned char *buf, int len) if(offset != -1 && len-offset-2 > 1) { - return buf[offset+2] & 0x7F; + return buf[offset+3] & 0x7F; } return -1; } @@ -586,13 +586,13 @@ int isup_get_generic_number(unsigned char *buf, int len, char* sb_buf) if(offset != -1 && len-offset-2 > 1) { sbparamlen = (buf[offset+1] & 0xFF) - 2; - oddeven = (buf[offset+2] >> 7) & 0x1; + oddeven = (buf[offset+3] >> 7) & 0x1; while ((sbparamlen > 0) && (buf[offset] != 0)) { - sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+4+sb_j] & 0x0F)]; + sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+5+sb_j] & 0x0F)]; if(sbparamlen > 1 || oddeven == 0) { - sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+4+sb_j] >>4 & 0x0F)]; + sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+5+sb_j] >>4 & 0x0F)]; } sb_i=sb_i+2; sbparamlen--;

1 0

git:master:d6ef0bf4: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: d6ef0bf487e6246092683e0281f5323f056cdaf4 URL: https://github.com/kamailio/kamailio/commit/d6ef0bf487e6246092683e0281f5323… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-10T09:31:18+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/d6ef0bf487e6246092683e0281f5323… Patch: https://github.com/kamailio/kamailio/commit/d6ef0bf487e6246092683e0281f5323… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 2ec0fb1de3..ca57cc7a0c 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -575,7 +575,8 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") 3.25. trace_dialog_ack (str) - Enable tracing of in-dialog ACK. + Enable tracing of in-dialog ACK. Before this param, one must have set + the onsend() route and captured the outgoing ACK there. Default value is 1 (enabled). @@ -586,7 +587,10 @@ modparam("siptrace", "trace_dialog_ack", 1) 3.26. trace_dialog_spiral (str) - Enable tracing of dialog spirals. + Enable tracing of dialog spirals. A spiraled dialog is a dialog + established by a SIP INVITE that loops back to the same kamailio(as + next hop). Right now, inside the siptrace code, a spiraled dialog is + identified by (*params->param == NULL). Default value is 1 (enabled).

1 0

git:master:b4ab0fdc: siptrace: Update doc for the two new modparams
by Stefan Mititelu 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: b4ab0fdcb9f49b2a3b3cac24b20a0f4e50283468 URL: https://github.com/kamailio/kamailio/commit/b4ab0fdcb9f49b2a3b3cac24b20a0f4… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-08-10T10:24:51+03:00 siptrace: Update doc for the two new modparams --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b4ab0fdcb9f49b2a3b3cac24b20a0f4… Patch: https://github.com/kamailio/kamailio/commit/b4ab0fdcb9f49b2a3b3cac24b20a0f4… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index ec5a5da63c..430c35b4f8 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -656,6 +656,7 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") <title><varname>trace_dialog_ack</varname> (str)</title> <para> Enable tracing of in-dialog ACK. + Before this param, one must have set the onsend() route and captured the outgoing ACK there. </para> <para> Default value is 1 (enabled). @@ -674,6 +675,8 @@ modparam("siptrace", "trace_dialog_ack", 1) <title><varname>trace_dialog_spiral</varname> (str)</title> <para> Enable tracing of dialog spirals. + A spiraled dialog is a dialog established by a SIP INVITE that loops back to the same kamailio(as next hop). + Right now, inside the siptrace code, a spiraled dialog is identified by (*params->param == NULL). </para> <para> Default value is 1 (enabled).

2 1

git:master:501421f4: siptrace: Trace in-dialog ACK and dialog spirals
by Henning Westerholt 10 Aug '22

10 Aug '22

Module: kamailio Branch: master Commit: 501421f42c17a411bde0fb2401437fa2ba1f5c66 URL: https://github.com/kamailio/kamailio/commit/501421f42c17a411bde0fb2401437fa… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-08T15:16:34+02:00 siptrace: Trace in-dialog ACK and dialog spirals Enable behavior via 2 new modparams. --- Modified: src/modules/siptrace/doc/siptrace_admin.xml Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/501421f42c17a411bde0fb2401437fa… Patch: https://github.com/kamailio/kamailio/commit/501421f42c17a411bde0fb2401437fa… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index c160b97275e..7852647f37d 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -651,6 +651,43 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") </programlisting> </example> </section> + + <section id="siptrace.p.trace_dialog_ack"> + <title><varname>trace_dialog_ack</varname> (str)</title> + <para> + Enable tracing of in-dialog ACK. + </para> + <para> + Default value is 0 (disabled). + </para> + <example> + <title>Set <varname>trace_dialog_ack</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("siptrace", "trace_dialog_ack", 1) +... +</programlisting> + </example> + </section> + + <section id="siptrace.p.trace_dialog_spiral"> + <title><varname>trace_dialog_spiral</varname> (str)</title> + <para> + Enable tracing of dialog spirals. + </para> + <para> + Default value is 0 (disabled). + </para> + <example> + <title>Set <varname>trace_dialog_spiral</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("siptrace", "trace_dialog_spiral", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 9540e83d062..81913f064da 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -195,6 +195,10 @@ static str trace_local_ip = {NULL, 0}; static db1_con_t *db_con = NULL; /*!< database connection */ static db_func_t db_funcs; /*!< Database functions */ +int trace_dialog_ack = 0; +int trace_dialog_spiral = 0; +static int spiral_tracked; + int pv_parse_siptrace_name(pv_spec_t *sp, str *in); int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -263,6 +267,8 @@ static param_export_t params[] = { {"trace_init_mode", PARAM_INT, &_siptrace_init_mode}, {"trace_mode", PARAM_INT, &_siptrace_mode}, {"evcb_msg", PARAM_STR, &_siptrace_evcb_msg}, + {"trace_dialog_ack", PARAM_INT, &trace_dialog_ack}, + {"trace_dialog_spiral", PARAM_INT, &trace_dialog_spiral}, {0, 0, 0} }; /* clang-format on */ @@ -1979,12 +1985,19 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p } /* request - params->req */ - if (params == NULL || params->req == NULL) { + if (params == NULL || (!trace_dialog_spiral && params->req == NULL)) { LM_ERR("Invalid args!\n"); return; } - if (!(params->req->msg_flags & FL_SIPTRACE)) { + if (trace_dialog_spiral && *params->param == NULL) { + LM_DBG("Spiraled dialog!\n"); + if (dlgb.register_dlgcb(dlg, DLGCB_SPIRALED, trace_dialog, &spiral_tracked, NULL) != 0) { + LM_ERR("could not register consider_exporting() for dialog event DLGCB_SPIRALED\n"); + } + } + + if (!trace_dialog_spiral && !(params->req->msg_flags & FL_SIPTRACE)) { LM_DBG("Trace is off for this request...\n"); return; } @@ -2007,6 +2020,13 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p return; } + /* this will trace in-dialog ACK */ + if(trace_dialog_ack && dlgb.register_dlgcb(dlg, DLGCB_CONFIRMED, + trace_dialog_transaction, xavp->val.v.vptr, 0) != 0) { + LM_ERR("Failed to register DLGCB_CONFIRMED callback!\n"); + return; + } + if(dlgb.register_dlgcb(dlg, DLGCB_TERMINATED, trace_dialog_transaction, xavp->val.v.vptr, trace_free_info) != 0) { LM_ERR("Failed to register DLGCB_TERMINATED callback!\n");

3 2

Kamailio World Conference - Sep 7-8, 2022 - Online
by Daniel-Constantin Mierla 10 Aug '22

10 Aug '22

For the 3rd year, we are planning an online version of Kamailio World Conference! At the beginning of 2022, the situation was not clear in terms of whether pandemic would decrease enough in intensity and we would be allowed to organize an on-site event late spring/beginner of summer, when the usual Kamailio Conference took place in Berlin, therefore we chose the safety path. But we hope that next year we will return in-person to the beautiful Berlin city center! The event this year, to happen in 4 weeks from now (Sep 7-8, 2022), follows the structure from previous edition, being two afternoons with presentations about Kamailio, sharing technical solutions and open discussions, allowing the community to interact and reconnect. The website of the event: - https://kamailioworld.com/k10-online/ There is no registration required, the event will happen on live video conferencing, also streamed to youtube. A text chatting channel will be made available as well. If you want to present, just send me the title and a short description -- we encourage community members to step forward and share their knowledge. It has to be related to Kamailio and fit within a 30min slot (including the questions). The agenda will be released in the near future. The event will be used also to celebrate 21 years of Kamailio project development, first commit being done on Sep 3, 2001. Two other major celebrations for 2022 to make the party bigger: - 20 years of open source for the project -- after one year of internal development, GPL was added on Sep 19, 2002 and source code was released to public - the 10th edition of Kamailio World Conference Book the dates in your agenda! I am looking forward to a very interesting event and (re-)connecting with many of you! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] SMSOPS: body < 3 characters not transmitted (empty) (Issue #3211)
by gmaruzz 09 Aug '22

09 Aug '22

Hello, seems to me that if cellphone sends an SMS shorter than 3 characters (eg: "aa") it is sent as empty string this maybe because of some snafu in PDU "payload" management in smsops_impl.c , pointer arithmetic between different characters' coding (ASCII, UTF8, UCS2, etc) (tested with OnePlus 5t, 6t, Open5GS, SRSRAN) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3211 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3211(a)github.com>

2 7

git:master:25bec8ef: tm: use similar coding style for tm_xdata_replace as for tm_xdata_swap
by Henning Westerholt 09 Aug '22

09 Aug '22

Module: kamailio Branch: master Commit: 25bec8eff91b332530095ada3997b92edbb5cce6 URL: https://github.com/kamailio/kamailio/commit/25bec8eff91b332530095ada3997b92… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T14:05:00Z tm: use similar coding style for tm_xdata_replace as for tm_xdata_swap --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/25bec8eff91b332530095ada3997b92… Patch: https://github.com/kamailio/kamailio/commit/25bec8eff91b332530095ada3997b92… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index db6117e557..6149c363d4 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -575,10 +575,7 @@ void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) xavp_set_list(bakxd->xavps_list); xavu_set_list(bakxd->xavus_list); xavi_set_list(bakxd->xavis_list); - return; - } - - if(newxd != NULL && bakxd != NULL) { + } else if(newxd != NULL && bakxd != NULL) { LM_DBG("replace existing list in backup xd from new xd\n"); bakxd->uri_avps_from = set_avp_list( AVP_TRACK_FROM | AVP_CLASS_URI, &newxd->uri_avps_from); @@ -595,7 +592,6 @@ void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) bakxd->xavps_list = xavp_set_list(&newxd->xavps_list); bakxd->xavus_list = xavu_set_list(&newxd->xavus_list); bakxd->xavis_list = xavi_set_list(&newxd->xavis_list); - return; } }

1 0

git:master:da017867: tm: add a comment to tm_xdata_swap
by Henning Westerholt 09 Aug '22

09 Aug '22

Module: kamailio Branch: master Commit: da0178673f9a47600329fff2c3105e0fbfbd78f7 URL: https://github.com/kamailio/kamailio/commit/da0178673f9a47600329fff2c3105e0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T14:15:04Z tm: add a comment to tm_xdata_swap --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/da0178673f9a47600329fff2c3105e0… Patch: https://github.com/kamailio/kamailio/commit/da0178673f9a47600329fff2c3105e0… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 6149c363d4..74e47ef7d8 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -514,6 +514,7 @@ struct s_table *init_hash_table() * backup xdata from/to msg context to local var and use T lists * - mode = 0 - from msg context to _txdata and use T lists * - mode = 1 - restore to msg context from _txdata + * the function can be also used to restore the core context from transacation data */ void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode) {

1 0

git:master:6b83bc4c: tm: use internal function tm_xdata_swap instead of manually copy X/AVPs
by Henning Westerholt 09 Aug '22

09 Aug '22

Module: kamailio Branch: master Commit: 6b83bc4cd6da55582793321e6c1f36ff71c4233a URL: https://github.com/kamailio/kamailio/commit/6b83bc4cd6da55582793321e6c1f36f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T13:52:42Z tm: use internal function tm_xdata_swap instead of manually copy X/AVPs --- Modified: src/modules/tm/t_hooks.c --- Diff: https://github.com/kamailio/kamailio/commit/6b83bc4cd6da55582793321e6c1f36f… Patch: https://github.com/kamailio/kamailio/commit/6b83bc4cd6da55582793321e6c1f36f…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev