sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev