- sr-dev - kamailio.org

git:master:bd42130e: misc/examples: kemi - sanity checks for response in python script
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: bd42130e3cfb87856b4b0431de50eccdd4324f9f URL: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T08:55:51+01:00 misc/examples: kemi - sanity checks for response in python script --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… Patch: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 601daa3687..f62f392594 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -172,7 +172,7 @@ def ksr_route_reqinit(self, msg): KSR.sl.sl_send_reply(200,"Keepalive") return -255 - if KSR.sanity.sanity_check(1511, 7)<0 : + if KSR.sanity.sanity_check(17895, 7)<0 : KSR.err("Malformed SIP message from " + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) +"\n") return -255 @@ -372,7 +372,14 @@ def ksr_failure_manage(self, msg): # SIP response handling # -- equivalent of reply_route{} def ksr_reply_route(self, msg): - KSR.info("===== response - from kamailio python script\n") + KSR.dbg("response handling - python script\n") + + if KSR.sanity.sanity_check(17604, 6)<0 : + KSR.err("Malformed SIP response from " + + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) +"\n") + KSR.set_drop() + return -255 + return 1

1 0

[kamailio/kamailio] How to change language in siremis web interface? (Issue #2979)
by Mohammadb06 20 Dec '21

20 Dec '21

Hello everyone I’m new in siremis as web interface of kamailio and I immediately need your help,I installed kamailio and siremis and login in siremis web interface,I can work with it but now I have a problem. I want to change menu language there is an option in(setting->translate->manage languages) add my desired language and click save and i see this error: Error message: #2, count(): Parameter must be an array or an object that implements Countable Script name and line number of error: /var/www/siremis-5.3.x/siremis/modules/translation/lib/LangPackCreator.php ![Screenshot from 2021-12-19 12-46-52](https://user-images.githubusercontent.com/84019067/146672269-4734… what’s wrong and what should I do to resolve it? thank you for your help and I am pleased to receive your response -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2979 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2979(a)github.com>

2 2

git:master:99a9f27c: misc/examples: kemi - update lua sample config
by Daniel-Constantin Mierla 19 Dec '21

19 Dec '21

Module: kamailio Branch: master Commit: 99a9f27c8d24a06f201b4713f7a2bfeb37092482 URL: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-19T17:55:55+01:00 misc/examples: kemi - update lua sample config --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… Patch: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index a406b6429c..7b1476efb1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -80,18 +80,20 @@ function ksr_request_route() return 1; end + -- handle retransmissions + if not KSR.is_ACK() then + if KSR.tmx.t_precheck_trans()>0 then + KSR.tm.t_check_trans(); + return 1; + end + if KSR.tm.t_check_trans()==0 then return 1 end + end + -- handle requests within SIP dialogs ksr_route_withindlg(); -- -- only initial requests (no To tag) - -- handle retransmissions - if KSR.tmx.t_precheck_trans()>0 then - KSR.tm.t_check_trans(); - return 1; - end - if KSR.tm.t_check_trans()==0 then return 1 end - -- authentication ksr_route_auth(); @@ -158,6 +160,11 @@ end -- Per SIP request initial checks function ksr_route_reqinit() + -- no connect for sending replies + KSR.set_reply_no_connect(); + -- enforce symmetric signaling + -- send back replies to the source address of request + KSR.force_rport(); if not KSR.is_myself_srcip() then local srcip = KSR.kx.get_srcip(); if KSR.htable.sht_match_name("ipban", "eq", srcip) > 0 then @@ -194,7 +201,7 @@ function ksr_route_reqinit() KSR.x.exit(); end - if KSR.sanity.sanity_check(1511, 7)<0 then + if KSR.sanity.sanity_check(17895, 7)<0 then KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); @@ -319,7 +326,6 @@ function ksr_route_natdetect() if not KSR.nathelper then return 1; end - KSR.force_rport(); if KSR.nathelper.nat_uac_test(19)>0 then if KSR.is_REGISTER() then KSR.nathelper.fix_nated_register();

1 0

git:master:8e7f2e6a: dlgs: optimize dlgs_init, if/else path are identical
by Henning Westerholt 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: 8e7f2e6a158bb2c59600b03be3c7e6eefc416180 URL: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-12-17T12:53:37Z dlgs: optimize dlgs_init, if/else path are identical --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… Patch: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 46de9d5c44..a0c7af791e 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -174,11 +174,7 @@ static int ki_dlgs_init(sip_msg_t *msg, str *src, str *dst, str *data) if(msg->first_line.type == SIP_REQUEST) { rtype = SIP_REQUEST; - if(msg->first_line.u.request.method_value == METHOD_INVITE) { - rmethod = METHOD_INVITE; - } else { - rmethod = msg->first_line.u.request.method_value; - } + rmethod = msg->first_line.u.request.method_value; } else { rtype = SIP_REPLY; if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) ||

1 0

git:master:a993f153: kemix: added KSR.kx.get_rcvaddr_sock() - return local received address in socket format
by Daniel-Constantin Mierla 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: a993f1538918c6c31c5da031e1d903250c4a9048 URL: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:45:11+01:00 kemix: added KSR.kx.get_rcvaddr_sock() - return local received address in socket format --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… Patch: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 3fb079349a..80d7807740 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -585,6 +585,38 @@ static sr_kemi_xval_t* ki_kx_get_rcv_sock_name(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvaddr_sock(sip_msg_t *msg) +{ + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + + } + + if(msg->rcv.bind_address==NULL || msg->rcv.bind_address->sock_str.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + if (msg->rcv.bind_address->sock_str.len + 1 >= pv_get_buffer_size()) { + LM_ERR("local buffer size exceeded\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.v.s.s = pv_get_buffer(); + strncpy(_sr_kemi_kx_xval.v.s.s, msg->rcv.bind_address->sock_str.s, + msg->rcv.bind_address->sock_str.len); + _sr_kemi_kx_xval.v.s.len = msg->rcv.bind_address->sock_str.len; + _sr_kemi_kx_xval.v.s.s[_sr_kemi_kx_xval.v.s.len] = '\0'; + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -1473,6 +1505,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_rcvaddr_sock"), + SR_KEMIP_XVAL, ki_kx_get_rcvaddr_sock, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_proto"), SR_KEMIP_XVAL, ki_kx_get_proto, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:2aae3ee3: pv: added $Ras - return local received address in socket format
by Daniel-Constantin Mierla 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: 2aae3ee39ea56e349879e25234a75aa79ff4284d URL: https://github.com/kamailio/kamailio/commit/2aae3ee39ea56e349879e25234a75aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:34:46+01:00 pv: added $Ras - return local received address in socket format --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/2aae3ee39ea56e349879e25234a75aa… Patch: https://github.com/kamailio/kamailio/commit/2aae3ee39ea56e349879e25234a75aa… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 9de6bc49af..c34ce5dd31 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -406,6 +406,9 @@ static pv_export_t mod_pvs[] = { {{"rz", (sizeof("rz")-1)}, /* */ PVT_OTHER, pv_get_ruri_attr, 0, 0, 0, pv_init_iname, 5}, + {{"Ras", (sizeof("Ras")-1)}, /* */ + PVT_OTHER, pv_get_rcvaddr_socket, 0, + 0, 0, 0, 0}, {{"Ri", (sizeof("Ri")-1)}, /* */ PVT_OTHER, pv_get_rcvip, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index de5d5b41c8..afccbd4c7f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -932,6 +932,18 @@ int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, return pv_get_rcvaddr_uri_helper(msg, param, 1, res); } +int pv_get_rcvaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address==NULL || msg->rcv.bind_address->sock_str.s==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->sock_str); +} + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 5e0f6860b5..ffb7d734ba 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -166,6 +166,9 @@ int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcvsname(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:d132d595: kemix: rename get_sas() to get_srcaddr_sock()
by Daniel-Constantin Mierla 17 Dec '21

17 Dec '21

Module: kamailio Branch: master Commit: d132d595c7a75e1206f4d42973966767e305f4fb URL: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:38:25+01:00 kemix: rename get_sas() to get_srcaddr_sock() --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… Patch: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 089ad5e326..3fb079349a 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1103,7 +1103,7 @@ static sr_kemi_xval_t* ki_kx_get_srcuri(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_sas(sip_msg_t *msg) +static sr_kemi_xval_t* ki_kx_get_srcaddr_sock(sip_msg_t *msg) { str ssock; @@ -1403,8 +1403,8 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_sas"), - SR_KEMIP_XVAL, ki_kx_get_sas, + { str_init("kx"), str_init("get_srcaddr_sock"), + SR_KEMIP_XVAL, ki_kx_get_srcaddr_sock, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:bd528072: core: parser sdp - check if delimiter exceeds body limit
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: master Commit: bd5280726a9842b257afabae548853d000ecd249 URL: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T10:01:34+01:00 core: parser sdp - check if delimiter exceeds body limit --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… Patch: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 14779e4d12..c3c94c37da 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -645,12 +645,16 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) d1p = d2p; if (d1p == NULL || d1p >= bodylimit) break; /* No applications left */ + if(d1p + delimiter.len + 2 > bodylimit) { + LM_ERR("failed parsing [%.*s]\n", mixed_body->len, mixed_body->s); + return -1; + } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); /* d2p is text limit for application parsing */ - memset(&hf,0, sizeof(struct hdr_field)); + memset(&hf, 0, sizeof(struct hdr_field)); rest = eat_line(d1p + delimiter.len + 2, d2p - d1p - delimiter.len - 2); if ( rest > d2p ) { - LM_ERR("Unparsable <%.*s>\n", (int)(d2p-d1p), d1p); + LM_ERR("unparsable [%.*s]\n", (int)(d2p-d1p), d1p); return -1; } no_eoh_found = 1;

1 0

git:master:03acf834: core: parser - clang format parser_f.c
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: master Commit: 03acf834a19689d6c3efcea93e48985d3e7ffc37 URL: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T09:44:54+01:00 core: parser - clang format parser_f.c --- Modified: src/core/parser/parser_f.c --- Diff: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… Patch: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… --- diff --git a/src/core/parser/parser_f.c b/src/core/parser/parser_f.c index f1a532fd6f..c124f68cc5 100644 --- a/src/core/parser/parser_f.c +++ b/src/core/parser/parser_f.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -28,22 +28,27 @@ */ -#include "parser_f.h" +#include "parser_f.h" #include "../ut.h" /** @brief returns pointer to next line or after the end of buffer */ -char* eat_line(char* buffer, unsigned int len) +char *eat_line(char *buffer, unsigned int len) { - char* nl; + char *nl; /* jku .. replace for search with a library function; not conforming as I do not care about CR */ - nl=(char *)q_memchr( buffer, '\n', len ); - if ( nl ) { - if ( nl + 1 < buffer+len) nl++; - if (( nl+1<buffer+len) && * nl=='\r') nl++; - } else nl=buffer+len; + nl = (char *)q_memchr(buffer, '\n', len); + if(nl) { + if(nl + 1 < buffer + len) { + nl++; + } + if((nl + 1 < buffer + len) && *nl == '\r') { + nl++; + } + } else { + nl = buffer + len; + } return nl; } -

1 0

git:5.5:3cd4676c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 3cd4676ce5071f83fccc0e16946c9e0376b018f6 URL: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-16T09:32:07+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… Patch: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 86dde8f336..2bba8c8115 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -238,6 +238,14 @@ Chapter 1. Admin Guide module that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in Kamailio.cfg). + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require Kamailio to be started with --atexit=no + command line parameters to avoid calling C atexit callbacks inside the + process ending during daemonize procedure as well as during shut down, + which can lead to crashes because it destroys and then accesses shared + memory. For example, such case has been reported for Ubuntu 20.04 or + RedHat 8. + 2. Quick Start The default kamailio.cfg file has basic tls support included, it has to

1 0

git:5.5:d06fbbea: misc/examples: kemi - sanity check for response in lua script
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: d06fbbea95b33934d841f37bff6ae2b32dde2f87 URL: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:55+01:00 misc/examples: kemi - sanity check for response in lua script (cherry picked from commit 96ba8bdf87221c985d8198fe36f7f0bd9858a738) --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… Patch: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index bddabbaa89..a406b6429c 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -195,7 +195,7 @@ function ksr_route_reqinit() end if KSR.sanity.sanity_check(1511, 7)<0 then - KSR.err("Malformed SIP message from " + KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); end @@ -418,6 +418,11 @@ end -- SIP response handling -- equivalent of reply_route{} function ksr_reply_route() - KSR.info("===== response - from kamailio lua script\n"); + KSR.dbg("response - from kamailio lua script\n"); + if KSR.sanity.sanity_check(17604, 6)<0 then + KSR.err("malformed SIP response from " + .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); + KSR.x.drop(); + end return 1; end

1 0

git:5.5:17bbfe97: Makefile.defs: use sed instead of awk for detecting glibc version
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 17bbfe97179a2965b145b946b76ba458c2af8bd5 URL: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:30:33+01:00 Makefile.defs: use sed instead of awk for detecting glibc version (cherry picked from commit 225a59475c91e154ce0a7f0ec252be841a5a8ce5) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… Patch: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ab3d6b7e27..3793705039 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1888,7 +1888,7 @@ ifeq ($(OS), linux) endif ifeq ($(CC_NAME), gcc) # link librt for glibc <= 2.17 - GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + GLIBCVER=$(shell ldd --version | head -1 | sed -e 's/^.* //' -e 's/\.//' ) ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) LIBS+=-lrt endif

1 0

git:5.5:e1fb93fa: tls: docs - added note about --atexit=no cli param for newer libssl versions
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: e1fb93fa9e3b79f043fd6b7379a61340ba93e071 URL: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:02+01:00 tls: docs - added note about --atexit=no cli param for newer libssl versions (cherry picked from commit 8dc18cab5bc32c1d34a9113242d230b7458d4075) --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… Patch: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index b5ea415ae7..e356d5bff7 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -64,6 +64,15 @@ that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in &kamailio;.cfg). </para> + <para> + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require &kamailio; to be started with + <emphasis>--atexit=no</emphasis> command line parameters to avoid + calling C atexit callbacks inside the process ending during + daemonize procedure as well as during shut down, which can lead + to crashes because it destroys and then accesses shared memory. For + example, such case has been reported for Ubuntu 20.04 or RedHat 8. + </para> </section> <section id="tls.quick_start"> <title>Quick Start</title>

1 0

git:5.5:a2446f51: core: parser - clang format for parse_identityinfo.c
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: a2446f5194446ab9432aecde99522e709ecdc1e3 URL: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:32+01:00 core: parser - clang format for parse_identityinfo.c (cherry picked from commit 1cd480dfe6f2e06bac99b74e466e0c6bb8801279) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7… Patch: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7…

1 0

git:5.5:d7c030f5: core: parser/sdp - check for delimiter size done before comparison
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: d7c030f576fa87b5959b7156c6b2077d76bb1fee URL: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:59+01:00 core: parser/sdp - check for delimiter size done before comparison (cherry picked from commit b83810eb1eb70f326698db874a1f67cf6a8d06cf) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… Patch: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 144d63b537..c62a347ddc 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -794,12 +794,12 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) return NULL; /* We matched '--', * now let's match the boundary delimiter */ + if(cp1+2+delimiter.len >= plimit) + return NULL; if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) break; else cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; } if (cp1[-1] == '\n' || cp1[-1] == '\r') return cp1;

1 0

git:5.5:27875047: presence: info logs instead of error for not maching conditions
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 27875047db766cc7cb3a4d5d7638bdafd98e09b1 URL: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:30:08+01:00 presence: info logs instead of error for not maching conditions (cherry picked from commit f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854) --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… Patch: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index a7629a4e92..0ba00f0197 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1369,10 +1369,10 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, send_412: if(!ruid) { - LM_ERR("No E_Tag match %*s\n", presentity->etag.len, + LM_INFO("No E-Tag match %*s\n", presentity->etag.len, presentity->etag.s); } else { - LM_ERR("No ruid match %*s\n", ruid->len, ruid->s); + LM_INFO("No ruid match %*s\n", ruid->len, ruid->s); } if(msg != NULL) {

1 0

git:5.5:f387209c: core: parser/sdp - cast to unsigned for left shifting
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: f387209ca7efd65a1fd7ee510d899fec6e080289 URL: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:28+01:00 core: parser/sdp - cast to unsigned for left shifting (cherry picked from commit c1ec3857f360c806b7cc856b8e6ae3d5362ef49f) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… Patch: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 8f189cf207..e118b4ac33 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -52,7 +52,10 @@ static struct { #define READ(val) \ - (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)) + ((unsigned int)(*(val + 0)) \ + + ((unsigned int)(*(val + 1)) << 8) \ + + ((unsigned int)(*(val + 2)) << 16) \ + + ((unsigned int)(*(val + 3)) << 24)) #define advance(_ptr,_n,_str,_error) \ do{\ if ((_ptr)+(_n)>(_str).s+(_str).len)\

1 0

git:5.5:4b9987bd: core: parser/sdp - coherent indentation of two functions
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 4b9987bd630d78aa27ea392491989ddfeeda0d98 URL: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:49+01:00 core: parser/sdp - coherent indentation of two functions (cherry picked from commit 1b5756ae9f67c3907c134eb725f19c875cccd913) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… Patch: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index e118b4ac33..144d63b537 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -742,7 +742,7 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) } /* eliminate leading whitespace */ - tmp=eat_lws_end(tmp, end); + tmp=eat_lws_end(tmp, end); if (tmp>=end) { LM_ERR("hf empty\n"); goto error; @@ -781,32 +781,32 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) { - static char delimiterhead[3] = "--"; - char *cp, *cp1; - /* Iterate through body */ - cp = p; - for (;;) { - if (cp >= plimit) - return NULL; - for(;;) { - cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); - if (cp1 == NULL) - return NULL; - /* We matched '--', - * now let's match the boundary delimiter */ - if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) - break; - else - cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; - } - if (cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; - if (plimit - cp1 < 2 + delimiter.len) - return NULL; - cp = cp1 + 2 + delimiter.len; - } + static char delimiterhead[3] = "--"; + char *cp, *cp1; + /* Iterate through body */ + cp = p; + for (;;) { + if (cp >= plimit) + return NULL; + for(;;) { + cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); + if (cp1 == NULL) + return NULL; + /* We matched '--', + * now let's match the boundary delimiter */ + if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) + break; + else + cp = cp1 + 2 + delimiter.len; + if (cp >= plimit) + return NULL; + } + if (cp1[-1] == '\n' || cp1[-1] == '\r') + return cp1; + if (plimit - cp1 < 2 + delimiter.len) + return NULL; + cp = cp1 + 2 + delimiter.len; + } } @@ -815,10 +815,10 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) */ char *find_next_sdp_line_delimiter(char* p, char* plimit, str delimiter, char* defptr) { - char *t; - if (p >= plimit || plimit - p < 3) - return defptr; - t = find_sdp_line_delimiter(p + 2, plimit, delimiter); - return t ? t : defptr; + char *t; + if (p >= plimit || plimit - p < 3) + return defptr; + t = find_sdp_line_delimiter(p + 2, plimit, delimiter); + return t ? t : defptr; }

1 0

git:5.5:0afcccdc: src/Makefile.defs: link -lrt if glibc <= 2.17
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 0afcccdc46950c5b4a49024e2092ab712ba6be94 URL: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:27:31+01:00 src/Makefile.defs: link -lrt if glibc <= 2.17 - GH #2921 (cherry picked from commit 743a9d33dcc3a6220bba217c14810dafb53355b2) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… Patch: https://github.com/kamailio/kamailio/commit/0afcccdc46950c5b4a49024e2092ab7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 82b8751e2e..ab3d6b7e27 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1886,6 +1886,13 @@ ifeq ($(OS), linux) ifeq ($(NO_SELECT),) C_DEFS+=-DHAVE_SELECT endif + ifeq ($(CC_NAME), gcc) + # link librt for glibc <= 2.17 + GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) + LIBS+=-lrt + endif + endif endif ifeq ($(OS), gnu_kfreebsd)

1 0

git:5.5:88b50be1: websockets: enable KEEPALIVE_MECHANISM_CONCHECK
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 88b50be127ca0dab57784e0ffb96d6eb44196772 URL: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:28:55+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled (cherry picked from commit 29c3b865d8efde8435c2217df44d1df684caaea2) --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… Patch: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 5cef5d6b1a..f7273048e3 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -221,6 +221,7 @@ static int mod_init(void) switch(ws_keepalive_mechanism) { case KEEPALIVE_MECHANISM_PING: case KEEPALIVE_MECHANISM_PONG: + case KEEPALIVE_MECHANISM_CONCHECK: break; default: ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;

1 0

git:5.5:dc5eda21: core: parser - print start of buffer on error for identity info
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: dc5eda219c152d1c08ba38849163849f62242b2d URL: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:16+01:00 core: parser - print start of buffer on error for identity info (cherry picked from commit 48dc90dfa1839a405e7d090b23c1fdc907107731) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… Patch: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index e58bcd26ff..6aaabf2377 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -313,7 +313,7 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) parseerror: if(p<end) { LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p, status, (int)(p-buffer), ZSW(p)); + *p, status, (int)(p-buffer), buffer); } else { LM_ERR("unexpected end of buffer - status %d\n", status); }

1 0

git:5.5:8d58f4b1: htable: Fix spelling errors in error and debug messages
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 8d58f4b158a30debe58027875287c6c9d675c8db URL: https://github.com/kamailio/kamailio/commit/8d58f4b158a30debe58027875287c6c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:27:02+01:00 htable: Fix spelling errors in error and debug messages (cherry picked from commit 9517cf47f512f561c6461edc3cbca3410e773735) --- Modified: src/modules/htable/api.c Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/8d58f4b158a30debe58027875287c6c… Patch: https://github.com/kamailio/kamailio/commit/8d58f4b158a30debe58027875287c6c…

1 0

git:5.5:0d77ae82: db_cluster: Fix spelling errors
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 0d77ae82ff1cac93a48ede3558ddf48632960a70 URL: https://github.com/kamailio/kamailio/commit/0d77ae82ff1cac93a48ede3558ddf48… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:26:51+01:00 db_cluster: Fix spelling errors (cherry picked from commit 2eed551ed55fcd2bc190e1045da377f6b1e4d22d) --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/0d77ae82ff1cac93a48ede3558ddf48… Patch: https://github.com/kamailio/kamailio/commit/0d77ae82ff1cac93a48ede3558ddf48… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 838f2a24c2..d1906e0f9d 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -72,7 +72,7 @@ extern int dbcl_max_query_length; cls->usedcon = cls->rlist[i].clist[j];\ return 0;\ } else {\ - LM_DBG("serial operation - failre on cluster"\ + LM_DBG("serial operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -105,7 +105,7 @@ extern int dbcl_max_query_length; cls->rlist[i].crt = (j+1) % cls->rlist[i].clen;\ return 0;\ } else {\ - LM_DBG("round robin operation - failre on cluster"\ + LM_DBG("round robin operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -409,7 +409,7 @@ db1_con_t* db_cluster_init(const str* _dburl) LM_DBG("initializing with cluster [%.*s]\n", _dburl->len, _dburl->s); if(_dburl->len<10 || strncmp(_dburl->s, "cluster://", 10)!=0) { - LM_ERR("invlaid url for cluster module [%.*s]\n", + LM_ERR("invalid url for cluster module [%.*s]\n", _dburl->len, _dburl->s); return NULL; } @@ -433,7 +433,7 @@ db1_con_t* db_cluster_init(const str* _dburl) cls->ref++; h = (db1_con_t*)pkg_malloc(sizeof(db1_con_t)); if (h==NULL) { - LM_ERR("out of pkg\n"); + LM_ERR("out of pkg memory\n"); return NULL; } memset(h, 0, sizeof(db1_con_t)); diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index f3cb2dcbf8..65bc0eed40 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -265,7 +265,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) pit->name.len, pit->name.s, i, cls->rlist[i].clen); cls->rlist[i].clen++; } else { - LM_WARN("too many read connections in cluster - con-id [%.*s]\n", + LM_WARN("too many read connections in cluster - connection id [%.*s]\n", pit->name.len, pit->name.s); } if(s.s[2]<'0' || s.s[2]>'9')

1 0

git:5.5:4814bac2: nat_traversal: declare flag literal as unsigned
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 4814bac2424db7fea2ba817fcdf4594a7b2e1c11 URL: https://github.com/kamailio/kamailio/commit/4814bac2424db7fea2ba817fcdf4594… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:24:43+01:00 nat_traversal: declare flag literal as unsigned - GH #2954 (cherry picked from commit 8c30109df0b479cc3fce39a765717149e9c70ddf) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/4814bac2424db7fea2ba817fcdf4594… Patch: https://github.com/kamailio/kamailio/commit/4814bac2424db7fea2ba817fcdf4594… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 4cfe8d4018..fd5fac5b5e 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -85,7 +85,7 @@ MODULE_VERSION /* WARNING: Keep this aligned with parser/msg_parser.h! */ -#define FL_DO_KEEPALIVE (1 << 31) +#define FL_DO_KEEPALIVE (1u << 31) #define HASH_SIZE 512

1 0

git:5.5:2c196d14: core: flags - use unsigned literal for bit shifting operations
by Daniel-Constantin Mierla 16 Dec '21

16 Dec '21

Module: kamailio Branch: 5.5 Commit: 2c196d149c19ee59174f89020407e1f15156182e URL: https://github.com/kamailio/kamailio/commit/2c196d149c19ee59174f89020407e1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:25:09+01:00 core: flags - use unsigned literal for bit shifting operations (cherry picked from commit 1a406e093ea7ac07428c92aec21ac67f8caa1093) --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/2c196d149c19ee59174f89020407e1f… Patch: https://github.com/kamailio/kamailio/commit/2c196d149c19ee59174f89020407e1f… --- diff --git a/src/core/flags.c b/src/core/flags.c index 551eefe2ee..207849c198 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -43,12 +43,12 @@ static flag_t sflags = 0; int setflag( struct sip_msg* msg, flag_t flag ) { - msg->flags |= 1 << flag; + msg->flags |= 1u << flag; return 1; } int resetflag( struct sip_msg* msg, flag_t flag ) { - msg->flags &= ~ (1 << flag); + msg->flags &= ~ (1u << flag); return 1; } @@ -58,7 +58,7 @@ int resetflags( struct sip_msg* msg, flag_t flags ) { } int isflagset( struct sip_msg* msg, flag_t flag ) { - return (msg->flags & (1<<flag)) ? 1 : -1; + return (msg->flags & (1u<<flag)) ? 1 : -1; } int flag_in_range( flag_t flag ) { @@ -79,21 +79,21 @@ int setsflagsval(flag_t val) int setsflag(flag_t flag) { - sflags |= 1 << flag; + sflags |= 1u << flag; return 1; } int resetsflag(flag_t flag) { - sflags &= ~ (1 << flag); + sflags &= ~ (1u << flag); return 1; } int issflagset(flag_t flag) { - return (sflags & (1<<flag)) ? 1 : -1; + return (sflags & (1u<<flag)) ? 1 : -1; } @@ -126,7 +126,7 @@ static unsigned char registered_flags[MAX_FLAG+1]; void init_named_flags() { int r; - + for (r=0; r<FLAGS_NAME_HASH_ENTRIES; r++) clist_init(&name2flags[r], next, prev); } @@ -149,7 +149,7 @@ inline static struct flag_entry* flag_search(struct flag_hash_head* lst, char* name, int len) { struct flag_entry* fe; - + clist_foreach(lst, fe, next){ if ((fe->name.len==len) && (memcmp(fe->name.s, name, len)==0)){ /* found */ @@ -176,7 +176,7 @@ inline static struct flag_entry* get_flag_entry(char* name, int len) int get_flag_no(char* name, int len) { struct flag_entry* fe; - + fe=get_flag_entry(name, len); return (fe)?fe->no:-1; } @@ -184,7 +184,7 @@ int get_flag_no(char* name, int len) /* resgiter a new flag name and associates it with pos - * pos== -1 => any position will do + * pos== -1 => any position will do * returns flag pos on success (>=0) * -1 flag is an alias for an already existing flag * -2 flag already registered @@ -199,7 +199,7 @@ int register_flag(char* name, int pos) static unsigned int crt_flag=0; unsigned int last_flag; unsigned int h; - + len=strlen(name); h=get_hash1_raw(name, len) & (FLAGS_NAME_HASH_ENTRIES-1); /* check if the name already exists */ @@ -235,7 +235,7 @@ int register_flag(char* name, int pos) } } registered_flags[pos]++; - + e=pkg_malloc(sizeof(struct flag_entry)); if (e==0){ PKG_MEM_ERROR; @@ -259,7 +259,7 @@ int setxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] |= 1 << fb; + msg->xflags[fi] |= 1u << fb; return 1; } @@ -272,7 +272,7 @@ int resetxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] &= ~ (1 << fb); + msg->xflags[fi] &= ~ (1u << fb); return 1; } @@ -285,5 +285,5 @@ int isxflagset(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; + return (msg->xflags[fi] & (1u<<fb)) ? 1 : -1; }

1 0

Next online devel meeting - Wed, Dec 15, 2021, 15:00UTC
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

Hello, 2021 is almost over, time ran fast somehow this year, with a major release in the middle, which delayed the development discussion for the next one, so it's time for it! As usual, the aim is to sketch the roadmap to next major release so the developers and community members can syncronize and plan what should be done till Kamailio v5.6 will be out as well as discuss about current state of the project, look for new ideas to improve collaboration within the community, a.s.o. The meeting will be done on a matrix chat room. More details are in the wiki page of the event, available at: * https://www.kamailio.org/wiki/devel/irc-meetings/2021a Feel free to add there topics that you want to be discussed. The proposed date is next Wednesday, December 15, 2021, at 15:00UTC (15:00 London/Dublin, 16:00 most of West Europe, 10:00 New York), but other dates can be proposed if they suit for more participants. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda _______________________________________________ Kamailio (SER) - Development Mailing List sr-dev(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

1 2

[kamailio/kamailio] http_client/http_async_client crash at startup if used with tls and openssl 1.1 (Issue #2912)
by kdanderso 15 Dec '21

15 Dec '21

### Description When attempting to use either http_client or http_async_client with tls support enabled and openssl version 1.1.x, Kamailio crashes at startup. If openssl is reverted to version 1.0.2r as described in #1860, the issue does not occur. #### Reproduction On a system using openssl version 1.1.x (e.g. 1.1.1l) start Kamailio 5.5.2 with this config file for http_client failure: [kamailio.cfg.txt](https://github.com/kamailio/kamailio/files/7442436/kamail… To test http_async_client, load pv.so and http_async_client.so instead of http_client.so. #### Debugging Data [bt.txt](https://github.com/kamailio/kamailio/files/7442493/bt.txt) #### Log Messages [kam.log.txt](https://github.com/kamailio/kamailio/files/7442496/kam.log.txt) ### Additional Information * **Kamailio Version**: [kamversion.txt](https://github.com/kamailio/kamailio/files/7442506/kamversi… * **Operating System**: Linux 5.4.0-89-generic #100-Ubuntu SMP Fri Sep 24 14:50:10 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux [os.txt](https://github.com/kamailio/kamailio/files/7442509/os.txt) -- 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/2912

4 9

git:master:09ac5b6c: kemix: exported kx.get_sas()
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

Module: kamailio Branch: master Commit: 09ac5b6c5330bc0a9eb4617d2385745b4a09c116 URL: https://github.com/kamailio/kamailio/commit/09ac5b6c5330bc0a9eb4617d2385745… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T14:53:00+01:00 kemix: exported kx.get_sas() - return source address in socket format, similar to $sas --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/09ac5b6c5330bc0a9eb4617d2385745… Patch: https://github.com/kamailio/kamailio/commit/09ac5b6c5330bc0a9eb4617d2385745… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 2b6f6ec9c2..089ad5e326 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1100,6 +1100,39 @@ static sr_kemi_xval_t* ki_kx_get_srcuri(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_sas(sip_msg_t *msg) +{ + str ssock; + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + + } + + if(get_src_address_socket(msg, &ssock)<0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + if (ssock.len + 1 >= pv_get_buffer_size()) { + LM_ERR("local buffer size exceeded\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.v.s.s = pv_get_buffer(); + strncpy(_sr_kemi_kx_xval.v.s.s, ssock.s, ssock.len); + _sr_kemi_kx_xval.v.s.len = ssock.len; + _sr_kemi_kx_xval.v.s.s[_sr_kemi_kx_xval.v.s.len] = '\0'; + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -1370,6 +1403,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_sas"), + SR_KEMIP_XVAL, ki_kx_get_sas, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_ua"), SR_KEMIP_XVAL, ki_kx_get_ua, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:06306c29: kazoo: fix prototype for ki_kz_amqp_publish_hdrs()
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

Module: kamailio Branch: master Commit: 06306c29d45449d83db718a3e2207ee3fd1755c1 URL: https://github.com/kamailio/kamailio/commit/06306c29d45449d83db718a3e2207ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T14:29:25+01:00 kazoo: fix prototype for ki_kz_amqp_publish_hdrs() --- Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/06306c29d45449d83db718a3e2207ee… Patch: https://github.com/kamailio/kamailio/commit/06306c29d45449d83db718a3e2207ee… --- diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 46897f694b..d614039211 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -275,8 +275,8 @@ int kz_amqp_add_connection(modparam_t type, void* val); int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload); int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); -int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers); -int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload); +int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload); +int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers); int kz_amqp_query(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* dst, char* headers); int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); int kz_amqp_subscribe(struct sip_msg* msg, char* payload);

1 0

git:master:96ba8bdf: misc/examples: kemi - sanity check for response in lua script
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

Module: kamailio Branch: master Commit: 96ba8bdf87221c985d8198fe36f7f0bd9858a738 URL: https://github.com/kamailio/kamailio/commit/96ba8bdf87221c985d8198fe36f7f0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T12:37:48+01:00 misc/examples: kemi - sanity check for response in lua script --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/96ba8bdf87221c985d8198fe36f7f0b… Patch: https://github.com/kamailio/kamailio/commit/96ba8bdf87221c985d8198fe36f7f0b… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index bddabbaa895..a406b6429cf 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -195,7 +195,7 @@ function ksr_route_reqinit() end if KSR.sanity.sanity_check(1511, 7)<0 then - KSR.err("Malformed SIP message from " + KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); end @@ -418,6 +418,11 @@ end -- SIP response handling -- equivalent of reply_route{} function ksr_reply_route() - KSR.info("===== response - from kamailio lua script\n"); + KSR.dbg("response - from kamailio lua script\n"); + if KSR.sanity.sanity_check(17604, 6)<0 then + KSR.err("malformed SIP response from " + .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); + KSR.x.drop(); + end return 1; end

1 0

git:master:1cd480df: core: parser - clang format for parse_identityinfo.c
by Daniel-Constantin Mierla 15 Dec '21

15 Dec '21

Module: kamailio Branch: master Commit: 1cd480dfe6f2e06bac99b74e466e0c6bb8801279 URL: https://github.com/kamailio/kamailio/commit/1cd480dfe6f2e06bac99b74e466e0c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-15T09:00:45+01:00 core: parser - clang format for parse_identityinfo.c --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1cd480dfe6f2e06bac99b74e466e0c6… Patch: https://github.com/kamailio/kamailio/commit/1cd480dfe6f2e06bac99b74e466e0c6…

1 0

git:master:b0f4c835: kazoo: fix kemi export due to changed function prototype
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: b0f4c835b91059f021c4e5be1b16a6493cc46fbe URL: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T20:42:02+01:00 kazoo: fix kemi export due to changed function prototype - change done in dcb8e1650204c9453457871515ab5c7ec2d497f1 --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… Patch: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 7155c62d37..4d9e3dcd8a 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1262,10 +1262,10 @@ int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, c headers_s.s = ""; } - return ki_kz_amqp_publish(msg, &exchange_s, &routing_key_s, &pl_s, &headers_s); + return ki_kz_amqp_publish_hdrs(msg, &exchange_s, &routing_key_s, &pl_s, &headers_s); }; -int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers) +int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers) { char *pl = ((str*)payload)->s; struct json_object *j = json_tokener_parse(pl); @@ -1279,6 +1279,11 @@ int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* pay return kz_amqp_pipe_send(exchange, routing_key, payload, headers); } +int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload) +{ + return ki_kz_amqp_publish_hdrs(msg, exchange, routing_key, payload, NULL); +} + int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload) { return kz_amqp_publish_ex(msg, exchange, routing_key, payload, NULL); diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 5903314139..46897f694b 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -276,6 +276,7 @@ int kz_amqp_add_connection(modparam_t type, void* val); int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload); int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers); +int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload); int kz_amqp_query(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* dst, char* headers); int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); int kz_amqp_subscribe(struct sip_msg* msg, char* payload);

1 0

git:master:2c239795: jwt: exported jwt_generate_hdrs() function to kemi
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: 2c239795d3d1a7e0ef9918006ff57da13dfedae1 URL: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T17:55:22+01:00 jwt: exported jwt_generate_hdrs() function to kemi --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… Patch: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 4424aee13d..233a0709e3 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -174,7 +174,8 @@ static int jwt_fcache_add(str *key, str *kdata) /** * */ -static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, str *headers) +static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, + str *headers) { str dupclaims = STR_NULL; str sparams = STR_NULL; @@ -187,7 +188,7 @@ static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, unsigned char keybuf[10240]; size_t keybuf_len = 0; param_t* params_list = NULL; - param_t* headers_list = NULL; + param_t* headers_list = NULL; param_hooks_t phooks; param_t *pit = NULL; param_t *header = NULL; @@ -323,7 +324,7 @@ static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, free_params(params_list); pkg_free(dupclaims.s); free_params(headers_list); - pkg_free(dupheaders.s); + pkg_free(dupheaders.s); jwt_free(jwt); return 1; @@ -404,7 +405,7 @@ static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaim LM_ERR("cannot get claims value\n"); return -1; } - + if (fixup_get_svalue(msg, (gparam_t*)pheaders, &sheaders) != 0) { LM_ERR("cannot get headers value\n"); return -1; @@ -617,6 +618,11 @@ static sr_kemi_t sr_kemi_jwt_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("jwt"), str_init("jwt_generate_hdrs"), + SR_KEMIP_INT, ki_jwt_generate_hdrs, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("jwt"), str_init("jwt_verify"), SR_KEMIP_INT, ki_jwt_verify, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

1 0

git:master:c83b3eb8: modules: readme files regenerated - jwt ... [skip ci]
by Kamailio Dev 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: c83b3eb828efbe5370eab9ecdfdd10cb9ea11a87 URL: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-14T17:46:16+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c… Patch: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c…

1 0

[kamailio/kamailio] jwt: possibility to add headers when generating jwt (PR #2971)
by Rodrigo Alves Silva 14 Dec '21

14 Dec '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] 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 Adding an optional forth parameter to jwt module to add headers. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2971 -- Commit Summary -- * jwt: possibility to add headers when generating jwt -- File Changes -- M src/modules/jwt/doc/jwt_admin.xml (11) M src/modules/jwt/jwt_mod.c (85) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2971.patch https://github.com/kamailio/kamailio/pull/2971.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2971

2 11

git:master:aaa142d2: jwt: possibility to add headers when generating jwt
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: aaa142d293105ef27f7e4b6143fc3fb18c9a5a75 URL: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb… Author: rodrigo.alves <rodrigo.alves(a)messagebird.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T17:36:02+01:00 jwt: possibility to add headers when generating jwt --- Modified: src/modules/jwt/doc/jwt_admin.xml Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb… Patch: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb…

1 0

git:master:8df3752c: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: 8df3752c2d7ea37b4acadf76283287744a56005a URL: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-14T14:16:31+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… Patch: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 127cfa7601..94c8cfc069 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -234,6 +234,14 @@ Chapter 1. Admin Guide module that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in Kamailio.cfg). + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require Kamailio to be started with --atexit=no + command line parameters to avoid calling C atexit callbacks inside the + process ending during daemonize procedure as well as during shut down, + which can lead to crashes because it destroys and then accesses shared + memory. For example, such case has been reported for Ubuntu 20.04 or + RedHat 8. + 2. Quick Start The default kamailio.cfg file has basic tls support included, it has to

1 0

git:master:8dc18cab: tls: docs - added note about --atexit=no cli param for newer libssl versions
by Daniel-Constantin Mierla 14 Dec '21

14 Dec '21

Module: kamailio Branch: master Commit: 8dc18cab5bc32c1d34a9113242d230b7458d4075 URL: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T14:02:41+01:00 tls: docs - added note about --atexit=no cli param for newer libssl versions --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… Patch: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index b5ea415ae79..e356d5bff7c 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -64,6 +64,15 @@ that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in &kamailio;.cfg). </para> + <para> + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require &kamailio; to be started with + <emphasis>--atexit=no</emphasis> command line parameters to avoid + calling C atexit callbacks inside the process ending during + daemonize procedure as well as during shut down, which can lead + to crashes because it destroys and then accesses shared memory. For + example, such case has been reported for Ubuntu 20.04 or RedHat 8. + </para> </section> <section id="tls.quick_start"> <title>Quick Start</title>

1 0

[kamailio/kamailio] Kamailio with dmq stop processing SIP (Issue #2974)
by tser 13 Dec '21

13 Dec '21

### Description Hi, I have been doing some load testing on kamailio 5.4.7 running in podman. Kamailio is using dmq to share dialogs and htable with a backup Kamailio also running 5.4.7. I tested with 100 CPS and during the first minutes all calls are being processed correctly but then all the messages start to be retransmitted. Kamailio is not processing any sip messages anymore but still replies to HTTP requests, is still possible to run kamctl/kamcmd commands on it but for example, if running the command "kamcmd dlg.list" nothing happens. Also, I did a load test with the backup Kamailio turn off so that there is no replication between them, and in that case, I can run the 100 CPS without any issue. In kamcmd trap file I can see a lot of "<error: Cannot access memory" errors. In order for Kamailio to start processing again sip, I need to restart it. Any extra logs that I can try to collect when the problem happens? #### Debugging Data  [trap.txt](https://github.com/kamailio/kamailio/files/7705076/trap.txt) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.7 (x86_64/linux) a19fe1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a19fe1 compiled on 14:06:57 Dec 13 2021 with gcc 10.2.1 ``` * **Operating System**:  ``` Debian 5.10.70-1 (2021-09-30) x86_64 GNU/Linux ``` -- 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/2974

2 2

git:master:2e62177f: core: tcp - fixed typo on condition introduced in previous commit
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 2e62177f7f08314efa883f87f3d703a4f71a1d5e URL: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T15:17:37+01:00 core: tcp - fixed typo on condition introduced in previous commit --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… Patch: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 8824e123ab..ba9ed92575 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1145,7 +1145,7 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { twaitms = 0; do { bytes = recv(c->s, &hdr, size, 0); - if(bytes==-1 && errno == EINTR)) { + if(bytes==-1 && errno == EINTR) { if(twaitms <= cfg_get(tcp, tcp_cfg, wait_data_ms)) { /* LM_DBG("bytes: %d - errno: %d (%d/%d) - twait: %dms\n", bytes, errno, EINTR, EAGAIN, twaitms); */

1 0

git:master:7a5ae41e: core: tcp - added core parameter tcp_wait_data
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 7a5ae41ec7184ffb362fe54154c350e552ad8917 URL: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T14:47:59+01:00 core: tcp - added core parameter tcp_wait_data - specify how long to wait (in milliseconds) to wait for data on tcp connections in certain cases - default is 5000ms (5secs) - now applies when reading on tcp connection for haproxy protocol --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… Patch: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e…

1 0

[kamailio/kamailio] dialog: fix missing else (PR #2973)
by Bastian Triller 13 Dec '21

13 Dec '21

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2973 -- Commit Summary -- * dialog: fix missing else -- File Changes -- M src/modules/dialog/dialog.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2973.patch https://github.com/kamailio/kamailio/pull/2973.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2973

2 2

git:master:1d0b7f22: dialog: fix missing else
by Bastian Triller 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 1d0b7f22b3321cf9b2a4866b0a8a6001538aba42 URL: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2021-12-13T13:11:26+01:00 dialog: fix missing else --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… Patch: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 16abec9e88..da3ce7cbfd 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2330,9 +2330,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, if (rpc->add(c, "{", &h) < 0) goto error; tnow = time(NULL); - if(dlg->end_ts) { + if (dlg->end_ts) { tdur = (int)(dlg->end_ts - dlg->start_ts); - } if(dlg->start_ts) { + } else if (dlg->start_ts) { tdur = (int)(tnow - dlg->start_ts); } else { tdur = 0;

1 0

git:master:8f23548c: Merge pull request #2973 from btriller/dialog-fix-missing-else
by GitHub 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 8f23548c4d201445e29e73cd0f2efab6a7dc5c04 URL: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T13:27:36+01:00 Merge pull request #2973 from btriller/dialog-fix-missing-else dialog: fix missing else --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… Patch: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 16abec9e88..da3ce7cbfd 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2330,9 +2330,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, if (rpc->add(c, "{", &h) < 0) goto error; tnow = time(NULL); - if(dlg->end_ts) { + if (dlg->end_ts) { tdur = (int)(dlg->end_ts - dlg->start_ts); - } if(dlg->start_ts) { + } else if (dlg->start_ts) { tdur = (int)(tnow - dlg->start_ts); } else { tdur = 0;

1 0

git:master:ba773d2a: dialog: added duration field in dialog rpc output
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: ba773d2a2bf64e01f1724e61acad765fb311a0a6 URL: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:54:29+01:00 dialog: added duration field in dialog rpc output --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… Patch: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7361887fe5..16abec9e88 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2324,10 +2324,20 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, void *h, *sh, *ssh; dlg_profile_link_t *pl; dlg_var_t *var; + time_t tnow; + int tdur; if (rpc->add(c, "{", &h) < 0) goto error; - rpc->struct_add(h, "dddSSSddddddddd", + tnow = time(NULL); + if(dlg->end_ts) { + tdur = (int)(dlg->end_ts - dlg->start_ts); + } if(dlg->start_ts) { + tdur = (int)(tnow - dlg->start_ts); + } else { + tdur = 0; + } + rpc->struct_add(h, "dddSSSdddddddddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, "ref", dlg->ref, @@ -2338,7 +2348,8 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, "start_ts", dlg->start_ts, "init_ts", dlg->init_ts, "end_ts", dlg->end_ts, - "timeout", dlg->tl.timeout ? time(0) + dlg->tl.timeout - get_ticks() : 0, + "duration", tdur, + "timeout", dlg->tl.timeout ? tnow + dlg->tl.timeout - get_ticks() : 0, "lifetime", dlg->lifetime, "dflags", dlg->dflags, "sflags", dlg->sflags,

1 0

git:master:3816bcb2: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 3816bcb2375baef9451025ed906ebf36e8c32ec3 URL: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-13T09:31:25+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… Patch: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index cb6413f981..8b85f1f05e 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2198,7 +2198,10 @@ kamcmd dlg.bridge_dlg _from_ _to_ _op_ Name: dlg.stats_active - Parameters: none. + Parameters: + * local_only (optional) - if not 0 then filter out non local dialogs + (the receiving socket is not found locally, from C code point of + view, the bind_addr info is not set). Returned fields * starting - initial INVITE has been processed, no ringing or 1xx has diff --git a/src/modules/ims_usrloc_scscf/README b/src/modules/ims_usrloc_scscf/README index eaf9b5cc87..d6de6ab3d7 100644 --- a/src/modules/ims_usrloc_scscf/README +++ b/src/modules/ims_usrloc_scscf/README @@ -47,6 +47,8 @@ Yasin Caner 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 4. RPC Commands @@ -79,6 +81,8 @@ Yasin Caner 1.19. Set support_wildcardPSI parameter 1.20. Set unreg_validity parameter 1.21. Set unreg_validity parameter + 1.22. Set realm parameter + 1.23. Set skip_realm parameter Chapter 1. Admin Guide @@ -112,6 +116,8 @@ Chapter 1. Admin Guide 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 4. RPC Commands @@ -159,6 +165,8 @@ Chapter 1. Admin Guide 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 3.1. db_url (string) @@ -385,6 +393,23 @@ st/scscf") modparam("ims_usrloc_scscf", "user_data_xsd", "/usr/local/etc/kamailio/C xDataType_Rel6.xsd") +3.22. realm (string) + + Default value is NULL + + Example 1.22. Set realm parameter + modparam("ims_usrloc_scscf", "realm", "kamailio-ims.org") + +3.23. skip_realm (int) + + Skipping defined network name in the realm for NOTIFY's Message body + reginfo tag. + + Default value is 0 + + Example 1.23. Set skip_realm parameter + modparam("ims_usrloc_scscf", "skip_realm", 1) + 4. RPC Commands 4.1. ulscscf.status

1 0

[kamailio/kamailio] failed master build on centos 6 (Issue #2921)
by sergey-safarov 13 Dec '21

13 Dec '21

``` flex -o core/lex.yy.c core/cfg.lex CC (gcc) [kamailio] core/lex.yy.o LD (gcc) [kamailio] kamailio core/ut.o: In function `ksr_clock_gettime': /root/rpmbuild/BUILD/kamailio-5.6.0-dev2/src/core/ut.c:175: undefined reference to `clock_gettime' collect2: ld returned 1 exit status make[1]: *** [kamailio] Error 1 make[1]: Leaving directory `/root/rpmbuild/BUILD/kamailio-5.6.0-dev2/src' make: *** [default] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.RFyzKs (%build) ``` Should we continue support CentOS 6? -- 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/2921

2 8

git:master:225a5947: Makefile.defs: use sed instead of awk for detecting glibc version
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 225a59475c91e154ce0a7f0ec252be841a5a8ce5 URL: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:29:06+01:00 Makefile.defs: use sed instead of awk for detecting glibc version --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… Patch: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8fab3fd812..57bccfe725 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1890,7 +1890,7 @@ ifeq ($(OS), linux) endif ifeq ($(CC_NAME), gcc) # link librt for glibc <= 2.17 - GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + GLIBCVER=$(shell ldd --version | head -1 | sed -e 's/^.* //' -e 's/\.//' ) ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) LIBS+=-lrt endif

1 0

[kamailio/kamailio] Using undefined environmental variables with #!defenv (Issue #2967)
by Ben Kaufman 13 Dec '21

13 Dec '21

### Description Currently, an undefined environmental variable with `#!defenv` results in Kamailio failing to start. The proposal here that if the environmental variable is not defined, then the macro value would be undefined as well. For example: ``` !#KAMAILIO loadmodule "xlog" loadmodule "pv" #!defenv FOO request_route { #!ifdef FOO xlog("L_INFO","Environmental variable $$FOO is set\n"); #!else xlog("L_WARN","Environmental variable $$FOO is NOT set\n"); #!endif forward(); } ``` Currently this configuration will fail to load if environmental variable is not set. My proposal is to either allow `#!envdef` to accept an undefined environmental variable and have the preprocessor macro undefined, or to add a new keyword (`#!envdefn` perhaps?) to allow this behavior. -- 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/2967

2 6

[kamailio/kamailio] dialog: add local_only paramter to RPC dlg.stats_active (PR #2935)
by Victor Seva 13 Dec '21

13 Dec '21

#### Pre-Submission Checklist    - [x ] Commit message has the format required by CONTRIBUTING guide - [ ]x Commits are split per component (core, individual modules, libs, utils, ...) - [x ] Each component has a single commit (if not, squash them into one commit) - [ x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x ] Tested changes locally - [ x] Related to issue #2920 #### Description allows to filter out non local dialogs from stats using a new argument fix #2920 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2935 -- Commit Summary -- * dialog: add local_only paramter to RPC dlg.stats_active -- File Changes -- M src/modules/dialog/dialog.c (5) M src/modules/dialog/doc/dialog_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2935.patch https://github.com/kamailio/kamailio/pull/2935.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2935

3 4

git:master:f639dfb5: dialog: docs - typo and clarification about local socket bind address
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: f639dfb5f5b74d77026bec7b8bb493b40ce6d47c URL: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:22:39+01:00 dialog: docs - typo and clarification about local socket bind address --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… Patch: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 745efb51f0..d456d545ef 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2805,7 +2805,8 @@ dlg_reset_property("timeout-noreset"); <itemizedlist> <listitem><para> <emphasis>local_only</emphasis> (optional) - if not 0 then filter out - non local dialogues. No bind_addr info in memory. + non local dialogs (the receiving socket is not found locally, + from C code point of view, the bind_addr info is not set). </para></listitem> </itemizedlist> <para>Returned fields</para>

1 0

git:master:506672e5: dialog: add local_only paramter to RPC dlg.stats_active
by Victor Seva 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: 506672e523a48985f89e2c35bdab3d024df0a34d URL: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T18:23:10+01:00 dialog: add local_only paramter to RPC dlg.stats_active allows to filter out non local dialogs from stats fix #2920 --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… Patch: https://github.com/kamailio/kamailio/commit/506672e523a48985f89e2c35bdab3d0… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 243bb9bd9fe..7361887fe59 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2858,16 +2858,21 @@ static void rpc_dlg_stats_active(rpc_t *rpc, void *c) { dlg_cell_t *dlg; unsigned int i; + int dlg_own = 0; int dlg_starting = 0; int dlg_connecting = 0; int dlg_answering = 0; int dlg_ongoing = 0; void *h; + if(rpc->scan(c, "*d", &dlg_own) < 1) + dlg_own = 0; for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if(dlg_own != 0 && dlg->bind_addr[0] == NULL) + continue; switch(dlg->state) { case DLG_STATE_UNCONFIRMED: dlg_starting++; diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 987bd545450..745efb51f07 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2801,7 +2801,13 @@ dlg_reset_property("timeout-noreset"); (not relying on core stats framework). </para> <para>Name: <emphasis>dlg.stats_active</emphasis></para> - <para>Parameters: none.</para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>local_only</emphasis> (optional) - if not 0 then filter out + non local dialogues. No bind_addr info in memory. + </para></listitem> + </itemizedlist> <para>Returned fields</para> <itemizedlist> <listitem><para>

1 0

git:master:c3e7b1e4: Merge pull request #2935 from kamailio/vseva/dlg_rpc
by GitHub 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: c3e7b1e4f402081b122ca6f0967f92005e1cfeaf URL: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T09:20:03+01:00 Merge pull request #2935 from kamailio/vseva/dlg_rpc dialog: add local_only paramter to RPC dlg.stats_active --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… Patch: https://github.com/kamailio/kamailio/commit/c3e7b1e4f402081b122ca6f0967f920… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 243bb9bd9fe..7361887fe59 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2858,16 +2858,21 @@ static void rpc_dlg_stats_active(rpc_t *rpc, void *c) { dlg_cell_t *dlg; unsigned int i; + int dlg_own = 0; int dlg_starting = 0; int dlg_connecting = 0; int dlg_answering = 0; int dlg_ongoing = 0; void *h; + if(rpc->scan(c, "*d", &dlg_own) < 1) + dlg_own = 0; for( i=0 ; i<d_table->size ; i++ ) { dlg_lock( d_table, &(d_table->entries[i]) ); for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if(dlg_own != 0 && dlg->bind_addr[0] == NULL) + continue; switch(dlg->state) { case DLG_STATE_UNCONFIRMED: dlg_starting++; diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 987bd545450..745efb51f07 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2801,7 +2801,13 @@ dlg_reset_property("timeout-noreset"); (not relying on core stats framework). </para> <para>Name: <emphasis>dlg.stats_active</emphasis></para> - <para>Parameters: none.</para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>local_only</emphasis> (optional) - if not 0 then filter out + non local dialogues. No bind_addr info in memory. + </para></listitem> + </itemizedlist> <para>Returned fields</para> <itemizedlist> <listitem><para>

1 0

[kamailio/kamailio] ims_usrloc_scscf: Add capability to skip a specific realm (PR #2951)
by alexyosifov 13 Dec '21

13 Dec '21

Capability to skip realm in NOTIFY's Message body reginfo tag. Added realm(string) and skip_realm(int) parameters.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2951 -- Commit Summary -- * ims_usrloc_scscf: Add capability to skip a specific realm -- File Changes -- M src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml (28) M src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c (5) M src/modules/ims_usrloc_scscf/udomain.c (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2951.patch https://github.com/kamailio/kamailio/pull/2951.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2951

3 4

git:master:d39bbb08: ims_usrloc_scscf: Add capability to skip a specific realm (#2951)
by GitHub 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: d39bbb080ba9e3d44cc66a35a7934732c5a5e058 URL: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473… Author: alexyosifov <47529095+alexyosifov(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T09:19:00+01:00 ims_usrloc_scscf: Add capability to skip a specific realm (#2951) * ims_usrloc_scscf: Add capability to skip a specific realm Capability to skip realm in NOTIFY's Message body reginfo tag. Added realm(string) and skip_realm(int) parameters. * Update ims_usrloc_scscf_admin.xml Revert changes for user_data_xsd --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473… Patch: https://github.com/kamailio/kamailio/commit/d39bbb080ba9e3d44cc66a35a793473…

1 0

git:master:f42b6c5c: presence: info logs instead of error for not maching conditions
by Daniel-Constantin Mierla 13 Dec '21

13 Dec '21

Module: kamailio Branch: master Commit: f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854 URL: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T08:31:07+01:00 presence: info logs instead of error for not maching conditions --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… Patch: https://github.com/kamailio/kamailio/commit/f42b6c5cf2ee9861cb1eed016a5ddcc… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index a7629a4e92..0ba00f0197 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1369,10 +1369,10 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, send_412: if(!ruid) { - LM_ERR("No E_Tag match %*s\n", presentity->etag.len, + LM_INFO("No E-Tag match %*s\n", presentity->etag.len, presentity->etag.s); } else { - LM_ERR("No ruid match %*s\n", ruid->len, ruid->s); + LM_INFO("No ruid match %*s\n", ruid->len, ruid->s); } if(msg != NULL) {

1 0

git:master:b83810eb: core: parser/sdp - check for delimiter size done before comparison
by Daniel-Constantin Mierla 12 Dec '21

12 Dec '21

Module: kamailio Branch: master Commit: b83810eb1eb70f326698db874a1f67cf6a8d06cf URL: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T13:29:00+01:00 core: parser/sdp - check for delimiter size done before comparison --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… Patch: https://github.com/kamailio/kamailio/commit/b83810eb1eb70f326698db874a1f67c… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 144d63b537..c62a347ddc 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -794,12 +794,12 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) return NULL; /* We matched '--', * now let's match the boundary delimiter */ + if(cp1+2+delimiter.len >= plimit) + return NULL; if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) break; else cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; } if (cp1[-1] == '\n' || cp1[-1] == '\r') return cp1;

1 0

git:master:c1ec3857: core: parser/sdp - cast to unsigned for left shifting
by Daniel-Constantin Mierla 12 Dec '21

12 Dec '21

Module: kamailio Branch: master Commit: c1ec3857f360c806b7cc856b8e6ae3d5362ef49f URL: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T12:31:29+01:00 core: parser/sdp - cast to unsigned for left shifting --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… Patch: https://github.com/kamailio/kamailio/commit/c1ec3857f360c806b7cc856b8e6ae3d… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 8f189cf2072..e118b4ac331 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -52,7 +52,10 @@ static struct { #define READ(val) \ - (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)) + ((unsigned int)(*(val + 0)) \ + + ((unsigned int)(*(val + 1)) << 8) \ + + ((unsigned int)(*(val + 2)) << 16) \ + + ((unsigned int)(*(val + 3)) << 24)) #define advance(_ptr,_n,_str,_error) \ do{\ if ((_ptr)+(_n)>(_str).s+(_str).len)\

1 0

git:master:1b5756ae: core: parser/sdp - coherent indentation of two functions
by Daniel-Constantin Mierla 12 Dec '21

12 Dec '21

Module: kamailio Branch: master Commit: 1b5756ae9f67c3907c134eb725f19c875cccd913 URL: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-12T13:13:32+01:00 core: parser/sdp - coherent indentation of two functions --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… Patch: https://github.com/kamailio/kamailio/commit/1b5756ae9f67c3907c134eb725f19c8… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index e118b4ac33..144d63b537 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -742,7 +742,7 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) } /* eliminate leading whitespace */ - tmp=eat_lws_end(tmp, end); + tmp=eat_lws_end(tmp, end); if (tmp>=end) { LM_ERR("hf empty\n"); goto error; @@ -781,32 +781,32 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) { - static char delimiterhead[3] = "--"; - char *cp, *cp1; - /* Iterate through body */ - cp = p; - for (;;) { - if (cp >= plimit) - return NULL; - for(;;) { - cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); - if (cp1 == NULL) - return NULL; - /* We matched '--', - * now let's match the boundary delimiter */ - if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) - break; - else - cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; - } - if (cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; - if (plimit - cp1 < 2 + delimiter.len) - return NULL; - cp = cp1 + 2 + delimiter.len; - } + static char delimiterhead[3] = "--"; + char *cp, *cp1; + /* Iterate through body */ + cp = p; + for (;;) { + if (cp >= plimit) + return NULL; + for(;;) { + cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); + if (cp1 == NULL) + return NULL; + /* We matched '--', + * now let's match the boundary delimiter */ + if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) + break; + else + cp = cp1 + 2 + delimiter.len; + if (cp >= plimit) + return NULL; + } + if (cp1[-1] == '\n' || cp1[-1] == '\r') + return cp1; + if (plimit - cp1 < 2 + delimiter.len) + return NULL; + cp = cp1 + 2 + delimiter.len; + } } @@ -815,10 +815,10 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) */ char *find_next_sdp_line_delimiter(char* p, char* plimit, str delimiter, char* defptr) { - char *t; - if (p >= plimit || plimit - p < 3) - return defptr; - t = find_sdp_line_delimiter(p + 2, plimit, delimiter); - return t ? t : defptr; + char *t; + if (p >= plimit || plimit - p < 3) + return defptr; + t = find_sdp_line_delimiter(p + 2, plimit, delimiter); + return t ? t : defptr; }

1 0

git:master:48dc90df: core: parser - print start of buffer on error for identity info
by Daniel-Constantin Mierla 11 Dec '21

11 Dec '21

Module: kamailio Branch: master Commit: 48dc90dfa1839a405e7d090b23c1fdc907107731 URL: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-11T18:40:51+01:00 core: parser - print start of buffer on error for identity info --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… Patch: https://github.com/kamailio/kamailio/commit/48dc90dfa1839a405e7d090b23c1fdc… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index e58bcd26ff..6aaabf2377 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -313,7 +313,7 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) parseerror: if(p<end) { LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p, status, (int)(p-buffer), ZSW(p)); + *p, status, (int)(p-buffer), buffer); } else { LM_ERR("unexpected end of buffer - status %d\n", status); }

1 0

[kamailio/kamailio] ims_charging: fix charging reply route with kemi (PR #2972)
by Riccardo-78 10 Dec '21

10 Dec '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2972 -- Commit Summary -- * ims_charging: fix charging reply route with kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (30) M src/modules/ims_charging/ims_ro.c (35) M src/modules/ims_charging/ims_ro.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2972.patch https://github.com/kamailio/kamailio/pull/2972.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2972

1 1

git:master:43c48edc: core: cfg.lex - renamed defenv value mode parameter
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 43c48edc5064cdef9d4a41a579d59dfbb2cfb865 URL: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:11:00+01:00 core: cfg.lex - renamed defenv value mode parameter --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df… Patch: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df…

1 0

[kamailio/kamailio] websockets: enable KEEPALIVE_MECHANISM_CONCHECK (PR #2966)
by lazedo 10 Dec '21

10 Dec '21

KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled   #### 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  add case for KEEPALIVE_MECHANISM_CONCHECK in mod_init validation of ws_keepalive_mechanism You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2966 -- Commit Summary -- * websockets: enable KEEPALIVE_MECHANISM_CONCHECK -- File Changes -- M src/modules/websocket/websocket.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2966.patch https://github.com/kamailio/kamailio/pull/2966.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2966

2 2

git:master:29c3b865: websockets: enable KEEPALIVE_MECHANISM_CONCHECK
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 29c3b865d8efde8435c2217df44d1df684caaea2 URL: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:02:18+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… Patch: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 5cef5d6b1a7..f7273048e36 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -221,6 +221,7 @@ static int mod_init(void) switch(ws_keepalive_mechanism) { case KEEPALIVE_MECHANISM_PING: case KEEPALIVE_MECHANISM_PONG: + case KEEPALIVE_MECHANISM_CONCHECK: break; default: ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;

1 0

[kamailio/kamailio] core: cfg.lex support for undefned env vars (PR #2969)
by Ben Kaufman 10 Dec '21

10 Dec '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] New feature (non-breaking change which adds new functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #2967 #### Description Add new preprocessor keywords `trydefenv` and `trydefenvs` that work like `defenv` and `defenvs` respectively, with the difference that if the environmental variable is not defined, then the value in Kamailio will not be defined. For example: ``` #!KAMAILIO loadmodule "xlog" loadmodule "pv" #!trydefenv EXTRALOG request_route { #!ifdef EXTRALOG xlog("L_I", "Some Extra Logging here\n"); #!endif forward (); } ``` If the environmental variable `$EXTRALOG` is defined, the log line will be written. If the environmental variable is not set, then in Kamailio `EXTRALOG` will not be defined and the `#!ifdef` section will not be loaded. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2969 -- Commit Summary -- * core: cfg.lex support for undefned env vars -- File Changes -- M src/core/cfg.lex (56) M src/core/ppcfg.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2969.patch https://github.com/kamailio/kamailio/pull/2969.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2969

2 2

git:master:03cd22b4: core: cfg.lex support for undefned env vars
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 03cd22b41b80a81a4260c0dee2c500cf1007e1f8 URL: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c… Author: Ben Kaufman <bkaufman(a)nexvortex.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:01:19+01:00 core: cfg.lex support for undefned env vars Feature Request GH #2967 for undefined defenv Add new keywords for preprocessing: - #!trydefenv - The same as #!defenv, except if the variable is undefined, the def value will be undefined as well. - #!trydefenvs - The same as #!defenvs, except if the variable is undefined, the def value will be undefined as well. --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c… Patch: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c…

1 0

git:master:3136d479: app_ruby: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 3136d47993a9f08ea1c7e4de715f5fbbdf18a4e4 URL: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:43:17+01:00 app_ruby: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb… Patch: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb…

1 0

git:master:7658cc9f: misc: kemi-code-gen.py - generate code for sqlang functions with xval return
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 7658cc9fdbfaba2001d538dbef23deaec4af8557 URL: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:57:38+01:00 misc: kemi-code-gen.py - generate code for sqlang functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… Patch: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 7def9fcf25..b7b4bba8c8 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="ruby" +PRINTMODE="sqlang" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -169,33 +169,16 @@ def printCodeIfRuby(prefix): def printCodeIfSQLang(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_sqlang_return_int(J, ket, ret);") + sparams = printCodeIfParams(prefix) + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_sqlang_return_xval(J, ket, xret);") + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_sqlang_return_int(J, ket, ret);") + print("\t\t\t\t}") # generated possible strings of length k with chars from set.

1 0

git:master:53fc8c1d: app_sqlang: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 53fc8c1dfeeff8231278563595cd3ae46ba81e22 URL: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:58:10+01:00 app_sqlang: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae… Patch: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae…

1 0

git:master:e9690b36: misc: kemi-code-gen.py - relocate code for generate conditions and params
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: e9690b36e44fc65fb6d368f7231bfa15faaeed59 URL: https://github.com/kamailio/kamailio/commit/e9690b36e44fc65fb6d368f7231bfa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:31:58+01:00 misc: kemi-code-gen.py - relocate code for generate conditions and params --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/e9690b36e44fc65fb6d368f7231bfa1… Patch: https://github.com/kamailio/kamailio/commit/e9690b36e44fc65fb6d368f7231bfa1… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 2a024f826e..ba5d4bcfff 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="python" +PRINTMODE="lua" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -29,7 +29,7 @@ def printCodeIfEnd(sretfunc): print(PRINTTABS + "}") -def printCodeIfJS(prefix): +def printCodeIfParams(prefix): global PRINTELSE sparams = "" for i, c in enumerate(prefix): @@ -55,7 +55,12 @@ def printCodeIfJS(prefix): else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") sparams += "vps[" + str(i) +"].n, " + return sparams + +def printCodeIfJS(prefix): + global PRINTELSE + sparams = printCodeIfParams(prefix) print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) @@ -69,31 +74,7 @@ def printCodeIfJS(prefix): def printCodeIfLua(prefix): global PRINTELSE - sparams = "" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sparams += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sparams += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - + sparams = printCodeIfParams(prefix) print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) @@ -107,31 +88,7 @@ def printCodeIfLua(prefix): def printCodeIfPython(prefix): global PRINTELSE - sparams = "" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sparams += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sparams += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sparams += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sparams += "vps[" + str(i) +"].n, " - + sparams = printCodeIfParams(prefix) print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams)

1 0

git:master:b9124539: misc: kemi-code-gen.py - generate code for ruby functions with xval return
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: b91245397f1c61313b853fc770f20a860f07b395 URL: https://github.com/kamailio/kamailio/commit/b91245397f1c61313b853fc770f20a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:42:43+01:00 misc: kemi-code-gen.py - generate code for ruby functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/b91245397f1c61313b853fc770f20a8… Patch: https://github.com/kamailio/kamailio/commit/b91245397f1c61313b853fc770f20a8… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index ba5d4bcfff..7def9fcf25 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="lua" +PRINTMODE="ruby" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -155,33 +155,16 @@ def printCodeIfPythonParams(prefix): def printCodeIfRuby(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_R->msg,\n" + PRINTTABS + "\t\t\t" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_ruby_return_int(ket, ret);") + sparams = printCodeIfParams(prefix) + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_R->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_ruby_return_xval(ket, xret);") + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_R->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_ruby_return_int(ket, ret);") + print("\t\t\t\t}") def printCodeIfSQLang(prefix):

1 0

git:master:466fcb28: app_python: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 466fcb283ccf0de92d78c90ca7df7830f8e8ced5 URL: https://github.com/kamailio/kamailio/commit/466fcb283ccf0de92d78c90ca7df783… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:08:11+01:00 app_python: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/466fcb283ccf0de92d78c90ca7df783… Patch: https://github.com/kamailio/kamailio/commit/466fcb283ccf0de92d78c90ca7df783…

1 0

git:master:871475c6: app_python3: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 871475c6aba89bd6506255665d304206325bbf4c URL: https://github.com/kamailio/kamailio/commit/871475c6aba89bd6506255665d30420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:11:54+01:00 app_python3: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/871475c6aba89bd6506255665d30420… Patch: https://github.com/kamailio/kamailio/commit/871475c6aba89bd6506255665d30420…

1 0

git:master:6064b1ee: app_jsdt: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 6064b1ee64fa2fa6682c671f554acaead5ca1898 URL: https://github.com/kamailio/kamailio/commit/6064b1ee64fa2fa6682c671f554acae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T21:01:04+01:00 app_jsdt: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6064b1ee64fa2fa6682c671f554acae… Patch: https://github.com/kamailio/kamailio/commit/6064b1ee64fa2fa6682c671f554acae…

1 0

git:master:5a048b94: misc: kemi-code-gen.py - generate code for python functions with xval return
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 5a048b9489ce4a5c48e632376f7472b26efefb45 URL: https://github.com/kamailio/kamailio/commit/5a048b9489ce4a5c48e632376f7472b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:07:23+01:00 misc: kemi-code-gen.py - generate code for python functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/5a048b9489ce4a5c48e632376f7472b… Patch: https://github.com/kamailio/kamailio/commit/5a048b9489ce4a5c48e632376f7472b… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index dd77d61655..2a024f826e 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="js" +PRINTMODE="python" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -60,10 +60,8 @@ def printCodeIfJS(prefix): sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_xval(J, ket, xret);") - print("\t\t\t\t} else {") sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" - print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_int(J, ket, ret);") print("\t\t\t\t}") @@ -100,10 +98,8 @@ def printCodeIfLua(prefix): sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_lua_return_xval(L, ket, xret);") - print("\t\t\t\t} else {") sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" - print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_lua_return_int(L, ket, ret);") print("\t\t\t\t}") @@ -111,33 +107,40 @@ def printCodeIfLua(prefix): def printCodeIfPython(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" + sparams = "" for i, c in enumerate(prefix): if i==0: if c == 's': print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " PRINTELSE = "} else " elif i==PRINTPARAMS-1: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" + sparams += "&vps[" + str(i) +"].s);" else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" + sparams += "vps[" + str(i) +"].n);" else: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_apy_return_int(ket, ret);") + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_apy_return_xval(ket, xret);") + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_apy_return_int(ket, ret);") + print("\t\t\t\t}") def printCodeIfPythonParams(prefix):

1 0

git:master:a99f581a: misc: kemi-code-gen.py - generate code for javascript functions with xval return
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: a99f581a519123e7c47479b724308a5dc239393a URL: https://github.com/kamailio/kamailio/commit/a99f581a519123e7c47479b724308a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:42:01+01:00 misc: kemi-code-gen.py - generate code for javascript functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/a99f581a519123e7c47479b724308a5… Patch: https://github.com/kamailio/kamailio/commit/a99f581a519123e7c47479b724308a5… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 6c2893a688..dd77d61655 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="lua" +PRINTMODE="js" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -31,33 +31,42 @@ def printCodeIfEnd(sretfunc): def printCodeIfJS(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + sparams = "" for i, c in enumerate(prefix): if i==0: if c == 's': print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " PRINTELSE = "} else " elif i==PRINTPARAMS-1: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" + sparams += "&vps[" + str(i) +"].s);" else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" + sparams += "vps[" + str(i) +"].n);" else: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_jsdt_return_int(J, ket, ret);") + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_xval(J, ket, xret);") + + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_int(J, ket, ret);") + print("\t\t\t\t}") def printCodeIfLua(prefix):

1 0

git:master:72cc434e: core: kemi - added typedefs for functions with three params and xval return
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 72cc434ef75a0667c843206cf84fe080bb912dd3 URL: https://github.com/kamailio/kamailio/commit/72cc434ef75a0667c843206cf84fe08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:12:22+01:00 core: kemi - added typedefs for functions with three params and xval return --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/72cc434ef75a0667c843206cf84fe08… Patch: https://github.com/kamailio/kamailio/commit/72cc434ef75a0667c843206cf84fe08… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 6493ab5009..26e9bd4860 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -180,6 +180,16 @@ typedef sr_kemi_xval_t* (*sr_kemi_xfmns_f)(sip_msg_t*, int, str*); typedef sr_kemi_xval_t* (*sr_kemi_xfmsn_f)(sip_msg_t*, str*, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmss_f)(sip_msg_t*, str*, str*); +/* return xval, params sip_msg_t and three int|str params */ +typedef sr_kemi_xval_t* (*sr_kemi_xfmnnn_f)(sip_msg_t*, int, int, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmnns_f)(sip_msg_t*, int, int, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmnsn_f)(sip_msg_t*, int, str*, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmnss_f)(sip_msg_t*, int, str*, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsnn_f)(sip_msg_t*, str*, int, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsns_f)(sip_msg_t*, str*, int, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmssn_f)(sip_msg_t*, str*, str*, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsss_f)(sip_msg_t*, str*, str*, str*); + sr_kemi_t* sr_kemi_lookup(str *mname, int midx, str *fname); int sr_kemi_modules_add(sr_kemi_t *klist);

1 0

git:master:8bce8a73: misc: kemi-code-gen.py - generate code for lua functions with 3 params and xval return
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: 8bce8a738e16303985ed386213e1d86a1a6a7878 URL: https://github.com/kamailio/kamailio/commit/8bce8a738e16303985ed386213e1d86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:15:31+01:00 misc: kemi-code-gen.py - generate code for lua functions with 3 params and xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/8bce8a738e16303985ed386213e1d86… Patch: https://github.com/kamailio/kamailio/commit/8bce8a738e16303985ed386213e1d86… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 8593c154140..6c2893a6884 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -2,9 +2,9 @@ # - print IF conditions with param types for KEMI interpreters # - print typedefs for functions -PRINTPARAMS=4 +PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="sqlang" +PRINTMODE="lua" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -62,33 +62,42 @@ def printCodeIfJS(prefix): def printCodeIfLua(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" + sparams = "" for i, c in enumerate(prefix): if i==0: if c == 's': print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " PRINTELSE = "} else " elif i==PRINTPARAMS-1: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" + sparams += "&vps[" + str(i) +"].s);" else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" + sparams += "vps[" + str(i) +"].n);" else: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_lua_return_int(L, ket, ret);") + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_lua_return_xval(L, ket, xret);") + + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" + + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_lua_return_int(L, ket, ret);") + print("\t\t\t\t}") def printCodeIfPython(prefix):

1 0

git:master:da9eee21: app_lua: update to handle xval return for functions with 3 parameters
by Daniel-Constantin Mierla 10 Dec '21

10 Dec '21

Module: kamailio Branch: master Commit: da9eee2125fc6e632bcbeae4d9133bb39c412dee URL: https://github.com/kamailio/kamailio/commit/da9eee2125fc6e632bcbeae4d9133bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:37:51+01:00 app_lua: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/da9eee2125fc6e632bcbeae4d9133bb… Patch: https://github.com/kamailio/kamailio/commit/da9eee2125fc6e632bcbeae4d9133bb…

1 0

[kamailio/kamailio] Network route priority (Issue #2968)
by xaled1 09 Dec '21

09 Dec '21

Hi, if event_route[network:msg] and event_route[siptrace:msg] both are enabled, then event_route[siptrace:msg] seems to be called before event_route[network:msg] when a message has been received (and event_route[siptrace:msg] called after event_route[network:msg], if a message has been sent) As network:msg (nio) is designed to process compression or encryption, it makes sense, that it is called before event_route[siptrace:msg], that is meant to work on a SIP message (when receiving data from the network). When sending a message, it makes sense, to call siptrace:msg before network:msg. Is there any option to change this priority (e.g. defining anchors/priorities)? -- 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/2968

2 2

git:master:cd2f5d4c: core: enclose in quotes the value for #!defenvs
by Daniel-Constantin Mierla 09 Dec '21

09 Dec '21

Module: kamailio Branch: master Commit: cd2f5d4ca2a3ec31c1e67cd08ad025a152241e35 URL: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T10:41:41+01:00 core: enclose in quotes the value for #!defenvs --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… Patch: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 551cfab014..84f5630483 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2087,6 +2087,7 @@ int pp_define_env(const char *text, int len, int qmode) char *r; str defname; str defvalue; + str newval; r = strchr(text, '='); @@ -2115,6 +2116,13 @@ int pp_define_env(const char *text, int len, int qmode) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } + if(qmode==KSR_PPDEF_QUOTED) { + if(pp_def_qvalue(&defvalue, &newval) < 0) { + LM_ERR("failed to enclose in quotes the value\n"); + return -1; + } + defvalue = newval; + } if(pp_define_set(defvalue.len, defvalue.s, qmode)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 67391557f8..3d91679df6 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -48,6 +48,31 @@ static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; static str_list_t *_ksr_substdef_strlist = NULL; +int pp_def_qvalue(str *defval, str *outval) +{ + str newval; + str_list_t *sb; + + if(pv_get_buffer_size() < defval->len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defval->s, defval->len); + newval.s[defval->len + 1] = '"'; + newval.s[defval->len + 2] = '\0'; + newval.len = defval->len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to link quoted value [%.*s]\n", defval->len, defval->s); + return -1; + } + *outval = sb->s; + + return 0; +} + int pp_subst_add(char *data) { struct subst_expr* se; @@ -163,22 +188,11 @@ int pp_substdef_add(char *data, int mode) } } if(mode==KSR_PPDEF_QUOTED) { - if(pv_get_buffer_size() < defvalue.len + 4) { - LM_ERR("defined value is too large\n"); - return -1; - } - newval.s = pv_get_buffer(); - newval.s[0] = '"'; - memcpy(newval.s + 1, defvalue.s, defvalue.len); - newval.s[defvalue.len + 1] = '"'; - newval.s[defvalue.len + 2] = '\0'; - newval.len = defvalue.len + 2; - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); + if(pp_def_qvalue(&defvalue, &newval) < 0) { + LM_ERR("failed to enclose in quotes the value\n"); return -1; } - defvalue = sb->s; + defvalue = newval; } if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index a8d27f7083..d08884775c 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -34,6 +34,8 @@ typedef struct ksr_ppdefine { int dtype; } ksr_ppdefine_t; +int pp_def_qvalue(str *defval, str *outval); + str* pp_get_define_name(int idx); ksr_ppdefine_t* pp_get_define(int idx);

1 0

[kamailio/kamailio] rtpengine: Fix set selection (PR #2965)
by Stefan Mititelu 08 Dec '21

08 Dec '21

When set_rtpengine_set() config function is called.   #### 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  After calling set_rtpengine_set(), the new set is not set for further rtpengine delete(). This is because active_rtpp_set is set to default_rtpp_set when msg id != current_msg_id (which is set once by set_rtpengine_set()) I've removed the msg id != current_msg_id condition, and initialized active_rtpp_set in mod_init(). Basically tested locally with 2 sets with 1 rtpengine each. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2965 -- Commit Summary -- * rtpengine: Fix set selection -- File Changes -- M src/modules/rtpengine/rtpengine.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2965.patch https://github.com/kamailio/kamailio/pull/2965.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2965

2 3

git:master:02be5bef: pv: added $msg(lpart) - return last part of the message
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: master Commit: 02be5bef89625a53b2f67f8ca8d3acd4073b6c2b URL: https://github.com/kamailio/kamailio/commit/02be5bef89625a53b2f67f8ca8d3acd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T15:17:11+01:00 pv: added $msg(lpart) - return last part of the message - headers and body (skips first line) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/02be5bef89625a53b2f67f8ca8d3acd… Patch: https://github.com/kamailio/kamailio/commit/02be5bef89625a53b2f67f8ca8d3acd… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index dc1f6a59a2..de5d5b41c8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4114,6 +4114,8 @@ int pv_parse_msg_attrs_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "fpart", 5)==0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "lpart", 5)==0) + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; case 8: @@ -4210,6 +4212,12 @@ int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) s.len = msg->unparsed - s.s; trim(&s); return pv_get_sintval(msg, param, res, s.len); + case 9: /* last part - headers + body */ + if(msg->headers==NULL || msg->headers->name.s==NULL) + return pv_get_null(msg, param, res); + s.s = msg->headers->name.s; + s.len = msg->buf + msg->len - s.s; + return pv_get_strval(msg, param, res, &s); default: return pv_get_null(msg, param, res);

1 0

git:master:dfbeb92a: pkg/kamailio/deb: fix lintian warnings
by Victor Seva 08 Dec '21

08 Dec '21

Module: kamailio Branch: master Commit: dfbeb92a956009fc57070ac988cb0177f9c8192f URL: https://github.com/kamailio/kamailio/commit/dfbeb92a956009fc57070ac988cb017… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-08T11:21:20+01:00 pkg/kamailio/deb: fix lintian warnings --- Added: pkg/kamailio/deb/bionic/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-systemd-modules.lintian-overrides Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/copyright Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/copyright Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/dfbeb92a956009fc57070ac988cb017… Patch: https://github.com/kamailio/kamailio/commit/dfbeb92a956009fc57070ac988cb017…

1 0

Kamailio v5.3.9 Released
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Hello, Kamailio SIP Server v5.3.9 stable release is out. This is a maintenance release of the old stable branch, 5.3, that includes fixes since the release of v5.3.8. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are strongly recommended to be upgraded to v5.3.9 or even better to v5.4.x or 5.5.x series. For more details about version 5.3.9 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/12/kamailio-v5-3-9-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the branch 5.3 is an old stable branch, v5.3.9 being the last planned release out of it, to mark the end of official maintenance. The maintained stable branches are now 5.4 and 5.5, at this time with v5.5.3 being the latest stable release. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.3:a5fd0a85: ChangeLog: content updated for v5.3.9
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.3 Commit: a5fd0a856717119ee53164ea2d8aa2892bc56b7a URL: https://github.com/kamailio/kamailio/commit/a5fd0a856717119ee53164ea2d8aa28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T10:15:16+01:00 ChangeLog: content updated for v5.3.9 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a5fd0a856717119ee53164ea2d8aa28… Patch: https://github.com/kamailio/kamailio/commit/a5fd0a856717119ee53164ea2d8aa28…

1 0

git:5.3:6a04f278: pkg: version set to 5.3.9 for rpm and alpine specs
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.3 Commit: 6a04f278372864b0c0bfa4be78d0f97283df9909 URL: https://github.com/kamailio/kamailio/commit/6a04f278372864b0c0bfa4be78d0f97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:39:04+01:00 pkg: version set to 5.3.9 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6a04f278372864b0c0bfa4be78d0f97… Patch: https://github.com/kamailio/kamailio/commit/6a04f278372864b0c0bfa4be78d0f97… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e8ee911c30..0476654b73 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.3.8 +pkgver=5.3.9 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 31d713b1f3..391ff883d0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.3.8 +%define ver 5.3.9 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.3:0cac7679: pkg/kamailio/deb: version set to 5.3.9
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.3 Commit: 0cac76792652237f362428ffbc62b29e73365aac URL: https://github.com/kamailio/kamailio/commit/0cac76792652237f362428ffbc62b29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:40:15+01:00 pkg/kamailio/deb: version set to 5.3.9 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0cac76792652237f362428ffbc62b29… Patch: https://github.com/kamailio/kamailio/commit/0cac76792652237f362428ffbc62b29…

1 0

git:5.3:91823791: Makefile.defs: set version to 5.3.9
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.3 Commit: 91823791bf485d18edfd01fdf0f923fcb09f736b URL: https://github.com/kamailio/kamailio/commit/91823791bf485d18edfd01fdf0f923f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:41:06+01:00 Makefile.defs: set version to 5.3.9 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/91823791bf485d18edfd01fdf0f923f… Patch: https://github.com/kamailio/kamailio/commit/91823791bf485d18edfd01fdf0f923f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 45db7086cc..f36fa6a7c4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 8 +SUBLEVEL = 9 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:76c052b2: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.3 Commit: 76c052b2dc86856e854c2ba1aad39a891bfb121e URL: https://github.com/kamailio/kamailio/commit/76c052b2dc86856e854c2ba1aad39a8… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:32:20+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method (cherry picked from commit de2bee1805c2c89565e9b28afb50fac375d0b5ba) (cherry picked from commit 52a01e54483c5e50fedec649689e5f142c16315a) (cherry picked from commit e04db74dc1e1706f4f3c8c2b6fcd3dba98534f04) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/76c052b2dc86856e854c2ba1aad39a8… Patch: https://github.com/kamailio/kamailio/commit/76c052b2dc86856e854c2ba1aad39a8… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

git:5.4:e04db74d: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.4 Commit: e04db74dc1e1706f4f3c8c2b6fcd3dba98534f04 URL: https://github.com/kamailio/kamailio/commit/e04db74dc1e1706f4f3c8c2b6fcd3db… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:31:41+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method (cherry picked from commit de2bee1805c2c89565e9b28afb50fac375d0b5ba) (cherry picked from commit 52a01e54483c5e50fedec649689e5f142c16315a) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/e04db74dc1e1706f4f3c8c2b6fcd3db… Patch: https://github.com/kamailio/kamailio/commit/e04db74dc1e1706f4f3c8c2b6fcd3db… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

git:5.5:52a01e54: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: 5.5 Commit: 52a01e54483c5e50fedec649689e5f142c16315a URL: https://github.com/kamailio/kamailio/commit/52a01e54483c5e50fedec649689e5f1… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:31:14+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method (cherry picked from commit de2bee1805c2c89565e9b28afb50fac375d0b5ba) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/52a01e54483c5e50fedec649689e5f1… Patch: https://github.com/kamailio/kamailio/commit/52a01e54483c5e50fedec649689e5f1… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

[kamailio/kamailio] auth_ephemeral broken for sha256/384/512 (Issue #2963)
by Justin LaVelle 08 Dec '21

08 Dec '21

### Description When using `auth_ephemeral` module I found that using anything other than the default sha1 would fail and crash Kamailio.  ### Troubleshooting #### Log Messages  ``` *** stack smashing detected ***: <unknown> terminated 13(85) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 15 0(65) ALERT: <core> [main.c:788]: handle_sigs(): child process 77 exited by a signal 6 0(65) ALERT: <core> [main.c:791]: handle_sigs(): core was generated ``` #### SIP Traffic  ``` N/A ``` ### Possible Solutions  I dug into the code and have a Pull Request to fix the issue. https://github.com/kamailio/kamailio/pull/2962 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.0-dev2 (x86_64/linux) 3c905e flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 3c905e -dirty compiled on 11:02:49 Dec 4 2021 with gcc 8.3.0 ``` * **Operating System**:  ``` Docker debian:debian on MacOS Mojave 10.14 Linux 47b9de1080dc 5.10.47-linuxkit #1 SMP Sat Jul 3 21:51:47 UTC 2021 x86_64 GNU/Linux ``` -- 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/2963

2 2

[kamailio/kamailio] auth_ephemeral: fix sha256/384/512 (PR #2962)
by Justin LaVelle 08 Dec '21

08 Dec '21

- sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method - update logging to include length You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2962 -- Commit Summary -- * auth_ephemeral: fix sha256/384/512 -- File Changes -- M src/modules/auth_ephemeral/authorize.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2962.patch https://github.com/kamailio/kamailio/pull/2962.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2962

3 4

git:master:de2bee18: auth_ephemeral: fix sha256/384/512
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: master Commit: de2bee1805c2c89565e9b28afb50fac375d0b5ba URL: https://github.com/kamailio/kamailio/commit/de2bee1805c2c89565e9b28afb50fac… Author: Justin-lavelle <justinl(a)broadvoice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:30:07+01:00 auth_ephemeral: fix sha256/384/512 - sha256/384/512 broken due to use of sha1 password length, change to check and use proper lengths for each - sha384 mistakenly using sha256 method --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/de2bee1805c2c89565e9b28afb50fac… Patch: https://github.com/kamailio/kamailio/commit/de2bee1805c2c89565e9b28afb50fac… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index bb92a4a2190..ff5012ade51 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -69,11 +69,11 @@ static inline int get_pass(str *_username, str *_secret, str *_password) break; case AUTHEPH_SHA384: hmac_len = SHA384_DIGEST_LENGTH; - if (HMAC(EVP_sha256(), _secret->s, _secret->len, + if (HMAC(EVP_sha384(), _secret->s, _secret->len, (unsigned char *) _username->s, _username->len, hmac_sha1, &hmac_len) == NULL) { - LM_ERR("HMAC-SHA256 failed\n"); + LM_ERR("HMAC-SHA384 failed\n"); return -1; } break; @@ -88,7 +88,7 @@ static inline int get_pass(str *_username, str *_secret, str *_password) } break; default: - LM_ERR("Inavlid SHA Algorithm\n"); + LM_ERR("Invalid SHA Algorithm\n"); return -1; } @@ -479,7 +479,26 @@ int autheph_proxy(struct sip_msg *_m, char *_realm, char *_p2) int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { - char generated_password[base64_enc_len(SHA_DIGEST_LENGTH)]; + unsigned int hmac_len = SHA_DIGEST_LENGTH; + switch(autheph_sha_alg) { + case AUTHEPH_SHA1: + hmac_len = SHA_DIGEST_LENGTH; + break; + case AUTHEPH_SHA256: + hmac_len = SHA256_DIGEST_LENGTH; + break; + case AUTHEPH_SHA384: + hmac_len = SHA384_DIGEST_LENGTH; + break; + case AUTHEPH_SHA512: + hmac_len = SHA512_DIGEST_LENGTH; + break; + default: + LM_ERR("Invalid SHA Algorithm\n"); + return AUTH_ERROR; + } + + char generated_password[base64_enc_len(hmac_len)]; str sgenerated_password; struct secret *secret_struct; @@ -515,14 +534,17 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) secret_struct = secret_list; while (secret_struct != NULL) { - LM_DBG("trying secret: %.*s\n", + LM_DBG("trying secret: %.*s (%i)\n", secret_struct->secret_key.len, - secret_struct->secret_key.s); + secret_struct->secret_key.s, + secret_struct->secret_key.len); if (get_pass(susername, &secret_struct->secret_key, &sgenerated_password) == 0) { - LM_DBG("generated password: %.*s\n", - sgenerated_password.len, sgenerated_password.s); + LM_DBG("generated password: %.*s (%i)\n", + sgenerated_password.len, + sgenerated_password.s, + sgenerated_password.len); if (spassword->len == sgenerated_password.len && strncmp(spassword->s, sgenerated_password.s, spassword->len) == 0)

1 0

git:master:743a9d33: src/Makefile.defs: link -lrt if glibc <= 2.17
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Module: kamailio Branch: master Commit: 743a9d33dcc3a6220bba217c14810dafb53355b2 URL: https://github.com/kamailio/kamailio/commit/743a9d33dcc3a6220bba217c14810da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-08T09:21:53+01:00 src/Makefile.defs: link -lrt if glibc <= 2.17 - GH #2921 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/743a9d33dcc3a6220bba217c14810da… Patch: https://github.com/kamailio/kamailio/commit/743a9d33dcc3a6220bba217c14810da… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index cde1faa6df..8fab3fd812 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1888,6 +1888,13 @@ ifeq ($(OS), linux) ifeq ($(NO_SELECT),) C_DEFS+=-DHAVE_SELECT endif + ifeq ($(CC_NAME), gcc) + # link librt for glibc <= 2.17 + GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) + LIBS+=-lrt + endif + endif endif ifeq ($(OS), gnu_kfreebsd)

1 0

Releasing Kamailio 5.3.9 - last in 5.3.x series
by Daniel-Constantin Mierla 08 Dec '21

08 Dec '21

Hello, it is time to mark the end of official packaging for 5.3.x releases, therefore during the next days I am going to cut the v5.3.9 release from branch 5.3, likely on Wednesday, Dec 8, 2021. In other words, if no major regression is detected shortly after this release, the v5.3.9 is going to be the last one from the 5.3 branch. It is strongly recommended to move to a series that is under active maintenance, respectively 5.5.x or 5.4.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Feb 21-24, 2022 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

[kamailio/kamailio] core: allow empty matches (#2869)
by Bastian Triller 07 Dec '21

07 Dec '21

Anchors like ^ and $ match beginning resp. ending of strings but their matches are zero length, which is ok. The anchors can be used to pre-/append a prefix/suffix via e.g. subst_hf("X-My-Header", "/^/prefix /", "a"); subst_hf("X-My-Header", "/$/ suffix/", "a");   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2869 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2869/commits/63190fb0f0580a276146…">core: allow empty matches</a> -- File Changes -- M src/core/data_lump.c (2) M src/core/re.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2869.patch https://github.com/kamailio/kamailio/pull/2869.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2869

3 7

git:master:4d06b1e4: htable: Modify previous commit to create new API for RPC and keep old API for backwards compatibility
by Olle E. Johansson 07 Dec '21

07 Dec '21

Module: kamailio Branch: master Commit: 4d06b1e4bbd371d247301ece057a3c26ae876a9f URL: https://github.com/kamailio/kamailio/commit/4d06b1e4bbd371d247301ece057a3c2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-12-07T10:12:32+01:00 htable: Modify previous commit to create new API for RPC and keep old API for backwards compatibility Thanks to @miconda for a hint! --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/4d06b1e4bbd371d247301ece057a3c2… Patch: https://github.com/kamailio/kamailio/commit/4d06b1e4bbd371d247301ece057a3c2… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 45623e0165..daf088d1f8 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -655,14 +655,33 @@ static void ht_cell_unlink(ht_t *ht, int idx, ht_cell_t *it) ht->entries[idx].esize--; } -/* Delete htable entry + +/* Delete entry in htable. +Return: + - 1 on error in argument + 0 otherwise +*/ +int ht_del_cell(ht_t *ht, str *name) +{ + int ret; + + ret = ht_del_cell_confirm(ht, name); + if (ret == -1) + return -1; + return 0; +} + +/* Delete htable entry with confirmation + +oldapi = 1 means to always return 0 +oldapi = 0 means to return 1 on successful deletion Return: -1 on error in argument 0 on entry not found 1 on entry found and deleted */ -int ht_del_cell(ht_t *ht, str *name) +int ht_del_cell_confirm(ht_t *ht, str *name) { unsigned int idx; unsigned int hid; diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index b9c1551180..4cee835325 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -91,6 +91,7 @@ int ht_init_tables(void); int ht_destroy(void); int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode); int ht_del_cell(ht_t *ht, str *name); +int ht_del_cell_confirm(ht_t *ht, str *name); ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old); int ht_cell_exists(ht_t *ht, str *name); diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 42e1847d30..6368fb0137 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -410,6 +410,10 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, return -1; } +/* Replay DMQ action + +Return 0 for non-error. Allt other returns are parsed as error. +*/ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d491e2e767..78f151daf3 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1454,7 +1454,7 @@ static void htable_rpc_delete(rpc_t* rpc, void* c) { LM_ERR("dmq replication failed\n"); } - res = ht_del_cell(ht, &keyname); + res = ht_del_cell_confirm(ht, &keyname); if (res == -1) { rpc->fault(c, 500, "Internal error");

1 0

git:master:cbd9fc13: htable: Add return code on successful deletion of item, update RPC commands with replies
by Olle E. Johansson 07 Dec '21

07 Dec '21

Module: kamailio Branch: master Commit: cbd9fc13ab11270df4b541afd9dc9b51517cdd12 URL: https://github.com/kamailio/kamailio/commit/cbd9fc13ab11270df4b541afd9dc9b5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-12-07T08:52:08+01:00 htable: Add return code on successful deletion of item, update RPC commands with replies --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/cbd9fc13ab11270df4b541afd9dc9b5… Patch: https://github.com/kamailio/kamailio/commit/cbd9fc13ab11270df4b541afd9dc9b5… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index d4310afa3d..45623e0165 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -655,6 +655,13 @@ static void ht_cell_unlink(ht_t *ht, int idx, ht_cell_t *it) ht->entries[idx].esize--; } +/* Delete htable entry + +Return: + -1 on error in argument + 0 on entry not found + 1 on entry found and deleted +*/ int ht_del_cell(ht_t *ht, str *name) { unsigned int idx; @@ -689,7 +696,7 @@ int ht_del_cell(ht_t *ht, str *name) ht_cell_unlink(ht, idx, it); ht_slot_unlock(ht, idx); ht_cell_free(it); - return 0; + return 1; } it = it->next; } diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index a20b3d6e8d..d491e2e767 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1438,6 +1438,7 @@ static const char* htable_store_doc[2] = { static void htable_rpc_delete(rpc_t* rpc, void* c) { str htname, keyname; ht_t *ht; + int res; if (rpc->scan(c, "SS", &htname, &keyname) < 2) { rpc->fault(c, 500, "Not enough parameters (htable name & key name"); @@ -1453,7 +1454,17 @@ static void htable_rpc_delete(rpc_t* rpc, void* c) { LM_ERR("dmq replication failed\n"); } - ht_del_cell(ht, &keyname); + res = ht_del_cell(ht, &keyname); + + if (res == -1) { + rpc->fault(c, 500, "Internal error"); + return; + } else if (res == 0) { + rpc->fault(c, 404, "Key not found in htable."); + return; + } + rpc->rpl_printf(c, "Ok. Key deleted."); + return; } /*! \brief RPC htable.get command to get one item */ @@ -1561,7 +1572,7 @@ static void htable_rpc_sets(rpc_t* rpc, void* c) { rpc->fault(c, 500, "Failed to set the item"); return; } - + rpc->rpl_printf(c, "Ok. Key set to new value."); return; } @@ -1596,7 +1607,7 @@ static void htable_rpc_seti(rpc_t* rpc, void* c) { rpc->fault(c, 500, "Failed to set the item"); return; } - + rpc->rpl_printf(c, "Ok. Key set to new value."); return; }

2 4

git:master:7556fbfa: pv: free escaped value for {val.json} transformations
by Daniel-Constantin Mierla 07 Dec '21

07 Dec '21

Module: kamailio Branch: master Commit: 7556fbfa38ac4dad00494944dd02fc60f65cfcb5 URL: https://github.com/kamailio/kamailio/commit/7556fbfa38ac4dad00494944dd02fc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-07T09:27:44+01:00 pv: free escaped value for {val.json} transformations --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/7556fbfa38ac4dad00494944dd02fc6… Patch: https://github.com/kamailio/kamailio/commit/7556fbfa38ac4dad00494944dd02fc6… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 5d7e0d32b3..5f45fa8e66 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2580,6 +2580,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, return 0; } if(sv.len >= TR_BUFFER_SIZE - 1) { + free(sv.s); LM_ERR("escaped value is too long\n"); return -1; } @@ -2588,6 +2589,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_buffer[sv.len] = '\0'; val->rs.s = _tr_buffer; val->rs.len = sv.len; + free(sv.s); } break; case TR_VAL_JSONQE: @@ -2601,7 +2603,8 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = 2; val->flags = PV_VAL_STR; } else if(val->flags&PV_TYPE_INT) { - break; + /* no change needed */ + return 0; } else if(val->flags&PV_VAL_STR) { ksr_str_json_escape(&val->rs, &sv, &emode); if(sv.s==NULL) { @@ -2613,6 +2616,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, return 0; } if(sv.len >= TR_BUFFER_SIZE - 3) { + free(sv.s); LM_ERR("escaped value is too long\n"); return -1; } @@ -2623,6 +2627,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_buffer[sv.len + 2] = '\0'; val->rs.s = _tr_buffer; val->rs.len = sv.len + 2; + free(sv.s); } break;

1 0

git:master:5b1177df: pv: added {val.jsonqe} - quoted json value
by Daniel-Constantin Mierla 07 Dec '21

07 Dec '21

Module: kamailio Branch: master Commit: 5b1177df2193968a3efc26bcf07eba80a59304e7 URL: https://github.com/kamailio/kamailio/commit/5b1177df2193968a3efc26bcf07eba8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-07T09:27:43+01:00 pv: added {val.jsonqe} - quoted json value --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/5b1177df2193968a3efc26bcf07eba8… Patch: https://github.com/kamailio/kamailio/commit/5b1177df2193968a3efc26bcf07eba8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index e221cb300e..5d7e0d32b3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2590,6 +2590,41 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = sv.len; } break; + case TR_VAL_JSONQE: + if(val->flags&PV_VAL_NULL) { + val->ri = 0; + tr_set_crt_buffer(); + val->rs.s = _tr_buffer; + val->rs.s[0] = '"'; + val->rs.s[1] = '"'; + val->rs.s[2] = '\0'; + val->rs.len = 2; + val->flags = PV_VAL_STR; + } else if(val->flags&PV_TYPE_INT) { + break; + } else if(val->flags&PV_VAL_STR) { + ksr_str_json_escape(&val->rs, &sv, &emode); + if(sv.s==NULL) { + LM_ERR("failed to escape the value\n"); + return -1; + } + if(emode==0) { + /* no escape was needed */ + return 0; + } + if(sv.len >= TR_BUFFER_SIZE - 3) { + LM_ERR("escaped value is too long\n"); + return -1; + } + tr_set_crt_buffer(); + _tr_buffer[0] = '"'; + memcpy(_tr_buffer + 1, sv.s, sv.len); + _tr_buffer[sv.len + 1] = '"'; + _tr_buffer[sv.len + 2] = '\0'; + val->rs.s = _tr_buffer; + val->rs.len = sv.len + 2; + } + break; default: LM_ERR("unknown subtype %d\n", @@ -3847,6 +3882,9 @@ char* tr_parse_val(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "json", 4)==0) { t->subtype = TR_VAL_JSON; goto done; + } else if(name.len==6 && strncasecmp(name.s, "jsonqe", 6)==0) { + t->subtype = TR_VAL_JSONQE; + goto done; } diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 329f09a8a2..ff5cbebff8 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -73,7 +73,7 @@ enum _tr_urialias_subtype { }; enum _tr_val_subtype { - TR_VAL_NONE=0, TR_VAL_N0, TR_VAL_NE, TR_VAL_JSON + TR_VAL_NONE=0, TR_VAL_N0, TR_VAL_NE, TR_VAL_JSON, TR_VAL_JSONQE };

1 0

git:master:9517cf47: htable: Fix spelling errors in error and debug messages
by Olle E. Johansson 07 Dec '21

07 Dec '21

Module: kamailio Branch: master Commit: 9517cf47f512f561c6461edc3cbca3410e773735 URL: https://github.com/kamailio/kamailio/commit/9517cf47f512f561c6461edc3cbca34… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-12-07T08:30:51+01:00 htable: Fix spelling errors in error and debug messages --- Modified: src/modules/htable/api.c Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9517cf47f512f561c6461edc3cbca34… Patch: https://github.com/kamailio/kamailio/commit/9517cf47f512f561c6461edc3cbca34…

1 0

git:5.3:3e21c4d9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 3e21c4d96e9f88ef9013467ea43acae6c31f307c URL: https://github.com/kamailio/kamailio/commit/3e21c4d96e9f88ef9013467ea43acae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-06T15:01:40+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/3e21c4d96e9f88ef9013467ea43acae… Patch: https://github.com/kamailio/kamailio/commit/3e21c4d96e9f88ef9013467ea43acae… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 3a9a6658a0..0d6b9347dd 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -222,9 +222,13 @@ Chapter 1. Admin Guide The module implements text based operations over the SIP message processed by Kamailio. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the message - at text level, e.g., regular expression search and replace, Perl-like + at text level, e.g., regular expression search, replace or substitutions, checks for method type, header presence, insert of new - header and date, etc. + header and date, string comparisons, multi-part body operations, etc. + + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. 2. Known Limitations @@ -545,7 +549,7 @@ replace_hdrs_str("Kamailio", "Kamailio SIP Proxy", "a"); 4.15. subst('/re/repl/flags') - Replaces re with repl (sed or perl like). + Replaces re with repl. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -626,7 +630,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ 4.18. subst_body('/re/repl/flags') - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -647,7 +651,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; 4.19. subst_hf(hf, subexp, flags) - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. Meaning of the parameters is as follows: * hf - header field name. @@ -713,7 +717,7 @@ set_reply_body("test", "text/plain"); Example 1.22. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.3:6a230024: core: clarification for -b cli parameter
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 6a230024af804ab97a2e260e5a644ad1f58d8c76 URL: https://github.com/kamailio/kamailio/commit/6a230024af804ab97a2e260e5a644ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:42:18+01:00 core: clarification for -b cli parameter (cherry picked from commit f068a9ad1892777bfb9a6d1bcfd17a291578c6b6) (cherry picked from commit 68a694676df0e0a0d0a8d0180ebc39f9893b49bc) (cherry picked from commit 748cd0834cc9118fec1ee69b749daad7203346fb) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/6a230024af804ab97a2e260e5a644ad… Patch: https://github.com/kamailio/kamailio/commit/6a230024af804ab97a2e260e5a644ad… --- diff --git a/src/main.c b/src/main.c index 6ca7feb5ef..0e16009e19 100644 --- a/src/main.c +++ b/src/main.c @@ -164,8 +164,8 @@ Options:\n\ (like for 'alias' global parameter)\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ - -b nr Maximum receive buffer size which will not be exceeded by\n\ - auto-probing procedure even if OS allows\n\ + -b nr Maximum OS UDP receive buffer size which will not be exceeded by\n\ + auto-probing-and-increase procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ -d Debugging mode (multiple -d increase the level)\n\ -D Control how daemonize is done:\n\

1 0

git:5.3:3c50cf57: msrp: fix some tcpconn where memory was never cleaned up
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 3c50cf570b41114925e689ca7c5dbd55b8d78d58 URL: https://github.com/kamailio/kamailio/commit/3c50cf570b41114925e689ca7c5dbd5… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:41:41+01:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 (cherry picked from commit bf371ccbfa1c89fefcd9d9322ae75189d97fc862) (cherry picked from commit f4ebe527c25ecedb3caffa8a361b5c42a2dd6b88) (cherry picked from commit dccc47c4fbb306150d88be40bf2463d4926c75bd) --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/3c50cf570b41114925e689ca7c5dbd5… Patch: https://github.com/kamailio/kamailio/commit/3c50cf570b41114925e689ca7c5dbd5… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:5.3:00e02d7d: core: io wait - remove log level string from debug message
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 00e02d7db1acdaaaf3193d701ba96081b7337331 URL: https://github.com/kamailio/kamailio/commit/00e02d7db1acdaaaf3193d701ba9608… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:41:52+01:00 core: io wait - remove log level string from debug message (cherry picked from commit 4608914cf9d3878c79560730ddad8e0800c38397) (cherry picked from commit 706b1ceb9cb5139c4464873c8df6d99c541dda7b) (cherry picked from commit 09ac130c86186334a1a1dd37d47f40b17a83b650) --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/00e02d7db1acdaaaf3193d701ba9608… Patch: https://github.com/kamailio/kamailio/commit/00e02d7db1acdaaaf3193d701ba9608… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 04186c72ad..f83c6ff6bf 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -371,7 +371,7 @@ inline static int io_watch_add( io_wait_h* h, LM_CRIT("maximum fd number exceeded: %d/%d\n", h->fd_no, h->max_fd_no); goto error; } - DBG("DBG: io_watch_add(%p, %d, %d, %p), fd_no=%d\n", + DBG("processing io_watch_add(%p, %d, %d, %p) - fd_no=%d\n", h, fd, type, data, h->fd_no); /* hash sanity check */ e=get_fd_map(h, fd);

1 0

git:5.3:31947769: textops: docs update to state regex params expect posix format
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 319477691bfed48749eea5c40626f033bfbcf842 URL: https://github.com/kamailio/kamailio/commit/319477691bfed48749eea5c40626f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:40:43+01:00 textops: docs update to state regex params expect posix format (cherry picked from commit b19aab7fe00f72d0c9e54a7a106ec7a065a3d02b) (cherry picked from commit a78acd8f40ed38b161a075bef74febd93acb092c) (cherry picked from commit e4eda3f5131e2788670a1f9f8342a2889e9b1107) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/319477691bfed48749eea5c40626f03… Patch: https://github.com/kamailio/kamailio/commit/319477691bfed48749eea5c40626f03… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4d5a7372ed..59eba31655 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -19,9 +19,15 @@ The module implements text based operations over the SIP message processed by &kamailio;. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the - message at text level, e.g., regular expression search and replace, - Perl-like substitutions, checks for method type, header presence, - insert of new header and date, etc. + message at text level, e.g., regular expression search, replace + or substitutions, checks for method type, header presence, + insert of new header and date, string comparisons, multi-part body + operations, etc. + </para> + <para> + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. </para> </section> <section> @@ -555,7 +561,7 @@ replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); <function moreinfo="none">subst('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like). + Replaces re with repl. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -692,7 +698,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ <function moreinfo="none">subst_body('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -732,7 +738,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; <function moreinfo="none">subst_hf(hf, subexp, flags)</function> </title> <para> - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:5.3:cfaf76db: timer: extend internal static HTTP message to have one header
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: cfaf76db114ff10005ee37ce33aa05b4b24116fd URL: https://github.com/kamailio/kamailio/commit/cfaf76db114ff10005ee37ce33aa05b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:40:52+01:00 timer: extend internal static HTTP message to have one header (cherry picked from commit c3629f877500373028d2c7cdefd976cddda31c15) (cherry picked from commit a9c5f3e4d29dccda79eee8e594d4316e32196db5) (cherry picked from commit 3d5f1a75a1413126532b6bed41f2e5ec7acc57fb) --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/cfaf76db114ff10005ee37ce33aa05b… Patch: https://github.com/kamailio/kamailio/commit/cfaf76db114ff10005ee37ce33aa05b… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 9880a8420b0..224a6bed572 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -159,7 +159,7 @@ static unsigned int timer_msg_no = 0; static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) { /*?min length of first line of message is 16 char!?*/ -#define MSG "GET /timer HTTP/0.9\n\n" +#define MSG "GET /timer HTTP/0.9\r\nUser-Agent: internal\r\n\r\n" sip_msg_t* msg; timer_action_t *a; run_act_ctx_t ra_ctx;

1 0

git:5.3:4ba9945e: core: parse main headers after updating msg buffer
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 4ba9945e26199b5a64b2e5cd02062ef9f866ac1a URL: https://github.com/kamailio/kamailio/commit/4ba9945e26199b5a64b2e5cd02062ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:41:03+01:00 core: parse main headers after updating msg buffer - same group of headers as for the case of receiving the message - applies for msg_apply_changes() as well - related to GH #2877 (cherry picked from commit d5c1b4693b6e47b4123b5f9417b5fd88d4dafd1f) (cherry picked from commit 992c5a349454e40c87c8918283ffde7302da9d8e) (cherry picked from commit 49f3ec66c9e187584f403ca19e3b436abd20376a) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/4ba9945e26199b5a64b2e5cd02062ef… Patch: https://github.com/kamailio/kamailio/commit/4ba9945e26199b5a64b2e5cd02062ef… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bb8d60c1ce..cc9943fe74 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3284,7 +3284,13 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) * valid/safe for config */ return 0; } - + if(parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } return 1; }

1 0

git:5.3:401c65ba: textops: fix broken example for filter_body
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 401c65ba3a8168af370c9a3e9c9e445eb66ebbf3 URL: https://github.com/kamailio/kamailio/commit/401c65ba3a8168af370c9a3e9c9e445… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:40:20+01:00 textops: fix broken example for filter_body (cherry picked from commit f8c1cabaeadb8ee145174843ed11bbbb0c3276b0) (cherry picked from commit d9c34770caa305fc6cafa18e255f3c05342305dc) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/401c65ba3a8168af370c9a3e9c9e445… Patch: https://github.com/kamailio/kamailio/commit/401c65ba3a8168af370c9a3e9c9e445… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 47d482aec7e..4d5a7372edb 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -859,7 +859,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.4:2296c8d8: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 2296c8d889797daf0eb5cedb4970f8f957a42f20 URL: https://github.com/kamailio/kamailio/commit/2296c8d889797daf0eb5cedb4970f8f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-06T14:46:31+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipdump/README Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/2296c8d889797daf0eb5cedb4970f8f… Patch: https://github.com/kamailio/kamailio/commit/2296c8d889797daf0eb5cedb4970f8f… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index e1841bf545..01d3a721df 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -289,8 +289,8 @@ event_route[sipdump:msg] { examples shows how to delete the files older than 2 days using Kamailio modules. ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") diff --git a/src/modules/textops/README b/src/modules/textops/README index dd1fc06a8b..1810c74782 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -237,9 +237,13 @@ Chapter 1. Admin Guide The module implements text based operations over the SIP message processed by Kamailio. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the message - at text level, e.g., regular expression search and replace, Perl-like + at text level, e.g., regular expression search, replace or substitutions, checks for method type, header presence, insert of new - header and date, etc. + header and date, string comparisons, multi-part body operations, etc. + + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. 2. Known Limitations @@ -565,7 +569,7 @@ replace_hdrs_str("Kamailio", "Kamailio SIP Proxy", "a"); 4.15. subst('/re/repl/flags') - Replaces re with repl (sed or perl like). + Replaces re with repl. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -646,7 +650,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ 4.18. subst_body('/re/repl/flags') - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -667,7 +671,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; 4.19. subst_hf(hf, subexp, flags) - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. Meaning of the parameters is as follows: * hf - header field name.

1 0

git:5.4:09ac130c: core: io wait - remove log level string from debug message
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 09ac130c86186334a1a1dd37d47f40b17a83b650 URL: https://github.com/kamailio/kamailio/commit/09ac130c86186334a1a1dd37d47f40b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:31:35+01:00 core: io wait - remove log level string from debug message (cherry picked from commit 4608914cf9d3878c79560730ddad8e0800c38397) (cherry picked from commit 706b1ceb9cb5139c4464873c8df6d99c541dda7b) --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/09ac130c86186334a1a1dd37d47f40b… Patch: https://github.com/kamailio/kamailio/commit/09ac130c86186334a1a1dd37d47f40b… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 04186c72ad..f83c6ff6bf 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -371,7 +371,7 @@ inline static int io_watch_add( io_wait_h* h, LM_CRIT("maximum fd number exceeded: %d/%d\n", h->fd_no, h->max_fd_no); goto error; } - DBG("DBG: io_watch_add(%p, %d, %d, %p), fd_no=%d\n", + DBG("processing io_watch_add(%p, %d, %d, %p) - fd_no=%d\n", h, fd, type, data, h->fd_no); /* hash sanity check */ e=get_fd_map(h, fd);

1 0

git:5.4:748cd083: core: clarification for -b cli parameter
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 748cd0834cc9118fec1ee69b749daad7203346fb URL: https://github.com/kamailio/kamailio/commit/748cd0834cc9118fec1ee69b749daad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:32:09+01:00 core: clarification for -b cli parameter (cherry picked from commit f068a9ad1892777bfb9a6d1bcfd17a291578c6b6) (cherry picked from commit 68a694676df0e0a0d0a8d0180ebc39f9893b49bc) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/748cd0834cc9118fec1ee69b749daad… Patch: https://github.com/kamailio/kamailio/commit/748cd0834cc9118fec1ee69b749daad… --- diff --git a/src/main.c b/src/main.c index 3a67f841e6..6b53133e31 100644 --- a/src/main.c +++ b/src/main.c @@ -170,8 +170,8 @@ Options:\n\ default is yes.\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ - -b nr Maximum receive buffer size which will not be exceeded by\n\ - auto-probing procedure even if OS allows\n\ + -b nr Maximum OS UDP receive buffer size which will not be exceeded by\n\ + auto-probing-and-increase procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ -d Debugging level control (multiple -d to increase the level from 0)\n\ --debug=val Debugging level value\n\

1 0

git:5.4:afc7f4c2: db_redis: don't leave unconsumed redis replies in case of error on update
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: afc7f4c2e9c8c9176e655303fa1d949cbb4ecdec URL: https://github.com/kamailio/kamailio/commit/afc7f4c2e9c8c9176e655303fa1d949… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:32:25+01:00 db_redis: don't leave unconsumed redis replies in case of error on update Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update encounters an error it was leaving unconsumed data thus causing unexpected reply later on when reading from the same connection. (cherry picked from commit bbd7b2ed5827252680e9d8949c193699da0a76b2) (cherry picked from commit 7b371b77702471e62d8bd2ee957c44df73f1db80) --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/afc7f4c2e9c8c9176e655303fa1d949… Patch: https://github.com/kamailio/kamailio/commit/afc7f4c2e9c8c9176e655303fa1d949… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c9a25adf36..ac1bd2b946 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2249,6 +2249,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&all_type_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return 0; error: @@ -2260,6 +2261,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&type_keys); db_redis_key_free(&set_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return -1; }

1 0

git:5.4:88ec70c9: tls: print src/dst port in error message
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 88ec70c9b056a91a187a68dcb0aa88345a5874e7 URL: https://github.com/kamailio/kamailio/commit/88ec70c9b056a91a187a68dcb0aa883… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:30:16+01:00 tls: print src/dst port in error message - related to GH #2872 (cherry picked from commit daedf1201c2776ccc1040e03f8f63d256e75a43a) (cherry picked from commit 058ed2e1e4fdaf4ff99cd6db5a96793d6b420483) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/88ec70c9b056a91a187a68dcb0aa883… Patch: https://github.com/kamailio/kamailio/commit/88ec70c9b056a91a187a68dcb0aa883… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 5ca11894f7..53c806a376 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1284,10 +1284,10 @@ int tls_h_read_f(struct tcp_connection* c, int* flags) TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); - ERR("source IP: %s\n", ip_buf); + ERR("src addr: %s:%d\n", ip_buf, c->rcv.src_port); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); - ERR("destination IP: %s\n", ip_buf); + ERR("dst addr: %s:%d\n", ip_buf, c->rcv.dst_port); goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/

1 0

git:5.4:dccc47c4: msrp: fix some tcpconn where memory was never cleaned up
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: dccc47c4fbb306150d88be40bf2463d4926c75bd URL: https://github.com/kamailio/kamailio/commit/dccc47c4fbb306150d88be40bf2463d… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:30:38+01:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 (cherry picked from commit bf371ccbfa1c89fefcd9d9322ae75189d97fc862) (cherry picked from commit f4ebe527c25ecedb3caffa8a361b5c42a2dd6b88) --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/dccc47c4fbb306150d88be40bf2463d… Patch: https://github.com/kamailio/kamailio/commit/dccc47c4fbb306150d88be40bf2463d… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b8..859432aa6d2 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:5.4:3d5f1a75: timer: extend internal static HTTP message to have one header
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 3d5f1a75a1413126532b6bed41f2e5ec7acc57fb URL: https://github.com/kamailio/kamailio/commit/3d5f1a75a1413126532b6bed41f2e5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:28:02+01:00 timer: extend internal static HTTP message to have one header (cherry picked from commit c3629f877500373028d2c7cdefd976cddda31c15) (cherry picked from commit a9c5f3e4d29dccda79eee8e594d4316e32196db5) --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/3d5f1a75a1413126532b6bed41f2e5e… Patch: https://github.com/kamailio/kamailio/commit/3d5f1a75a1413126532b6bed41f2e5e… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 9880a8420b..224a6bed57 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -159,7 +159,7 @@ static unsigned int timer_msg_no = 0; static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) { /*?min length of first line of message is 16 char!?*/ -#define MSG "GET /timer HTTP/0.9\n\n" +#define MSG "GET /timer HTTP/0.9\r\nUser-Agent: internal\r\n\r\n" sip_msg_t* msg; timer_action_t *a; run_act_ctx_t ra_ctx;

1 0

git:5.4:49f3ec66: core: parse main headers after updating msg buffer
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 49f3ec66c9e187584f403ca19e3b436abd20376a URL: https://github.com/kamailio/kamailio/commit/49f3ec66c9e187584f403ca19e3b436… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:29:42+01:00 core: parse main headers after updating msg buffer - same group of headers as for the case of receiving the message - applies for msg_apply_changes() as well - related to GH #2877 (cherry picked from commit d5c1b4693b6e47b4123b5f9417b5fd88d4dafd1f) (cherry picked from commit 992c5a349454e40c87c8918283ffde7302da9d8e) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/49f3ec66c9e187584f403ca19e3b436… Patch: https://github.com/kamailio/kamailio/commit/49f3ec66c9e187584f403ca19e3b436… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 1ecb566592..683b4a3b00 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3315,7 +3315,13 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) * valid/safe for config */ return 0; } - + if(parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } return 1; }

1 0

git:5.4:1dcda242: sipdump: docs - fix example config snippet
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 1dcda2425d28c182cf2b85f6f53ebe94c4f28ea1 URL: https://github.com/kamailio/kamailio/commit/1dcda2425d28c182cf2b85f6f53ebe9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:29:56+01:00 sipdump: docs - fix example config snippet (cherry picked from commit f202cfe647c6a1ac92a3c2b8e2ee056d678fb802) (cherry picked from commit 8df8974bb0f9754b126cac75eed76360e12d8a22) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1dcda2425d28c182cf2b85f6f53ebe9… Patch: https://github.com/kamailio/kamailio/commit/1dcda2425d28c182cf2b85f6f53ebe9… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 0a603c2803..d6a679d215 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -309,8 +309,8 @@ event_route[sipdump:msg] { </para> <programlisting format="linespecific"> ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

git:5.4:eb163386: async: docs - added section ids for parameters
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: eb1633863b28089681707c9cd27842a9109fea51 URL: https://github.com/kamailio/kamailio/commit/eb1633863b28089681707c9cd27842a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:27:19+01:00 async: docs - added section ids for parameters (cherry picked from commit ed3b2506e13214d25a3dd78e487ed35ed13053ac) (cherry picked from commit 4dd8c636701c778f50d11a37265e9b6300f45ecb) --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eb1633863b28089681707c9cd27842a… Patch: https://github.com/kamailio/kamailio/commit/eb1633863b28089681707c9cd27842a… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 5e9277a194c..a56c60d7d2f 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -68,7 +68,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="async.p.workers"> <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous @@ -88,7 +88,7 @@ modparam("async", "workers", 2) </programlisting> </example> </section> - <section> + <section id="async.p.ms_timer"> <title><varname>ms_timer</varname> (int)</title> <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions.

1 0

git:5.4:e4eda3f5: textops: docs update to state regex params expect posix format
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: e4eda3f5131e2788670a1f9f8342a2889e9b1107 URL: https://github.com/kamailio/kamailio/commit/e4eda3f5131e2788670a1f9f8342a28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:27:36+01:00 textops: docs update to state regex params expect posix format (cherry picked from commit b19aab7fe00f72d0c9e54a7a106ec7a065a3d02b) (cherry picked from commit a78acd8f40ed38b161a075bef74febd93acb092c) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e4eda3f5131e2788670a1f9f8342a28… Patch: https://github.com/kamailio/kamailio/commit/e4eda3f5131e2788670a1f9f8342a28… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 55e7cf36aa..c0791ab00c 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -19,9 +19,15 @@ The module implements text based operations over the SIP message processed by &kamailio;. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the - message at text level, e.g., regular expression search and replace, - Perl-like substitutions, checks for method type, header presence, - insert of new header and date, etc. + message at text level, e.g., regular expression search, replace + or substitutions, checks for method type, header presence, + insert of new header and date, string comparisons, multi-part body + operations, etc. + </para> + <para> + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. </para> </section> <section> @@ -555,7 +561,7 @@ replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); <function moreinfo="none">subst('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like). + Replaces re with repl. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -692,7 +698,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ <function moreinfo="none">subst_body('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -732,7 +738,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; <function moreinfo="none">subst_hf(hf, subexp, flags)</function> </title> <para> - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:5.5:84c08aca: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.5 Commit: 84c08acade0e548de11867866ec52223295c2f4a URL: https://github.com/kamailio/kamailio/commit/84c08acade0e548de11867866ec5222… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-06T14:31:24+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/84c08acade0e548de11867866ec5222… Patch: https://github.com/kamailio/kamailio/commit/84c08acade0e548de11867866ec5222… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 5ccd4af6c7..0b0d385a3e 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -55,7 +55,7 @@ Daniel-Constantin Mierla 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -317,7 +317,7 @@ Chapter 1. Admin Guide 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -693,7 +693,7 @@ failure_route["serial"] 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -1290,7 +1290,7 @@ modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ... -3.29. unmatched_cancel (string) +3.29. unmatched_cancel (integer) This parameter selects between forwarding CANCELs that do not match any transaction statefully (0, default value), statelessly (1) or dropping @@ -1307,7 +1307,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") Example 1.29. Set unmatched_cancel parameter ... -modparam("tm", "unmatched_cancel", "2") +modparam("tm", "unmatched_cancel", 2) ... 3.30. ruri_matching (integer)

1 0

git:5.5:7b371b77: db_redis: don't leave unconsumed redis replies in case of error on update
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.5 Commit: 7b371b77702471e62d8bd2ee957c44df73f1db80 URL: https://github.com/kamailio/kamailio/commit/7b371b77702471e62d8bd2ee957c44d… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:24:45+01:00 db_redis: don't leave unconsumed redis replies in case of error on update Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update encounters an error it was leaving unconsumed data thus causing unexpected reply later on when reading from the same connection. (cherry picked from commit bbd7b2ed5827252680e9d8949c193699da0a76b2) --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/7b371b77702471e62d8bd2ee957c44d… Patch: https://github.com/kamailio/kamailio/commit/7b371b77702471e62d8bd2ee957c44d… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c9a25adf36d..ac1bd2b9467 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2249,6 +2249,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&all_type_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return 0; error: @@ -2260,6 +2261,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&type_keys); db_redis_key_free(&set_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return -1; }

1 0

git:5.5:68a69467: core: clarification for -b cli parameter
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.5 Commit: 68a694676df0e0a0d0a8d0180ebc39f9893b49bc URL: https://github.com/kamailio/kamailio/commit/68a694676df0e0a0d0a8d0180ebc39f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:23:41+01:00 core: clarification for -b cli parameter (cherry picked from commit f068a9ad1892777bfb9a6d1bcfd17a291578c6b6) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/68a694676df0e0a0d0a8d0180ebc39f… Patch: https://github.com/kamailio/kamailio/commit/68a694676df0e0a0d0a8d0180ebc39f… --- diff --git a/src/main.c b/src/main.c index 7630fcfeff..4075d9cdce 100644 --- a/src/main.c +++ b/src/main.c @@ -169,8 +169,8 @@ Options:\n\ default is yes.\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ - -b nr Maximum receive buffer size which will not be exceeded by\n\ - auto-probing procedure even if OS allows\n\ + -b nr Maximum OS UDP receive buffer size which will not be exceeded by\n\ + auto-probing-and-increase procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ --cfg-print Print configuration file evaluating includes and ifdefs\n\ -d Debugging level control (multiple -d to increase the level from 0)\n\

1 0

git:5.5:a2969015: Fix TM Module Doc unmatched_cancel param
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.5 Commit: a2969015b92667a728c0ec8df64adb99859b5f84 URL: https://github.com/kamailio/kamailio/commit/a2969015b92667a728c0ec8df64adb9… Author: Zion Dials <me(a)ziondials.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:24:08+01:00 Fix TM Module Doc unmatched_cancel param (cherry picked from commit c060e9000f9c6cca98e23bef7aa8c295c8863de6) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/a2969015b92667a728c0ec8df64adb9… Patch: https://github.com/kamailio/kamailio/commit/a2969015b92667a728c0ec8df64adb9… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 3fdb0a7a497..247d6ad5e6d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -876,7 +876,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") </section> <section id="tm.p.unmatched_cancel"> - <title><varname>unmatched_cancel</varname> (string)</title> + <title><varname>unmatched_cancel</varname> (integer)</title> <para> This parameter selects between forwarding CANCELs that do not match any transaction statefully (0, @@ -899,7 +899,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") <title>Set <varname>unmatched_cancel</varname> parameter</title> <programlisting> ... -modparam("tm", "unmatched_cancel", "2") +modparam("tm", "unmatched_cancel", 2) ... </programlisting> </example>

1 0

git:5.5:fcc065f0: dispatcher: Not possible to deactivate probing of destination by reload
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.5 Commit: fcc065f0cd873d9880a5b9a170a305c858b95753 URL: https://github.com/kamailio/kamailio/commit/fcc065f0cd873d9880a5b9a170a305c… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:24:28+01:00 dispatcher: Not possible to deactivate probing of destination by reload If ds_probing_mode is set to 3, flag in the dispatcher entry needs to include 8 for probing to happen. Changing a destination to not include this anymore while the destination do not respond to OPTIONS will cause the probing flag to be re-added because of the delayed response. A restart will fix it. We need to check against the probing flag in the CB function to determine if we should continue probing this destination. If probing is deativated while waiting for a reply, we should abort. (cherry picked from commit 429fea8069f0753e6b8dbfbfaf36701e30af6dda) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/fcc065f0cd873d9880a5b9a170a305c… Patch: https://github.com/kamailio/kamailio/commit/fcc065f0cd873d9880a5b9a170a305c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 674678417d..936c7f2993 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3503,6 +3503,11 @@ static void ds_options_callback( } } + /* Check if in the meantime someone disabled probing of the target through RPC, MI or reload */ + if(ds_probing_mode == DS_PROBE_ONLYFLAGGED && !(ds_get_state(group, &uri) & DS_PROBING_DST)) { + return; + } + /* ps->code contains the result-code of the request. * * We accept both a "200 OK" or the configured reply as a valid response */

1 0

git:master:2eed551e: db_cluster: Fix spelling errors
by Olle E. Johansson 06 Dec '21

06 Dec '21

Module: kamailio Branch: master Commit: 2eed551ed55fcd2bc190e1045da377f6b1e4d22d URL: https://github.com/kamailio/kamailio/commit/2eed551ed55fcd2bc190e1045da377f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-12-06T13:12:23+01:00 db_cluster: Fix spelling errors --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/2eed551ed55fcd2bc190e1045da377f… Patch: https://github.com/kamailio/kamailio/commit/2eed551ed55fcd2bc190e1045da377f… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 838f2a24c2..d1906e0f9d 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -72,7 +72,7 @@ extern int dbcl_max_query_length; cls->usedcon = cls->rlist[i].clist[j];\ return 0;\ } else {\ - LM_DBG("serial operation - failre on cluster"\ + LM_DBG("serial operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -105,7 +105,7 @@ extern int dbcl_max_query_length; cls->rlist[i].crt = (j+1) % cls->rlist[i].clen;\ return 0;\ } else {\ - LM_DBG("round robin operation - failre on cluster"\ + LM_DBG("round robin operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -409,7 +409,7 @@ db1_con_t* db_cluster_init(const str* _dburl) LM_DBG("initializing with cluster [%.*s]\n", _dburl->len, _dburl->s); if(_dburl->len<10 || strncmp(_dburl->s, "cluster://", 10)!=0) { - LM_ERR("invlaid url for cluster module [%.*s]\n", + LM_ERR("invalid url for cluster module [%.*s]\n", _dburl->len, _dburl->s); return NULL; } @@ -433,7 +433,7 @@ db1_con_t* db_cluster_init(const str* _dburl) cls->ref++; h = (db1_con_t*)pkg_malloc(sizeof(db1_con_t)); if (h==NULL) { - LM_ERR("out of pkg\n"); + LM_ERR("out of pkg memory\n"); return NULL; } memset(h, 0, sizeof(db1_con_t)); diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 02a3e7cbbe..6ff994974e 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -298,7 +298,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) pit->name.len, pit->name.s, i, cls->rlist[i].clen); cls->rlist[i].clen++; } else { - LM_WARN("too many read connections in cluster - con-id [%.*s]\n", + LM_WARN("too many read connections in cluster - connection id [%.*s]\n", pit->name.len, pit->name.s); } if(s.s[2]<'0' || s.s[2]>'9')

1 0

git:master:3e36a56f: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 05 Dec '21

05 Dec '21

Module: kamailio Branch: master Commit: 3e36a56fa6e04d68227bc4098689be3771ec8995 URL: https://github.com/kamailio/kamailio/commit/3e36a56fa6e04d68227bc4098689be3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-05T21:01:20+01:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/3e36a56fa6e04d68227bc4098689be3… Patch: https://github.com/kamailio/kamailio/commit/3e36a56fa6e04d68227bc4098689be3… --- diff --git a/src/modules/lrkproxy/README b/src/modules/lrkproxy/README index 8de720a1c7..373201433b 100644 --- a/src/modules/lrkproxy/README +++ b/src/modules/lrkproxy/README @@ -88,7 +88,7 @@ Chapter 1. Admin Guide 1. Overview This is a module that enables media streams to be relayed via - pylrkproxy engine that exist in: + pylrkproxy engine. This engine can be found at: https://github.com/mojtabaesfandiari/pylrkproxy It does relaying audio streams between peers in PREROUTING netfilter-hooking section in kernel-space linux. The LRKProxy architecture is composed of two @@ -133,7 +133,7 @@ Chapter 1. Admin Guide IMPORTANT: This module does not support balancing inside a set like as is done RTPProxy module based on the weight of each rtpproxy from the - set. The balancing would be run on different machine + set. The balancing would be run on different machine. 4. Dependencies

1 0

git:master:17ff51f2: lrkproxy: small changes in documentation
by Henning Westerholt 05 Dec '21

05 Dec '21

Module: kamailio Branch: master Commit: 17ff51f205a9c311e9dd2908d370957faf770ea5 URL: https://github.com/kamailio/kamailio/commit/17ff51f205a9c311e9dd2908d370957… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-12-05T19:56:53Z lrkproxy: small changes in documentation --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/17ff51f205a9c311e9dd2908d370957… Patch: https://github.com/kamailio/kamailio/commit/17ff51f205a9c311e9dd2908d370957… --- diff --git a/src/modules/lrkproxy/doc/lrkproxy_admin.xml b/src/modules/lrkproxy/doc/lrkproxy_admin.xml index 2a0beb401d..728e3ea64b 100644 --- a/src/modules/lrkproxy/doc/lrkproxy_admin.xml +++ b/src/modules/lrkproxy/doc/lrkproxy_admin.xml @@ -18,7 +18,7 @@ <title>Overview</title> <para> This is a module that enables media streams to be relayed via - pylrkproxy engine that exist in: + pylrkproxy engine. This engine can be found at: https://github.com/mojtabaesfandiari/pylrkproxy It does relaying audio streams between peers in PREROUTING netfilter-hooking section in kernel-space linux. @@ -77,7 +77,7 @@ </para> <para> IMPORTANT: This module does not support balancing inside a set like as is done RTPProxy module based on - the weight of each rtpproxy from the set. The balancing would be run on different machine + the weight of each rtpproxy from the set. The balancing would be run on different machine. </para> </section>

1 0

git:master:3c905ec2: lrkproxy:some features add to lrkproxy module
by Mojtaba Esfandiari.S 05 Dec '21

05 Dec '21

Module: kamailio Branch: master Commit: 3c905ec289c2779b969f185021518f3532ce6833 URL: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com> Date: 2021-12-04T00:41:51+03:30 lrkproxy:some features add to lrkproxy module add 'gt' option for optimization port resource allocation add 'custom_sdp_ip_avp' option for handling NAT client --- Modified: src/modules/lrkproxy/README Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml Modified: src/modules/lrkproxy/lrkproxy.c Modified: src/modules/lrkproxy/lrkproxy_funcs.c Modified: src/modules/lrkproxy/lrkproxy_funcs.h Modified: src/modules/lrkproxy/lrkproxy_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3… Patch: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3…

2 1

git:master:986b9bea: pkg/kamailio/deb: fix bookworm and sid build
by Victor Seva 04 Dec '21

04 Dec '21

Module: kamailio Branch: master Commit: 986b9bea258864bf40606afe9761dc17dead6476 URL: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-04T17:01:55+01:00 pkg/kamailio/deb: fix bookworm and sid build * no python2 and dh-systemd package available --- Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules --- Diff: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1… Patch: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1…

1 0

DMQ + Presence issue (Notify generated by both server)
by Hardik Patel 03 Dec '21

03 Dec '21

Hello Team, We are using Kamailio 5.4.7 (DMQ + Presence) modules. We want to replicate all subscribe from server-1(Presence) to server-2(Presence).Replication worked perfectly fine but we noticed that after replicate the subscribe event both the presence server are generating the NOTIFY which should not. Can you please guide us where we made the mistake or how we can just replicate the subscribe information to other server using DMQ module? Please find the configuration SERVER-1 (Presence) ======================== ### presence_dialoginfo params ### modparam("presence_dialoginfo", "force_single_dialog", 1) ######## presence params ######### modparam("presence", "db_table_lock_type", 0) modparam("presence", "db_url", DBURL_LOCAL) modparam("presence", "db_update_period", 30) modparam("presence", "send_fast_notify", 1) modparam("presence", "clean_period", 100) modparam("presence", "subs_db_mode", 3) modparam("presence", "timeout_rm_subs", 0) //new/ modparam("presence", "notifier_poll_rate", 20) //new// modparam("presence", "waitn_time",1) modparam("presence", "fetch_rows", 1000) modparam("presence", "presentity_table", "presentity") modparam("presence", "active_watchers_table", "active_watchers") modparam("presence", "watchers_table", "watchers") modparam("presence", "max_expires", 3600) modparam("presence", "server_address", "sip:presence@VAR_LOCAL_IP:SIP_PORT") modparam("presence", "notifier_processes", 0) modparam("presence", "publ_cache", 1) modparam("presence", "subs_htable_size", 15) modparam("presence", "pres_htable_size", 15) modparam("presence", "delete_same_subs", 1) modparam("presence", "timer_mode", 0) modparam("presence", "force_delete", 1) modparam("presence", "enable_dmq", 1) ######## presence_xml params ###### modparam("presence_xml", "db_url", DBURL_LOCAL) modparam("presence_xml", "force_active", 1) #modparam("presence_xml", "disable_presence",1) #--- dmq db param ---- modparam("dmq","server_address","sip:VAR_LOCAL_IP:SIP_PORT") modparam("dmq", "notification_address", DMQ_NOTIFY_ADDR1) modparam("dmq", "num_workers", 4) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) if(is_method("KDMQ")) { dmq_handle_message(); } route[HANDLE_PRESENCE] { if (! t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { if ($hdr(Event) == "message-summary") { if($hdr(P-Flags)=~"1") { remove_hf("Event"); append_hf("Event: dialog\r\n"); msg_apply_changes(); remove_hf("Content-Type"); append_hf("Content-Type: application/dialog-info+xml\r\n"); msg_apply_changes(); } } if((search_hf("To", "queue+", "a")) && is_present_hf("SIP-If-Match")){ remove_hf("SIP-If-Match"); msg_apply_changes(); } xlog("L_ERR","(xhttp:request) : HANDLE_PUBLISH_FUN \n"); handle_publish(); t_release(); } else if( is_method("SUBSCRIBE")) { handle_subscribe(); if(!dmq_is_from_node()) dmq_t_replicate(); t_release(); } exit; } SERVER-2 (Presence) ====================== ### presence_dialoginfo params ### modparam("presence_dialoginfo", "force_single_dialog", 1) ######## presence params ######### modparam("presence", "db_table_lock_type", 0) modparam("presence", "db_url", DBURL_LOCAL) modparam("presence", "db_update_period", 30) modparam("presence", "send_fast_notify", 1) modparam("presence", "clean_period", 100) modparam("presence", "subs_db_mode", 3) modparam("presence", "timeout_rm_subs", 0) //new/ modparam("presence", "notifier_poll_rate", 20) //new// modparam("presence", "waitn_time",1) modparam("presence", "fetch_rows", 1000) modparam("presence", "presentity_table", "presentity") modparam("presence", "active_watchers_table", "active_watchers") modparam("presence", "watchers_table", "watchers") modparam("presence", "max_expires", 3600) modparam("presence", "server_address", "sip:presence@VAR_LOCAL_IP:SIP_PORT") modparam("presence", "notifier_processes", 0) modparam("presence", "publ_cache", 1) modparam("presence", "subs_htable_size", 15) modparam("presence", "pres_htable_size", 15) modparam("presence", "delete_same_subs", 1) modparam("presence", "timer_mode", 0) modparam("presence", "force_delete", 1) modparam("presence", "enable_dmq", 1) ######## presence_xml params ###### modparam("presence_xml", "db_url", DBURL_LOCAL) modparam("presence_xml", "force_active", 1) #modparam("presence_xml", "disable_presence",1) #--- dmq db param ---- modparam("dmq","server_address","sip:VAR_LOCAL_IP:SIP_PORT") modparam("dmq", "notification_address", DMQ_NOTIFY_ADDR1) modparam("dmq", "num_workers", 4) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) if(is_method("KDMQ")) { dmq_handle_message(); } route[HANDLE_PRESENCE] { if (! t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { if ($hdr(Event) == "message-summary") { if($hdr(P-Flags)=~"1") { remove_hf("Event"); append_hf("Event: dialog\r\n"); msg_apply_changes(); remove_hf("Content-Type"); append_hf("Content-Type: application/dialog-info+xml\r\n"); msg_apply_changes(); } } if((search_hf("To", "queue+", "a")) && is_present_hf("SIP-If-Match")){ remove_hf("SIP-If-Match"); msg_apply_changes(); } xlog("L_ERR","(xhttp:request) : HANDLE_PUBLISH_FUN \n"); handle_publish(); t_release(); } else if( is_method("SUBSCRIBE")) { handle_subscribe(); if(!dmq_is_from_node()) dmq_t_replicate(); t_release(); } exit; } version: kamailio 5.4.7 (x86_64/linux) a19fe1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a19fe1 compiled on 00:05:09 Oct 21 2021 with gcc 8.3.0 -- Hardik Patel

1 0

git:master:3e4e5958: tsilo: reworked checking ruri and contact parameters
by Daniel-Constantin Mierla 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: 3e4e59584f3e8a2fea1d9167eaf42eda8cc5653b URL: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-03T13:02:45+01:00 tsilo: reworked checking ruri and contact parameters - removed module name from log messages --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed… Patch: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed…

1 0

[kamailio/kamailio] sqlite: module group creation (PR #2952)
by jailbird777 03 Dec '21

03 Dec '21

- Add sqlite as an option to Makefile.groups - Add sqlite to INSTALL documentation - [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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description db_sqlite couldn't be enable previously using group_include=sqlite. This fixes that. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2952 -- Commit Summary -- * sqlite: module group creation -- File Changes -- M INSTALL (10) M src/Makefile.groups (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2952.patch https://github.com/kamailio/kamailio/pull/2952.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2952

2 1

git:master:e976054f: sqlite: module group creation
by Daniel-Constantin Mierla 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: e976054f71692b536f59a81347e8254886f08a69 URL: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… Author: JailBird <jailbird(a)fdf.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-03T13:02:06+01:00 sqlite: module group creation - Add sqlite as an option to Makefile.groups - Add sqlite to INSTALL documentation --- Modified: INSTALL Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… Patch: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… --- diff --git a/INSTALL b/INSTALL index 63c03062f4..7982d1d380 100644 --- a/INSTALL +++ b/INSTALL @@ -102,6 +102,7 @@ Requirements: - python and devel headers for the Python module - jdk and gcj for Java module - the jansson library for the jansson module used for JSON document handling +- libsqlite3 if you need SQLite support (the db_sqlite module) Some modules have other requirements on third-party libraries. This is documented in the README for the specific module. @@ -120,6 +121,7 @@ OS Notes: - expat-1.95.8 (/usr/ports/textproc/expat2) for libexpat - libxml2-2.6.18 (/usr/ports/textproc/libxml2) for libxml2 - radiusclient-0.4.7 (/usr/ports/net/radiusclient) for libradiusclient-ng + - sqlite3-3.35.5 (/usr/ports/databases/sqlite3) for libsqlite3 NOTE: you'll need to add radiusclient_ng=4 to the gmake command line if you use the 0.4.* version. @@ -135,6 +137,7 @@ OS Notes: http://download.berlios.de/radiusclient-ng/radiusclient-ng-0.5.1.tar.gz (you need to download and install it, since there is no "official" openbsd port for it) for libradiusclient-ng + - sqlite3-3.35.5 (/usr/ports/databases/sqlite3) for libsqlite3 Compile example (all the modules and SIP server core in a tar.gz): gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa" @@ -145,6 +148,7 @@ OS Notes: - expat-1.95.8nb2 (/usr/pkgsrc/textproc/expat) for libexpat - libxml2-2.6.19 (/usr/pkgsrc/textproc/libxml2) for libxml2 - radiusclient-ng-0.5.1 (see OpenBSD) + - sqlite3-3.36.0 (/usr/pkgsrc/databases/sqlite3) for libsqlite Compile example (all the modules and SIP server in a tar.gz): gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa" @@ -172,6 +176,7 @@ OS Notes: - libexpat1-dev for libexpat - libxml2-dev for libxml2 - libradiusclient-ng-dev for libradiusclient + - libsqlite3-dev for libsqlite - other libraries are needed for some other modules, see README of the module you want to use Kamailio have APT deb repositories that allow you to @@ -258,8 +263,8 @@ Including groups of modules: - db - Modules in this group use databases and need a database driver to run. Included are drivers for the text mode db (dbtext) and for dumping - large amount of data to files (db_flatstore). See also the mysql or - postgres groups. + large amount of data to files (db_flatstore). See also the mysql, + postgres, or sqlite groups. - standard_dep - Modules in this group are considered a standard part of Kamailio (due to widespread usage) but they have dependencies that must be satisfied @@ -290,6 +295,7 @@ are grouped based on Debian packaging rules. For example: mysql - Include all the db modules dependent and the MySQL db driver postgres - Include all the db modules and the PostgreSQL db driver + sqlite - Include all the db modules and the SQLite db driver radius - Include all modules on radiusclient presence - Include all the presence modules diff --git a/src/Makefile.groups b/src/Makefile.groups index 62a585cafb..c388489a66 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -319,6 +319,10 @@ module_group_mysql=$(module_group_mysql_driver) $(module_group_db) module_group_postgres_driver=$(mod_list_postgres) module_group_postgres=$(module_group_postgres_driver) $(module_group_db) +# For sqlite +module_group_sqlite_driver=$(mod_list_sqlite) +module_group_sqlite=$(module_group_sqlite_driver) $(module_group_db) + # For radius module_group_radius=$(mod_list_radius)

1 0

git:master:f01a00bf: pkg/kamailio/deb: Add bookworm support
by Victor Seva 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: f01a00bf86bbdd09e26ba08f0da8ec89172a5eb8 URL: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-03T11:01:35+01:00 pkg/kamailio/deb: Add bookworm support --- Added: pkg/kamailio/deb/bookworm/changelog Added: pkg/kamailio/deb/bookworm/compat Added: pkg/kamailio/deb/bookworm/control Added: pkg/kamailio/deb/bookworm/copyright Added: pkg/kamailio/deb/bookworm/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/bookworm/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio.README.Debian Added: pkg/kamailio/deb/bookworm/kamailio.default Added: pkg/kamailio/deb/bookworm/kamailio.examples Added: pkg/kamailio/deb/bookworm/kamailio.init Added: pkg/kamailio/deb/bookworm/kamailio.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio.postinst Added: pkg/kamailio/deb/bookworm/kamailio.service Added: pkg/kamailio/deb/bookworm/rules Added: pkg/kamailio/deb/bookworm/source.lintian-overrides Added: pkg/kamailio/deb/bookworm/source/format Added: pkg/kamailio/deb/bookworm/watch Added: pkg/kamailio/deb/debian/backports/bookworm --- Diff: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8… Patch: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8…

1 0

[kamailio/kamailio] add dlg.stats_active parameter to filter dialogs that belongs to the server (Issue #2920)
by Victor Seva 01 Dec '21

01 Dec '21

### Description If two kamailio servers share the same dialog db table, on restart, they both load all dialogues info stored in db into memory and dlg.stats_alive returns the same amount of alive dialogues on both serves. ### Expected behavior I would expect that dlg.stats_alive would return just the dialogues info that belongs to the server ( socket_info is not empty ) ### Possible Solutions Introduce an optional parameter to the RPC command to filter just the dialogues that belongs to the server -- 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/2920

2 2

[kamailio/kamailio] Loose Route Problem with uac_reg_request_to()/uac_auth() in combination with topos/topos_redis (Issue #2961)
by Emil Kroymann 01 Dec '21

01 Dec '21

We use Kamailio 5.5.0 and topos/topos_redis as well as the uac module to register with sipconnect 1.1 based trunks. When we want to originate a call via such a trunk, we encounter the following problem with ACK routing. 200 OK sent by Trunk `U 217.10.68.150:5060 -> 172.31.16.103:5060 #7583 SIP/2.0 200 OK. Via: SIP/2.0/UDP 3.67.244.157:5060;branch=z9hG4bK496f.744a3c48b24be1ba5fdda68cf5fe3878.1. Record-Route: <sip:172.20.40.8;lr>. Record-Route: <sip:217.10.68.150;lr>. Call-ID: 7cd83e052202a97f4e28728276e0c758@35.157.121.101:5060. From: "01705441258" <sip:2908206t0@sipconnect.sipgate.de>;tag=as010d26b4. To: <sip:+493046996025@voip.sandbox.aaron.ai>;tag=221f5413-4c48-4f53-97e8-d96ea6413f26. CSeq: 102 INVITE. Allow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, MESSAGE, REFER. Contact: <sip:217.10.77.61:5060>. Supported: replaces. Content-Type: application/sdp. Content-Length: 242. .. v=0. o=- 56188352 56188354 IN IP4 212.9.44.180. s=sGW. c=IN IP4 212.9.44.180. t=0 0. m=audio 27558 RTP/AVP 8 101. a=maxptime:150. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=sendrecv. a=rtcp:27559. a=ptime:20. ` ACK sent by Kamailio `ACK sip:217.10.68.150:5060 SIP/2.0. Via: SIP/2.0/UDP 3.67.244.157:5060;branch=z9hG4bK496f.af6a45e3907d2bea8ea65cc42f223fb2.0. Max-Forwards: 69. From: "01705441258" <sip:01705441258@35.157.121.101>;tag=as010d26b4. To: <sip:+493046996025@voip.sandbox.aaron.ai:5060>;tag=221f5413-4c48-4f53-97e8-d96ea6413f26. Call-ID: 7cd83e052202a97f4e28728276e0c758@35.157.121.101:5060. CSeq: 102 ACK. User-Agent: Asterisk PBX 13.38.1. Content-Length: 0. Route: <sip:217.10.68.150;lr>. Route: <sip:172.20.40.8;lr>. Contact: <sip:btpsh-61a6122b-a-1@3.67.244.157>. .. ` The ACK is not accepted by the trunk, because the R-URI does not contain the address fromt the 200 OK/Contact. 200 OK is then retransmitted by the trunk. [kamailio-uac-topos-bug-report.zip](https://github.com/kamailio/kamailio/fil… -- 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/2961

2 2

git:master:d6a34eee: core: reworked string-number conversion to catch out of limits values
by Daniel-Constantin Mierla 01 Dec '21

01 Dec '21

Module: kamailio Branch: master Commit: d6a34eee893a47450650ea29671e80dbffc03c8f URL: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-01T09:34:28+01:00 core: reworked string-number conversion to catch out of limits values --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… Patch: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… --- diff --git a/src/core/ut.h b/src/core/ut.h index 9b899a94e7..44bd0e75c7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -627,37 +627,43 @@ static inline void strlower(str* _s) } } - -#define str2unval(_s, _r, _vmax) do { \ - int i; \ - if (_r == NULL) return -1; \ +#define str2unval(_s, _r, _vtype, _vmax) do { \ + _vtype limitmul; \ + int i, c, limitrst; \ + if((_s == NULL) || (_r == NULL) || (_s->len < 0) || (_s->s == NULL)) { \ + return -1; \ + } \ *_r = 0; \ - if (_s == NULL) return -1; \ - if (_s->len < 0) return -1; \ - if (_s->s == NULL) return -1; \ - for(i = 0; i < _s->len; i++) { \ - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ - if(*_r > _vmax/10) { \ - return -1; \ - } \ - *_r *= 10; \ - if(*_r > _vmax - (_s->s[i] - '0')) { \ - return -1; \ - } \ - *_r += _s->s[i] - '0'; \ - } else { \ + i = 0; \ + if (_s->s[0] == '+') { \ + i++; \ + } \ + limitmul = _vmax / 10; \ + limitrst = _vmax % 10; \ + for(; i < _s->len; i++) { \ + c = (unsigned char)_s->s[i]; \ + if (c < '0' || c > '9') { \ + return -1; \ + } \ + c -= '0'; \ + if (*_r > limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmax; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r += c; \ } \ } \ return 0; \ } while(0) + /* * Convert an str to unsigned long */ static inline int str2ulong(str* _s, unsigned long* _r) { - str2unval(_s, _r, ULONG_MAX); + str2unval(_s, _r, long, ULONG_MAX); } /* @@ -665,56 +671,69 @@ static inline int str2ulong(str* _s, unsigned long* _r) */ static inline int str2int(str* _s, unsigned int* _r) { - str2unval(_s, _r, UINT_MAX); + str2unval(_s, _r, int, UINT_MAX); } -#define str2snval(_s, _r, _vmin, _vmax) do { \ - int i; \ - int sign; \ - long long ll; \ - if (_s == NULL) return -1; \ - if (_r == NULL) return -1; \ - if (_s->len < 0) return -1; \ - if (_s->s == NULL) return -1; \ + +#define str2snval(_s, _r, _vtype, _vmin, _vmax) do { \ + _vtype limitmul; \ + int i, c, neg, limitrst; \ + if((_s == NULL) || (_r == NULL) || (_s->len < 0) || (_s->s == NULL)) { \ + return -1; \ + } \ *_r = 0; \ - sign = 1; \ + neg = 0; \ i = 0; \ if (_s->s[0] == '+') { \ i++; \ } else if (_s->s[0] == '-') { \ - sign = -1; \ + neg = 1; \ i++; \ } \ + limitmul = neg ? _vmin : _vmax; \ + limitrst = limitmul % 10; \ + limitmul /= 10; \ + if (neg) { \ + if (limitrst > 0) { \ + limitrst -= 10; \ + limitmul += 1; \ + } \ + limitrst = -limitrst; \ + } \ for(; i < _s->len; i++) { \ - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ - if(*_r > _vmax/10) { \ + c = (unsigned char)_s->s[i]; \ + if (c < '0' || c > '9') { \ + return -1; \ + } \ + c -= '0'; \ + if (neg) { \ + if (*_r < limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmin; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r -= c; \ } \ - *_r *= 10; \ - if(*_r > _vmax - (_s->s[i] - '0')) { \ + } else { \ + if (*_r > limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmax; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r += c; \ } \ - *_r += _s->s[i] - '0'; \ - } else { \ - return -1; \ } \ } \ - if(sign < 0) { \ - ll = (long long)(*_r) * sign; \ - if(ll < _vmin) { \ - return -1; \ - } \ - *_r *= sign; \ - } \ return 0; \ } while(0) + /* * Convert an str to signed long */ static inline int str2slong(str* _s, long* _r) { - str2snval(_s, _r, LONG_MIN, LONG_MAX); + str2snval(_s, _r, long, LONG_MIN, LONG_MAX); } @@ -723,7 +742,7 @@ static inline int str2slong(str* _s, long* _r) */ static inline int str2sint(str* _s, int* _r) { - str2snval(_s, _r, INT_MIN, INT_MAX); + str2snval(_s, _r, int, INT_MIN, INT_MAX); }

1 0

[kamailio/kamailio] sipt: added one function and 8 pseudo-variables (#2841)
by MikhailKalashnikov 30 Nov '21

30 Nov '21

- sipt_has_isup_body() - $sipt(redirection_information.reason) - $sipt(redirection_information.original_reason) - $sipt(redirecting_number.nai) - $sipt(redirecting_number) - $sipt(original_called_number.nai) - $sipt(original_called_number) - $sipt(generic_number.nai) - $sipt(generic_number)   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2841 -- Commit Summary -- * sipt: added one function and 8 pseudo-variables -- File Changes -- M src/modules/sipt/doc/sipt_admin.xml (95) M src/modules/sipt/sipt.c (358) M src/modules/sipt/ss7.h (14) M src/modules/sipt/ss7_parser.c (208) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2841.patch https://github.com/kamailio/kamailio/pull/2841.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2841

4 20

git:master:94d1eecc: core: added #!defenvs preprocessor directive
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 94d1eecc618067bb04ed36deaf0ceee4e3bff06b URL: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T11:15:30+01:00 core: added #!defenvs preprocessor directive - similar to #!defenv, but the value is enclosed in double quotes to make it covenient to be used as a string token --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… Patch: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 06c87361a7..551cfab014 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -129,7 +129,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID +%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID DEFENVS_ID %x LINECOMMENT DEFINE_ID DEFINE_EOL DEFINE_DATA IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -565,6 +565,7 @@ ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" DEFENV defenv +DEFENVS defenvs /* else is already defined */ @@ -1449,7 +1450,28 @@ IMPORTFILE "import_file" <DEFENV_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ count(); ksr_cfg_print_part(yytext); - if(pp_define_env(yytext, yyleng) < 0) { + if(pp_define_env(yytext, yyleng, KSR_PPDEF_NORMAL) < 0) { + LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); + ksr_exit(-1); + } + state = INITIAL; + ksr_cfg_print_initial_state(); +} + +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFENVS} { count(); + ksr_cfg_print_part(yytext); + state = DEFINE_S; + BEGIN(DEFENVS_ID); +} + +<DEFENVS_ID>[ \t]* { /* eat the whitespace */ + count(); + ksr_cfg_print_part(yytext); + } +<DEFENVS_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ + count(); + ksr_cfg_print_part(yytext); + if(pp_define_env(yytext, yyleng, KSR_PPDEF_QUOTED) < 0) { LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); ksr_exit(-1); } @@ -2060,7 +2082,7 @@ int pp_define_set(int len, char *text, int mode) return 0; } -int pp_define_env(const char *text, int len) +int pp_define_env(const char *text, int len, int qmode) { char *r; str defname; @@ -2093,7 +2115,7 @@ int pp_define_env(const char *text, int len) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } - if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_NORMAL)<0) { + if(pp_define_set(defvalue.len, defvalue.s, qmode)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 17b19380bc..a8d27f7083 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -45,7 +45,7 @@ int pp_define(int len, const char *text); int pp_define_set(int len, char *text, int mode); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); -int pp_define_env(const char * text, int len); +int pp_define_env(const char * text, int len, int qmode); void pp_ifdef_level_update(int val); int pp_ifdef_level_check(void);

1 0

[kamailio/kamailio] db_redis: don't leave unconsumed redis replies in case of error (PR #2960)
by Andrew Pogrebennyk 30 Nov '21

30 Nov '21

- Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update encounters an error it was leaving unconsumed data thus causing unexpected reply later on when reading from the same connection.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] 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/2960 -- Commit Summary -- * db_redis: don't leave unconsumed redis replies in case of error on update -- File Changes -- M src/modules/db_redis/redis_dbase.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2960.patch https://github.com/kamailio/kamailio/pull/2960.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2960

3 2

git:master:e97ae3e6: Merge pull request #2960 from apogrebennyk/apogrebennyk/db_redis_update
by GitHub 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: e97ae3e621b2e7f28bd01069a9fbdd77ea16663f URL: https://github.com/kamailio/kamailio/commit/e97ae3e621b2e7f28bd01069a9fbdd7… Author: Andreas Granig <agranig(a)linguin.org> Committer: GitHub <noreply(a)github.com> Date: 2021-11-30T11:03:07+01:00 Merge pull request #2960 from apogrebennyk/apogrebennyk/db_redis_update db_redis: don't leave unconsumed redis replies in case of error --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/e97ae3e621b2e7f28bd01069a9fbdd7… Patch: https://github.com/kamailio/kamailio/commit/e97ae3e621b2e7f28bd01069a9fbdd7… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index f7e26e693e..a53d1a3443 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2249,6 +2249,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&all_type_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return 0; error: @@ -2260,6 +2261,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&type_keys); db_redis_key_free(&set_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return -1; }

1 0

git:master:bbd7b2ed: db_redis: don't leave unconsumed redis replies in case of error on update
by Andrii Pogrebennyk 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: bbd7b2ed5827252680e9d8949c193699da0a76b2 URL: https://github.com/kamailio/kamailio/commit/bbd7b2ed5827252680e9d8949c19369… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Andrii Pogrebennyk <andrii(a)ng-voice.com> Date: 2021-11-28T08:34:36+01:00 db_redis: don't leave unconsumed redis replies in case of error on update Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update encounters an error it was leaving unconsumed data thus causing unexpected reply later on when reading from the same connection. --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/bbd7b2ed5827252680e9d8949c19369… Patch: https://github.com/kamailio/kamailio/commit/bbd7b2ed5827252680e9d8949c19369… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index f7e26e693e..a53d1a3443 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2249,6 +2249,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&all_type_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return 0; error: @@ -2260,6 +2261,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&type_keys); db_redis_key_free(&set_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return -1; }

1 0

[kamailio/kamailio] pv: extend $cnt to work with $xavp (PR #2940)
by Nicolas C 30 Nov '21

30 Nov '21

As suggested in previous PR (#2936). This is much more flexible as it can also handle sub XAVPs, and indexes. This ended up being more complicated than I anticipated, but I wanted to handle all possible cases. The tests I performed are detailled after, they should cover every possible use case. #### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description Allows counting XAVPs with `$cnt($xavp(...))` In addition to the `$cnt($avp(...))` - which is not modified. /* Usage: * * $cnt($xavp(key[*])) : number of XAVPs "key". * $cnt($xavp(key[n]=>sub[*])) : number of children "sub" in XAVP "key[n]". * $cnt($xavp(key[*]=>sub[*])) : total number of children "sub" in all XAVPs "key". * * $cnt($xavp(key[n])) : 1 or 0 (if this index exists or not). * $cnt($xavp(key[-n])) : same but with reverse indexing (-1 is the last index). * * $cnt($xavp(key[*]=>sub[n])) : number of children "sub[n]" that exist in all XAPVs "key". * * $cnt($xavp(key)) is the same as $cnt($xavp(key[*])). * $cnt($xavp(key=>sub)) is the same as $cnt($xavp(key[*]=>sub[*])). * * Note: Usually for a XAVP no index means "index 0", not all. * But this would be less intuitive in our case for counting. */ #### Tests I tried to be exhaustive. All the test cases below do work as expected. ``` $xavp(case1) = "case1.value1"; $xavp(case1) = "case1.value2"; $xavp(case1) = "case1.value3"; $xavp(case2=>sub1) = "case2.value1 sub1.value1"; $xavp(case2[0]=>sub1) = "case2.value1 sub1.value2"; $xavp(case2[0]=>sub1) = "case2.value1 sub1.value3"; $xavp(case2[0]=>sub2) = "case2.value1 sub2.value1"; $xavp(case2[0]=>sub2) = "case2.value1 sub2.value2"; # => will become case2[1] after adding the next entry $xavp(case2=>sub1) = "case2.value2 sub1.value1"; $xavp(case2[0]=>sub1) = "case2.value2 sub1.value2"; xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs with no sub XAVPs\n"); xlog("L_INFO", "xavp(case1[0]) : value = $xavp(case1[0]) : cnt (expect: 1) = $cnt($xavp(case1[0]))\n"); xlog("L_INFO", "xavp(case1[1]) : value = $xavp(case1[1]) : cnt (expect: 1) = $cnt($xavp(case1[1]))\n"); xlog("L_INFO", "xavp(case1[-1]) : value = $xavp(case1[-1]) : cnt (expect: 1) = $cnt($xavp(case1[-1]))\n"); xlog("L_INFO", "xavp(case1[-2]) : value = $xavp(case1[-2]) : cnt (expect: 1) = $cnt($xavp(case1[-2]))\n"); xlog("L_INFO", "xavp(case1[-66]) : value = $xavp(case1[-66]) : cnt (expect: 0) = $cnt($xavp(case1[-66]))\n"); xlog("L_INFO", "xavp(case1[66]) : value = $xavp(case1[66]) : cnt (expect: 0) = $cnt($xavp(case1[66]))\n"); xlog("L_INFO", "xavp(case1[*]) : cnt (expect: 3) = $cnt($xavp(case1[*]))\n"); xlog("L_INFO", "xavp(case1) : cnt (expect: 3) = $cnt($xavp(case1))\n"); xlog("L_INFO", "xavp(case1=>sub) : cnt (expect: 0) = $cnt($xavp(case1=>sub))\n"); xlog("L_INFO", "xavp(case1[0]=>sub) : cnt (expect: 0) = $cnt($xavp(case1[0]=>sub))\n"); xlog("L_INFO", "xavp(case1[0]=>sub[0]) : value = $xavp(case1[0]=>sub[0]) : cnt (expect: 0) = $cnt($xavp(case1[0]=>sub[0]))\n"); xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs using single index\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[0]) : value = $xavp(case2[1]=>sub1[0]) : cnt (expect: 1) = $cnt($xavp(case2[1]=>sub1[0]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[-1]) : value = $xavp(case2[1]=>sub1[-1]) : cnt (expect: 1) = $cnt($xavp(case2[1]=>sub1[-1]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[3]) : value = $xavp(case2[1]=>sub1[3]) : cnt (expect: 0) = $cnt($xavp(case2[1]=>sub1[3]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[*]) : cnt (expect: 3) = $cnt($xavp(case2[1]=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1) : cnt (expect: 3) = $cnt($xavp(case2[1]=>sub1))\n"); xlog("L_INFO", "xavp(case2[1]=>sub2[*]) : cnt (expect: 2) = $cnt($xavp(case2[1]=>sub2[*]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub2) : cnt (expect: 2) = $cnt($xavp(case2[1]=>sub2))\n"); xlog("L_INFO", "xavp(case2[66]=>sub1) : cnt (expect: 0) = $cnt($xavp(case2[66]=>sub1))\n"); xlog("L_INFO", "xavp(case2[66]=>sub1[0]) : cnt (expect: 0) = $cnt($xavp(case2[66]=>sub1[0]))\n"); xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs using all index\n"); xlog("L_INFO", "xavp(case2=>sub1) : cnt (expect: 5) = $cnt($xavp(case2=>sub1))\n"); xlog("L_INFO", "xavp(case2=>sub1[*]) : cnt (expect: 5) = $cnt($xavp(case2=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[*]) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[0]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub1[0]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[2]) : cnt (expect: 1) = $cnt($xavp(case2[*]=>sub1[2]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[-1]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub1[-1]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub2) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub2))\n"); xlog("L_INFO", "xavp(case2[*]=>sub2[*]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub2[*]))\n"); #xlog("L_INFO", "----------- TESTS $$cnt(...) - parsing errors\n"); # parsing error => server fails to start #xlog("L_INFO", "PARSE ERROR: $cnt($xavu(test))\n"); #xlog("L_INFO", "PARSE ERROR: $cnt($var(test))\n"); #xlog("L_INFO", "PARSE ERROR: $cnt($unknown(test))\n"); ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2940 -- Commit Summary -- * pv: extend $cnt to work with $xavp -- File Changes -- M src/modules/pv/pv_core.c (156) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2940.patch https://github.com/kamailio/kamailio/pull/2940.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2940

2 2

git:master:2af28f2e: pv: extend $cnt to work with $xavp
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 2af28f2e303b5eaa3738d045269fb94e8b059904 URL: https://github.com/kamailio/kamailio/commit/2af28f2e303b5eaa3738d045269fb94… Author: Nicolas C <nchaigne(a)capgemini.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T10:09:24+01:00 pv: extend $cnt to work with $xavp As suggested in previous PR (#2936). This is much more flexible as we also handle sub XAVPs and indexes. --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/2af28f2e303b5eaa3738d045269fb94… Patch: https://github.com/kamailio/kamailio/commit/2af28f2e303b5eaa3738d045269fb94…

1 0

git:master:557952f0: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 557952f00bff4e9e70a41cad0be22c2f545f3c22 URL: https://github.com/kamailio/kamailio/commit/557952f00bff4e9e70a41cad0be22c2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-30T08:46:13+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/557952f00bff4e9e70a41cad0be22c2… Patch: https://github.com/kamailio/kamailio/commit/557952f00bff4e9e70a41cad0be22c2… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index eb59dec135..c06ccdd6ec 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -899,8 +899,9 @@ modparam("presence", "timer_mode", 0) 3.38. subs_respond_200 (integer) Specify the response code for accepted SUBSCRIBE requests. If set to 0, - 202 Accepted will be returned. If set to 1, 200 OK will be returned - instead, in conformance to RFC6665 which prohibits 202 responses. + "202 Accepted" will be returned (default behaviour till version 5.5). + If set to 1, "200 OK" will be returned instead, in conformance to + RFC6665, which prohibits 202 responses. Default value is 1.

1 0

git:master:1ef34045: presence: docs - note the version for default behaviour change on 202 reply
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 1ef340457d0bddd8b15be2195c0a9d5d79f88d12 URL: https://github.com/kamailio/kamailio/commit/1ef340457d0bddd8b15be2195c0a9d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:33:34+01:00 presence: docs - note the version for default behaviour change on 202 reply --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1ef340457d0bddd8b15be2195c0a9d5… Patch: https://github.com/kamailio/kamailio/commit/1ef340457d0bddd8b15be2195c0a9d5… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 764aa26a56..25e43ef0b6 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -983,10 +983,10 @@ modparam("presence", "timer_mode", 0) <section id="presence.p.subs_respond_200"> <title><varname>subs_respond_200</varname> (integer)</title> <para> - Specify the response code for accepted SUBSCRIBE requests. - If set to 0, 202 Accepted will be returned. - If set to 1, 200 OK will be returned instead, in conformance to RFC6665 - which prohibits 202 responses. + Specify the response code for accepted SUBSCRIBE requests. If set to 0, + "202 Accepted" will be returned (default behaviour till version 5.5). If set + to 1, "200 OK" will be returned instead, in conformance to RFC6665, which + prohibits 202 responses. </para> <para> <emphasis>

1 0

git:master:7a01a991: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 7a01a991b9012918130b131336a988a5f9fc4285 URL: https://github.com/kamailio/kamailio/commit/7a01a991b9012918130b131336a988a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-30T08:31:19+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7a01a991b9012918130b131336a988a… Patch: https://github.com/kamailio/kamailio/commit/7a01a991b9012918130b131336a988a… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 94dd0adcd6..eb59dec135 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -902,11 +902,11 @@ modparam("presence", "timer_mode", 0) 202 Accepted will be returned. If set to 1, 200 OK will be returned instead, in conformance to RFC6665 which prohibits 202 responses. - Default value is 0. + Default value is 1. Example 1.38. Set subs_respond_200 parameter ... -modparam("presence", "subs_respond_200", 1) +modparam("presence", "subs_respond_200", 0) ... 4. Functions

1 0

[kamailio/kamailio] presence: return 200 instead of 202 by default (PR #2949)
by Laurențiu Nicola 30 Nov '21

30 Nov '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #2930 #### Description See https://github.com/kamailio/kamailio/pull/2930#issuecomment-971748854. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2949 -- Commit Summary -- * presence: return 200 instead of 202 by default -- File Changes -- M src/modules/presence/doc/presence_admin.xml (4) M src/modules/presence/presence.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2949.patch https://github.com/kamailio/kamailio/pull/2949.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2949

2 2

git:master:22dd8c88: presence: return 200 instead of 202 by default
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 22dd8c88f854cb507b0af07ec8712ff3e74c510d URL: https://github.com/kamailio/kamailio/commit/22dd8c88f854cb507b0af07ec8712ff… Author: LaurenÈiu Nicola <lnicola(a)dend.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:25:18+01:00 presence: return 200 instead of 202 by default --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/22dd8c88f854cb507b0af07ec8712ff… Patch: https://github.com/kamailio/kamailio/commit/22dd8c88f854cb507b0af07ec8712ff… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 18d276b73d..764aa26a56 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -990,14 +990,14 @@ modparam("presence", "timer_mode", 0) </para> <para> <emphasis> - Default value is 0. + Default value is 1. </emphasis> </para> <example> <title>Set <varname>subs_respond_200</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("presence", "subs_respond_200", 1) +modparam("presence", "subs_respond_200", 0) ... </programlisting> </example> diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 3e1e347490..da253acbac 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -166,7 +166,7 @@ int pres_retrieve_order = 0; str pres_retrieve_order_by = str_init("priority"); int pres_enable_dmq = 0; int pres_delete_same_subs = 0; -int pres_subs_respond_200 = 0; +int pres_subs_respond_200 = 1; int pres_db_table_lock_type = 1; db_locking_t pres_db_table_lock = DB_LOCKING_WRITE;

1 0

[kamailio/kamailio] dispatcher: Not possible to deactivate probing of destination by reload (PR #2959)
by mtryfoss 30 Nov '21

30 Nov '21

If ds_probing_mode is set to 3, flag in the dispatcher entry needs to include 8 for probing to happen. Changing a destination to not include this anymore while the destination do not respond to OPTIONS will cause the probing flag to be re-added because of the delayed response. A restart will fix it. We need to check against the probing flag in the CB function to determine if we should continue probing this destination. If probing is deativated while waiting for a reply, we should abort. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2959 -- Commit Summary -- * dispatcher: Not possible to deactivate probing of destination by reload -- File Changes -- M src/modules/dispatcher/dispatch.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2959.patch https://github.com/kamailio/kamailio/pull/2959.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2959

2 2

git:master:429fea80: dispatcher: Not possible to deactivate probing of destination by reload
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 429fea8069f0753e6b8dbfbfaf36701e30af6dda URL: https://github.com/kamailio/kamailio/commit/429fea8069f0753e6b8dbfbfaf36701… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:24:03+01:00 dispatcher: Not possible to deactivate probing of destination by reload If ds_probing_mode is set to 3, flag in the dispatcher entry needs to include 8 for probing to happen. Changing a destination to not include this anymore while the destination do not respond to OPTIONS will cause the probing flag to be re-added because of the delayed response. A restart will fix it. We need to check against the probing flag in the CB function to determine if we should continue probing this destination. If probing is deativated while waiting for a reply, we should abort. --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/429fea8069f0753e6b8dbfbfaf36701… Patch: https://github.com/kamailio/kamailio/commit/429fea8069f0753e6b8dbfbfaf36701… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index dd3c93f9a8..661b4a9533 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3529,6 +3529,11 @@ static void ds_options_callback( } } + /* Check if in the meantime someone disabled probing of the target through RPC, MI or reload */ + if(ds_probing_mode == DS_PROBE_ONLYFLAGGED && !(ds_get_state(group, &uri) & DS_PROBING_DST)) { + return; + } + /* ps->code contains the result-code of the request. * * We accept both a "200 OK" or the configured reply as a valid response */

1 0

git:master:96a285db: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 96a285dbb193a7eb7b4080963bee69bce859abd8 URL: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-29T17:46:20+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… Patch: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 2af6b9a703..dbe63719e2 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -55,7 +55,7 @@ Daniel-Constantin Mierla 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -319,7 +319,7 @@ Chapter 1. Admin Guide 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -696,7 +696,7 @@ failure_route["serial"] 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -1294,7 +1294,7 @@ modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ... -3.29. unmatched_cancel (string) +3.29. unmatched_cancel (integer) This parameter selects between forwarding CANCELs that do not match any transaction statefully (0, default value), statelessly (1) or dropping @@ -1311,7 +1311,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") Example 1.29. Set unmatched_cancel parameter ... -modparam("tm", "unmatched_cancel", "2") +modparam("tm", "unmatched_cancel", 2) ... 3.30. ruri_matching (integer)

1 0

[kamailio/kamailio] Fix TM Module Doc unmatched_cancel param from string to integer (PR #2958)
by Zion Dials 29 Nov '21

29 Nov '21

Currently, the documentation states the unmatched_cancel parameter accepts a string input, but it only accepts an integer input. Fixing documentation to match the code's expectations. https://github.com/kamailio/kamailio/blob/b6cebaa76eaa4b98bbba6e271c50dbfa1… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2958 -- Commit Summary -- * Fix TM Module Doc unmatched_cancel param -- File Changes -- M src/modules/tm/doc/params.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2958.patch https://github.com/kamailio/kamailio/pull/2958.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2958

2 2

git:master:c060e900: Fix TM Module Doc unmatched_cancel param
by Henning Westerholt 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: c060e9000f9c6cca98e23bef7aa8c295c8863de6 URL: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… Author: Zion Dials <me(a)ziondials.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2021-11-29T17:44:21+01:00 Fix TM Module Doc unmatched_cancel param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… Patch: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 8614fdac85..ee305b891c 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -876,7 +876,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") </section> <section id="tm.p.unmatched_cancel"> - <title><varname>unmatched_cancel</varname> (string)</title> + <title><varname>unmatched_cancel</varname> (integer)</title> <para> This parameter selects between forwarding CANCELs that do not match any transaction statefully (0, @@ -899,7 +899,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") <title>Set <varname>unmatched_cancel</varname> parameter</title> <programlisting> ... -modparam("tm", "unmatched_cancel", "2") +modparam("tm", "unmatched_cancel", 2) ... </programlisting> </example>

1 0

[kamailio/kamailio] asan: probable stack-buffer-overflow (Issue #2953)
by sergey-safarov 29 Nov '21

29 Nov '21

### Description Kamailio (744bc8f9e12b698cd6b8bc5ef63c84df7a3aea90) compiled with ASAN. During the start, I got the message ``` 0(52607) INFO: <core> [core/tcp_main.c:4997]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(52607) WARNING: <core> [core/daemonize.c:348]: daemonize(): pid file contains old pid, replacing pid 0(52607) INFO: cfgutils [cfgutils.c:869]: mod_init(): no hash_file given, disable hash functionality ================================================================= ==52607==ERROR: AddressSanitizer: stack-buffer-overflow on address 0xffffc6e64058 at pc 0x000000d02d10 bp 0xffffc6e63dc0 sp 0xffffc6e63de0 READ of size 4 at 0xffffc6e64058 thread T0 #0 0xd02d0f in fixup_get_param_type core/sr_module.c:1061 #1 0xd13a33 in fixup_var_pve_str_12 core/sr_module.c:1474 #2 0xffffa8ca8203 in redirect_init /usr/src/debug/kamailio-5.6.0-dev2.0.el8.centos.aarch64/src/modules/uac_redirect/uac_redirect.c:278 #3 0xd0021f (/usr/sbin/kamailio+0xd0021f) #4 0xcfefef (/usr/sbin/kamailio+0xcfefef) #5 0xcfefef (/usr/sbin/kamailio+0xcfefef) #6 0xcfefef (/usr/sbin/kamailio+0xcfefef) #7 0xcfefef (/usr/sbin/kamailio+0xcfefef) #8 0xcfefef (/usr/sbin/kamailio+0xcfefef) #9 0xcfefef (/usr/sbin/kamailio+0xcfefef) #10 0xcfefef (/usr/sbin/kamailio+0xcfefef) #11 0xcfefef (/usr/sbin/kamailio+0xcfefef) #12 0xcfefef (/usr/sbin/kamailio+0xcfefef) #13 0xcfefef (/usr/sbin/kamailio+0xcfefef) #14 0xcfefef (/usr/sbin/kamailio+0xcfefef) #15 0xcfefef (/usr/sbin/kamailio+0xcfefef) #16 0xcfefef (/usr/sbin/kamailio+0xcfefef) #17 0xcfefef (/usr/sbin/kamailio+0xcfefef) #18 0xcfefef (/usr/sbin/kamailio+0xcfefef) #19 0xcfefef (/usr/sbin/kamailio+0xcfefef) #20 0xcfefef (/usr/sbin/kamailio+0xcfefef) #21 0xcfefef (/usr/sbin/kamailio+0xcfefef) #22 0xcfefef (/usr/sbin/kamailio+0xcfefef) #23 0xcfefef (/usr/sbin/kamailio+0xcfefef) #24 0xcfefef (/usr/sbin/kamailio+0xcfefef) #25 0xcfefef (/usr/sbin/kamailio+0xcfefef) #26 0xcfefef (/usr/sbin/kamailio+0xcfefef) #27 0xcfefef (/usr/sbin/kamailio+0xcfefef) #28 0xcfefef (/usr/sbin/kamailio+0xcfefef) #29 0xcfefef (/usr/sbin/kamailio+0xcfefef) #30 0xcfefef (/usr/sbin/kamailio+0xcfefef) #31 0xcfefef (/usr/sbin/kamailio+0xcfefef) #32 0xcfefef (/usr/sbin/kamailio+0xcfefef) #33 0xcfefef (/usr/sbin/kamailio+0xcfefef) #34 0xcfefef (/usr/sbin/kamailio+0xcfefef) #35 0xd015ab in init_modules (/usr/sbin/kamailio+0xd015ab) #36 0x49fa6b in main (/usr/sbin/kamailio+0x49fa6b) #37 0xfffface10de3 in __libc_start_main (/lib64/libc.so.6+0x20de3) #38 0x4204eb (/usr/sbin/kamailio+0x4204eb) Address 0xffffc6e64058 is located in stack of thread T0 at offset 88 in frame #0 0xffffa8ca70e7 in redirect_init /usr/src/debug/kamailio-5.6.0-dev2.0.el8.centos.aarch64/src/modules/uac_redirect/uac_redirect.c:265 This frame has 8 object(s): [32, 40) 'filter' [96, 104) 'p' <== Memory access at offset 88 underflows this variable [160, 224) '__kld' [256, 320) '__kld' [352, 416) '__kld' [448, 512) '__kld' [544, 608) '__kld' [640, 704) '__kld' HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) SUMMARY: AddressSanitizer: stack-buffer-overflow core/sr_module.c:1061 in fixup_get_param_type Shadow bytes around the buggy address: 0x200ff8dcc7b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x200ff8dcc7c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x200ff8dcc7d0: 00 00 00 00 00 00 00 00 f1 f1 f1 f1 00 00 00 00 0x200ff8dcc7e0: 00 00 00 00 f3 f3 f3 f3 00 00 00 00 00 00 00 00 0x200ff8dcc7f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 =>0x200ff8dcc800: f1 f1 f1 f1 00 f2 f2 f2 f2 f2 f2[f2]00 f2 f2 f2 0x200ff8dcc810: f2 f2 f2 f2 00 00 00 00 00 00 00 00 f2 f2 f2 f2 0x200ff8dcc820: 00 00 00 00 00 00 00 00 f2 f2 f2 f2 00 00 00 00 0x200ff8dcc830: 00 00 00 00 f2 f2 f2 f2 00 00 00 00 00 00 00 00 0x200ff8dcc840: f2 f2 f2 f2 00 00 00 00 00 00 00 00 f2 f2 f2 f2 0x200ff8dcc850: 00 00 00 00 00 00 00 00 f3 f3 f3 f3 00 00 00 00 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb ==52607==ABORTING ``` I do not know this is important or not. ASAN reports ``` HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) ``` -- 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/2953

2 2

[kamailio/kamailio] asan: shift exponent is too large for 32-bit type 'int' (Issue #2954)
by sergey-safarov 29 Nov '21

29 Nov '21

### Description Kamailio compiled with ASAN. During Kamailio start I see messages ``` core/flags.c:46:18: runtime error: shift exponent 4294967295 is too large for 32-bit type 'int' ``` and ``` nat_traversal.c:1293:27: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' ``` tested on current master -- 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/2954

2 3

git:master:1a406e09: core: flags - use unsigned literal for bit shifting operations
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 1a406e093ea7ac07428c92aec21ac67f8caa1093 URL: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: flags - use unsigned literal for bit shifting operations --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… Patch: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… --- diff --git a/src/core/flags.c b/src/core/flags.c index 551eefe2ee..207849c198 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -43,12 +43,12 @@ static flag_t sflags = 0; int setflag( struct sip_msg* msg, flag_t flag ) { - msg->flags |= 1 << flag; + msg->flags |= 1u << flag; return 1; } int resetflag( struct sip_msg* msg, flag_t flag ) { - msg->flags &= ~ (1 << flag); + msg->flags &= ~ (1u << flag); return 1; } @@ -58,7 +58,7 @@ int resetflags( struct sip_msg* msg, flag_t flags ) { } int isflagset( struct sip_msg* msg, flag_t flag ) { - return (msg->flags & (1<<flag)) ? 1 : -1; + return (msg->flags & (1u<<flag)) ? 1 : -1; } int flag_in_range( flag_t flag ) { @@ -79,21 +79,21 @@ int setsflagsval(flag_t val) int setsflag(flag_t flag) { - sflags |= 1 << flag; + sflags |= 1u << flag; return 1; } int resetsflag(flag_t flag) { - sflags &= ~ (1 << flag); + sflags &= ~ (1u << flag); return 1; } int issflagset(flag_t flag) { - return (sflags & (1<<flag)) ? 1 : -1; + return (sflags & (1u<<flag)) ? 1 : -1; } @@ -126,7 +126,7 @@ static unsigned char registered_flags[MAX_FLAG+1]; void init_named_flags() { int r; - + for (r=0; r<FLAGS_NAME_HASH_ENTRIES; r++) clist_init(&name2flags[r], next, prev); } @@ -149,7 +149,7 @@ inline static struct flag_entry* flag_search(struct flag_hash_head* lst, char* name, int len) { struct flag_entry* fe; - + clist_foreach(lst, fe, next){ if ((fe->name.len==len) && (memcmp(fe->name.s, name, len)==0)){ /* found */ @@ -176,7 +176,7 @@ inline static struct flag_entry* get_flag_entry(char* name, int len) int get_flag_no(char* name, int len) { struct flag_entry* fe; - + fe=get_flag_entry(name, len); return (fe)?fe->no:-1; } @@ -184,7 +184,7 @@ int get_flag_no(char* name, int len) /* resgiter a new flag name and associates it with pos - * pos== -1 => any position will do + * pos== -1 => any position will do * returns flag pos on success (>=0) * -1 flag is an alias for an already existing flag * -2 flag already registered @@ -199,7 +199,7 @@ int register_flag(char* name, int pos) static unsigned int crt_flag=0; unsigned int last_flag; unsigned int h; - + len=strlen(name); h=get_hash1_raw(name, len) & (FLAGS_NAME_HASH_ENTRIES-1); /* check if the name already exists */ @@ -235,7 +235,7 @@ int register_flag(char* name, int pos) } } registered_flags[pos]++; - + e=pkg_malloc(sizeof(struct flag_entry)); if (e==0){ PKG_MEM_ERROR; @@ -259,7 +259,7 @@ int setxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] |= 1 << fb; + msg->xflags[fi] |= 1u << fb; return 1; } @@ -272,7 +272,7 @@ int resetxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] &= ~ (1 << fb); + msg->xflags[fi] &= ~ (1u << fb); return 1; } @@ -285,5 +285,5 @@ int isxflagset(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; + return (msg->xflags[fi] & (1u<<fb)) ? 1 : -1; }

1 0

git:master:bcd59d73: core: protect for int value overflow on string convert
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: bcd59d73e2fc5ae8e14cad520e726ef431f0563f URL: https://github.com/kamailio/kamailio/commit/bcd59d73e2fc5ae8e14cad520e726ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: protect for int value overflow on string convert --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/bcd59d73e2fc5ae8e14cad520e726ef… Patch: https://github.com/kamailio/kamailio/commit/bcd59d73e2fc5ae8e14cad520e726ef… --- diff --git a/src/core/ut.h b/src/core/ut.h index 385db99ca7..1dd0706f59 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -662,9 +662,10 @@ static inline int str2int(str* _s, unsigned int* _r) str2unval(_s, _r); } -#define str2snval(_s, _r) do { \ +#define str2snval(_s, _r, _vmin, _vmax) do { \ int i; \ int sign; \ + long long ll; \ if (_s == NULL) return -1; \ if (_r == NULL) return -1; \ if (_s->len < 0) return -1; \ @@ -680,13 +681,25 @@ static inline int str2int(str* _s, unsigned int* _r) } \ for(; i < _s->len; i++) { \ if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + if(*_r > _vmax/10) { \ + return -1; \ + } \ *_r *= 10; \ + if(*_r > _vmax - (_s->s[i] - '0')) { \ + return -1; \ + } \ *_r += _s->s[i] - '0'; \ } else { \ return -1; \ } \ } \ - *_r *= sign; \ + if(sign < 0) { \ + ll = (long long)(*_r) * sign; \ + if(ll < _vmin) { \ + return -1; \ + } \ + *_r *= sign; \ + } \ return 0; \ } while(0) @@ -695,7 +708,7 @@ static inline int str2int(str* _s, unsigned int* _r) */ static inline int str2slong(str* _s, long* _r) { - str2snval(_s, _r); + str2snval(_s, _r, LONG_MIN, LONG_MAX); } @@ -704,7 +717,7 @@ static inline int str2slong(str* _s, long* _r) */ static inline int str2sint(str* _s, int* _r) { - str2snval(_s, _r); + str2snval(_s, _r, INT_MIN, INT_MAX); }

1 0

git:master:0afc10d9: core: protect for unsigned int value overflow on string convert
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 0afc10d9b1b3f65b92d649d530b6363476b3d03b URL: https://github.com/kamailio/kamailio/commit/0afc10d9b1b3f65b92d649d530b6363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: protect for unsigned int value overflow on string convert --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/0afc10d9b1b3f65b92d649d530b6363… Patch: https://github.com/kamailio/kamailio/commit/0afc10d9b1b3f65b92d649d530b6363… --- diff --git a/src/core/ut.h b/src/core/ut.h index 1dd0706f59..9b899a94e7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -628,7 +628,7 @@ static inline void strlower(str* _s) } -#define str2unval(_s, _r) do { \ +#define str2unval(_s, _r, _vmax) do { \ int i; \ if (_r == NULL) return -1; \ *_r = 0; \ @@ -637,7 +637,13 @@ static inline void strlower(str* _s) if (_s->s == NULL) return -1; \ for(i = 0; i < _s->len; i++) { \ if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + if(*_r > _vmax/10) { \ + return -1; \ + } \ *_r *= 10; \ + if(*_r > _vmax - (_s->s[i] - '0')) { \ + return -1; \ + } \ *_r += _s->s[i] - '0'; \ } else { \ return -1; \ @@ -651,7 +657,7 @@ static inline void strlower(str* _s) */ static inline int str2ulong(str* _s, unsigned long* _r) { - str2unval(_s, _r); + str2unval(_s, _r, ULONG_MAX); } /* @@ -659,7 +665,7 @@ static inline int str2ulong(str* _s, unsigned long* _r) */ static inline int str2int(str* _s, unsigned int* _r) { - str2unval(_s, _r); + str2unval(_s, _r, UINT_MAX); } #define str2snval(_s, _r, _vmin, _vmax) do { \

1 0

git:master:8c30109d: nat_traversal: declare flag literal as unsigned
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 8c30109df0b479cc3fce39a765717149e9c70ddf URL: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 nat_traversal: declare flag literal as unsigned - GH #2954 --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… Patch: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index edaa6dfe3d..58d1b78c70 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -85,7 +85,7 @@ MODULE_VERSION /* WARNING: Keep this aligned with parser/msg_parser.h! */ -#define FL_DO_KEEPALIVE (1 << 31) +#define FL_DO_KEEPALIVE (1u << 31) #define HASH_SIZE 512

1 0

git:master:1ba6f2fa: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: 1ba6f2fa77459ed1fcec04f446fe9e8c210b94d6 URL: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-26T22:46:22+01:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… Patch: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… --- diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index 88e9e22859..812755bc5d 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -212,8 +212,7 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") Its values may be: * acc_log_request * acc_db_request - * acc_rad_request - * acc_diam_request + * acc_request The default value is “acc_log_request”.

1 0

git:master:35767f38: acc: expose accounting functions via inter-module api
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: 35767f387bbcd2766bf7a4ff1345183612219225 URL: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-25T13:36:59+01:00 acc: expose accounting functions via inter-module api --- Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Patch: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… --- diff --git a/src/modules/acc/acc_api.h b/src/modules/acc/acc_api.h index 0a6df2e32c..04b893483b 100644 --- a/src/modules/acc/acc_api.h +++ b/src/modules/acc/acc_api.h @@ -146,8 +146,16 @@ typedef acc_extra_t* (*parse_extra_f)(char *extra_str); typedef int (*register_cdr_engine_f)(cdr_engine_t *eng); typedef int (*cdr_api_exec_f)(struct dlg_cell *dlg, struct sip_msg *rq, cdr_engine_t *eng, acc_param_t* comment); +typedef int (*acc_log_request_f)(sip_msg_t *msg, str *comment); +typedef int (*acc_db_request_f)(sip_msg_t *msg, str *comment, str *dbtable); +typedef int (*acc_request_f)(sip_msg_t *msg, str *comment, str *dbtable); + + /* the acc API */ typedef struct acc_api { + acc_log_request_f acc_log_request; + acc_db_request_f acc_db_request; + acc_request_f acc_request; leg_info_f get_leg_info; core2strar_f get_core_attrs; extra2strar_f get_extra_attrs; diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 5afcab113b..801a908025 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -644,6 +644,12 @@ static int bind_acc(acc_api_t* api) return -1; } + memset(api, 0, sizeof(acc_api_t)); + + api->acc_log_request = ki_acc_log_request; + api->acc_db_request = ki_acc_db_request; + api->acc_request = ki_acc_request; + api->register_engine = acc_register_engine; api->get_leg_info = get_leg_info; api->get_core_attrs = core2strar;

1 0

git:master:a0ef1ccd: uac_redirect: use inter-module acc api instead of config export lookup
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: a0ef1ccd17368775d68f8687f25b0d72656ac273 URL: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-26T15:32:54+01:00 uac_redirect: use inter-module acc api instead of config export lookup - use acc functions via inter-module acc api, intead of config file function export lookup, to get the right signature and avoid workaround of fixing a modparam like a function param and improper access of expected fields by offset - GH #2953 --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml Modified: src/modules/uac_redirect/rd_funcs.c Modified: src/modules/uac_redirect/rd_funcs.h Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Patch: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7…

1 0

[kamailio/kamailio] Config errors (Issue #2957)
by SerhiiZahuba 26 Nov '21

26 Nov '21

Perhaps I am doing something wrong? New installation, new config file and when starting the server I see an error 1) parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 165, column 1-5: syntax error 164 / * LOG Levels: 3 = DBG, 2 = INFO, 1 = NOTICE, 0 = WARN, -1 = ERR, ... * / 165 debug = DBGLEVEL 166 2) /usr/local/etc/kamailio/kamailio.cfg, line 34, column 1-9: syntax error 32 # *** To enable authentication execute: 33 #mysql 34 WITH_AUTH Where can there be an error if this file is downloaded from your server? Please tell me this is driving me crazy. -- 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/2957

2 4

parse error in core/receive.c
by Juha Heinanen 26 Nov '21

26 Nov '21

Is it only me who gets this with master? -- Juha CC (gcc) [pres-serv] core/receive.o In file included from core/ut.h:42, from core/ip_addr.h:39, from core/receive.h:32, from core/receive.c:34: core/receive.c: In function 'receive_msg': core/receive.c:376:5: error: expected ')' before 'ip_addr2a' 376 | ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, | ^~~~~~~~~ core/dprint.h:317:30: note: in definition of macro 'LOG_FX' 317 | _ksr_slog_func(&__kld, fmt, ## args); \ | ^~~ core/dprint.h:351:4: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ...

1 1

[kamailio/kamailio] cannot adopt OIDs in KAMAILIO-SIP-COMMON-MIB (Issue #2955)
by abonela 25 Nov '21

25 Nov '21

Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue. we have configured snmp module following https://www.kamailio.org/dokuwiki/doku.php/utils:kamailio-and-snmp ### Description  we could able to poll or snmpwalk most of the OIDs in KAMAILIO-REG-MIB , KAMAILIO-SIP-SERVER-MIB but having issues below from KAMAILIO-SIP-COMMON-MIB snmpd[358730]: Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsMethod ::= { kamailioSIPMethodStatsEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsOutbounds ::= { kamailioSIPMethodStatsEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsInbounds ::= { kamailioSIPMethodStatsEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeMethod ::= { kamailioSIPStatusCodesEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeValue ::= { kamailioSIPStatusCodesEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeIns ::= { kamailioSIPStatusCodesEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeOuts ::= { kamailioSIPStatusCodesEntry 4 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeRowStatus ::= { kamailioSIPStatusCodesEntry 5 } ### Troubleshooting root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2.0 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2.0 = No Such Object available on this agent at this OID root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2 = No Such Object available on this agent at this OID #### Reproduction using snmpwalk or snmget to any of the above mentioned kamailioSIPStats* OIDs will do ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.1 (x86_64/linux) 307af8-dirty ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.2 LTS Release: 20.04 Codename: focal ``` -- 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/2955

2 2

[kamailio/kamailio] OpenSSL:It(PTHREAD_PROCESS_SHARED) is not initialized, which may cause the Kamailio worker process to block (Issue #2956)
by 陈庆毅 25 Nov '21

25 Nov '21

why the process sharing option (PTHREAD_PROCESS_SHARED) was not used for initialization, which might cause the Kamailio worker process to block -- 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/2956

2 2

git:master:b3f77460: tls: get local/remote issuer line via $tls(key)
by Daniel-Constantin Mierla 25 Nov '21

25 Nov '21

Module: kamailio Branch: master Commit: b3f77460ff78f4d38542ca79bb13398180cd7710 URL: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-25T09:55:31+01:00 tls: get local/remote issuer line via $tls(key) - new keys: m_issuer_line, p_issuer_line --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… Patch: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 9a1f6b94b3..985e6dcec1 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1263,6 +1263,13 @@ int pv_parse_tls_name(pv_spec_p sp, str *in) return -1; switch(in->len) { + case 13: + if(strncmp(in->s, "m_issuer_line", 13)==0) + sp->pvp.pvn.u.isname.name.n = 1001; + else if(strncmp(in->s, "p_issuer_line", 13)==0) + sp->pvp.pvn.u.isname.name.n = 5001; + else goto error; + break; case 14: if(strncmp(in->s, "m_subject_line", 14)==0) sp->pvp.pvn.u.isname.name.n = 1000; @@ -1309,9 +1316,9 @@ int pv_get_tls(struct sip_msg *msg, pv_param_t *param, : SSL_get_peer_certificate(ssl); if (cert == NULL) { if (param->pvn.u.isname.name.n < 5000) { - LM_ERR("Unable to retrieve my TLS certificate from SSL structure\n"); + LM_ERR("failed to retrieve my TLS certificate from SSL structure\n"); } else { - LM_ERR("Unable to retrieve peer TLS certificate from SSL structure\n"); + LM_ERR("failed to retrieve peer TLS certificate from SSL structure\n"); } goto error; } @@ -1325,8 +1332,21 @@ int pv_get_tls(struct sip_msg *msg, pv_param_t *param, if(X509_NAME_oneline(X509_get_subject_name(cert), sv.s, sv.len)==NULL) { goto error; } + tcpconn_put(c); + return pv_get_strzval(msg, param, res, sv.s); + break; + + case 1001: + case 5001: + sv.s = pv_get_buffer(); + sv.len = pv_get_buffer_size() - 1; + if(X509_NAME_oneline(X509_get_issuer_name(cert), sv.s, sv.len)==NULL) { + goto error; + } + tcpconn_put(c); return pv_get_strzval(msg, param, res, sv.s); break; + default: goto error; }

1 0

Re: [sr-dev] [kamailio/kamailio] tls: openssl_mutex_shared - add a date to the note about libssl workaround validity (a0ca4cd)
by 陈庆毅 25 Nov '21

25 Nov '21

I wonder why the process sharing option (PTHREAD_PROCESS_SHARED) was not used for initialization, which might cause the Kamailio worker process to block -- 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/commit/a0ca4cd43f098d10aa5aadcc18453cb…

1 0

[kamailio/kamailio] TLS module: access UID attribute (#1843)
by Sebastian Denz 24 Nov '21

24 Nov '21

### Description While implementing an edgeproxy based on kamailio i have to add a custom SIPHeader which contains the uid from the useragents client certificate. The UID is part of the subject like: O = Company CN = Sebastian Denz UID = denz But i cant access that attribute. All i can do is reading the CN and O. ### Expected behavior There should be a select to access the uid Attribute from the subject, or at least a select which returns the whole subject, so it can be parsed manually in kamailio.cfg. #### Actual observed behavior It is only possible to access the O and CN field from the subject. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.2.0 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` -- 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/1843

4 24

Kamailio v5.5.3 Released
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Hello, Kamailio SIP Server v5.5.3 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.3. For more details about version 5.5.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/11/kamailio-v5-5-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.5:473cefc7: ChangeLog: content updated for v5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: 473cefc7678c747874944216801cb72adb054aa0 URL: https://github.com/kamailio/kamailio/commit/473cefc7678c747874944216801cb72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T12:40:07+01:00 ChangeLog: content updated for v5.5.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/473cefc7678c747874944216801cb72… Patch: https://github.com/kamailio/kamailio/commit/473cefc7678c747874944216801cb72…

1 0

git:5.5:f3a4cfd5: Makefile.defs: version set to 5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: f3a4cfd565c3c5a998de5bab39b3c066edc12496 URL: https://github.com/kamailio/kamailio/commit/f3a4cfd565c3c5a998de5bab39b3c06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T12:34:56+01:00 Makefile.defs: version set to 5.5.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f3a4cfd565c3c5a998de5bab39b3c06… Patch: https://github.com/kamailio/kamailio/commit/f3a4cfd565c3c5a998de5bab39b3c06… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9f76722eb5..82b8751e2e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:cd6b228d: pkg/kamailio/deb: version set 5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: cd6b228dc9b902da37101dc3b6da3859adecc0de URL: https://github.com/kamailio/kamailio/commit/cd6b228dc9b902da37101dc3b6da385… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T11:48:45+01:00 pkg/kamailio/deb: version set 5.5.3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/cd6b228dc9b902da37101dc3b6da385… Patch: https://github.com/kamailio/kamailio/commit/cd6b228dc9b902da37101dc3b6da385…

1 0

git:5.5:35477876: pkg: version set to 5.5.3 for rpm and alpine specs
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: 3547787637f856e83974358ee0e3d09754532a76 URL: https://github.com/kamailio/kamailio/commit/3547787637f856e83974358ee0e3d09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T12:04:33+01:00 pkg: version set to 5.5.3 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3547787637f856e83974358ee0e3d09… Patch: https://github.com/kamailio/kamailio/commit/3547787637f856e83974358ee0e3d09… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 9ce95c81d9..9fcabf2cd1 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.2 +pkgver=5.5.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5c5948b669..fa6c13757e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.2 +%define ver 5.5.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:c2c3c8b5: tls: new config variable $tls(key)
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: master Commit: c2c3c8b5615294989ac81203e65df76b2a08fb02 URL: https://github.com/kamailio/kamailio/commit/c2c3c8b5615294989ac81203e65df76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T11:41:17+01:00 tls: new config variable $tls(key) - return attributes related to tls communication - first implemented keys: - m_subject_line - return local (my) certificate subject line - p_subject_line - return remote (peer) certificate subject line --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/c2c3c8b5615294989ac81203e65df76… Patch: https://github.com/kamailio/kamailio/commit/c2c3c8b5615294989ac81203e65df76… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 89b6a44b67..9a1f6b94b3 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -39,6 +39,7 @@ #include "../../core/tcp_server.h" #include "../../core/tcp_conn.h" #include "../../core/ut.h" +#include "../../core/pvapi.h" #include "../../core/cfg/cfg.h" #include "../../core/dprint.h" #include "../../core/strutils.h" @@ -1256,8 +1257,84 @@ static int pv_tlsext_sn(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) } +int pv_parse_tls_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 14: + if(strncmp(in->s, "m_subject_line", 14)==0) + sp->pvp.pvn.u.isname.name.n = 1000; + else if(strncmp(in->s, "p_subject_line", 14)==0) + sp->pvp.pvn.u.isname.name.n = 5000; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + return 0; +error: + LM_ERR("unknown PV tls name %.*s\n", in->len, in->s); + return -1; +} + + +int pv_get_tls(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + SSL *ssl = NULL; + tcp_connection_t *c = NULL; + X509 *cert = NULL; + str sv = STR_NULL; + + if(msg==NULL || param==NULL) { + return -1; + } + + c = get_cur_connection(msg); + if (c == NULL) { + LM_DBG("TLS connection not found\n"); + return pv_get_null(msg, param, res); + } + ssl = get_ssl(c); + if (ssl == NULL) { + goto error; + } + cert = (param->pvn.u.isname.name.n < 5000) ? SSL_get_certificate(ssl) + : SSL_get_peer_certificate(ssl); + if (cert == NULL) { + if (param->pvn.u.isname.name.n < 5000) { + LM_ERR("Unable to retrieve my TLS certificate from SSL structure\n"); + } else { + LM_ERR("Unable to retrieve peer TLS certificate from SSL structure\n"); + } + goto error; + } + + switch(param->pvn.u.isname.name.n) + { + case 1000: + case 5000: + sv.s = pv_get_buffer(); + sv.len = pv_get_buffer_size() - 1; + if(X509_NAME_oneline(X509_get_subject_name(cert), sv.s, sv.len)==NULL) { + goto error; + } + return pv_get_strzval(msg, param, res, sv.s); + break; + default: + goto error; + } + +error: + tcpconn_put(c); + return pv_get_null(msg, param, res); +} select_row_t tls_sel[] = { /* Current cipher parameters */ @@ -1544,6 +1621,8 @@ pv_export_t tls_pv[] = { {{"tls_peer_server_name", sizeof("tls_peer_server_name")-1}, PVT_OTHER, pv_tlsext_sn, 0, 0, 0, pv_init_iname, PV_TLSEXT_SNI }, + { {"tls", (sizeof("tls")-1)}, PVT_OTHER, pv_get_tls, + 0, pv_parse_tls_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 }

2 1

[kamailio/kamailio] nats: Add one subscriber connection per nats_url (PR #2918)
by Stefan Mititelu 24 Nov '21

24 Nov '21

Updated doc. Fixes #2916.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a separate connection for each nats_url, for subscriber workers. Basically tested it locally, with 3 nats_url and 2 workers. Thanks, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2918 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2918/commits/dd86ed8d88ad1e25a765…">nats: Add one subscriber connection per nats_url</a> -- File Changes -- M src/modules/nats/doc/nats_admin.xml (4) M src/modules/nats/nats_mod.c (41) M src/modules/nats/nats_mod.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2918.patch https://github.com/kamailio/kamailio/pull/2918.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2918

3 5

Releasing Kamailio v5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Hello, I am considering to release Kamailio v5.5.3 sometime next week, likely on Wednesday or Thursday (Nov 24/25, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 4

[kamailio/kamailio] Store full JSON output of rtpengine_query in avp (#2130)
by hrantbagdasarian 23 Nov '21

23 Nov '21

### Description Currently the rtpengine_query function stores some values in predefined avps. I would like to have access to the whole output returned by the query to rtpengine. Sample provided at: https://github.com/sipwise/rtpengine#query-message ### Possible Solutions / Expected behavior Introduce a new avp which stores the full output in json format. -- 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/2130

2 2

git:5.5:9427586f: core: parser - detect pai/ppi headers spanning many lines
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

Module: kamailio Branch: 5.5 Commit: 9427586f3af4dacfa2b3293ea6c5813a6b6c1e5c URL: https://github.com/kamailio/kamailio/commit/9427586f3af4dacfa2b3293ea6c5813… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T20:26:57+01:00 core: parser - detect pai/ppi headers spanning many lines - GH #2837 (cherry picked from commit f0e8898d83c54e5e4383b70ba54ad340c5ae13b6) --- Modified: src/core/parser/parse_ppi_pai.c --- Diff: https://github.com/kamailio/kamailio/commit/9427586f3af4dacfa2b3293ea6c5813… Patch: https://github.com/kamailio/kamailio/commit/9427586f3af4dacfa2b3293ea6c5813… --- diff --git a/src/core/parser/parse_ppi_pai.c b/src/core/parser/parse_ppi_pai.c index 4e4ebe392b..c60e33a9fd 100644 --- a/src/core/parser/parse_ppi_pai.c +++ b/src/core/parser/parse_ppi_pai.c @@ -65,6 +65,26 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) while ((*tmp == ',') && (num_uri < NUM_PAI_BODIES)) { tmp++; + while(tmp<buf+len && (*tmp==' ' || *tmp=='\t')) tmp++; + if(tmp>=buf+len) { + LM_ERR("no content after comma when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + if((tmp<buf+len-1 && *tmp=='\n') + || (tmp<buf+len-2 && *tmp=='\r' && *(tmp+1)=='\n')) { + if(*tmp=='\n') { + tmp++; + } else { + tmp += 2; + } + if(*tmp!=' ' && *tmp!='\t') { + LM_ERR("no space after EOL when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + tmp++; + } tmp = parse_addr_spec(tmp, buf+len, &uri_b[num_uri], 1); if (uri_b[num_uri].error == PARSE_ERROR) {

1 0

[kamailio/kamailio] Error when parsing P-Asserted-Identity use $ai variable (#2837)
by MikhailKalashnikov 23 Nov '21

23 Nov '21

### Description According to RFC 3261 part `7.3.1 Header Field Format` header fields values can be extended over multiple lines separated with tab (`\r\n\t`). It seems that for many headers Kamailio support this format, but for `P-Asserted-Identity` if I try to use variable `$ai` I get error and null value ``` ERROR: |1232432423|<core> [core/parser/parse_addr_spec.c:662]: parse_addr_spec(): unexpected char [] in status 0: [] . ERROR: |1232432423|<core> [core/parser/parse_ppi_pai.c:71]: parse_pai_ppi_body(): Error parsing PAI/PPI body 1 '<sip:+70000000000@test.com>, <tel:+79211119987>' ``` I attach example of pcap. [pai.zip](https://github.com/kamailio/kamailio/files/7071411/pai.zip) And below quotes from RFC 3261 ``` Header fields can be extended over multiple lines by preceding each extra line with at least one SP or horizontal tab (HT) .... Route: <sip:alice@atlanta.com>, <sip:bob@biloxi.com>, <sip:carol@chicago.com> ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0 (x86_64/linux) 6c4fce flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 6c4fce compiled on 17:15:32 Jul 29 2020 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.8.2003 ``` -- 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/2837

2 5

[kamailio/kamailio] tls: update DH initialization for OpenSSL 1.1.x (PR #2945)
by space88man 23 Nov '21

23 Nov '21

For OpenSSL 3.x, this will fix a deprecation warning.   #### 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 Update DH initialization with appropriate API for OpenSSL >= 1.1.1. This also fixes a deprecation warning with OpenSSL 3.x. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2945 -- Commit Summary -- * tls: update DH initialization for OpenSSL 1.1.x -- File Changes -- M src/modules/tls/tls_domain.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2945.patch https://github.com/kamailio/kamailio/pull/2945.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2945

2 7

git:master:744bc8f9: tls: update DH initialization for OpenSSL 1.1.x
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

Module: kamailio Branch: master Commit: 744bc8f9e12b698cd6b8bc5ef63c84df7a3aea90 URL: https://github.com/kamailio/kamailio/commit/744bc8f9e12b698cd6b8bc5ef63c84d… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T20:02:37+01:00 tls: update DH initialization for OpenSSL 1.1.x For OpenSSL 3.x, this will fix a deprecation warning. --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/744bc8f9e12b698cd6b8bc5ef63c84d… Patch: https://github.com/kamailio/kamailio/commit/744bc8f9e12b698cd6b8bc5ef63c84d… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 5f939df1d4..c6eac20738 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -89,6 +89,10 @@ static void setup_ecdh(SSL_CTX *ctx) #ifndef OPENSSL_NO_DH +/* + * not needed for OpenSSL 1.1.0+ and LibreSSL + */ +#if !defined(SSL_CTX_set_dh_auto) static unsigned char dh3072_p[] = { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2, 0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1, @@ -126,9 +130,15 @@ static unsigned char dh3072_p[] = { }; static unsigned char dh3072_g[] = { 0x02 }; +#endif static void setup_dh(SSL_CTX *ctx) { +/* + * not needed for OpenSSL 1.1.0+ and LibreSSL + * DH_new() is deprecated in OpenSSL 3 + */ +#if !defined(SSL_CTX_set_dh_auto) DH *dh; BIGNUM *p; BIGNUM *g; @@ -146,19 +156,17 @@ static void setup_dh(SSL_CTX *ctx) return; } -#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER) - /* libssl >= v1.1.0 */ - DH_set0_pqg(dh, p, NULL, g); -#else dh->p = p; dh->g = g; -#endif SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); SSL_CTX_set_tmp_dh(ctx, dh); DH_free(dh); +#else + SSL_CTX_set_dh_auto(ctx, 1); +#endif } #endif

1 0

git:master:13bd752c: core: print udp sock fd in debug messages of probe_max_receive_buffer()
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

Module: kamailio Branch: master Commit: 13bd752cc932818f920a0835637431bf29d7db40 URL: https://github.com/kamailio/kamailio/commit/13bd752cc932818f920a0835637431b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T17:25:32+01:00 core: print udp sock fd in debug messages of probe_max_receive_buffer() --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/13bd752cc932818f920a0835637431b… Patch: https://github.com/kamailio/kamailio/commit/13bd752cc932818f920a0835637431b… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 9234e54ec1..bffdda1b01 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -143,15 +143,15 @@ int probe_max_receive_buffer( int udp_sock ) if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &ioptval, &ioptvallen) == -1 ) { - LM_ERR("getsockopt: %s\n", strerror(errno)); + LM_ERR("fd: %d getsockopt: %s\n", udp_sock, strerror(errno)); return -1; } if ( ioptval==0 ) { - LM_DBG("SO_RCVBUF initially set to 0; resetting to %d\n", - BUFFER_INCREMENT ); + LM_DBG("SO_RCVBUF initially set to 0 for fd %d; resetting to %d\n", + udp_sock, BUFFER_INCREMENT); ioptval=BUFFER_INCREMENT; - } else LM_INFO("SO_RCVBUF is initially %d\n", ioptval ); + } else LM_INFO("SO_RCVBUF is initially %d for fd %d\n", ioptval, udp_sock); for (optval=ioptval; ; ) { /* increase size; double in initial phase, add linearly later */ if (phase==0) optval <<= 1; else optval+=BUFFER_INCREMENT; @@ -160,11 +160,12 @@ int probe_max_receive_buffer( int udp_sock ) else { phase=1; optval >>=1; continue; } } if(ksr_verbose_startup) - LM_DBG("trying SO_RCVBUF: %d\n", optval); + LM_DBG("trying SO_RCVBUF: %d on fd: %d\n", optval, udp_sock); if (setsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*)&optval, sizeof(optval)) ==-1){ /* Solaris returns -1 if asked size too big; Linux ignores */ - LM_DBG("SOL_SOCKET failed for %d, phase %d: %s\n", optval, phase, strerror(errno)); + LM_DBG("SOL_SOCKET failed for val %d on fd %d, phase %d: %s\n", + optval, udp_sock, phase, strerror(errno)); /* if setting buffer size failed and still in the aggressive phase, try less aggressively; otherwise give up */ @@ -179,14 +180,14 @@ int probe_max_receive_buffer( int udp_sock ) if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &voptval, &voptvallen) == -1 ) { - LM_ERR("getsockopt: %s\n", strerror(errno)); + LM_ERR("fd: %d getsockopt: %s\n", udp_sock, strerror(errno)); return -1; } else { if(ksr_verbose_startup) - LM_DBG("setting SO_RCVBUF; set=%d,verify=%d\n", - optval, voptval); + LM_DBG("setting SO_RCVBUF on fd %d; val=%d, verify=%d\n", + udp_sock, optval, voptval); if (voptval<optval) { - LM_DBG("setting SO_RCVBUF has no effect\n"); + LM_DBG("setting SO_RCVBUF on fd %d has no effect\n", udp_sock); /* if setting buffer size failed and still in the aggressive phase, try less aggressively; otherwise give up */ @@ -200,10 +201,10 @@ int probe_max_receive_buffer( int udp_sock ) if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &foptval, &foptvallen) == -1 ) { - LM_ERR("getsockopt: %s\n", strerror(errno)); + LM_ERR("fd: %d getsockopt: %s\n", udp_sock, strerror(errno)); return -1; } - LM_INFO("SO_RCVBUF is finally %d\n", foptval ); + LM_INFO("SO_RCVBUF is finally %d on fd %d\n", foptval, udp_sock); return 0;

1 0

git:master:f068a9ad: core: clarification for -b cli parameter
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

Module: kamailio Branch: master Commit: f068a9ad1892777bfb9a6d1bcfd17a291578c6b6 URL: https://github.com/kamailio/kamailio/commit/f068a9ad1892777bfb9a6d1bcfd17a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T17:25:32+01:00 core: clarification for -b cli parameter --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f068a9ad1892777bfb9a6d1bcfd17a2… Patch: https://github.com/kamailio/kamailio/commit/f068a9ad1892777bfb9a6d1bcfd17a2… --- diff --git a/src/main.c b/src/main.c index 14126ca3d0..60435e865e 100644 --- a/src/main.c +++ b/src/main.c @@ -169,8 +169,8 @@ Options:\n\ default is yes.\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ - -b nr Maximum receive buffer size which will not be exceeded by\n\ - auto-probing procedure even if OS allows\n\ + -b nr Maximum OS UDP receive buffer size which will not be exceeded by\n\ + auto-probing-and-increase procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ --cfg-print Print configuration file evaluating includes and ifdefs\n\ -d Debugging level control (multiple -d to increase the level from 0)\n\

1 0

[kamailio/kamailio] nats: move nats connection handling into a struct in order to extend features (PR #2934)
by Emmanuel Schmidbauer 23 Nov '21

23 Nov '21

- [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2916 #### Description This update moves the nats urls into a `nats_connection_ptr` struct. This will allow the nats_urls to be extended into a linked-list (to allow simultaneous connections) while still maintaining nats built-in failover connectivity which comes included in the libnats You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2934 -- Commit Summary -- * nats: move nats connection handling into a struct in order to extend features -- File Changes -- M src/modules/nats/nats_mod.c (248) M src/modules/nats/nats_mod.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2934.patch https://github.com/kamailio/kamailio/pull/2934.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2934

2 4

git:master:ff852c46: nats: move nats connection handling into a struct in order to extend features
by Emmanuel Schmidbauer 23 Nov '21

23 Nov '21

Module: kamailio Branch: master Commit: ff852c46b3b8bee94f63a30974c0742b5829204d URL: https://github.com/kamailio/kamailio/commit/ff852c46b3b8bee94f63a30974c0742… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-11-19T07:24:29-05:00 nats: move nats connection handling into a struct in order to extend features --- Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ff852c46b3b8bee94f63a30974c0742… Patch: https://github.com/kamailio/kamailio/commit/ff852c46b3b8bee94f63a30974c0742…

1 0

git:master:210da840: Merge pull request #2934 from kamailio/nats-connection-ptr
by GitHub 23 Nov '21

23 Nov '21

Module: kamailio Branch: master Commit: 210da8403463290cdd0abec25473df5a15557b83 URL: https://github.com/kamailio/kamailio/commit/210da8403463290cdd0abec25473df5… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-23T07:59:26-05:00 Merge pull request #2934 from kamailio/nats-connection-ptr nats: move nats connection handling into a struct in order to extend features --- Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/210da8403463290cdd0abec25473df5… Patch: https://github.com/kamailio/kamailio/commit/210da8403463290cdd0abec25473df5…

1 0

[kamailio/kamailio] SQLOPS Module (Issue #2950)
by iliesh 23 Nov '21

23 Nov '21

### Description By using module 'sqlops' would be nice to pass also the database name as an argument to the function "sql_query" along with the connection name and SQL statement. This would be very useful when you have few database hosts and an SQL Proxy which is routing all queries based on the database name, for example: customer_1 -> db_host_1 -> db_name_c1 customer_2 -> db_host_2 -> db_name_c2 So instead of: ``` if($var(customer) == "customer_1") { sql_query("ca", "SELECT name from demo where id=1", "ra"); } else { sql_query("cb","SELECT name from demo where id=1", "ra"); } ``` use just a single connection to the Proxy: ``` sql_query("ca", "$var(db_name)", "SELECT name from demo where id=1", "ra"); ``` -- 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/2950

2 3

[kamailio/kamailio] misc: update ims pcscf register example (PR #2947)
by alexyosifov 22 Nov '21

22 Nov '21

- Updated ims pcscf register script file with removing of ck/ik in 401 Challenge reply.   #### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2947 -- Commit Summary -- * misc: update ims pcscf register example -- File Changes -- M misc/examples/ims/pcscf/route/register.cfg (48) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2947.patch https://github.com/kamailio/kamailio/pull/2947.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2947

2 2

git:master:a84392d4: misc: update ims pcscf register example
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: a84392d49551dcc98378e9fe2feee5f6c3fb81a4 URL: https://github.com/kamailio/kamailio/commit/a84392d49551dcc98378e9fe2feee5f… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T19:32:49+01:00 misc: update ims pcscf register example - Updated ims pcscf register script file with removing of ck/ik in 401 Challenge reply. --- Modified: misc/examples/ims/pcscf/route/register.cfg --- Diff: https://github.com/kamailio/kamailio/commit/a84392d49551dcc98378e9fe2feee5f… Patch: https://github.com/kamailio/kamailio/commit/a84392d49551dcc98378e9fe2feee5f… --- diff --git a/misc/examples/ims/pcscf/route/register.cfg b/misc/examples/ims/pcscf/route/register.cfg index c10979d84a4..e90b7fa300b 100644 --- a/misc/examples/ims/pcscf/route/register.cfg +++ b/misc/examples/ims/pcscf/route/register.cfg @@ -3,9 +3,9 @@ ###################################################################### route[REGISTER] { # Provide some statistics - if ($sht(a=>$ci::start_time) == $null || $sht(a=>$ci::start_time) == 0) { - $sht(a=>$ci::start_time) = $TV(Sn); - } + if ($sht(a=>$ci::start_time) == $null || $sht(a=>$ci::start_time) == 0) { + $sht(a=>$ci::start_time) = $TV(Sn); + } # Strip Transport from RURI: $ru = $(ru{re.subst,/;transport=[A-Za-z]*//g}); @@ -146,23 +146,31 @@ onreply_route[REGISTER_reply] #!endif #!endif #update stats for register reply on success - $var(start_secs) = $(sht(a=>$ci::start_time){s.select,0,.}); - $var(start_usecs) = $(sht(a=>$ci::start_time){s.select,1,.}); - $var(diff_secs) = $TV(s) - $var(start_secs); - $var(diff_usecs) = $TV(u) - $var(start_usecs); - $var(diff_ms) = $var(diff_secs)*1000 + ($var(diff_usecs)/1000); - $sht(a=>$ci::start_time)=0; - $var(stat_add) = "+" + $var(diff_ms); - xlog("L_DBG", "REGISTER SUCCESS[$ci] took $var(stat_add)ms\n"); - update_stat("register_success", "+1"); - update_stat("register_time", "$var(stat_add)"); + $var(start_secs) = $(sht(a=>$ci::start_time){s.select,0,.}); + $var(start_usecs) = $(sht(a=>$ci::start_time){s.select,1,.}); + $var(diff_secs) = $TV(s) - $var(start_secs); + $var(diff_usecs) = $TV(u) - $var(start_usecs); + $var(diff_ms) = $var(diff_secs)*1000 + ($var(diff_usecs)/1000); + $sht(a=>$ci::start_time)=0; + $var(stat_add) = "+" + $var(diff_ms); + xlog("L_DBG", "REGISTER SUCCESS[$ci] took $var(stat_add)ms\n"); + update_stat("register_success", "+1"); + update_stat("register_time", "$var(stat_add)"); #!ifdef WITH_IPSEC - ipsec_forward("location"); - } - else { + ipsec_forward("location"); + } + else { if (t_check_status("401")) { - ipsec_create("location"); - } + #Remove ck and ik from Authentication header + $var(rem_ck) = $(hdr(WWW-Authenticate){re.subst,/ck="[a-zA-Z0-9]*", //g}); + $var(rem_ik) = $(var(rem_ck){re.subst,/ik="[a-zA-Z0-9]*", //g}); + remove_hf("WWW-Authenticate"); + append_hf("WWW-Authenticate: $var(rem_ik)\r\n"); + + if(ipsec_create("location")!=1) { + send_reply("503", "Service Unavailable (Create ipsec failed)"); + } + } #!endif } exit; @@ -183,12 +191,12 @@ failure_route[REGISTER_failure] xlog("Blocking traffic from $si\n"); $sht(ipban=>$si) = 1; } - update_stat("register_failed", "+1"); + update_stat("register_failed", "+1"); } #!endif if (t_check_status("408")) { send_reply("504","Server Time-Out"); - update_stat("register_failed", "+1"); + update_stat("register_failed", "+1"); exit; } }

1 0

[kamailio/kamailio] tls: fix wrong macro used to detect OpenSSL 1.1.0+ (PR #2944)
by space88man 22 Nov '21

22 Nov '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description In commit 6c8861353e504a2bc1b661e5685fc5c12ba48f52 we attempt to detect OpenSSL 1.1.0+ to fix initialization of EC. The wrong macro `OPENSSL_VERSION_1_1` was used; this is not actually defined in the OpenSSL headers. Use the correct macro `OPENSSL_VERSION_NUMBER`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2944 -- Commit Summary -- * tls: fix wrong macro used to detect OpenSSL 1.1.0+ -- File Changes -- M src/modules/tls/tls_domain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2944.patch https://github.com/kamailio/kamailio/pull/2944.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2944

2 2

git:master:1285d8a2: tls: fix wrong macro used to detect OpenSSL 1.1.0+
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: 1285d8a291a1b746a33d643004153203bc06b6cb URL: https://github.com/kamailio/kamailio/commit/1285d8a291a1b746a33d64300415320… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T19:22:23+01:00 tls: fix wrong macro used to detect OpenSSL 1.1.0+ --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/1285d8a291a1b746a33d64300415320… Patch: https://github.com/kamailio/kamailio/commit/1285d8a291a1b746a33d64300415320… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index b5160ec833..5f939df1d4 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -62,7 +62,7 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); * prime256v1 by default. This is Apache mod_ssl's initialization * policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) +#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER < 0x10100000L static void setup_ecdh(SSL_CTX *ctx) { #if !defined(SSL_CTX_set_ecdh_auto) @@ -701,7 +701,7 @@ static int set_cipher_list(tls_domain_t* d) tls_domain_str(d), cipher_list); return -1; } -#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) +#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER < 0x10100000L setup_ecdh(d->ctx[i]); #endif #ifndef OPENSSL_NO_DH

1 0

git:master:112f38a4: pv: added {val.ne} transformation
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: 112f38a4787c4ea5a3b3df3ebc8619f08a05e790 URL: https://github.com/kamailio/kamailio/commit/112f38a4787c4ea5a3b3df3ebc8619f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T18:54:02+01:00 pv: added {val.ne} transformation - return empty string if the variable value is $null --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/112f38a4787c4ea5a3b3df3ebc8619f… Patch: https://github.com/kamailio/kamailio/commit/112f38a4787c4ea5a3b3df3ebc8619f… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 4848936d62..e221cb300e 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2551,6 +2551,16 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; } break; + case TR_VAL_NE: + if(val->flags&PV_VAL_NULL) { + val->ri = 0; + tr_set_crt_buffer(); + val->rs.s = _tr_buffer; + val->rs.s[0] = '\0'; + val->rs.len = 0; + val->flags = PV_VAL_STR; + } + break; case TR_VAL_JSON: if(val->flags&PV_VAL_NULL) { val->ri = 0; @@ -3831,6 +3841,9 @@ char* tr_parse_val(str* in, trans_t *t) if(name.len==2 && strncasecmp(name.s, "n0", 2)==0) { t->subtype = TR_VAL_N0; goto done; + } else if(name.len==2 && strncasecmp(name.s, "ne", 2)==0) { + t->subtype = TR_VAL_NE; + goto done; } else if(name.len==4 && strncasecmp(name.s, "json", 4)==0) { t->subtype = TR_VAL_JSON; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index ebae2720f9..329f09a8a2 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -73,7 +73,7 @@ enum _tr_urialias_subtype { }; enum _tr_val_subtype { - TR_VAL_NONE=0, TR_VAL_N0, TR_VAL_JSON + TR_VAL_NONE=0, TR_VAL_N0, TR_VAL_NE, TR_VAL_JSON };

1 0

[kamailio/kamailio] presence: return 200 instead of 202 (PR #2930)
by Laurențiu Nicola 22 Nov '21

22 Nov '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description RFC 6665 [says](https://datatracker.ietf.org/doc/html/rfc6665#section-8.3.1): > Implementations conformant with the current specification MUST treat an incoming 202 response as identical to a 200 response and MUST NOT generate 202 response codes to SUBSCRIBE or NOTIFY requests. I'm not sure if Kamailio is supposed to conform to the older RFC, so this change might not be _acceptable_. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2930 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2930/commits/04d51f7c489bce19fdf5…">presence: return 200 instead of 202</a> -- File Changes -- M src/modules/presence/subscribe.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2930.patch https://github.com/kamailio/kamailio/pull/2930.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2930

4 21

[kamailio/kamailio] RFE app_python3: future EL8 packages switch to Python 3.9 (Issue #2938)
by space88man 22 Nov '21

22 Nov '21

### Description RHEL8 and rebuilders (Oracle Linux, AlmaLinux, Rocky Linux et al) now include Python 3.9 in base system. This RFE is for ≥ 5.6.x: can we switch the `app_python3` package to use the Python 3.9 packages - no external repos will be required for switch. This will allow newer Python 3.9 features in the routing script and keep up to date with improvements in the Python language. Further more Python 3.6 is EoL on 23 Dec 2021. I don't propose this for 5.5.x as it may be too intrusive but perhaps the switch could be made on master in anticipation for 5.6.x.  ### Expected behavior `app_python3` module will now use system Python 3.9 packages instead of Python 3.6 packages #### Actual observed behavior `app_python3` module in 5.5.x now uses system Python 3.6. -- 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/2938

2 3

[kamailio/kamailio] Expose the domain in certificate validation errors (#2873)
by Todd 22 Nov '21

22 Nov '21

We ran into an issue recently with certificate validation and this modification to the source code helped us quickly identify the root cause. Previously we had no way of seeing which domain was invalid. I didn't like using malloc here but hopefully freeing it in the same context ensures no memory leak as well avoid any memory corruption... with the memcpy and '\0'... hope this helps...   #### 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 - [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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2873 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2873/commits/b7673a8423ed17b78f81…">Expose the domain in certificate validation errors</a> -- File Changes -- M src/modules/tls/tls_util.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2873.patch https://github.com/kamailio/kamailio/pull/2873.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2873

2 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev