- sr-dev - kamailio.org

git:5.1:2b4cfd66: tools: use correct check of None instead of wrong comparison in route_graph.py tool
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.1 Commit: 2b4cfd66a57fdb1558852554189287f08c15ae5a URL: https://github.com/kamailio/kamailio/commit/2b4cfd66a57fdb1558852554189287f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:25:01+02:00 tools: use correct check of None instead of wrong comparison in route_graph.py tool (cherry picked from commit 545ef51912ae9bf5e14eaffeb9f41be8359a442f) --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/2b4cfd66a57fdb1558852554189287f… Patch: https://github.com/kamailio/kamailio/commit/2b4cfd66a57fdb1558852554189287f… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index 2024cf42a0..135440a3c5 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -79,7 +79,7 @@ def traverse_routes(_level, _name): if len(sys.argv) == 3: max_depth = int(sys.argv[2]) cfg = file(sys.argv[1], "r") -if cfg == None: +if cfg is None: raise "Missing config file" line = cfg.readline() rt = routes @@ -90,40 +90,40 @@ def traverse_routes(_level, _name): main_match = re_main_route.search(line) def_match = re_def_route.search(line) call_match = re_call_route.search(line) - if not call_match == None: + if not call_match is None: log("CALL: " + line) name = call_match.group(2) log(rname +":"+name) rt[rname].append(name) - elif not def_match == None: + elif not def_match is None: log("DEF: " + line) rtype = def_match.group(1) rname = def_match.group(3) if rtype == "failure_": rt = f_routes - if rname == None: + if rname is None: rname = "failure" elif rtype == "onreply_": rt = r_routes - if rname == None: + if rname is None: rname = "onreply" elif rtype == "onsend_": rt = s_routes - if rname == None: + if rname is None: rname = "onsend" elif rtype == "branch_": rt = b_routes - if rname == None: + if rname is None: rname = "branch" elif rtype == "event_": rt = e_routes - if rname == None: + if rname is None: rname = "event" else: rt = routes log(rname) rt[rname] = [] - elif not main_match == None: + elif not main_match is None: log("MAIN: " + line) rtype = main_match.group(1) if rtype == "failure_":

1 0

git:5.1:cd0fe9e4: tools: fix python exception usage in route_graph.py tool
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.1 Commit: cd0fe9e469c60be0b5c22cfa62f33cc70c12bb1f URL: https://github.com/kamailio/kamailio/commit/cd0fe9e469c60be0b5c22cfa62f33cc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:25:25+02:00 tools: fix python exception usage in route_graph.py tool (cherry picked from commit 4a66e500ddb6028d3dfcf67aca951282309b6ea4) --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/cd0fe9e469c60be0b5c22cfa62f33cc… Patch: https://github.com/kamailio/kamailio/commit/cd0fe9e469c60be0b5c22cfa62f33cc… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index 135440a3c5..b416bdc186 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -75,12 +75,12 @@ def traverse_routes(_level, _name): if len(sys.argv) < 2: - raise "usage: %s configuration-file [max_depth]" % sys.argv[0] + raise Exception('wrong number of arguments\nusage: ' + sys.argv[0] + ' configuration-file [max_depth]') if len(sys.argv) == 3: max_depth = int(sys.argv[2]) cfg = file(sys.argv[1], "r") if cfg is None: - raise "Missing config file" + raise Exception ('Missing config file') line = cfg.readline() rt = routes while line:

1 0

git:5.1:f21f3e63: core: fix possible int overflow (conversion after multiplication) in cfg code
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.1 Commit: f21f3e63fe6e16867568883e8aafd4f8dbe7c9f5 URL: https://github.com/kamailio/kamailio/commit/f21f3e63fe6e16867568883e8aafd4f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:24:24+02:00 core: fix possible int overflow (conversion after multiplication) in cfg code (cherry picked from commit d1f5a2a266716d4f6759f9e695249dce442ccdd2) --- Modified: src/core/cfg/cfg_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/f21f3e63fe6e16867568883e8aafd4f… Patch: https://github.com/kamailio/kamailio/commit/f21f3e63fe6e16867568883e8aafd4f… --- diff --git a/src/core/cfg/cfg_struct.c b/src/core/cfg/cfg_struct.c index f7b1530419..f89e5a0daf 100644 --- a/src/core/cfg/cfg_struct.c +++ b/src/core/cfg/cfg_struct.c @@ -682,7 +682,7 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, if (i > 0) memcpy( new_array, old_array, - inst_size * i); + (size_t) inst_size * i); memset((char*)new_array + inst_size * i, 0, inst_size); *new_group = (cfg_group_inst_t *)((char*)new_array + inst_size * i); @@ -691,7 +691,7 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, if (i < meta->num) memcpy( (char*)new_array + inst_size * (i + 1), (char*)old_array + inst_size * i, - inst_size * (meta->num - i)); + (size_t) inst_size * (meta->num - i)); return new_array; }

1 0

git:5.2:d3ee5a3e: tools: fix python exception usage in route_graph.py tool
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.2 Commit: d3ee5a3e16750655c0c106613028b27a8d00e427 URL: https://github.com/kamailio/kamailio/commit/d3ee5a3e16750655c0c106613028b27… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:25:20+02:00 tools: fix python exception usage in route_graph.py tool (cherry picked from commit 4a66e500ddb6028d3dfcf67aca951282309b6ea4) --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/d3ee5a3e16750655c0c106613028b27… Patch: https://github.com/kamailio/kamailio/commit/d3ee5a3e16750655c0c106613028b27… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index 135440a3c5..b416bdc186 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -75,12 +75,12 @@ def traverse_routes(_level, _name): if len(sys.argv) < 2: - raise "usage: %s configuration-file [max_depth]" % sys.argv[0] + raise Exception('wrong number of arguments\nusage: ' + sys.argv[0] + ' configuration-file [max_depth]') if len(sys.argv) == 3: max_depth = int(sys.argv[2]) cfg = file(sys.argv[1], "r") if cfg is None: - raise "Missing config file" + raise Exception ('Missing config file') line = cfg.readline() rt = routes while line:

1 0

git:5.2:24b46f0e: core: remove unused seq variable in build_iface_list function
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.2 Commit: 24b46f0e3ec6b280302e3cf59b41ed44424eaf7a URL: https://github.com/kamailio/kamailio/commit/24b46f0e3ec6b280302e3cf59b41ed4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:25:51+02:00 core: remove unused seq variable in build_iface_list function (cherry picked from commit 8821cc2f5a6b972307fb71e73cf8d57496e61f66) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/24b46f0e3ec6b280302e3cf59b41ed4… Patch: https://github.com/kamailio/kamailio/commit/24b46f0e3ec6b280302e3cf59b41ed4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 424c5d83e8..6c3f6d5921 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -992,7 +992,6 @@ static int build_iface_list(void) struct rtgenmsg g; } req; - int seq = 0; int rtn = 0; struct nlmsghdr* nlp; struct ifaddrmsg *ifi;

1 0

git:5.2:1ef44dbf: tools: use correct check of None instead of wrong comparison in route_graph.py tool
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.2 Commit: 1ef44dbf7a62a912618f2dc3174ac0adc91e63ac URL: https://github.com/kamailio/kamailio/commit/1ef44dbf7a62a912618f2dc3174ac0a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:24:55+02:00 tools: use correct check of None instead of wrong comparison in route_graph.py tool (cherry picked from commit 545ef51912ae9bf5e14eaffeb9f41be8359a442f) --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/1ef44dbf7a62a912618f2dc3174ac0a… Patch: https://github.com/kamailio/kamailio/commit/1ef44dbf7a62a912618f2dc3174ac0a… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index 2024cf42a0..135440a3c5 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -79,7 +79,7 @@ def traverse_routes(_level, _name): if len(sys.argv) == 3: max_depth = int(sys.argv[2]) cfg = file(sys.argv[1], "r") -if cfg == None: +if cfg is None: raise "Missing config file" line = cfg.readline() rt = routes @@ -90,40 +90,40 @@ def traverse_routes(_level, _name): main_match = re_main_route.search(line) def_match = re_def_route.search(line) call_match = re_call_route.search(line) - if not call_match == None: + if not call_match is None: log("CALL: " + line) name = call_match.group(2) log(rname +":"+name) rt[rname].append(name) - elif not def_match == None: + elif not def_match is None: log("DEF: " + line) rtype = def_match.group(1) rname = def_match.group(3) if rtype == "failure_": rt = f_routes - if rname == None: + if rname is None: rname = "failure" elif rtype == "onreply_": rt = r_routes - if rname == None: + if rname is None: rname = "onreply" elif rtype == "onsend_": rt = s_routes - if rname == None: + if rname is None: rname = "onsend" elif rtype == "branch_": rt = b_routes - if rname == None: + if rname is None: rname = "branch" elif rtype == "event_": rt = e_routes - if rname == None: + if rname is None: rname = "event" else: rt = routes log(rname) rt[rname] = [] - elif not main_match == None: + elif not main_match is None: log("MAIN: " + line) rtype = main_match.group(1) if rtype == "failure_":

1 0

git:5.2:35292bc1: core: fix possible int overflow (conversion after multiplication) in cfg code
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: 5.2 Commit: 35292bc172e8ad2246b3c7c1e1e576264e70a1de URL: https://github.com/kamailio/kamailio/commit/35292bc172e8ad2246b3c7c1e1e5762… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:24:19+02:00 core: fix possible int overflow (conversion after multiplication) in cfg code (cherry picked from commit d1f5a2a266716d4f6759f9e695249dce442ccdd2) --- Modified: src/core/cfg/cfg_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/35292bc172e8ad2246b3c7c1e1e5762… Patch: https://github.com/kamailio/kamailio/commit/35292bc172e8ad2246b3c7c1e1e5762… --- diff --git a/src/core/cfg/cfg_struct.c b/src/core/cfg/cfg_struct.c index f7b1530419..f89e5a0daf 100644 --- a/src/core/cfg/cfg_struct.c +++ b/src/core/cfg/cfg_struct.c @@ -682,7 +682,7 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, if (i > 0) memcpy( new_array, old_array, - inst_size * i); + (size_t) inst_size * i); memset((char*)new_array + inst_size * i, 0, inst_size); *new_group = (cfg_group_inst_t *)((char*)new_array + inst_size * i); @@ -691,7 +691,7 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, if (i < meta->num) memcpy( (char*)new_array + inst_size * (i + 1), (char*)old_array + inst_size * i, - inst_size * (meta->num - i)); + (size_t) inst_size * (meta->num - i)); return new_array; }

1 0

git:master:f89b0e2e: core: remove pointless assert, block_size returns size_t so it will be always >= 0
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: master Commit: f89b0e2eb5b543f9689e894b02cb5e0585fd0b99 URL: https://github.com/kamailio/kamailio/commit/f89b0e2eb5b543f9689e894b02cb5e0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:22:20+02:00 core: remove pointless assert, block_size returns size_t so it will be always >= 0 --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/f89b0e2eb5b543f9689e894b02cb5e0… Patch: https://github.com/kamailio/kamailio/commit/f89b0e2eb5b543f9689e894b02cb5e0… --- diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index bcaf979466..4907142e9b 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -491,7 +491,6 @@ static block_header_t* block_split(block_header_t* block, size_t size) tlsf_assert(block_size(block) == remain_size + size + block_header_overhead); block_set_size(remaining, remain_size); - tlsf_assert(block_size(remaining) >= 0 && "block split with invalid size"); block_set_size(block, size); block_mark_as_free(remaining);

1 0

git:master:d1f5a2a2: core: fix possible int overflow (conversion after multiplication) in cfg code
by Henning Westerholt 21 Sep '19

21 Sep '19

Module: kamailio Branch: master Commit: d1f5a2a266716d4f6759f9e695249dce442ccdd2 URL: https://github.com/kamailio/kamailio/commit/d1f5a2a266716d4f6759f9e695249dc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-21T21:15:12+02:00 core: fix possible int overflow (conversion after multiplication) in cfg code --- Modified: src/core/cfg/cfg_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/d1f5a2a266716d4f6759f9e695249dc… Patch: https://github.com/kamailio/kamailio/commit/d1f5a2a266716d4f6759f9e695249dc… --- diff --git a/src/core/cfg/cfg_struct.c b/src/core/cfg/cfg_struct.c index 0e3f30ae02..49a885d8af 100644 --- a/src/core/cfg/cfg_struct.c +++ b/src/core/cfg/cfg_struct.c @@ -683,7 +683,7 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, if (i > 0) memcpy( new_array, old_array, - inst_size * i); + (size_t) inst_size * i); memset((char*)new_array + inst_size * i, 0, inst_size); *new_group = (cfg_group_inst_t *)((char*)new_array + inst_size * i); @@ -692,7 +692,7 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, if (i < meta->num) memcpy( (char*)new_array + inst_size * (i + 1), (char*)old_array + inst_size * i, - inst_size * (meta->num - i)); + (size_t) inst_size * (meta->num - i)); return new_array; }

1 0

Re: [sr-dev] [SR-Users] Info: initialization of libssl 1.1.+ with PTHREAD_PROCESS_SHARED attribute for pthread mutex and rwlock
by Henning Westerholt 21 Sep '19

21 Sep '19

Hi Andrew, the 5.2.4 does not contain the 5.3-pre1 workaround yet. So if you test the workaround you need to install the lastest 5.3 from the git master debian repository. But nevertheless it would be good to look at the backtrace, while you have it. Cheers, Henning Am 18.09.19 um 22:10 schrieb Joel Serrano: Hi Andrew, Download from here: http://deb.kamailio.org/kamailio52/pool/main/k/kamailio/ You have kamailio-dbg v5.2.4 (latest 5.2) for all distros... Example for amd64+stretch: http://deb.kamailio.org/kamailio52/pool/main/k/kamailio/kamailio-dbg_5.2.4%… Cheers, Joel. On Wed, Sep 18, 2019 at 12:16 PM Andrew Chen <achen(a)fuze.com<mailto:achen@fuze.com>> wrote: Hi Henning, I'm running 5.2.4. Will this deb package work? On Wed, Sep 18, 2019 at 2:39 PM Andrew Chen <achen(a)fuze.com<mailto:achen@fuze.com>> wrote: Thanks Henning On Wed, Sep 18, 2019 at 2:13 PM Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hello Andrew, strange - it should be there, as it is available on deb.kamailio.org<http://deb.kamailio.org>. Here e.g. the one for 64bit stretch: https://deb.kamailio.org/kamailiodev-nightly/pool/main/k/kamailio/kamailio-… Cheers, Henning Am 18.09.19 um 18:52 schrieb Andrew Chen: I don't see one for debug: root@ashintgkama51:~ # apt-cache search kamailio resource-agents - Cluster Resource Agents kamailio - very fast, dynamic and configurable SIP server kamailio-autheph-modules - authentication using ephemeral credentials for the Kamailio SIP server kamailio-berkeley-bin - Berkeley database module for Kamailio - helper program kamailio-berkeley-modules - Berkeley database module for the Kamailio SIP server kamailio-carrierroute-modules - carrierroute module for the Kamailio SIP server kamailio-cnxcc-modules - cnxcc modules for the Kamailio SIP server kamailio-cpl-modules - CPL module (CPL interpreter engine) for the Kamailio SIP server kamailio-erlang-modules - Erlang modules for the Kamailio SIP server kamailio-geoip-modules - geoip module for the Kamailio SIP Server kamailio-geoip2-modules - geoip2 module for the Kamailio SIP Server kamailio-ims-modules - IMS module for the Kamailio SIP server kamailio-json-modules - Json parser and Json-RPC modules for the Kamailio SIP server On Wed, Sep 18, 2019 at 11:26 AM Daniel-Constantin Mierla <miconda(a)gmail.com<mailto:miconda@gmail.com>> wrote: You have to install the debug symbols package, otherwise the backtrace doesn't show any useful information. It just require to install that package and then get again the backtraces. The package name should be kamailio-dbg. Cheers, Daniel On 18.09.19 16:37, Andrew Chen wrote: Sorry..forgot bt full output (gdb) bt full #0 0x0000562fcc3544c0 in ?? () No symbol table info available. #1 0x0000562fcc354632 in ?? () No symbol table info available. #2 0x0000562fcc354974 in local_timer_run () No symbol table info available. #3 0x0000562fcc3fb256 in ?? () No symbol table info available. #4 0x0000562fcc3fb64c in tcp_receive_loop () No symbol table info available. #5 0x0000562fcc2acf52 in tcp_init_children () No symbol table info available. #6 0x0000562fcc1ad94a in main_loop () No symbol table info available. #7 0x0000562fcc1b4a7b in main () No symbol table info available. (gdb) On Wed, Sep 18, 2019 at 10:35 AM Andrew Chen <achen(a)fuze.com<mailto:achen@fuze.com>> wrote: backtrace output: (gdb) bt #0 0x0000562fcc3544c0 in ?? () #1 0x0000562fcc354632 in ?? () #2 0x0000562fcc354974 in local_timer_run () #3 0x0000562fcc3fb256 in ?? () #4 0x0000562fcc3fb64c in tcp_receive_loop () #5 0x0000562fcc2acf52 in tcp_init_children () #6 0x0000562fcc1ad94a in main_loop () #7 0x0000562fcc1b4a7b in main () (gdb) On Wed, Sep 18, 2019 at 10:01 AM Andrew Chen <achen(a)fuze.com<mailto:achen@fuze.com>> wrote: I'll look for the core. As part of our release process, I don't think we can release master branch of Kamailio. On Wed, Sep 18, 2019 at 9:54 AM Daniel-Constantin Mierla <miconda(a)gmail.com<mailto:miconda@gmail.com>> wrote: Hello, did you get core files? If yes, it would be good to see the gdb bracktraces. Have you used the pre-loaded library workaround? The code was not backported to branch 5.2 yet, I wanted to wait a bit and see if there are reports with good/bad results. If you want to use it, then you have to install nightly builds from master branch (development version, should be 5.3.0-pre1 at this moment). Cheers, Daniel On 18.09.19 15:26, Andrew Chen wrote: Hi Daniel, Which apt repository can we get this workaround? Today I noticed our Kamailio 5.2.4 cored during one of our load test sessions: Wed Sep 18 09:31:14 2019] kamailio[26997]: segfault at 7f8501366000 ip 00007f8501e58585 sp 00007fffd5c84248 error 4 in libcrypto.so.1.1[7f8501dd4000+29b000] [Wed Sep 18 10:12:29 2019] kamailio[27110]: segfault at 7f1a8eea1000 ip 00007f1a8f993585 sp 00007ffddc8848c8 error 4 in libcrypto.so.1.1[7f1a8f90f000+29b000] [Wed Sep 18 10:12:43 2019] kamailio[11060]: segfault at 20 ip 00007f0a85dac128 sp 00007fff6847aad0 error 4 in libcrypto.so.1.1[7f0a85c40000+29b000] [Wed Sep 18 10:12:44 2019] kamailio[11059]: segfault at f0 ip 00007f0a85cc43ea sp 00007fff6847a9e8 error 4 in libcrypto.so.1.1[7f0a85c40000+29b000] [Wed Sep 18 10:13:02 2019] kamailio[11187]: segfault at 7f75e06c8000 ip 00007f75e11ba585 sp 00007ffe29b47c88 error 4 in libcrypto.so.1.1[7f75e1136000+29b000] [Wed Sep 18 10:13:17 2019] kamailio[11445]: segfault at 7f0f3743f000 ip 00007f0f37f31585 sp 00007ffde54daa38 error 4 in libcrypto.so.1.1[7f0f37ead000+29b000] [Wed Sep 18 10:13:36 2019] kamailio[11644]: segfault at 7f804309c000 ip 00007f8043b8e585 sp 00007ffe89fe8228 error 4 in libcrypto.so.1.1[7f8043b0a000+29b000] [Wed Sep 18 10:13:52 2019] kamailio[11799]: segfault at 7ff59c7e2000 ip 00007ff59d2d4585 sp 00007ffd69d76bb8 error 4 in libcrypto.so.1.1[7ff59d250000+29b000] [Wed Sep 18 10:13:52 2019] kamailio[11792]: segfault at 7ff59c7e2000 ip 00007ff59d2d4585 sp 00007ffd69d76bb8 error 4 in libcrypto.so.1.1[7ff59d250000+29b000] [Wed Sep 18 12:48:01 2019] kamailio[12066]: segfault at 7f22dca6d000 ip 00007f22dd55f585 sp 00007fffbc766ab8 error 4 in libcrypto.so.1.1[7f22dd4db000+29b000] [Wed Sep 18 12:48:14 2019] kamailio[16344]: segfault at 7f7cca42d000 ip 00007f7ccaf1f585 sp 00007ffe99f16108 error 4 in libcrypto.so.1.1[7f7ccae9b000+29b000] [Wed Sep 18 12:48:32 2019] kamailio[16708]: segfault at 7fb309141000 ip 00007fb309c33585 sp 00007ffd07a5f3c8 error 4 in libcrypto.so.1.1[7fb309baf000+29b000] [Wed Sep 18 12:48:49 2019] kamailio[16824]: segfault at f0 ip 00007fc59095b3ea sp 00007ffe58a490b8 error 4 in libcrypto.so.1.1[7fc5908d7000+29b000] [Wed Sep 18 12:49:04 2019] kamailio[16956]: segfault at 7fcc22e58000 ip 00007fcc2394a585 sp 00007fffa9c52258 error 4 in libcrypto.so.1.1[7fcc238c6000+29b000] [Wed Sep 18 12:49:04 2019] kamailio[16945]: segfault at f0 ip 00007fcc2394a3ea sp 00007fffa9c52128 error 4 in libcrypto.so.1.1[7fcc238c6000+29b000] [Wed Sep 18 12:49:16 2019] kamailio[17244]: segfault at 7f586ed20000 ip 00007f586f812585 sp 00007ffeae1adcd8 error 4 in libcrypto.so.1.1[7f586f78e000+29b000] [Wed Sep 18 12:49:33 2019] kamailio[17431]: segfault at 8 ip 0000562fcc44c5d5 sp 00007ffe825c9dd0 error 4 in kamailio[562fcc17c000+4a2000] [Wed Sep 18 12:49:33 2019] kamailio[17386]: segfault at 10 ip 00007f96c3735c3e sp 00007ffe825ca270 error 4 in dialog.so[7f96c36d6000+be000] [Wed Sep 18 12:49:33 2019] kamailio[17423]: segfault at 0 ip 0000562fcc3544c0 sp 00007ffe825ca1f0 error 6 in kamailio[562fcc17c000+4a2000] [Wed Sep 18 12:49:33 2019] kamailio[17378]: segfault at 0 ip 00007f96c5dd099f sp 00007ffe825c98e0 error 4 in tm.so[7f96c5da5000+13f000] [Wed Sep 18 12:49:33 2019] kamailio[17417]: segfault at 0 ip 0000562fcc3544c0 sp 00007ffe825ca1f0 error 6 in kamailio[562fcc17c000+4a2000] [Wed Sep 18 12:49:33 2019] kamailio[17416]: segfault at 0 ip 0000562fcc3544c0 sp 00007ffe825ca1f0 error 6 in kamailio[562fcc17c000+4a2000] [Wed Sep 18 12:49:33 2019] kamailio[17380]: segfault at 0 ip 00007f96c5dd099f sp 00007ffe825c98e0 error 4 in tm.so[7f96c5da5000+13f000] [Wed Sep 18 12:49:33 2019] kamailio[17381]: segfault at 0 ip 00007f96c5dd099f sp 00007ffe825c98e0 error 4 in tm.so[7f96c5da5000+13f000] [Wed Sep 18 12:49:34 2019] kamailio[17387]: segfault at 8 ip 0000562fcc25d1f3 sp 00007ffe825ca370 error 6 in kamailio[562fcc17c000+4a2000] and I was wondering if this core is related. Thanks On Fri, Sep 13, 2019 at 5:18 PM Alex Balashov <abalashov(a)evaristesys.com<mailto:abalashov@evaristesys.com>> wrote: Hi Daniel, Thanks a lot for this work; it's definitely important that Kamailio build against OpenSSL v1.1, and I'll be happy to contribute some testing in a live environment in the coming weeks. Much appreciated. Have a good weekend, -- Alex On Fri, Sep 13, 2019 at 01:34:12PM +0200, Daniel-Constantin Mierla wrote: > Hello, > after couple of months waiting for feedback about the workaround with the > preloaded shared library to set the PTHREAD_PROCESS_SHARED attribute for > pthread mutex/rwlock in order to avoid deadlocks and as it seems to be the > solution, I just pushed a few commits to move that code in the core of > kamailio. > > It this way the initialization with the PTHREAD_PROCESS_SHARED attribute is > done by default when libssl v1.1 is detected at compile time, without the > need of using the approach with a preloaded library. > > The shared library is still kept in the tls module: > * > https://github.com/kamailio/kamailio/tree/master/src/modules/tls/utils/open… > > Probably is going to be removed in the near future. > > I am asking the community members that use Kamailio on systems with libssl > v1.1+ to test the master branch and give feedback. The master branch is > anyhow in testing phase for preparing the next major release v5.3.0, so it > will help for that as well. > > If no issue is going to be reported soon, the commits will be backported to > stable branches, to re-enable smooth use of Kamailio with libssl v1.1+. > > When libssl v1.1+ is detected, the core links with pthread, but that was > already present in the Makefiles.defs for different compile options. The > pthread more or less a default library on linuxes/unixes, so this should > not introduce any major dependency to the Kamailio core. > > Cheers, > Daniel > > -- > Daniel-Constantin Mierla - http://www.asipto.com > http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Alex Balashov | Principal | Evariste Systems LLC Tel: +1-706-510-6800 / +1-800-250-5920 (toll-free) Web: http://www.evaristesys.com/, http://www.csrpswitch.com/ _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@<mailto:achen@thinkingphones.com>fuze.com<http://fuze.com> *Confidentiality Notice: The information contained in this e-mail and any attachments may be confidential. If you are not an intended recipient, you are hereby notified that any dissemination, distribution or copying of this e-mail is strictly prohibited. If you have received this e-mail in error, please notify the sender and permanently delete the e-mail and any attachments immediately. You should not retain, copy or use this e-mail or any attachment for any purpose, nor disclose all or any part of the contents to any other person. Thank you.* _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Daniel-Constantin Mierla -- www.asipto.com<http://www.asipto.com> www.twitter.com/miconda<http://www.twitter.com/miconda> -- www.linkedin.com/in/miconda<http://www.linkedin.com/in/miconda> Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@<mailto:achen@thinkingphones.com>fuze.com<http://fuze.com> -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@<mailto:achen@thinkingphones.com>fuze.com<http://fuze.com> -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@<mailto:achen@thinkingphones.com>fuze.com<http://fuze.com> *Confidentiality Notice: The information contained in this e-mail and any attachments may be confidential. If you are not an intended recipient, you are hereby notified that any dissemination, distribution or copying of this e-mail is strictly prohibited. If you have received this e-mail in error, please notify the sender and permanently delete the e-mail and any attachments immediately. You should not retain, copy or use this e-mail or any attachment for any purpose, nor disclose all or any part of the contents to any other person. Thank you.* -- Daniel-Constantin Mierla -- www.asipto.com<http://www.asipto.com> www.twitter.com/miconda<http://www.twitter.com/miconda> -- www.linkedin.com/in/miconda<http://www.linkedin.com/in/miconda> Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@<mailto:achen@thinkingphones.com>fuze.com<http://fuze.com> *Confidentiality Notice: The information contained in this e-mail and any attachments may be confidential. If you are not an intended recipient, you are hereby notified that any dissemination, distribution or copying of this e-mail is strictly prohibited. If you have received this e-mail in error, please notify the sender and permanently delete the e-mail and any attachments immediately. You should not retain, copy or use this e-mail or any attachment for any purpose, nor disclose all or any part of the contents to any other person. Thank you.* _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/ -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@<mailto:achen@thinkingphones.com>fuze.com<http://fuze.com> -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@<mailto:achen@thinkingphones.com>fuze.com<http://fuze.com> *Confidentiality Notice: The information contained in this e-mail and any attachments may be confidential. If you are not an intended recipient, you are hereby notified that any dissemination, distribution or copying of this e-mail is strictly prohibited. If you have received this e-mail in error, please notify the sender and permanently delete the e-mail and any attachments immediately. You should not retain, copy or use this e-mail or any attachment for any purpose, nor disclose all or any part of the contents to any other person. Thank you.*_______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

3 5

git:master:d0ed04ae: xcap_server: free xpath object before reusing the variable
by Daniel-Constantin Mierla 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: d0ed04ae7938ef09da1ca215043334190adb9c52 URL: https://github.com/kamailio/kamailio/commit/d0ed04ae7938ef09da1ca2150433341… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-20T19:25:26+02:00 xcap_server: free xpath object before reusing the variable - removed unnecessary resets of local variables at the end of function --- Modified: src/modules/xcap_server/xcap_misc.c --- Diff: https://github.com/kamailio/kamailio/commit/d0ed04ae7938ef09da1ca2150433341… Patch: https://github.com/kamailio/kamailio/commit/d0ed04ae7938ef09da1ca2150433341… --- diff --git a/src/modules/xcap_server/xcap_misc.c b/src/modules/xcap_server/xcap_misc.c index bc09ce70d8..8c04bbe27c 100644 --- a/src/modules/xcap_server/xcap_misc.c +++ b/src/modules/xcap_server/xcap_misc.c @@ -436,8 +436,8 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) { xmlDocPtr doc = NULL; xmlDocPtr newnode = NULL; - xmlXPathContextPtr xpathCtx = NULL; - xmlXPathObjectPtr xpathObj = NULL; + xmlXPathContextPtr xpathCtx = NULL; + xmlXPathObjectPtr xpathObj = NULL; xmlNodeSetPtr nodes; const xmlChar* value = NULL; xmlChar *xmem = NULL; @@ -466,7 +466,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) LM_ERR("unable to create new XPath context\n"); goto error; } - + /* Evaluate xpath expression */ xpathObj = xmlXPathEvalExpression( (const xmlChar*)xpaths->s, xpathCtx); @@ -488,6 +488,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) goto done; /* evaluate xpath expression for parrent node */ *p = 0; + xmlXPathFreeObject(xpathObj); xpathObj = xmlXPathEvalExpression( (const xmlChar*)xpaths->s, xpathCtx); if(xpathObj == NULL) @@ -525,7 +526,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) size = nodes->nodeNr; if(val!=NULL) value = (const xmlChar*)val->s; - + /* * NOTE: the nodes are processed in reverse order, i.e. reverse document * order because xmlNodeSetContent can actually free up descendant @@ -561,7 +562,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) * This can be exercised by running * valgrind xpath2 test3.xml '//discarded' discarded * There is 2 ways around it: - * - make a copy of the pointers to the nodes from the result set + * - make a copy of the pointers to the nodes from the result set * then call xmlXPathFreeObject() and then modify the nodes * or * - remove the reference to the modified nodes from the node set @@ -599,22 +600,16 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) done: if(xpathObj!=NULL) xmlXPathFreeObject(xpathObj); - if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx); + if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx); if(doc!=NULL) xmlFreeDoc(doc); if(newnode!=NULL) xmlFreeDoc(newnode); - xpathObj = NULL; - xpathCtx = NULL; - doc = NULL; return 0; error: if(xpathObj!=NULL) xmlXPathFreeObject(xpathObj); - if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx); + if(xpathCtx!=NULL) xmlXPathFreeContext(xpathCtx); if(doc!=NULL) xmlFreeDoc(doc); if(newnode!=NULL) xmlFreeDoc(newnode); - xpathObj = NULL; - xpathCtx = NULL; - doc = NULL; outbuf->s = NULL; outbuf->len = 0; return -1;

1 0

git:master:b54573ca: xmlrpc: reset fields in case of error for building fake via
by Daniel-Constantin Mierla 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: b54573ca9167c807a1de39634bed04cb7953dce0 URL: https://github.com/kamailio/kamailio/commit/b54573ca9167c807a1de39634bed04c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-20T14:25:31+02:00 xmlrpc: reset fields in case of error for building fake via --- Modified: src/modules/xmlrpc/http.c --- Diff: https://github.com/kamailio/kamailio/commit/b54573ca9167c807a1de39634bed04c… Patch: https://github.com/kamailio/kamailio/commit/b54573ca9167c807a1de39634bed04c… --- diff --git a/src/modules/xmlrpc/http.c b/src/modules/xmlrpc/http.c index 04e1cd06eb..81fb6df9b7 100644 --- a/src/modules/xmlrpc/http.c +++ b/src/modules/xmlrpc/http.c @@ -67,6 +67,7 @@ static int insert_fake_via(sip_msg_t* msg, char* via, int via_len) LM_ERR("out of pkg memory\n"); goto error; } + memset(vb, 0, sizeof(struct via_body)); msg->h_via1 = pkg_malloc(sizeof(hdr_field_t)); if (!msg->h_via1) { @@ -74,7 +75,6 @@ static int insert_fake_via(sip_msg_t* msg, char* via, int via_len) goto error; } memset(msg->h_via1, 0, sizeof(hdr_field_t)); - memset(vb, 0, sizeof(struct via_body)); /* FIXME: The code below would break if the VIA prefix * gets changed in config.h @@ -121,10 +121,12 @@ static int insert_fake_via(sip_msg_t* msg, char* via, int via_len) error: if (vb) { free_via_list(vb); - pkg_free(vb); } - if (msg->h_via1) pkg_free(msg->h_via1); + if (msg->h_via1) { + pkg_free(msg->h_via1); + msg->h_via1 = 0; + } return -1; }

1 0

git:master:f58c3ce7: tools: add reply_route support to route_graph.py tool
by Henning Westerholt 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: f58c3ce7050908606e7bfd4dcde7f47622c0473e URL: https://github.com/kamailio/kamailio/commit/f58c3ce7050908606e7bfd4dcde7f47… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-20T12:53:10+02:00 tools: add reply_route support to route_graph.py tool --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/f58c3ce7050908606e7bfd4dcde7f47… Patch: https://github.com/kamailio/kamailio/commit/f58c3ce7050908606e7bfd4dcde7f47… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index b416bdc186..f5633c92fd 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -37,6 +37,7 @@ routes = {} f_routes = {} b_routes = {} +or_routes = {} r_routes = {} s_routes = {} e_routes = {} @@ -104,9 +105,13 @@ def traverse_routes(_level, _name): if rname is None: rname = "failure" elif rtype == "onreply_": - rt = r_routes + rt = or_routes if rname is None: rname = "onreply" + elif rtype == "reply_": + rt = r_routes + if rname is None: + rname = "reply" elif rtype == "onsend_": rt = s_routes if rname is None: @@ -130,8 +135,11 @@ def traverse_routes(_level, _name): rt = f_routes rname = "failure" elif rtype == "onreply_": - rt = r_routes + rt = or_routes rname = "onreply" + elif rtype == "reply_": + rt = r_routes + rname = "reply" elif rtype == "onsend_": rt = s_routes rname = "onsend" @@ -151,7 +159,8 @@ def traverse_routes(_level, _name): log("routes: %s" % (routes)) log("branch_routes: %s" % (b_routes)) log("failure_routes: %s" % (f_routes)) -log("onreply_routes: %s" % (r_routes)) +log("onreply_routes: %s" % (or_routes)) +log("reply_routes: %s" % (r_routes)) log("onsend_routes: %s" % (s_routes)) log("event_routes: %s" % (e_routes)) @@ -193,8 +202,15 @@ def traverse_routes(_level, _name): for r in f_routes[fr]: traverse_routes(1, r) -if len(r_routes) > 0: +if len(or_routes) > 0: print "\nOnreply routes\n--------------" + for onr in or_routes.keys(): + print "\n%s" % (onr) + for r in or_routes[onr]: + traverse_routes(1, r) + +if len(r_routes) > 0: + print "\nReply routes\n--------------" for onr in r_routes.keys(): print "\n%s" % (onr) for r in r_routes[onr]:

1 0

git:master:dc2acb89: core: replace glibc time function calls with the thread-safe versions
by Henning Westerholt 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: dc2acb895538131e99c770da6f7448cb5a46fc32 URL: https://github.com/kamailio/kamailio/commit/dc2acb895538131e99c770da6f7448c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-19T23:49:32+02:00 core: replace glibc time function calls with the thread-safe versions - replace glibc time function calls with the thread-safe versions, to prevent race conditions from multi-process / multi-threaded access - used in 'kamcmd core.uptime' rpc cmd, no functional change, locally tested --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/dc2acb895538131e99c770da6f7448c… Patch: https://github.com/kamailio/kamailio/commit/dc2acb895538131e99c770da6f7448c… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 5b1c4624ed..717e240fde 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -224,8 +224,7 @@ static const char* dst_blst_stats_get_doc[] = { #endif - -#define MAX_CTIME_LEN 128 +#define MAX_CTIME_LEN 25 /* up time */ static char up_since_ctime[MAX_CTIME_LEN]; @@ -381,13 +380,14 @@ static void core_uptime(rpc_t* rpc, void* c) { void* s; time_t now; + char buf[MAX_CTIME_LEN]; str snow; + snow.s = buf; time(&now); if (rpc->add(c, "{", &s) < 0) return; - snow.s = ctime(&now); - if(snow.s) { + if(ctime_r(&now, snow.s)) { snow.len = strlen(snow.s); if(snow.len>2 && snow.s[snow.len-1]=='\n') snow.len--; rpc->struct_add(s, "S", "now", &snow); @@ -1187,21 +1187,14 @@ int register_core_rpcs(void) int rpc_init_time(void) { - char *t; - t=ctime(&up_since); - if (strlen(t)+1>=MAX_CTIME_LEN) { - ERR("Too long data %d\n", (int)strlen(t)); + char t[MAX_CTIME_LEN]; + int len; + if (! ctime_r(&up_since, t)) { + ERR("Invalid time value\n"); return -1; } strcpy(up_since_ctime, t); - t = up_since_ctime + strlen(up_since_ctime); - while(t>up_since_ctime) { - if(*t=='\0' || *t=='\r' || *t=='\n') { - *t = '\0'; - } else { - break; - } - t--; - } + len = strlen(up_since_ctime); + if(len>2 && up_since_ctime[len-1]=='\n') up_since_ctime[len-1]='\0'; return 0; }

2 3

git:master:4a66e500: tools: fix python exception usage in route_graph.py tool
by Henning Westerholt 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: 4a66e500ddb6028d3dfcf67aca951282309b6ea4 URL: https://github.com/kamailio/kamailio/commit/4a66e500ddb6028d3dfcf67aca95128… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-20T12:02:03+02:00 tools: fix python exception usage in route_graph.py tool --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/4a66e500ddb6028d3dfcf67aca95128… Patch: https://github.com/kamailio/kamailio/commit/4a66e500ddb6028d3dfcf67aca95128… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index 135440a3c5..b416bdc186 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -75,12 +75,12 @@ def traverse_routes(_level, _name): if len(sys.argv) < 2: - raise "usage: %s configuration-file [max_depth]" % sys.argv[0] + raise Exception('wrong number of arguments\nusage: ' + sys.argv[0] + ' configuration-file [max_depth]') if len(sys.argv) == 3: max_depth = int(sys.argv[2]) cfg = file(sys.argv[1], "r") if cfg is None: - raise "Missing config file" + raise Exception ('Missing config file') line = cfg.readline() rt = routes while line:

1 0

git:master:545ef519: tools: use correct check of None instead of wrong comparison in route_graph.py tool
by Henning Westerholt 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: 545ef51912ae9bf5e14eaffeb9f41be8359a442f URL: https://github.com/kamailio/kamailio/commit/545ef51912ae9bf5e14eaffeb9f41be… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-20T11:54:16+02:00 tools: use correct check of None instead of wrong comparison in route_graph.py tool --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/545ef51912ae9bf5e14eaffeb9f41be… Patch: https://github.com/kamailio/kamailio/commit/545ef51912ae9bf5e14eaffeb9f41be… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index 2024cf42a0..135440a3c5 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -79,7 +79,7 @@ def traverse_routes(_level, _name): if len(sys.argv) == 3: max_depth = int(sys.argv[2]) cfg = file(sys.argv[1], "r") -if cfg == None: +if cfg is None: raise "Missing config file" line = cfg.readline() rt = routes @@ -90,40 +90,40 @@ def traverse_routes(_level, _name): main_match = re_main_route.search(line) def_match = re_def_route.search(line) call_match = re_call_route.search(line) - if not call_match == None: + if not call_match is None: log("CALL: " + line) name = call_match.group(2) log(rname +":"+name) rt[rname].append(name) - elif not def_match == None: + elif not def_match is None: log("DEF: " + line) rtype = def_match.group(1) rname = def_match.group(3) if rtype == "failure_": rt = f_routes - if rname == None: + if rname is None: rname = "failure" elif rtype == "onreply_": rt = r_routes - if rname == None: + if rname is None: rname = "onreply" elif rtype == "onsend_": rt = s_routes - if rname == None: + if rname is None: rname = "onsend" elif rtype == "branch_": rt = b_routes - if rname == None: + if rname is None: rname = "branch" elif rtype == "event_": rt = e_routes - if rname == None: + if rname is None: rname = "event" else: rt = routes log(rname) rt[rname] = [] - elif not main_match == None: + elif not main_match is None: log("MAIN: " + line) rtype = main_match.group(1) if rtype == "failure_":

1 0

git:master:4c709004: core: fix out of bounds write, related to commits 776d0d6bb1086 and dc2acb895538
by Henning Westerholt 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: 4c709004bcc6a90fee21cf39fa1b19b0d69afec0 URL: https://github.com/kamailio/kamailio/commit/4c709004bcc6a90fee21cf39fa1b19b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-20T11:31:50+02:00 core: fix out of bounds write, related to commits 776d0d6bb1086 and dc2acb895538 --- Modified: src/core/core_cmd.c Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/4c709004bcc6a90fee21cf39fa1b19b… Patch: https://github.com/kamailio/kamailio/commit/4c709004bcc6a90fee21cf39fa1b19b… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 717e240fde..6a32b2f932 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -224,7 +224,7 @@ static const char* dst_blst_stats_get_doc[] = { #endif -#define MAX_CTIME_LEN 25 +#define MAX_CTIME_LEN 26 /* up time */ static char up_since_ctime[MAX_CTIME_LEN]; diff --git a/src/core/select_core.c b/src/core/select_core.c index 6190c8b875..029f880a48 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -1565,7 +1565,7 @@ int select_sys_now_fmt(str* res, select_t* s, struct sip_msg* msg) return -1; } if (s->n <= SEL_POS+1) { - char buff[25]; + char buff[26]; if (! asctime_r(&tm, buff)) { ERR("Invalid time value\n"); return -1;

1 0

git:master:b2c3344f: core: remove unnecessary negative check for unsigned int value (code scan warning)
by Henning Westerholt 20 Sep '19

20 Sep '19

Module: kamailio Branch: master Commit: b2c3344fb2ed55ef9da5594046b7eb92bc479517 URL: https://github.com/kamailio/kamailio/commit/b2c3344fb2ed55ef9da5594046b7eb9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-20T10:16:32+02:00 core: remove unnecessary negative check for unsigned int value (code scan warning) --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/b2c3344fb2ed55ef9da5594046b7eb9… Patch: https://github.com/kamailio/kamailio/commit/b2c3344fb2ed55ef9da5594046b7eb9… --- diff --git a/src/core/flags.c b/src/core/flags.c index 589421ce7b..551eefe2ee 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -66,10 +66,6 @@ int flag_in_range( flag_t flag ) { LM_ERR("message flag %d too high; MAX=%d\n", flag, MAX_FLAG ); return 0; } - if ((int)flag<0) { - LM_ERR("message flag (%d) must be in range 0..%d\n", flag, MAX_FLAG ); - return 0; - } return 1; }

1 0

git:master:0e6b79f2: core: comment added to timer fork logic
by Henning Westerholt 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: 0e6b79f293e05222230f4e72efe1b5667253af48 URL: https://github.com/kamailio/kamailio/commit/0e6b79f293e05222230f4e72efe1b56… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-20T00:03:55+02:00 core: comment added to timer fork logic --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/0e6b79f293e05222230f4e72efe1b56… Patch: https://github.com/kamailio/kamailio/commit/0e6b79f293e05222230f4e72efe1b56… --- diff --git a/src/main.c b/src/main.c index 03d39b46d4..9b82cbca68 100644 --- a/src/main.c +++ b/src/main.c @@ -1436,6 +1436,7 @@ int main_loop(void) if (arm_timer()<0) goto error; timer_main(); }else{ + /* do nothing for main timer */ } if(sr_wtimer_start()<0) {

1 0

git:master:eef64d61: core: add missing #include header guard
by Henning Westerholt 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: eef64d618745b4837990603d1268f8f87d33c1a7 URL: https://github.com/kamailio/kamailio/commit/eef64d618745b4837990603d1268f8f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-19T23:59:52+02:00 core: add missing #include header guard --- Modified: src/core/name_alias.h --- Diff: https://github.com/kamailio/kamailio/commit/eef64d618745b4837990603d1268f8f… Patch: https://github.com/kamailio/kamailio/commit/eef64d618745b4837990603d1268f8f… --- diff --git a/src/core/name_alias.h b/src/core/name_alias.h index ed75330f80..7efb571bdd 100644 --- a/src/core/name_alias.h +++ b/src/core/name_alias.h @@ -27,6 +27,8 @@ */ +#ifndef name_alias_h +#define name_alias_h #include "str.h" #include "dprint.h" @@ -108,3 +110,4 @@ static inline int add_alias(char* name, int len, unsigned short port, +#endif \ No newline at end of file

1 0

git:master:776d0d6b: core: replace glibc time function calls with the thread-safe versions
by Henning Westerholt 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: 776d0d6bb10866e330e62003b7ec5bfcf4761f1a URL: https://github.com/kamailio/kamailio/commit/776d0d6bb10866e330e62003b7ec5bf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-19T23:52:45+02:00 core: replace glibc time function calls with the thread-safe versions - replace glibc time function calls with the thread-safe versions, to prevent race conditions from multi-process / multi-threaded access - used in (undocumented) SER 'sys' selects, no functional change, locally tested --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/776d0d6bb10866e330e62003b7ec5bf… Patch: https://github.com/kamailio/kamailio/commit/776d0d6bb10866e330e62003b7ec5bf… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index c96db61104..6190c8b875 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -1542,16 +1542,22 @@ int select_sys_now_fmt(str* res, select_t* s, struct sip_msg* msg) { #define SEL_POS 2 time_t t; - struct tm *tm; + struct tm tm; t = time(NULL); switch (s->params[SEL_POS].v.i) { case SEL_NOW_GMT: - tm = gmtime(&t); + if (! gmtime_r(&t, &tm)) { + ERR("Invalid UTC time value\n"); + return -1; + } break; case SEL_NOW_LOCAL: - tm = localtime(&t); + if (! localtime_r(&t, &tm)) { + ERR("Invalid local time value\n"); + return -1; + } break; default: BUG("Unexpected parameter value 'now' \"%d\" (%p)\n", @@ -1559,19 +1565,22 @@ int select_sys_now_fmt(str* res, select_t* s, struct sip_msg* msg) return -1; } if (s->n <= SEL_POS+1) { - char *c; - c = asctime(tm); - res->len = strlen(c); - while (res->len && c[res->len-1] < ' ') res->len--; /* rtrim */ + char buff[25]; + if (! asctime_r(&tm, buff)) { + ERR("Invalid time value\n"); + return -1; + } + res->len = strlen(buff); + while (res->len && buff[res->len-1] < ' ') res->len--; /* rtrim */ res->s = get_static_buffer(res->len); if (!res->s) return -1; - memcpy(res->s, c, res->len); + memcpy(res->s, &buff, res->len); } else { char c, buff[80]; c = s->params[SEL_POS+1].v.s.s[s->params[SEL_POS+1].v.s.len]; s->params[SEL_POS+1].v.s.s[s->params[SEL_POS+1].v.s.len] = '\0'; - res->len = strftime(buff, sizeof(buff)-1, s->params[SEL_POS+1].v.s.s, tm); + res->len = strftime(buff, sizeof(buff)-1, s->params[SEL_POS+1].v.s.s, &tm); s->params[SEL_POS+1].v.s.s[s->params[SEL_POS+1].v.s.len] = c; res->s = get_static_buffer(res->len); if (!res->s) return -1;

1 0

git:master:9b7a8f90: core: replace glibc time function calls with the thread-safe versions
by Henning Westerholt 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: 9b7a8f90742ab03735c3c9f4fe3053d1f9f6fa35 URL: https://github.com/kamailio/kamailio/commit/9b7a8f90742ab03735c3c9f4fe3053d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-19T23:54:59+02:00 core: replace glibc time function calls with the thread-safe versions - replace glibc time function calls with the thread-safe versions, to prevent race conditions from multi-process / multi-threaded access - used in different utility functions which are used from core and modules - trivial change, only the respective variable types were changed --- Modified: src/core/ut.c --- Diff: https://github.com/kamailio/kamailio/commit/9b7a8f90742ab03735c3c9f4fe3053d… Patch: https://github.com/kamailio/kamailio/commit/9b7a8f90742ab03735c3c9f4fe3053d… --- diff --git a/src/core/ut.c b/src/core/ut.c index 5ee8f34db1..90b01d1026 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -99,7 +99,7 @@ int group2gid(int* gid, char* group) time_t _timegm(struct tm* t) { time_t tl, tb; - struct tm* tg; + struct tm tg; t->tm_isdst = 0; tl = mktime(t); @@ -112,12 +112,12 @@ time_t _timegm(struct tm* t) tl += 3600; } - tg = gmtime(&tl); - tg->tm_isdst = 0; - tb = mktime(tg); + gmtime_r(&tl, &tg); + tg.tm_isdst = 0; + tb = mktime(&tg); if (tb == -1) { - tg->tm_hour--; - tb = mktime (tg); + tg.tm_hour--; + tb = mktime (&tg); if (tb == -1) { return -1; /* can't deal with output from gmtime */ } @@ -130,22 +130,22 @@ time_t _timegm(struct tm* t) /* Convert time_t value that is relative to local timezone to UTC */ time_t local2utc(time_t in) { - struct tm* tt; - tt = gmtime(&in); - tt->tm_isdst = -1; - return mktime(tt); + struct tm tt; + gmtime_r(&in, &tt); + tt.tm_isdst = -1; + return mktime(&tt); } /* Convert time_t value in UTC to to value relative to local time zone */ time_t utc2local(time_t in) { - struct tm* tt; - tt = localtime(&in); + struct tm tt; + localtime_r(&in, &tt); #ifdef HAVE_TIMEGM - return timegm(tt); + return timegm(&tt); #else - return _timegm(tt); + return _timegm(&tt); #endif }

1 0

git:master:f229d221: core: rename local variable that hides global variable
by Henning Westerholt 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: f229d221de2d9cbe8535019e98b018f31313c8cd URL: https://github.com/kamailio/kamailio/commit/f229d221de2d9cbe8535019e98b018f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-19T23:47:49+02:00 core: rename local variable that hides global variable --- Modified: src/core/error.c --- Diff: https://github.com/kamailio/kamailio/commit/f229d221de2d9cbe8535019e98b018f… Patch: https://github.com/kamailio/kamailio/commit/f229d221de2d9cbe8535019e98b018f… --- diff --git a/src/core/error.c b/src/core/error.c index b41afb01c4..a45fa9e4d2 100644 --- a/src/core/error.c +++ b/src/core/error.c @@ -39,7 +39,7 @@ int ser_error=-1; int prev_ser_error=-1; int err2reason_phrase( - int ser_error, /* current internal ser error */ + int int_error, /* current internal ser error */ int *sip_error, /* the sip error code to which ser ser error will be turned */ char *phrase, /* resulting error text */ @@ -49,22 +49,22 @@ int err2reason_phrase( char *error_txt; - switch( ser_error ) { + switch( int_error ) { case E_SEND: error_txt="Unfortunately error on sending to next hop occurred"; - *sip_error=-ser_error; + *sip_error=-int_error; break; case E_BAD_ADDRESS: error_txt="Unresolvable destination"; - *sip_error=-ser_error; + *sip_error=-int_error; break; case E_BAD_REQ: error_txt="Bad Request"; - *sip_error=-ser_error; + *sip_error=-int_error; break; case E_BAD_URI: error_txt="Regretfully, we were not able to process the URI"; - *sip_error=-ser_error; + *sip_error=-int_error; break; case E_BAD_TUPEL: error_txt="Transaction tuple incomplete"; @@ -105,7 +105,7 @@ int err2reason_phrase( case E_CANCELED: error_txt="transaction canceled"; - *sip_error=-ser_error; + *sip_error=-int_error; break; case E_OUT_OF_MEM: @@ -125,7 +125,7 @@ int err2reason_phrase( break; } return snprintf( phrase, etl, "%s (%d/%s)", error_txt, - -ser_error, signature ); + -int_error, signature ); } char *error_text( int code )

1 0

git:master:8821cc2f: core: remove unused seq variable in build_iface_list function
by Henning Westerholt 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: 8821cc2f5a6b972307fb71e73cf8d57496e61f66 URL: https://github.com/kamailio/kamailio/commit/8821cc2f5a6b972307fb71e73cf8d57… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-19T23:45:20+02:00 core: remove unused seq variable in build_iface_list function --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/8821cc2f5a6b972307fb71e73cf8d57… Patch: https://github.com/kamailio/kamailio/commit/8821cc2f5a6b972307fb71e73cf8d57… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index ee2a543289..b5b25c5304 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1067,7 +1067,6 @@ static int build_iface_list(void) struct rtgenmsg g; } req; - int seq = 0; int rtn = 0; struct nlmsghdr* nlp; struct ifaddrmsg *ifi;

1 0

enabling mem_join as default
by Henning Westerholt 19 Sep '19

19 Sep '19

Hello, it was discussed some years ago, but I thought it makes sense to discuss it briefly before the 5.3 release again. One common advice that we give people that run out of memory is to enable the mem_join parameter to enable the internal memory manager to join memory chunks. Some downstream distributions (e.g. kazoo) enables this as default since at least three years [1]. So it seems to be generally working and stable. I would like to recommend to enable this as default in the core. Comments, objections? Cheers, Henning [1] https://github.com/2600hz/kazoo-configs-kamailio/blame/ec79276cd58ad9d7407f… -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

1 0

git:master:6ea0555f: msilo: coherent indentation and whitespacing
by Daniel-Constantin Mierla 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: 6ea0555fbe3c941215c20372516431c07d466750 URL: https://github.com/kamailio/kamailio/commit/6ea0555fbe3c941215c20372516431c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-19T17:28:28+02:00 msilo: coherent indentation and whitespacing --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/6ea0555fbe3c941215c20372516431c… Patch: https://github.com/kamailio/kamailio/commit/6ea0555fbe3c941215c20372516431c…

1 0

[kamailio/kamailio] xavp_serialize_fields : adding an equal sign on empty strings (#2067)
by Julien Chavanton 19 Sep '19

19 Sep '19

I noticed the problem when trying ot use : xavp_params_implode followed by xavp_params_explode no luck with that because xavp_params_explode will fail to parse emtpy params. Example: `$xavp(x[0]=>y) = "";` Will fail to parse because `y=;` is consider invalid by the param parser. Glad to see that the core was exposing a reusable serialize function ! -- 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/2067

2 1

[kamailio/kamailio] core: fix xavp_serialize_fields (#2068)
by Julien Chavanton 19 Sep '19

19 Sep '19

stop adding plus signs when serializing empty strings github issue #2067 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2068 -- Commit Summary -- * core: fix xavp_serialize_fields -- File Changes -- M src/core/xavp.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2068.patch https://github.com/kamailio/kamailio/pull/2068.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/2068

2 2

git:master:3709b235: Merge pull request #2068 from kamailio/xavp_serialize_fields
by GitHub 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: 3709b235a56b7c237bafc02ea87fd873e54b4b6d URL: https://github.com/kamailio/kamailio/commit/3709b235a56b7c237bafc02ea87fd87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-19T10:11:13+02:00 Merge pull request #2068 from kamailio/xavp_serialize_fields core: fix xavp_serialize_fields --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/3709b235a56b7c237bafc02ea87fd87… Patch: https://github.com/kamailio/kamailio/commit/3709b235a56b7c237bafc02ea87fd87… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b3a2654764..e5e33f6e9d 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1030,9 +1030,14 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) break; case SR_XTYPE_STR: LM_DBG(" XAVP str value: %s\n", avp->val.v.s.s); - ostr.len = snprintf(ostr.s, olen-rlen, "%.*s=%.*s;", + if(avp->val.v.s.len == 0) { + ostr.len = snprintf(ostr.s, olen-rlen, "%.*s;", + avp->name.len, avp->name.s); + } else { + ostr.len = snprintf(ostr.s, olen-rlen, "%.*s=%.*s;", avp->name.len, avp->name.s, avp->val.v.s.len, avp->val.v.s.s); + } if(ostr.len<=0 || ostr.len>=olen-rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, olen-rlen);

1 0

git:master:6416d394: core: fix xavp_serialize_fields
by Julien Chavanton 19 Sep '19

19 Sep '19

Module: kamailio Branch: master Commit: 6416d394ae4fcb07726a19686dbc4c3f2e0116c5 URL: https://github.com/kamailio/kamailio/commit/6416d394ae4fcb07726a19686dbc4c3… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-09-18T10:57:35-07:00 core: fix xavp_serialize_fields stop adding plus signs when serializing empty strings github issue #2067 --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/6416d394ae4fcb07726a19686dbc4c3… Patch: https://github.com/kamailio/kamailio/commit/6416d394ae4fcb07726a19686dbc4c3… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b3a2654764..e5e33f6e9d 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1030,9 +1030,14 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) break; case SR_XTYPE_STR: LM_DBG(" XAVP str value: %s\n", avp->val.v.s.s); - ostr.len = snprintf(ostr.s, olen-rlen, "%.*s=%.*s;", + if(avp->val.v.s.len == 0) { + ostr.len = snprintf(ostr.s, olen-rlen, "%.*s;", + avp->name.len, avp->name.s); + } else { + ostr.len = snprintf(ostr.s, olen-rlen, "%.*s=%.*s;", avp->name.len, avp->name.s, avp->val.v.s.len, avp->val.v.s.s); + } if(ostr.len<=0 || ostr.len>=olen-rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, olen-rlen);

1 0

Re: [sr-dev] [SR-Users] Possible locking issue in usrloc module in file udomain.c
by Henning Westerholt 18 Sep '19

18 Sep '19

Hello Rupesh, the lock mode was changed, you find the reasoning (and the linked commit) in this issue: https://github.com/kamailio/kamailio/issues/577 Cheers, Henning Am 18.09.19 um 22:05 schrieb Rupesh Kumar: Hi , Currently I am running kamailio 4.2 and now upgrading to kamailio 5.2 and was just going thru the changes. In the file modules/usrloc/udomain.c inside the function free_udomain( ) , it appears that we are not protecting via lock_ulslot and unlock_ulslot doing free. Could it cause some race condition ? May be its intentional but going thru the github history its there since day 1. I checked all branches in kamailio 4.x and we have the protection. In 4.x void free_udomain(udomain_t* _d) { int i; if (_d->table) { for(i = 0; i < _d->size; i++) { lock_ulslot(_d, i); deinit_slot(_d->table + i); unlock_ulslot(_d, i); } shm_free(_d->table); } shm_free(_d); } In 5.x void free_udomain(udomain_t* _d) { int i; if (_d->table) { for(i = 0; i < _d->size; i++) { deinit_slot(_d->table + i); } shm_free(_d->table); } shm_free(_d); } _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

2 1

Re: [sr-dev] [SR-Users] Info: initialization of libssl 1.1.+ with PTHREAD_PROCESS_SHARED attribute for pthread mutex and rwlock
by Andrew Chen 18 Sep '19

18 Sep '19

Thanks Joel. Got it to work: root@ashintgkama51:/home/achen # dpkg -l | grep kamailio-dbg ii *kamailio-dbg*:amd64 5.2.4+bionic amd64 very fast and configurable SIP server [debug symbols] root@ashintgkama51:/home/achen # Just to confirm there's no modparam or loadmodules for this to work? On Wed, Sep 18, 2019 at 4:14 PM Joel Serrano <joel(a)textplus.com> wrote: > Hi Andrew, > > Download from here: > http://deb.kamailio.org/kamailio52/pool/main/k/kamailio/ > > You have kamailio-dbg v5.2.4 (latest 5.2) for all distros... > > Example for amd64+stretch: > http://deb.kamailio.org/kamailio52/pool/main/k/kamailio/kamailio-dbg_5.2.4%… > > Cheers, > Joel. > > > > > > On Wed, Sep 18, 2019 at 12:16 PM Andrew Chen <achen(a)fuze.com> wrote: > >> Hi Henning, >> >> I'm running 5.2.4. Will this deb package work? >> >> On Wed, Sep 18, 2019 at 2:39 PM Andrew Chen <achen(a)fuze.com> wrote: >> >>> Thanks Henning >>> >>> On Wed, Sep 18, 2019 at 2:13 PM Henning Westerholt <hw(a)skalatan.de> >>> wrote: >>> >>>> Hello Andrew, >>>> >>>> strange - it should be there, as it is available on deb.kamailio.org. >>>> >>>> Here e.g. the one for 64bit stretch: >>>> >>>> >>>> https://deb.kamailio.org/kamailiodev-nightly/pool/main/k/kamailio/kamailio-… >>>> >>>> Cheers, >>>> >>>> Henning >>>> Am 18.09.19 um 18:52 schrieb Andrew Chen: >>>> >>>> I don't see one for debug: >>>> >>>> root@ashintgkama51:~ # apt-cache search kamailio >>>> >>>> resource-agents - Cluster Resource Agents >>>> >>>> kamailio - very fast, dynamic and configurable SIP server >>>> >>>> kamailio-autheph-modules - authentication using ephemeral credentials >>>> for the Kamailio SIP server >>>> >>>> kamailio-berkeley-bin - Berkeley database module for Kamailio - helper >>>> program >>>> >>>> kamailio-berkeley-modules - Berkeley database module for the Kamailio >>>> SIP server >>>> >>>> kamailio-carrierroute-modules - carrierroute module for the Kamailio >>>> SIP server >>>> >>>> kamailio-cnxcc-modules - cnxcc modules for the Kamailio SIP server >>>> >>>> kamailio-cpl-modules - CPL module (CPL interpreter engine) for the >>>> Kamailio SIP server >>>> >>>> kamailio-erlang-modules - Erlang modules for the Kamailio SIP server >>>> >>>> kamailio-geoip-modules - geoip module for the Kamailio SIP Server >>>> >>>> kamailio-geoip2-modules - geoip2 module for the Kamailio SIP Server >>>> >>>> kamailio-ims-modules - IMS module for the Kamailio SIP server >>>> >>>> kamailio-json-modules - Json parser and Json-RPC modules for the >>>> Kamailio SIP server >>>> >>>> On Wed, Sep 18, 2019 at 11:26 AM Daniel-Constantin Mierla < >>>> miconda(a)gmail.com> wrote: >>>> >>>>> You have to install the debug symbols package, otherwise the backtrace >>>>> doesn't show any useful information. It just require to install that >>>>> package and then get again the backtraces. The package name should be >>>>> kamailio-dbg. >>>>> >>>>> Cheers, >>>>> Daniel >>>>> On 18.09.19 16:37, Andrew Chen wrote: >>>>> >>>>> Sorry..forgot bt full output >>>>> >>>>> (gdb) bt full >>>>> >>>>> #0 0x0000562fcc3544c0 in ?? () >>>>> >>>>> No symbol table info available. >>>>> >>>>> #1 0x0000562fcc354632 in ?? () >>>>> >>>>> No symbol table info available. >>>>> >>>>> #2 0x0000562fcc354974 in local_timer_run () >>>>> >>>>> No symbol table info available. >>>>> >>>>> #3 0x0000562fcc3fb256 in ?? () >>>>> >>>>> No symbol table info available. >>>>> >>>>> #4 0x0000562fcc3fb64c in tcp_receive_loop () >>>>> >>>>> No symbol table info available. >>>>> >>>>> #5 0x0000562fcc2acf52 in tcp_init_children () >>>>> >>>>> No symbol table info available. >>>>> >>>>> #6 0x0000562fcc1ad94a in main_loop () >>>>> >>>>> No symbol table info available. >>>>> >>>>> #7 0x0000562fcc1b4a7b in main () >>>>> >>>>> No symbol table info available. >>>>> >>>>> (gdb) >>>>> >>>>> On Wed, Sep 18, 2019 at 10:35 AM Andrew Chen <achen(a)fuze.com> wrote: >>>>> >>>>>> backtrace output: >>>>>> >>>>>> >>>>>> (gdb) bt >>>>>> >>>>>> #0 0x0000562fcc3544c0 in ?? () >>>>>> >>>>>> #1 0x0000562fcc354632 in ?? () >>>>>> >>>>>> #2 0x0000562fcc354974 in local_timer_run () >>>>>> >>>>>> #3 0x0000562fcc3fb256 in ?? () >>>>>> >>>>>> #4 0x0000562fcc3fb64c in tcp_receive_loop () >>>>>> >>>>>> #5 0x0000562fcc2acf52 in tcp_init_children () >>>>>> >>>>>> #6 0x0000562fcc1ad94a in main_loop () >>>>>> >>>>>> #7 0x0000562fcc1b4a7b in main () >>>>>> >>>>>> (gdb) >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> On Wed, Sep 18, 2019 at 10:01 AM Andrew Chen <achen(a)fuze.com> wrote: >>>>>> >>>>>>> I'll look for the core. >>>>>>> >>>>>>> As part of our release process, I don't think we can release master >>>>>>> branch of Kamailio. >>>>>>> >>>>>>> On Wed, Sep 18, 2019 at 9:54 AM Daniel-Constantin Mierla < >>>>>>> miconda(a)gmail.com> wrote: >>>>>>> >>>>>>>> Hello, >>>>>>>> >>>>>>>> did you get core files? If yes, it would be good to see the gdb >>>>>>>> bracktraces. >>>>>>>> >>>>>>>> Have you used the pre-loaded library workaround? >>>>>>>> >>>>>>>> The code was not backported to branch 5.2 yet, I wanted to wait a >>>>>>>> bit and see if there are reports with good/bad results. If you want to use >>>>>>>> it, then you have to install nightly builds from master branch (development >>>>>>>> version, should be 5.3.0-pre1 at this moment). >>>>>>>> >>>>>>>> Cheers, >>>>>>>> Daniel >>>>>>>> On 18.09.19 15:26, Andrew Chen wrote: >>>>>>>> >>>>>>>> Hi Daniel, >>>>>>>> Which apt repository can we get this workaround? Today I noticed >>>>>>>> our Kamailio 5.2.4 cored during one of our load test sessions: >>>>>>>> >>>>>>>> Wed Sep 18 09:31:14 2019] kamailio[26997]: segfault at >>>>>>>> 7f8501366000 ip 00007f8501e58585 sp 00007fffd5c84248 error 4 in >>>>>>>> libcrypto.so.1.1[7f8501dd4000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:12:29 2019] kamailio[27110]: segfault at >>>>>>>> 7f1a8eea1000 ip 00007f1a8f993585 sp 00007ffddc8848c8 error 4 in >>>>>>>> libcrypto.so.1.1[7f1a8f90f000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:12:43 2019] kamailio[11060]: segfault at 20 ip >>>>>>>> 00007f0a85dac128 sp 00007fff6847aad0 error 4 in >>>>>>>> libcrypto.so.1.1[7f0a85c40000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:12:44 2019] kamailio[11059]: segfault at f0 ip >>>>>>>> 00007f0a85cc43ea sp 00007fff6847a9e8 error 4 in >>>>>>>> libcrypto.so.1.1[7f0a85c40000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:13:02 2019] kamailio[11187]: segfault at >>>>>>>> 7f75e06c8000 ip 00007f75e11ba585 sp 00007ffe29b47c88 error 4 in >>>>>>>> libcrypto.so.1.1[7f75e1136000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:13:17 2019] kamailio[11445]: segfault at >>>>>>>> 7f0f3743f000 ip 00007f0f37f31585 sp 00007ffde54daa38 error 4 in >>>>>>>> libcrypto.so.1.1[7f0f37ead000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:13:36 2019] kamailio[11644]: segfault at >>>>>>>> 7f804309c000 ip 00007f8043b8e585 sp 00007ffe89fe8228 error 4 in >>>>>>>> libcrypto.so.1.1[7f8043b0a000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:13:52 2019] kamailio[11799]: segfault at >>>>>>>> 7ff59c7e2000 ip 00007ff59d2d4585 sp 00007ffd69d76bb8 error 4 in >>>>>>>> libcrypto.so.1.1[7ff59d250000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 10:13:52 2019] kamailio[11792]: segfault at >>>>>>>> 7ff59c7e2000 ip 00007ff59d2d4585 sp 00007ffd69d76bb8 error 4 in >>>>>>>> libcrypto.so.1.1[7ff59d250000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:48:01 2019] kamailio[12066]: segfault at >>>>>>>> 7f22dca6d000 ip 00007f22dd55f585 sp 00007fffbc766ab8 error 4 in >>>>>>>> libcrypto.so.1.1[7f22dd4db000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:48:14 2019] kamailio[16344]: segfault at >>>>>>>> 7f7cca42d000 ip 00007f7ccaf1f585 sp 00007ffe99f16108 error 4 in >>>>>>>> libcrypto.so.1.1[7f7ccae9b000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:48:32 2019] kamailio[16708]: segfault at >>>>>>>> 7fb309141000 ip 00007fb309c33585 sp 00007ffd07a5f3c8 error 4 in >>>>>>>> libcrypto.so.1.1[7fb309baf000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:48:49 2019] kamailio[16824]: segfault at f0 ip >>>>>>>> 00007fc59095b3ea sp 00007ffe58a490b8 error 4 in >>>>>>>> libcrypto.so.1.1[7fc5908d7000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:04 2019] kamailio[16956]: segfault at >>>>>>>> 7fcc22e58000 ip 00007fcc2394a585 sp 00007fffa9c52258 error 4 in >>>>>>>> libcrypto.so.1.1[7fcc238c6000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:04 2019] kamailio[16945]: segfault at f0 ip >>>>>>>> 00007fcc2394a3ea sp 00007fffa9c52128 error 4 in >>>>>>>> libcrypto.so.1.1[7fcc238c6000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:16 2019] kamailio[17244]: segfault at >>>>>>>> 7f586ed20000 ip 00007f586f812585 sp 00007ffeae1adcd8 error 4 in >>>>>>>> libcrypto.so.1.1[7f586f78e000+29b000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17431]: segfault at 8 ip >>>>>>>> 0000562fcc44c5d5 sp 00007ffe825c9dd0 error 4 in >>>>>>>> kamailio[562fcc17c000+4a2000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17386]: segfault at 10 ip >>>>>>>> 00007f96c3735c3e sp 00007ffe825ca270 error 4 in >>>>>>>> dialog.so[7f96c36d6000+be000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17423]: segfault at 0 ip >>>>>>>> 0000562fcc3544c0 sp 00007ffe825ca1f0 error 6 in >>>>>>>> kamailio[562fcc17c000+4a2000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17378]: segfault at 0 ip >>>>>>>> 00007f96c5dd099f sp 00007ffe825c98e0 error 4 in tm.so[7f96c5da5000+13f000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17417]: segfault at 0 ip >>>>>>>> 0000562fcc3544c0 sp 00007ffe825ca1f0 error 6 in >>>>>>>> kamailio[562fcc17c000+4a2000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17416]: segfault at 0 ip >>>>>>>> 0000562fcc3544c0 sp 00007ffe825ca1f0 error 6 in >>>>>>>> kamailio[562fcc17c000+4a2000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17380]: segfault at 0 ip >>>>>>>> 00007f96c5dd099f sp 00007ffe825c98e0 error 4 in tm.so[7f96c5da5000+13f000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:33 2019] kamailio[17381]: segfault at 0 ip >>>>>>>> 00007f96c5dd099f sp 00007ffe825c98e0 error 4 in tm.so[7f96c5da5000+13f000] >>>>>>>> >>>>>>>> [Wed Sep 18 12:49:34 2019] kamailio[17387]: segfault at 8 ip >>>>>>>> 0000562fcc25d1f3 sp 00007ffe825ca370 error 6 in >>>>>>>> kamailio[562fcc17c000+4a2000] >>>>>>>> >>>>>>>> >>>>>>>> and I was wondering if this core is related. >>>>>>>> >>>>>>>> Thanks >>>>>>>> >>>>>>>> >>>>>>>> On Fri, Sep 13, 2019 at 5:18 PM Alex Balashov < >>>>>>>> abalashov(a)evaristesys.com> wrote: >>>>>>>> >>>>>>>>> Hi Daniel, >>>>>>>>> >>>>>>>>> Thanks a lot for this work; it's definitely important that Kamailio >>>>>>>>> build against OpenSSL v1.1, and I'll be happy to contribute some >>>>>>>>> testing >>>>>>>>> in a live environment in the coming weeks. Much appreciated. >>>>>>>>> >>>>>>>>> Have a good weekend, >>>>>>>>> >>>>>>>>> -- Alex >>>>>>>>> >>>>>>>>> On Fri, Sep 13, 2019 at 01:34:12PM +0200, Daniel-Constantin Mierla >>>>>>>>> wrote: >>>>>>>>> >>>>>>>>> > Hello, >>>>>>>>> > after couple of months waiting for feedback about the workaround >>>>>>>>> with the >>>>>>>>> > preloaded shared library to set the PTHREAD_PROCESS_SHARED >>>>>>>>> attribute for >>>>>>>>> > pthread mutex/rwlock in order to avoid deadlocks and as it seems >>>>>>>>> to be the >>>>>>>>> > solution, I just pushed a few commits to move that code in the >>>>>>>>> core of >>>>>>>>> > kamailio. >>>>>>>>> > >>>>>>>>> > It this way the initialization with the PTHREAD_PROCESS_SHARED >>>>>>>>> attribute is >>>>>>>>> > done by default when libssl v1.1 is detected at compile time, >>>>>>>>> without the >>>>>>>>> > need of using the approach with a preloaded library. >>>>>>>>> > >>>>>>>>> > The shared library is still kept in the tls module: >>>>>>>>> > * >>>>>>>>> > >>>>>>>>> https://github.com/kamailio/kamailio/tree/master/src/modules/tls/utils/open… >>>>>>>>> > >>>>>>>>> > Probably is going to be removed in the near future. >>>>>>>>> > >>>>>>>>> > I am asking the community members that use Kamailio on systems >>>>>>>>> with libssl >>>>>>>>> > v1.1+ to test the master branch and give feedback. The master >>>>>>>>> branch is >>>>>>>>> > anyhow in testing phase for preparing the next major release >>>>>>>>> v5.3.0, so it >>>>>>>>> > will help for that as well. >>>>>>>>> > >>>>>>>>> > If no issue is going to be reported soon, the commits will be >>>>>>>>> backported to >>>>>>>>> > stable branches, to re-enable smooth use of Kamailio with libssl >>>>>>>>> v1.1+. >>>>>>>>> > >>>>>>>>> > When libssl v1.1+ is detected, the core links with pthread, but >>>>>>>>> that was >>>>>>>>> > already present in the Makefiles.defs for different compile >>>>>>>>> options. The >>>>>>>>> > pthread more or less a default library on linuxes/unixes, so >>>>>>>>> this should >>>>>>>>> > not introduce any major dependency to the Kamailio core. >>>>>>>>> > >>>>>>>>> > Cheers, >>>>>>>>> > Daniel >>>>>>>>> > >>>>>>>>> > -- >>>>>>>>> > Daniel-Constantin Mierla - http://www.asipto.com >>>>>>>>> > http://twitter.com/#!/miconda - >>>>>>>>> http://www.linkedin.com/in/miconda >>>>>>>>> >>>>>>>>> > _______________________________________________ >>>>>>>>> > Kamailio (SER) - Users Mailing List >>>>>>>>> > sr-users(a)lists.kamailio.org >>>>>>>>> > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >>>>>>>>> >>>>>>>>> >>>>>>>>> -- >>>>>>>>> Alex Balashov | Principal | Evariste Systems LLC >>>>>>>>> >>>>>>>>> Tel: +1-706-510-6800 / +1-800-250-5920 (toll-free) >>>>>>>>> Web: http://www.evaristesys.com/, http://www.csrpswitch.com/ >>>>>>>>> >>>>>>>>> _______________________________________________ >>>>>>>>> Kamailio (SER) - Users Mailing List >>>>>>>>> sr-users(a)lists.kamailio.org >>>>>>>>> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Andy Chen >>>>>>>> Sr. Telephony Lead Engineer >>>>>>>> 415 516 5535 (M) >>>>>>>> achen@ <achen(a)thinkingphones.com>fuze.com >>>>>>>> >>>>>>>> >>>>>>>> *Confidentiality Notice: The information contained in this e-mail >>>>>>>> and any >>>>>>>> attachments may be confidential. If you are not an intended >>>>>>>> recipient, you >>>>>>>> are hereby notified that any dissemination, distribution or copying >>>>>>>> of this >>>>>>>> e-mail is strictly prohibited. If you have received this e-mail in >>>>>>>> error, >>>>>>>> please notify the sender and permanently delete the e-mail and any >>>>>>>> attachments immediately. You should not retain, copy or use this >>>>>>>> e-mail or >>>>>>>> any attachment for any purpose, nor disclose all or any part of the >>>>>>>> contents to any other person. Thank you.* >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> Kamailio (SER) - Users Mailing Listsr-users@lists.kamailio.orghttps://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >>>>>>>> >>>>>>>> -- >>>>>>>> Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda >>>>>>>> Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Andy Chen >>>>>>> Sr. Telephony Lead Engineer >>>>>>> 415 516 5535 (M) >>>>>>> achen@ <achen(a)thinkingphones.com>fuze.com >>>>>>> >>>>>>> >>>>>> >>>>>> -- >>>>>> Andy Chen >>>>>> Sr. Telephony Lead Engineer >>>>>> 415 516 5535 (M) >>>>>> achen@ <achen(a)thinkingphones.com>fuze.com >>>>>> >>>>>> >>>>> >>>>> -- >>>>> Andy Chen >>>>> Sr. Telephony Lead Engineer >>>>> 415 516 5535 (M) >>>>> achen@ <achen(a)thinkingphones.com>fuze.com >>>>> >>>>> >>>>> *Confidentiality Notice: The information contained in this e-mail and >>>>> any >>>>> attachments may be confidential. If you are not an intended recipient, >>>>> you >>>>> are hereby notified that any dissemination, distribution or copying of >>>>> this >>>>> e-mail is strictly prohibited. If you have received this e-mail in >>>>> error, >>>>> please notify the sender and permanently delete the e-mail and any >>>>> attachments immediately. You should not retain, copy or use this >>>>> e-mail or >>>>> any attachment for any purpose, nor disclose all or any part of the >>>>> contents to any other person. Thank you.* >>>>> >>>>> -- >>>>> Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda >>>>> Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat >>>>> >>>>> >>>> >>>> -- >>>> Andy Chen >>>> Sr. Telephony Lead Engineer >>>> 415 516 5535 (M) >>>> achen@ <achen(a)thinkingphones.com>fuze.com >>>> >>>> >>>> *Confidentiality Notice: The information contained in this e-mail and >>>> any >>>> attachments may be confidential. If you are not an intended recipient, >>>> you >>>> are hereby notified that any dissemination, distribution or copying of >>>> this >>>> e-mail is strictly prohibited. If you have received this e-mail in >>>> error, >>>> please notify the sender and permanently delete the e-mail and any >>>> attachments immediately. You should not retain, copy or use this e-mail >>>> or >>>> any attachment for any purpose, nor disclose all or any part of the >>>> contents to any other person. Thank you.* >>>> >>>> _______________________________________________ >>>> Kamailio (SER) - Users Mailing Listsr-users@lists.kamailio.orghttps://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >>>> >>>> -- >>>> Kamailio Merchandising - https://skalatan.de/merchandising/ >>>> Kamailio services - https://skalatan.de/services >>>> Henning Westerholt - https://skalatan.de/blog/ >>>> >>>> >>> >>> -- >>> Andy Chen >>> Sr. Telephony Lead Engineer >>> 415 516 5535 (M) >>> achen@ <achen(a)thinkingphones.com>fuze.com >>> >>> >> >> -- >> Andy Chen >> Sr. Telephony Lead Engineer >> 415 516 5535 (M) >> achen@ <achen(a)thinkingphones.com>fuze.com >> >> >> *Confidentiality Notice: The information contained in this e-mail and any >> attachments may be confidential. If you are not an intended recipient, you >> are hereby notified that any dissemination, distribution or copying of >> this >> e-mail is strictly prohibited. If you have received this e-mail in error, >> please notify the sender and permanently delete the e-mail and any >> attachments immediately. You should not retain, copy or use this e-mail or >> any attachment for any purpose, nor disclose all or any part of the >> contents to any other person. Thank you.* >> _______________________________________________ >> Kamailio (SER) - Users Mailing List >> sr-users(a)lists.kamailio.org >> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >> > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users > -- Andy Chen Sr. Telephony Lead Engineer 415 516 5535 (M) achen@ <achen(a)thinkingphones.com>fuze.com -- *Confidentiality Notice: The information contained in this e-mail and any attachments may be confidential. If you are not an intended recipient, you are hereby notified that any dissemination, distribution or copying of this e-mail is strictly prohibited. If you have received this e-mail in error, please notify the sender and permanently delete the e-mail and any attachments immediately. You should not retain, copy or use this e-mail or any attachment for any purpose, nor disclose all or any part of the contents to any other person. Thank you.*

1 0

Re: [sr-dev] [kamailio/kamailio] erlang: fix never used value assigned to a variable (6542a36)
by Henning Westerholt 18 Sep '19

18 Sep '19

So you are saying this change caused a bug in the module? Then please open a new issue for that on our tracker about it. -- 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/6542a367638ec5f8a2b62994f8c309e…

1 0

Re: [sr-dev] [kamailio/kamailio] erlang: fix never used value assigned to a variable (6542a36)
by vipulpatel310 18 Sep '19

18 Sep '19

I 'm getting warning each time and It donot get value in erl_xbuff after this change. "============================================== WARNING: <core> [core/mem/q_malloc.c:480]: qm_free(): WARNING: free(0) called from erlang: pv_xbuff.c: xavp_decode(1209) ALERT: <script>: 520:type(auth_repl): <null>, format(auth_repl): <null> ==============================================" -- 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/6542a367638ec5f8a2b62994f8c309e…

1 0

Re: [sr-dev] [kamailio/kamailio] erlang: fix never used value assigned to a variable (6542a36)
by vipulpatel310 18 Sep '19

18 Sep '19

I 'm getting warning each time and It donot get value in erl_xbuff after this change. ====================================== WARNING: <core> [core/mem/q_malloc.c:480]: qm_free(): WARNING: free(0) called from erlang: pv_xbuff.c: xavp_decode(1209) ALERT: <script>: 520:type(auth_repl): <null>, format(auth_repl): <null> ======================================= -- 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/6542a367638ec5f8a2b62994f8c309e…

1 0

[kamailio/kamailio] Kamailio crashes immediately after receiving SIP ACK if TLS is used (#2028)
by Mathias Schneuwly 18 Sep '19

18 Sep '19

### Description Hi We have a situation where Kamailio crashes always just after receiving a SIP ACK. We are using the following setup: phoneA(192.168.147.100) -(TLS)- (192.168.147.1)KamailioA(192.168.1.1) -(TLS)- (192.168.1.2)KamailioB(192.168.148.1) -(TLS)- (192.168.148.100)phoneB If I do a call from phoneA to phoneB, the Invite is sent correctly to phoneB. phoneB sends back the ACK and then KamailioA immediately crashes. KamailioA is listening on interface 192.168.147.1 KamailioB is listening on interface 192.168.148.1 Both Kamailios are running on version 5.2.2 I can see a strange warning in the log of KamailioA which says: `<core> [core/tcp_main.c:1148]: tcp_do_connect(): 192.168.148.1:5071: could not find corresponding listening socket for 192.168.1.1, using default...` I'm not sure if this is related to this problem. Interestingly Kamailio does not listen on interface 192.168.1.1, so why does it use this socket? If I'm using plain SIP, then it uses the specified bind interface 192.168.147.1, but not if TLS is used. **If I turn the TLS connection between the two Kamailios to plain, then everything works fine. Kamailio used the defined socket, and it does not crash.** ### Troubleshooting #### Reproduction The crash happens always using the scenario described above. #### Debugging Data  ``` (gdb) bt full #0 0xb6bce4c6 in populate_leg_info (dlg=0xb4c37018, msg=0xb72fdf40, t=0xb4c352d4, leg=1, tag=0xbfd065ac) at dlg_handlers.c:257 __llevel = 3 skip_recs = 1 cseq = {s = 0x0, len = 0} contact = { s = 0xb4c226e3 "sip:2011000@192.168.148.100:5071;transport=tls>\r\nServer: Cisco-CP-8841-3PCC/11.2.3\r\nContent-Length: 295\r\nAllow: ACK, BYE, CANCEL, INFO, INVITE, NOTIFY, OPTIONS, REFER, UPDATE\r\nSupported: replaces, sec"..., len = 46} rr_set = { s = 0xb72aee9c "<sip:192.168.148.1:5071;transport=tls;lr;ftag=c01877e49ac3d2e1o0;did=91e.6b8>ac3d2e1o0;did=91e.6da>\r\nContact: \"CP8841\" <sip:2011000@192.168.148.100:5071;tra\300\300\300\300\355\357\315\253ls>\r\nSer\234", len = 77} __FUNCTION__ = "populate_leg_info" #1 0xb6bd0fb4 in dlg_onreply (t=0xb4c352d4, type=1048576, param=0xbfd066e8) at dlg_handlers.c:503 dlg = 0xb4c37018 iuid = 0xb4c378cc new_state = 3 old_state = 2 unref = 0 event = 3 tag = { s = 0xb4c224ce "2835feb24ee85510i0\r\nFrom: \"CP8861\" <sip:1011000@192.168.147.1>;tag=c01877e49ac3d2e1o0\r\nCall-ID: 12d45870-96108bc9(a)192.168.147.100\r\nCSeq: 101 INVITE\r\nVia: SIP/2.0/TLS 192.168.147.1:5071;received=192.16"..., len = 18} req = 0xb4c342a0 rpl = 0xb72fdf40 __FUNCTION__ = "dlg_onreply" #2 0xb6fbf850 in run_trans_callbacks_internal (cb_lst=0xb4c35318, type=1048576, trans=0xb4c352d4, params=0xbfd066e8) at t_hooks.c:260 cbp = 0xb4c3cb08 backup_from = 0x84c5e90 backup_to = 0x84c5e94 backup_dom_from = 0x84c5e98 backup_dom_to = 0x84c5e9c backup_uri_from = 0x84c5e88 backup_uri_to = 0x84c5e8c backup_xavps = 0x84c5f1c __FUNCTION__ = "run_trans_callbacks_internal" #3 0xb6fbfa43 in run_trans_callbacks_with_buf (type=1048576, rbuf=0xb4c3534c, req=0xb4c342a0, repl=0xb72fdf40, flags=0) at t_hooks.c:305 params = {req = 0xb4c342a0, rpl = 0xb72fdf40, param = 0xb4c3cb14, code = 200, flags = 0, branch = 0, t_rbuf = 0xb4c3534c, dst = 0xb4c35380, send_buf = { s = 0xb4c393c4 "SIP/2.0 200 OK\r\nTo: \"2011000\" <sip:2011000@192.168.147.1>;tag=2835feb24ee85510i0\r\nFrom: \"CP8861\" <sip:1011000@192.168.147.1>;tag=c01877e49ac3d2e1o0\r\nCall-ID: 12d45870-96108bc9(a)192.168.147.100\r\nCSeq: 1"..., len = 1015}} trans = 0xb4c352d4 #4 0xb7005b22 in relay_reply (t=0xb4c352d4, p_msg=0xb72fdf40, branch=0, msg_status=200, cancel_data=0xbfd06c64, do_put_on_wait=1) at t_reply.c:1986 relay = 0 save_clone = 0 buf = 0xb72ea5b4 "SIP/2.0 200 OK\r\nTo: \"2011000\" <sip:2011000@192.168.147.1>;tag=2835feb24ee85510i0\r\nFrom: \"CP8861\" <sip:1011000@192.168.147.1>;tag=c01877e49ac3d2e1o0\r\nCall-ID: 12d45870-96108bc9(a)192.168.147.100\r\nCSeq: 1"... res_len = 1015 relayed_code = 200 relayed_msg = 0xb72fdf40 reply_bak = 0xb6fefd71 bm = {to_tag_val = {s = 0x8d5e370 "CEST", len = -1221923564}} totag_retr = 0 reply_status = RPS_COMPLETED uas_rb = 0xb4c3534c to_tag = 0xb7085b6c reason = {s = 0x1 <Address 0x1 out of bounds>, len = 7200} onsend_params = {req = 0x0, rpl = 0x25, param = 0x36, code = 1, flags = 7, branch = 0, t_rbuf = 0xb7085b6c, dst = 0xbfd06988, send_buf = { s = 0x828077e "\213E\334\203\304l[^_]\303U\211\345WVS\203\354l\241\064]K\b\205\300t\020\241\060]K\b\307", len = -1266092160}} ip = {af = 1, len = 0, u = {addrl = {0, 0, 0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}} __FUNCTION__ = "relay_reply" #5 0xb700a5a2 in reply_received (p_msg=0xb72fdf40) at t_reply.c:2558 msg_status = 200 last_uac_status = 180 ---Type <return> to continue, or q <return> to quit--- ack = 0x0 ack_len = 0 branch = 0 reply_status = 0 onreply_route = 1 cancel_data = {cancel_bitmap = 0, reason = {cause = 200, u = {text = {s = 0x0, len = 0}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 0}}}} uac = 0xb4c35440 t = 0xb4c352d4 lack_dst = {send_sock = 0x1, to = {s = {sa_family = 0, sa_data = "\000\000x\250\354\b\000\000\000\000\000\000\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 149727352}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 149727352, sin6_addr = {__in6_u = { __u6_addr8 = "\000\000\000\000\000\000\000\000\377\377\377\377\b\000\000", __u6_addr16 = {0, 0, 0, 0, 65535, 65535, 8, 0}, __u6_addr32 = {0, 0, 4294967295, 8}}}, sin6_scope_id = 3077709910}}, id = 149859988, proto = 0 '\000', send_flags = {f = 0, blst_imask = 0}} backup_user_from = 0x84c5e90 backup_user_to = 0x84c5e94 backup_domain_from = 0x84c5e98 backup_domain_to = 0x84c5e9c backup_uri_from = 0x84c5e88 backup_uri_to = 0x84c5e8c backup_xavps = 0x84c5f1c replies_locked = 1 branch_ret = 119 prev_branch = -1717986917 blst_503_timeout = 822083589 hf = 0x1 onsend_params = {req = 0xb72d7f80, rpl = 0xbfd06d58, param = 0xbfd06d54, code = -1217257384, flags = 14254, branch = 46962, t_rbuf = 0x8d5e370, dst = 0x2, send_buf = { s = 0xb7635c91 "[\201\303c\363\020", len = 0}} ctx = {rec_lev = 0, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {-1224189076, 7, 138001188, -1076860760, 728924134, -1680286071}, __mask_was_saved = 0, __saved_mask = {__val = {0, 4294967295, 8, 539106558, 0, 4294967295, 4294967295, 138775360, 49, 4294967295, 4294967295, 3073043760, 3032623058, 3032623058, 3032623355, 0, 0, 137132517, 926089367, 3, 3218107556, 3, 3218107538, 3077138491, 149859986, 3218107538, 3069139848, 138001188, 138129710, 3218107816, 3068640855, 3073367872}}}}} bctx = 0x0 keng = 0x0 __FUNCTION__ = "reply_received" #6 0x080f0c70 in do_forward_reply (msg=0xb72fdf40, mode=0) at core/forward.c:747 new_buf = 0x0 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = { sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 0, proto = 0 '\000', send_flags = {f = 0, blst_imask = 0}} new_len = 31 r = 0 ip = {af = 3342336, len = 3070983510, u = {addrl = {3071029744, 138001188, 3218108100, 3070983858}, addr32 = {3071029744, 138001188, 3218108100, 3070983858}, addr16 = {12784, 46860, 47908, 2105, 28356, 49104, 32434, 46859}, addr = "\360\061\f\267$\273\071\b\304n\320\277\262~\v\267"}} s = 0x40000004 <Address 0x40000004 out of bounds> len = 0 __FUNCTION__ = "do_forward_reply" #7 0x080f27a5 in forward_reply (msg=0xb72fdf40) at core/forward.c:852 No locals. #8 0x0817dd75 in receive_msg ( buf=0xb4c22490 "SIP/2.0 200 OK\r\nTo: \"2011000\" <sip:2011000@192.168.147.1>;tag=2835feb24ee85510i0\r\nFrom: \"CP8861\" <sip:1011000@192.168.147.1>;tag=c01877e49ac3d2e1o0\r\nCall-ID: 12d45870-96108bc9(a)192.168.147.100\r\nCSeq: 1"..., len=1131, rcv_info=0xb4c222cc) at core/receive.c:433 msg = 0xb72fdf40 ctx = {rec_lev = 149727352, run_flags = 0, last_retcode = 21, jmp_env = {{__jmpbuf = {1, 0, 0, -1, 8, -1217257386}, __mask_was_saved = 149859988, __saved_mask = {__val = {3032621868, 15252, 1160, 16383, 1131, 3032718380, 3032730124, 0, 4294967295, 3064727794, 10, 3032622387, 33, 926137124, 3077853172, 3218109060, 149859980, 3218108712, 3077134290, 3077709903, 3077000373, 3218108739, 3077850112, 0, 2576980379, 822083589, 0, 3077853172, 3077373168, 0, 0, 0}}}}} bctx = 0x0 ret = 0 stats_on = 0 tvb = {tv_sec = 1565164477, tv_usec = 894759} tve = {tv_sec = 0, tv_usec = -1076858112} tz = {tz_minuteswest = 0, tz_dsttime = 0} diff = 0 inb = { ---Type <return> to continue, or q <return> to quit--- s = 0xb4c22490 "SIP/2.0 200 OK\r\nTo: \"2011000\" <sip:2011000@192.168.147.1>;tag=2835feb24ee85510i0\r\nFrom: \"CP8861\" <sip:1011000@192.168.147.1>;tag=c01877e49ac3d2e1o0\r\nCall-ID: 12d45870-96108bc9(a)192.168.147.100\r\nCSeq: 1"..., len = 1131} netinfo = {data = {s = 0x9108 <Address 0x9108 out of bounds>, len = 149860088}, rcv = 0xb7744ff4, dst = 0xb7746380} keng = 0x0 evp = {data = 0xbfd07140, rcv = 0xb4c222cc, dst = 0x0} cidlockidx = 0 cidlockset = 0 errsipmsg = 0 __FUNCTION__ = "receive_msg" #9 0x08273e49 in receive_tcp_msg ( tcpbuf=0xb4c22490 "SIP/2.0 200 OK\r\nTo: \"2011000\" <sip:2011000@192.168.147.1>;tag=2835feb24ee85510i0\r\nFrom: \"CP8861\" <sip:1011000@192.168.147.1>;tag=c01877e49ac3d2e1o0\r\nCall-ID: 12d45870-96108bc9(a)192.168.147.100\r\nCSeq: 1"..., len=1131, rcv_info=0xb4c222cc, con=0xb4c222b8) at core/tcp_read.c:1399 buf = 0x0 bsize = 0 blen = 295 __FUNCTION__ = "receive_tcp_msg" #10 0x08276179 in tcp_read_req (con=0xb4c222b8, bytes_read=0xbfd07964, read_flags=0xbfd0795c) at core/tcp_read.c:1631 bytes = 1131 total_bytes = 1131 resp = 1 size = 0 req = 0xb4c2232c dst = {send_sock = 0x7, to = {s = {sa_family = 8193, sa_data = "\000\000\214\361.\267\332\000\000\000\214\361.\267"}, sin = {sin_family = 8193, sin_port = 0, sin_addr = {s_addr = 3073307020}, sin_zero = "\332\000\000\000\214\361.\267"}, sin6 = {sin6_family = 8193, sin6_port = 0, sin6_flowinfo = 3073307020, sin6_addr = {__in6_u = { __u6_addr8 = "\332\000\000\000\214\361.\267 \034\000\000\000\000\000", __u6_addr16 = {218, 0, 61836, 46894, 7200, 0, 0, 0}, __u6_addr32 = {218, 3073307020, 7200, 0}}}, sin6_scope_id = 4294967295}}, id = 0, proto = 4 '\004', send_flags = {f = 0, blst_imask = 0}} c = -13 '\363' ret = 0 __FUNCTION__ = "tcp_read_req" #11 0x08279b62 in handle_io (fm=0xb72ef18c, events=1, idx=-1) at core/tcp_read.c:1862 ret = 0 n = 0 read_flags = 1 con = 0xb4c222b8 s = 13 resp = 1 t = 484016151 __FUNCTION__ = "handle_io" #12 0x08267d1f in io_wait_loop_epoll (h=0x8493aa0, t=2, repeat=0) at core/io_wait.h:1065 n = 1 r = 0 fm = 0xb72ef18c revents = 1 __FUNCTION__ = "io_wait_loop_epoll" #13 0x0827ae67 in tcp_receive_loop (unix_sock=34) at core/tcp_read.c:1974 __FUNCTION__ = "tcp_receive_loop" #14 0x0825e55e in tcp_init_children () at core/tcp_main.c:4853 r = 1 i = 7 reader_fd_1 = 34 pid = 0 si_desc = "tcp receiver (generic)\000\000\000\000\000\000\227c)\267\031\000\000\000\310|\320\277\252\067(\b\377\377\377\377\251\221?\b\001\000\000\000\360\061(\b\000\000\000\000\001\000\000\000\000\000\000\000\237)9\b\317\000\000\000\244\037\071\b\250|\320\277\035W5\b\b\366\210\264\000\000\000\000\003\000\000\000\031\000\000\000\030\000\000\000\031\000\000\000\000\064\000\000\031\000\000\000\037\273\071\b" si = 0x0 __FUNCTION__ = "tcp_init_children" #15 0x0806899f in main_loop () at main.c:1745 i = 8 pid = 13312 si = 0x0 si_desc = "udp receiver child=7 sock=192.168.147.1:5070", '\000' <repeats 28 times>, "\003", '\000' <repeats 54 times> nrprocs = 8 ---Type <return> to continue, or q <return> to quit--- woneinit = 1 __FUNCTION__ = "main_loop" #16 0x0806f474 in main (argc=13, argv=0xbfd083f4) at main.c:2696 cfg_stream = 0x8d58008 c = -1 r = 0 tmp = 0xbfd0894d "" tmp_len = 0 port = 0 proto = 5 options = 0x8385f70 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 734287085 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xb778b848 p = 0xbfd08374 "\260\203\320\277G\244w\267H\270x\267(\234v\267\364Ot\267" st = {st_dev = 18, __pad1 = 0, st_ino = 14575, st_mode = 16877, st_nlink = 2, st_uid = 0, st_gid = 0, st_rdev = 0, __pad2 = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1565162952, tv_nsec = 144000000}, st_mtim = {tv_sec = 1565164469, tv_nsec = 12000000}, st_ctim = {tv_sec = 1565164469, tv_nsec = 12000000}, __unused4 = 0, __unused5 = 0} __FUNCTION__ = "main" ``` ``` (gdb) info locals __llevel = 3 skip_recs = 1 cseq = {s = 0x0, len = 0} contact = { s = 0xb4c226e3 "sip:2011000@192.168.148.100:5071;transport=tls>\r\nServer: Cisco-CP-8841-3PCC/11.2.3\r\nContent-Length: 295\r\nAllow: ACK, BYE, CANCEL, INFO, INVITE, NOTIFY, OPTIONS, REFER, UPDATE\r\nSupported: replaces, sec"..., len = 46} rr_set = { s = 0xb72aee9c "<sip:192.168.148.1:5071;transport=tls;lr;ftag=c01877e49ac3d2e1o0;did=91e.6b8>ac3d2e1o0;did=91e.6da>\r\nContact: \"CP8841\" <sip:2011000@192.168.148.100:5071;tra\300\300\300\300\355\357\315\253ls>\r\nSer\234", len = 77} __FUNCTION__ = "populate_leg_info" ``` ``` (gdb) list 252 in dlg_handlers.c ``` #### Log Messages  ``` Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/tcp_read.c:1560]: tcp_read_req(): content-length=295 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:620]: parse_msg(): SIP Reply (status): Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:622]: parse_msg(): version: <SIP/2.0> Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:624]: parse_msg(): status: <200> Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:626]: parse_msg(): reason: <OK> Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=2835feb24ee85510i0 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [62]; uri=[sip:2011000@192.168.147.1] Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:174]: get_hdr_field(): to body ["2011000" <sip:2011000@192.168.147.1>], to tag [2835feb24ee85510i0] Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <101> <INVITE> Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 234, <received> = <192.168.1.1>; state=6 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKdec2.d7353bd8ebe652818b71c61e08511e1e.0>; state=6 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 236, <i> = <1>; state=16 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:498]: parse_headers(): Via found, flags=2 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:500]: parse_headers(): this is the first via Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/receive.c:245]: receive_msg(): --- received sip message - reply - call-id: [12d45870-96108bc9(a)192.168.147.100] - cseq: [101 INVITE] Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK-81f1c844>; state=16 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:498]: parse_headers(): Via found, flags=ffffffffffffffff Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:511]: parse_headers(): this is the second via Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:185]: get_hdr_field(): content_length=295 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_lookup.c:1043]: t_check_msg(): msg (0xb72fdf40) id=3/13319 global id=2/13319 T start=0xffffffff Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_lookup.c:920]: t_reply_matching(): t_reply_matching: hash 11501 label 0 branch 0 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_lookup.c:974]: t_reply_matching(): reply (0xb72fdf40) matched an active transaction (T=0xb4c352d4)! Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_hooks.c:258]: run_trans_callbacks_internal(): DBG: trans=0xb4c352d4, callback type 2, id 0 entered Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} acc [acc_logic.c:682]: tmcb_func(): acc callback called for t(0xb4c352d4) event type 2, reply code 200 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} acc [acc_logic.c:414]: should_acc_reply(): probing acc state - code: 200 flags: 0x2 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} acc [acc_logic.c:446]: should_acc_reply(): acc is on Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_hooks.c:258]: run_trans_callbacks_internal(): DBG: trans=0xb4c352d4, callback type 2, id 0 entered Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:712]: dlg_lookup(): ref dlg 0xb4c37018 with 1 -> 2 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:714]: dlg_lookup(): dialog id=2774 found on entry 3609 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_profile.c:536]: set_current_dialog(): setting current dialog [3609:2774] Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:957]: dlg_unref_helper(): unref op on 0xb4c37018 with 1 from dlg_hash.c:975 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:961]: dlg_unref_helper(): unref dlg 0xb4c37018 with 1 -> 1 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_lookup.c:1113]: t_check_msg(): msg (0xb72fdf40) id=3/13319 global id=3/13319 T end=0xb4c352d4 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_reply.c:2243]: reply_received(): transaction found - T:0xb4c352d4 branch:0 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_reply.c:2258]: reply_received(): org. status uas=180, uac[0]=180 local=0 is_invite=1) Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <script>: incoming reply Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_reply.c:1266]: t_should_relay_response(): ->>>>>>>>> T_code=180, new_code=200 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_reply.c:1518]: t_should_relay_response(): rps completed - uas status: 180 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_reply.c:1824]: relay_reply(): reply status=4 branch=0, save=0, relay=0 icode=0 msg status=200 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_hooks.c:258]: run_trans_callbacks_internal(): DBG: trans=0xb4c352d4, callback type 32, id 0 entered Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:712]: dlg_lookup(): ref dlg 0xb4c37018 with 1 -> 2 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:714]: dlg_lookup(): dialog id=2774 found on entry 3609 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:957]: dlg_unref_helper(): unref op on 0xb4c37018 with 1 from dlg_hash.c:975 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:961]: dlg_unref_helper(): unref dlg 0xb4c37018 with 1 -> 1 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <core> [core/msg_translator.c:2288]: generate_res_buf_from_sip_res(): old size: 1131, new size: 1015 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <core> [core/msg_translator.c:2306]: generate_res_buf_from_sip_res(): copied size: orig:327, new: 211, rest: 804 msg= SIP/2.0 200 OK^M To: "2011000" <sip:2011000@192.168.147.1>;tag=2835feb24ee85510i0^M From: "CP8861" <sip:1011000@192.168.147.1>;tag=c01877e49ac3d2e1o0^M Call-ID: 12d45870-96108bc9(a)192.168.147.100^M CSeq: 101 INVITE^M Via: SIP/2.0/TLS 192.168.147.100:5062;branch=z9hG4bK-81f1c844^M Record-Route: <sip:192.168.148.1:5071;transport=tls;lr;ftag=c01877e49ac3d2e1o0;did=91e.6b8>^M Record-Route: <sip:192.168.147.1:5071;transport=tls;lr;ftag=c01877e49ac3d2e1o0;did=91e.6da>^M Contact: "CP8841" <sip:2011000@192.168.148.100:5071;transport=tls>^M Server: Cisco-CP-8841-3PCC/11.2.3^M Content-Length: 295^M Allow: ACK, BYE, CANCEL, INFO, INVITE, NOTIFY, OPTIONS, REFER, UPDATE^M Supported: replaces, sec-agree^M Content-Type: application/sdp^M ^M v=0^M o=- 90523 90523 IN IP4 192.168.148.100^M s=-^M c=IN IP4 192.168 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_reply.c:332]: update_totag_set(): new totag [2835feb24ee85510i0] Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} tm [t_hooks.c:258]: run_trans_callbacks_internal(): DBG: trans=0xb4c352d4, callback type 1048576, id 0 entered Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:712]: dlg_lookup(): ref dlg 0xb4c37018 with 1 -> 2 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:714]: dlg_lookup(): dialog id=2774 found on entry 3609 Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_hash.c:1158]: next_state_dlg(): dialog 0xb4c37018 changed from state 2 to state 3, due event 3 (ref 2) Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} dialog [dlg_handlers.c:484]: dlg_onreply(): dialog 0xb4c37018 confirmed (ACK pending) Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <core> [core/parser/parse_rr.c:381]: print_rr_body(): current rr is <sip:192.168.148.1:5071;transport=tls;lr;ftag=c01877e49ac3d2e1o0;did=91e.6b8> Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <core> [core/parser/parse_rr.c:381]: print_rr_body(): current rr is <sip:192.168.147.1:5071;transport=tls;lr;ftag=c01877e49ac3d2e1o0;did=91e.6da> Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <core> [core/parser/parse_rr.c:406]: print_rr_body(): skipping 1 route records Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <core> [core/parser/parse_rr.c:444]: print_rr_body(): out rr [<sip:192.168.148.1:5071;transport=tls;lr;ftag=c01877e49ac3d2e1o0;did=91e.6b8>] Aug 7 09:54:37 bs3-1 /usr/sbin/kamailio[13319]: DEBUG: {2 101 INVITE 12d45870-96108bc9(a)192.168.147.100} <core> [core/parser/parse_rr.c:445]: print_rr_body(): we have 1 records Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13326]: DEBUG: <core> [core/tcp_main.c:3281]: handle_tcp_child(): dead tcp child 1 (pid 13319, no 17) (shutting down?) Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13326]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x8471820, 33, -1, 0x0) fd_no=32 called Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13326]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 30 Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13326]: DEBUG: <core> [core/tcp_main.c:3513]: handle_ser_child(): dead child 17, pid 13319 (shutting down?) Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13326]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x8471820, 30, -1, 0x0) fd_no=31 called Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: ALERT: <core> [main.c:756]: handle_sigs(): child process 13319 exited by a signal 11 Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: ALERT: <core> [main.c:759]: handle_sigs(): core was generated Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: INFO: <core> [main.c:781]: handle_sigs(): terminating due to SIGCHLD Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: <core> [main.c:783]: handle_sigs(): terminating due to SIGCHLD Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13323]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13321]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13320]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13318]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13317]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13315]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13306]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13304]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13303]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13316]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13314]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13310]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13309]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13308]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13307]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13305]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13325]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13322]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13326]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13324]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13313]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13311]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13312]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: dialog [dlg_hash.c:345]: destroy_dlg(): destroying dialog 0xb4c37018 (ref 2) Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: dialog [dlg_hash.c:361]: destroy_dlg(): removed timer for dlg 0xb4c37018 [3609:2774] with clid '12d45870-96108bc9(a)192.168.147.100' and tags 'c01877e49ac3d2e1o0' '' Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: db_sqlite [dbase.c:223]: db_sqlite_submit_query(): submit_query: insert into location (username,contact,expires,q,callid,cseq,flags,cflags,user_agent,socket,methods,last_modified,ruid,reg_id,server_id,connection_id,keepalive,partition ) values (?1,?2,?3,?4,?5,?6,?7,?8,?9,?10,?11,?12,?13,?14,?15,?16,?17,?18) Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tm [t_funcs.c:85]: tm_shutdown(): start Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tm [t_funcs.c:88]: tm_shutdown(): emptying hash table Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tm [h_table.c:133]: free_cell_helper(): freeing transaction 0xb4c352d4 from h_table.c:465 Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: dialog [dlg_handlers.c:310]: dlg_iuid_sfree(): freeing dlg iuid [3609:2774] (0xb4c378cc) Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tm [h_table.c:222]: free_cell_helper(): branch 0 -> dns_h.srv (_sips._tcp.b.ersaimfs.ch) ref=2, dns_h.a (ttel.b.ersaimfs.ch) ref=2 Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tm [t_funcs.c:90]: tm_shutdown(): removing semaphores Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tm [t_funcs.c:92]: tm_shutdown(): destroying tmcb lists Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tm [t_funcs.c:95]: tm_shutdown(): done Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: INFO: db_sqlite [db_sqlite.c:227]: mod_destroy(): SQlite terminate Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: tls [tls_init.c:853]: destroy_tls_h(): tls module final tls destroy Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: <core> [core/mem/shm.c:283]: shm_destroy_manager(): destroying memory manager: q_malloc Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: <core> [core/mem/q_malloc.c:1178]: qm_shm_lock_destroy(): destroying the shared memory lock Aug 7 09:54:38 bs3-1 /usr/sbin/kamailio[13297]: DEBUG: <core> [core/mem/pkg.c:91]: pkg_destroy_manager(): destroying memory manager: q_malloc ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.2.2 (i386/linux) 67f967 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: 67f967 compiled on 23:45:38 Jul 27 2019 with i586-akira_i586v2-linux-gnu-gcc 4.4.7 ``` * **Operating System**:  This is an own Linux distribution. So nothing common... ``` uname -a Linux bs3-1 4.9.155 #1 SMP Sat Jul 27 16:32:51 UTC 2019 i686 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/2028

3 17

mysql_ping in db_mysql_submit_query
by Juha Heinanen 18 Sep '19

18 Sep '19

As was found out in "Kamailio stops processing requests over UDP" thread, db_mysql_submit_query() in some circumstances hangs when it executes mysql_ping here: if (my_ping_interval) { t = time(0); if ((t - CON_TIMESTAMP(_h)) > my_ping_interval) { for (i=0; i < (db_mysql_auto_reconnect ? 3 : 1); i++) { if (mysql_ping(CON_CONNECTION(_h))) { LM_INFO("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h))); counter_inc(mysql_cnts_h.driver_err); } else { break; } } } ... } Comment in front of db_mysql_submit_query() function tells: * Send a SQL query to the database server. This methods tries to reconnect * to the server if the connection is gone and the auto_reconnect parameter is * enabled. It also issues a mysql_ping before the query to connect again after * a long waiting period because for some older mysql versions the auto reconnect * don't work sufficient. If auto_reconnect is enabled and the server supports it, * then the mysql_ping is probably not necessary, but its safer to do it in this * cases too. * The text was most likely written many years ago and auto reconnect now works OK in mysql versions in use today. I would like to test if the hangup could be prevented without the above code. Would it be possible to make the code optional via a compilation flag or by some other means? -- Juha

2 9

missing db structure changes
by Juha Heinanen 17 Sep '19

17 Sep '19

Upgrade instructions to 5.3 are missing db structure changes: https://www.kamailio.org/wiki/install/upgrade/stable-to-devel I remember seeing many in the commits. It would be a good idea (actually Kamailio policy) to immediately update the wiki when a db change is made. -- Juha

2 2

git:5.2:e8c6a8fb: dialog: run DLGCB_LOADED callbacks when loading dialog from db
by Federico Cabiddu 17 Sep '19

17 Sep '19

Module: kamailio Branch: 5.2 Commit: e8c6a8fbd1b16ddd1b8c9180aaf27dcd5cc9e05c URL: https://github.com/kamailio/kamailio/commit/e8c6a8fbd1b16ddd1b8c9180aaf27dc… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-17T14:35:53+02:00 dialog: run DLGCB_LOADED callbacks when loading dialog from db --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_cb.c Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/e8c6a8fbd1b16ddd1b8c9180aaf27dc… Patch: https://github.com/kamailio/kamailio/commit/e8c6a8fbd1b16ddd1b8c9180aaf27dc… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 6665398742..9c656e2b58 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -707,7 +707,6 @@ static int mod_init(void) } } - destroy_dlg_callbacks( DLGCB_LOADED ); /* timer process to send keep alive requests */ if(dlg_ka_timer>0 && dlg_ka_interval>0) diff --git a/src/modules/dialog/dlg_cb.c b/src/modules/dialog/dlg_cb.c index 12946994ba..f3c70bc173 100644 --- a/src/modules/dialog/dlg_cb.c +++ b/src/modules/dialog/dlg_cb.c @@ -232,6 +232,23 @@ void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg) return; } +void run_dlg_load_callbacks(struct dlg_cell *dlg) +{ + struct dlg_callback *cb; + + if (load_cbs && load_cbs!=POINTER_CLOSED_MARKER) { + for ( cb=load_cbs->first; cb; cb=cb->next ) { + params.req = NULL; + params.rpl = NULL; + params.direction = DLG_DIR_NONE; + params.param = &cb->param; + + cb->callback( dlg, DLGCB_LOADED, &params ); + } + } + return; +} + void run_dlg_callbacks( int type , struct dlg_cell *dlg, diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index 82afa05a82..bb0037c7f7 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -109,6 +109,7 @@ void run_dlg_callbacks( int type , void run_load_callbacks( void ); +void run_dlg_load_callbacks(struct dlg_cell *dlg); /*! * \brief Function that returns valid SIP message from given dialog callback parameter struct diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index b15cc86485..41bf52bd74 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -40,6 +40,7 @@ #include "../../core/counters.h" #include "dlg_hash.h" #include "dlg_var.h" +#include "dlg_cb.h" #include "dlg_profile.h" #include "dlg_db_handler.h" @@ -488,6 +489,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, get_ticks()); dlg->dflags = 0; + if(mode!=0) { if(loaded_extra<DLG_MAX_DB_LOAD_EXTRA) { dbuid[loaded_extra].h_entry = dlg->h_entry; @@ -497,6 +499,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg->dflags |= DLG_FLAG_DB_LOAD_EXTRA; loaded_extra_more = 1; } + /* if loading at runtime run the callbacks for the loaded dialog */ + run_dlg_load_callbacks(dlg); } next_dialog: ;

1 0

[kamailio/kamailio] dialog: run DLGCB_LOADED callbacks when loading dialog from db (#2066)
by Federico Cabiddu 17 Sep '19

17 Sep '19

When a specific dialog is loaded from db via dlg_db_load_callid, the load callbacks are not executed so, for example, a CDR is not generated. No sure if this should considered a new feature or a bug (and so eventually be backported). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2066 -- Commit Summary -- * dialog: run DLGCB_LOADED callbacks when loading dialog from db -- File Changes -- M src/modules/dialog/dialog.c (1) M src/modules/dialog/dlg_cb.c (17) M src/modules/dialog/dlg_cb.h (1) M src/modules/dialog/dlg_db_handler.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2066.patch https://github.com/kamailio/kamailio/pull/2066.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/2066

3 7

git:master:392a9abb: Merge pull request #2066 from kamailio/grumvalski/run_cb_on_dlg_load
by GitHub 17 Sep '19

17 Sep '19

Module: kamailio Branch: master Commit: 392a9abb79c1ff85e087540cc50f7f2a54d201df URL: https://github.com/kamailio/kamailio/commit/392a9abb79c1ff85e087540cc50f7f2… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-17T14:35:10+02:00 Merge pull request #2066 from kamailio/grumvalski/run_cb_on_dlg_load dialog: run DLGCB_LOADED callbacks when loading dialog from db --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_cb.c Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/392a9abb79c1ff85e087540cc50f7f2… Patch: https://github.com/kamailio/kamailio/commit/392a9abb79c1ff85e087540cc50f7f2… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 8f5a186e40..b849cfbb6c 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -714,7 +714,6 @@ static int mod_init(void) } } - destroy_dlg_callbacks( DLGCB_LOADED ); /* timer process to send keep alive requests */ if(dlg_ka_timer>0 && dlg_ka_interval>0) diff --git a/src/modules/dialog/dlg_cb.c b/src/modules/dialog/dlg_cb.c index 12946994ba..f3c70bc173 100644 --- a/src/modules/dialog/dlg_cb.c +++ b/src/modules/dialog/dlg_cb.c @@ -232,6 +232,23 @@ void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg) return; } +void run_dlg_load_callbacks(struct dlg_cell *dlg) +{ + struct dlg_callback *cb; + + if (load_cbs && load_cbs!=POINTER_CLOSED_MARKER) { + for ( cb=load_cbs->first; cb; cb=cb->next ) { + params.req = NULL; + params.rpl = NULL; + params.direction = DLG_DIR_NONE; + params.param = &cb->param; + + cb->callback( dlg, DLGCB_LOADED, &params ); + } + } + return; +} + void run_dlg_callbacks( int type , struct dlg_cell *dlg, diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index 82afa05a82..bb0037c7f7 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -109,6 +109,7 @@ void run_dlg_callbacks( int type , void run_load_callbacks( void ); +void run_dlg_load_callbacks(struct dlg_cell *dlg); /*! * \brief Function that returns valid SIP message from given dialog callback parameter struct diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 56c7ef39a2..1325469675 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -40,6 +40,7 @@ #include "../../core/counters.h" #include "dlg_hash.h" #include "dlg_var.h" +#include "dlg_cb.h" #include "dlg_profile.h" #include "dlg_db_handler.h" @@ -493,6 +494,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, get_ticks()); dlg->dflags = 0; + if(mode!=0) { if(loaded_extra<DLG_MAX_DB_LOAD_EXTRA) { dbuid[loaded_extra].h_entry = dlg->h_entry; @@ -502,6 +504,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg->dflags |= DLG_FLAG_DB_LOAD_EXTRA; loaded_extra_more = 1; } + /* if loading at runtime run the callbacks for the loaded dialog */ + run_dlg_load_callbacks(dlg); } next_dialog: ;

1 0

git:master:10037f65: dialog: run DLGCB_LOADED callbacks when loading dialog from db
by Federico Cabiddu 17 Sep '19

17 Sep '19

Module: kamailio Branch: master Commit: 10037f658cd1657275f383314b6960715c17ea39 URL: https://github.com/kamailio/kamailio/commit/10037f658cd1657275f383314b69607… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-17T07:52:29+02:00 dialog: run DLGCB_LOADED callbacks when loading dialog from db --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_cb.c Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/10037f658cd1657275f383314b69607… Patch: https://github.com/kamailio/kamailio/commit/10037f658cd1657275f383314b69607… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 8f5a186e40..b849cfbb6c 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -714,7 +714,6 @@ static int mod_init(void) } } - destroy_dlg_callbacks( DLGCB_LOADED ); /* timer process to send keep alive requests */ if(dlg_ka_timer>0 && dlg_ka_interval>0) diff --git a/src/modules/dialog/dlg_cb.c b/src/modules/dialog/dlg_cb.c index 12946994ba..f3c70bc173 100644 --- a/src/modules/dialog/dlg_cb.c +++ b/src/modules/dialog/dlg_cb.c @@ -232,6 +232,23 @@ void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg) return; } +void run_dlg_load_callbacks(struct dlg_cell *dlg) +{ + struct dlg_callback *cb; + + if (load_cbs && load_cbs!=POINTER_CLOSED_MARKER) { + for ( cb=load_cbs->first; cb; cb=cb->next ) { + params.req = NULL; + params.rpl = NULL; + params.direction = DLG_DIR_NONE; + params.param = &cb->param; + + cb->callback( dlg, DLGCB_LOADED, &params ); + } + } + return; +} + void run_dlg_callbacks( int type , struct dlg_cell *dlg, diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index 82afa05a82..bb0037c7f7 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -109,6 +109,7 @@ void run_dlg_callbacks( int type , void run_load_callbacks( void ); +void run_dlg_load_callbacks(struct dlg_cell *dlg); /*! * \brief Function that returns valid SIP message from given dialog callback parameter struct diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 56c7ef39a2..1325469675 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -40,6 +40,7 @@ #include "../../core/counters.h" #include "dlg_hash.h" #include "dlg_var.h" +#include "dlg_cb.h" #include "dlg_profile.h" #include "dlg_db_handler.h" @@ -493,6 +494,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, get_ticks()); dlg->dflags = 0; + if(mode!=0) { if(loaded_extra<DLG_MAX_DB_LOAD_EXTRA) { dbuid[loaded_extra].h_entry = dlg->h_entry; @@ -502,6 +504,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg->dflags |= DLG_FLAG_DB_LOAD_EXTRA; loaded_extra_more = 1; } + /* if loading at runtime run the callbacks for the loaded dialog */ + run_dlg_load_callbacks(dlg); } next_dialog: ;

1 0

git:master:801a9e38: core: print a version flag when pthread shared mutex is enabled for tls
by Daniel-Constantin Mierla 17 Sep '19

17 Sep '19

Module: kamailio Branch: master Commit: 801a9e38bcd863950a53ed0ca63a2976376daddc URL: https://github.com/kamailio/kamailio/commit/801a9e38bcd863950a53ed0ca63a297… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-17T13:18:08+02:00 core: print a version flag when pthread shared mutex is enabled for tls --- Modified: src/core/ver_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/801a9e38bcd863950a53ed0ca63a297… Patch: https://github.com/kamailio/kamailio/commit/801a9e38bcd863950a53ed0ca63a297… --- diff --git a/src/core/ver_defs.h b/src/core/ver_defs.h index bc2cb8d082..333260ed10 100644 --- a/src/core/ver_defs.h +++ b/src/core/ver_defs.h @@ -318,6 +318,12 @@ #define USE_DST_BLACKLIST_STATS_STR "" #endif +#ifdef KSR_PTHREAD_MUTEX_SHARED +#define KSR_PTHREAD_MUTEX_SHARED_STR ", TLS_PTHREAD_MUTEX_SHARED" +#else +#define KSR_PTHREAD_MUTEX_SHARED_STR "" +#endif + #define SER_COMPILE_FLAGS \ EXTRA_DEBUG_STR USE_TCP_STR USE_TLS_STR \ USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ @@ -332,7 +338,8 @@ USE_SYSV_SEM_STR USE_COMP_STR USE_DNS_CACHE_STR USE_DNS_FAILOVER_STR \ DNS_WATCHDOG_SUPPORT_STR USE_NAPTR_STR USE_DST_BLACKLIST_STR \ HAVE_RESOLV_RES_STR SYSLOG_CALLBACK_SUPPORT_STR MYSQL_FAKE_NULL_STR \ - USE_DST_BLACKLIST_STATS_STR USE_DNS_CACHE_STATS_STR + USE_DST_BLACKLIST_STATS_STR USE_DNS_CACHE_STATS_STR \ + KSR_PTHREAD_MUTEX_SHARED_STR #endif

1 0

Kamailio merchandising shop
by Henning Westerholt 16 Sep '19

16 Sep '19

Hello, there is now a Kamailio merchandising shop available: https://skalatan.de/merchandising/ You find there many options e.g. different Kamailio T-Shirts, Hoodies, Bags, Caps, Mugs, etc.. It provides shipping in many countries world-wide (based from Europe and also USA). Feedback via (direct) e-mail welcome. Best regards, Henning

1 1

git:master:b9bd13a1: tm: small change related to commit 38bcfb75d, prevent short from tag in else case
by Henning Westerholt 16 Sep '19

16 Sep '19

Module: kamailio Branch: master Commit: b9bd13a1d016eba5e4211ca9068bee1a3f5dbf83 URL: https://github.com/kamailio/kamailio/commit/b9bd13a1d016eba5e4211ca9068bee1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-16T22:29:17+02:00 tm: small change related to commit 38bcfb75d, prevent short from tag in else case --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/b9bd13a1d016eba5e4211ca9068bee1… Patch: https://github.com/kamailio/kamailio/commit/b9bd13a1d016eba5e4211ca9068bee1… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 2de8d29f27..82e7f5edf2 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -112,6 +112,9 @@ void generate_fromtag(str* tag, str* callid, str* ruri) crcitt_string_array(&from_tag[MD5_LEN + 1], callid, 1); if(ruri) { crcitt_string_array(&from_tag[MD5_LEN + 5], ruri, 1); + } else { + /* prevent shorter tag in this case, to be changed */ + crcitt_string_array(&from_tag[MD5_LEN + 5], callid, 1); } tag->s = from_tag; tag->len = FROM_TAG_LEN;

1 0

git:master:38bcfb75: tm: safety check when using r-uri for generating from tag
by Daniel-Constantin Mierla 16 Sep '19

16 Sep '19

Module: kamailio Branch: master Commit: 38bcfb75d3dfc5492fdee9e9bbb17f44cce37684 URL: https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-16T09:13:28+02:00 tm: safety check when using r-uri for generating from tag - it can come from functions exported via tm api and the r-uri can be optional because there are other checks if it is null or not --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f4… Patch: https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f4… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index e80b4ad62e..2de8d29f27 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -110,7 +110,9 @@ void generate_fromtag(str* tag, str* callid, str* ruri) { /* calculate from tag from callid and request uri */ crcitt_string_array(&from_tag[MD5_LEN + 1], callid, 1); - crcitt_string_array(&from_tag[MD5_LEN + 5], ruri, 1); + if(ruri) { + crcitt_string_array(&from_tag[MD5_LEN + 5], ruri, 1); + } tag->s = from_tag; tag->len = FROM_TAG_LEN; }

2 3

git:master:88d06a08: kamctl: kamdbctl.base - replaced get_answer() with a portable version
by Daniel-Constantin Mierla 16 Sep '19

16 Sep '19

Module: kamailio Branch: master Commit: 88d06a08a8baf460188745f1d748dd83f275356f URL: https://github.com/kamailio/kamailio/commit/88d06a08a8baf460188745f1d748dd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-16T10:12:47+02:00 kamctl: kamdbctl.base - replaced get_answer() with a portable version - contributed by Sergey Safarov, GH #2019 --- Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/88d06a08a8baf460188745f1d748dd8… Patch: https://github.com/kamailio/kamailio/commit/88d06a08a8baf460188745f1d748dd8… --- diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 7029fd386e..3846196b20 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -205,16 +205,11 @@ merr() { # get_answer () { - value=$1 - question=$2 - if [ "${value}" = "ask" ]; then - echo -n "$question" - read ANSWER - else - ANSWER=${value} - fi - ANSWER=${ANSWER:0:1} - ANSWER=${ANSWER/Y/y} - ANSWER=${ANSWER/N/n} + value=$1 + question=$2 + if [ "${value}" = "ask" ]; then + echo -n "$question" + read value + fi + ANSWER=$(echo ${value} | grep -o -e '[YyNn]' | sed -e 's/Y/y/' -e 's/N/n/') } -

1 0

git:master:66508a75: presence: init event structure to avoid use if invaid values
by Daniel-Constantin Mierla 16 Sep '19

16 Sep '19

Module: kamailio Branch: master Commit: 66508a753d8685ba8bcd0b43a94ce3477c198c4a URL: https://github.com/kamailio/kamailio/commit/66508a753d8685ba8bcd0b43a94ce34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-16T09:51:40+02:00 presence: init event structure to avoid use if invaid values --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/66508a753d8685ba8bcd0b43a94ce34… Patch: https://github.com/kamailio/kamailio/commit/66508a753d8685ba8bcd0b43a94ce34… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index f496f4a583..a0667d096a 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1355,6 +1355,7 @@ int pres_htable_restore(void) ev_str.s = (char *)row_vals[event_col].val.string_val; ev_str.len = strlen(ev_str.s); + memset(&ev, 0, sizeof(event_t)); if(event_parser(ev_str.s, ev_str.len, &ev) < 0) { LM_ERR("parsing event\n"); free_event_params(ev.params.list, PKG_MEM_TYPE);

1 0

git:master:28dc74fa: presence: reset freed list to avoid double free in case of error
by Daniel-Constantin Mierla 16 Sep '19

16 Sep '19

Module: kamailio Branch: master Commit: 28dc74fa8a30b17abd7f7b173b66b8538c5a4bb5 URL: https://github.com/kamailio/kamailio/commit/28dc74fa8a30b17abd7f7b173b66b85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-16T09:45:33+02:00 presence: reset freed list to avoid double free in case of error --- Modified: src/modules/presence/event_list.c --- Diff: https://github.com/kamailio/kamailio/commit/28dc74fa8a30b17abd7f7b173b66b85… Patch: https://github.com/kamailio/kamailio/commit/28dc74fa8a30b17abd7f7b173b66b85… --- diff --git a/src/modules/presence/event_list.c b/src/modules/presence/event_list.c index 0865412ec2..6f062614e1 100644 --- a/src/modules/presence/event_list.c +++ b/src/modules/presence/event_list.c @@ -142,6 +142,7 @@ int add_event(pres_ev_t *event) ev = (pres_ev_t *)shm_malloc(sizeof(pres_ev_t)); if(ev == NULL) { free_event_params(parsed_event.params.list, PKG_MEM_TYPE); + parsed_event.params.list = NULL; ERR_MEM(SHARE_MEM); } memset(ev, 0, sizeof(pres_ev_t));

1 0

git:master:9e703c1c: log_systemd: return in case the xavp is not valid
by Daniel-Constantin Mierla 16 Sep '19

16 Sep '19

Module: kamailio Branch: master Commit: 9e703c1c1eb362bd68e53b38021aa42f8b173d0c URL: https://github.com/kamailio/kamailio/commit/9e703c1c1eb362bd68e53b38021aa42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-16T09:38:26+02:00 log_systemd: return in case the xavp is not valid --- Modified: src/modules/log_systemd/journal_send.c --- Diff: https://github.com/kamailio/kamailio/commit/9e703c1c1eb362bd68e53b38021aa42… Patch: https://github.com/kamailio/kamailio/commit/9e703c1c1eb362bd68e53b38021aa42… --- diff --git a/src/modules/log_systemd/journal_send.c b/src/modules/log_systemd/journal_send.c index a3a95d57e7..e78d8c0e3c 100644 --- a/src/modules/log_systemd/journal_send.c +++ b/src/modules/log_systemd/journal_send.c @@ -40,6 +40,7 @@ int k_sd_journal_send_xavp(str *rname) if (!rxavp || rxavp->val.type != SR_XTYPE_XAVP) { LM_ERR("not a valid xavp: %.*s?\n", rname->len, rname->s); + return -1; } /* first, count xavp nodes */

1 0

git:master:17dc42ad: modules: readme files regenerated - msilo ... [skip ci]
by Kamailio Dev 14 Sep '19

14 Sep '19

Module: kamailio Branch: master Commit: 17dc42ad31643eb95a0fd745ec7a7abc2a70b107 URL: https://github.com/kamailio/kamailio/commit/17dc42ad31643eb95a0fd745ec7a7ab… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-14T16:47:10+02:00 modules: readme files regenerated - msilo ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/17dc42ad31643eb95a0fd745ec7a7ab… Patch: https://github.com/kamailio/kamailio/commit/17dc42ad31643eb95a0fd745ec7a7ab… --- diff --git a/src/modules/msilo/README b/src/modules/msilo/README index 7a8e5a4ac6..7b8b8abd3c 100644 --- a/src/modules/msilo/README +++ b/src/modules/msilo/README @@ -14,8 +14,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Juha Heinanen <jh(a)tutpro.com> @@ -510,7 +508,7 @@ modparam("msilo", "expire_time", 36000) module keeps each request send by itself for a new online user and if the reply is 2xx then the message is deleted from database. - Default value is “30”. + Default value is “60”. Example 1.21. Set the “check_time” parameter ... @@ -537,7 +535,7 @@ modparam("msilo", "send_time", 60) Number of “check_time” cycles when to check if there are expired messages in database. - Default value is “5”. + Default value is “10”. Example 1.23. Set the “clean_period” parameter ...

1 0

git:5.2:2c011ba6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Sep '19

14 Sep '19

Module: kamailio Branch: 5.2 Commit: 2c011ba68ae2c2d299d1851a818a5d4b7018f74e URL: https://github.com/kamailio/kamailio/commit/2c011ba68ae2c2d299d1851a818a5d4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-14T16:46:57+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/2c011ba68ae2c2d299d1851a818a5d4… Patch: https://github.com/kamailio/kamailio/commit/2c011ba68ae2c2d299d1851a818a5d4… --- diff --git a/src/modules/msilo/README b/src/modules/msilo/README index 7a8e5a4ac6..7b8b8abd3c 100644 --- a/src/modules/msilo/README +++ b/src/modules/msilo/README @@ -14,8 +14,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Juha Heinanen <jh(a)tutpro.com> @@ -510,7 +508,7 @@ modparam("msilo", "expire_time", 36000) module keeps each request send by itself for a new online user and if the reply is 2xx then the message is deleted from database. - Default value is “30”. + Default value is “60”. Example 1.21. Set the “check_time” parameter ... @@ -537,7 +535,7 @@ modparam("msilo", "send_time", 60) Number of “check_time” cycles when to check if there are expired messages in database. - Default value is “5”. + Default value is “10”. Example 1.23. Set the “clean_period” parameter ...

1 0

git:5.1:faf7ed42: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Sep '19

14 Sep '19

Module: kamailio Branch: 5.1 Commit: faf7ed428eca529e2b5cb72365f72a23d524d19f URL: https://github.com/kamailio/kamailio/commit/faf7ed428eca529e2b5cb72365f72a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-14T16:46:42+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/faf7ed428eca529e2b5cb72365f72a2… Patch: https://github.com/kamailio/kamailio/commit/faf7ed428eca529e2b5cb72365f72a2… --- diff --git a/src/modules/msilo/README b/src/modules/msilo/README index 456e530853..ef69a32bba 100644 --- a/src/modules/msilo/README +++ b/src/modules/msilo/README @@ -14,8 +14,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Juha Heinanen <jh(a)tutpro.com> @@ -510,7 +508,7 @@ modparam("msilo", "expire_time", 36000) module keeps each request send by itself for a new online user and if the reply is 2xx then the message is deleted from database. - Default value is “30”. + Default value is “60”. Example 1.21. Set the “check_time” parameter ... @@ -537,7 +535,7 @@ modparam("msilo", "send_time", 60) Number of “check_time” cycles when to check if there are expired messages in database. - Default value is “5”. + Default value is “10”. Example 1.23. Set the “clean_period” parameter ...

1 0

git:5.1:79e75abb: msilo: fix documentation for expire_time and clean_period to values from code
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: 5.1 Commit: 79e75abb34ebc0b2d6edf179b8403637bf637522 URL: https://github.com/kamailio/kamailio/commit/79e75abb34ebc0b2d6edf179b840363… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T16:41:00+02:00 msilo: fix documentation for expire_time and clean_period to values from code (cherry picked from commit 492f6e1584d4a2a51c584ab5a71fe43822acef72) --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79e75abb34ebc0b2d6edf179b840363… Patch: https://github.com/kamailio/kamailio/commit/79e75abb34ebc0b2d6edf179b840363… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index d958d15f18..5605a239ac 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -465,7 +465,7 @@ modparam("msilo", "expire_time", 36000) </para> <para> <emphasis> - Default value is <quote>30</quote>. + Default value is <quote>60</quote>. </emphasis> </para> <example> @@ -509,7 +509,7 @@ modparam("msilo", "send_time", 60) </para> <para> <emphasis> - Default value is <quote>5</quote>. + Default value is <quote>10</quote>. </emphasis> </para> <example>

1 0

git:5.2:5ac8002c: msilo: fix documentation for expire_time and clean_period to values from code
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: 5.2 Commit: 5ac8002cfe62bb825dbc2db75a47e38244b03404 URL: https://github.com/kamailio/kamailio/commit/5ac8002cfe62bb825dbc2db75a47e38… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T16:40:56+02:00 msilo: fix documentation for expire_time and clean_period to values from code (cherry picked from commit 492f6e1584d4a2a51c584ab5a71fe43822acef72) --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5ac8002cfe62bb825dbc2db75a47e38… Patch: https://github.com/kamailio/kamailio/commit/5ac8002cfe62bb825dbc2db75a47e38… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 7d53dba51b..885368ea36 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -465,7 +465,7 @@ modparam("msilo", "expire_time", 36000) </para> <para> <emphasis> - Default value is <quote>30</quote>. + Default value is <quote>60</quote>. </emphasis> </para> <example> @@ -509,7 +509,7 @@ modparam("msilo", "send_time", 60) </para> <para> <emphasis> - Default value is <quote>5</quote>. + Default value is <quote>10</quote>. </emphasis> </para> <example>

1 0

git:master:492f6e15: msilo: fix documentation for expire_time and clean_period to values from code
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: master Commit: 492f6e1584d4a2a51c584ab5a71fe43822acef72 URL: https://github.com/kamailio/kamailio/commit/492f6e1584d4a2a51c584ab5a71fe43… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T16:40:25+02:00 msilo: fix documentation for expire_time and clean_period to values from code --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/492f6e1584d4a2a51c584ab5a71fe43… Patch: https://github.com/kamailio/kamailio/commit/492f6e1584d4a2a51c584ab5a71fe43… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 7d53dba51b..885368ea36 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -465,7 +465,7 @@ modparam("msilo", "expire_time", 36000) </para> <para> <emphasis> - Default value is <quote>30</quote>. + Default value is <quote>60</quote>. </emphasis> </para> <example> @@ -509,7 +509,7 @@ modparam("msilo", "send_time", 60) </para> <para> <emphasis> - Default value is <quote>5</quote>. + Default value is <quote>10</quote>. </emphasis> </para> <example>

1 0

git:master:059eb6f1: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 14 Sep '19

14 Sep '19

Module: kamailio Branch: master Commit: 059eb6f10d604d253f642db608dbfd54aafa30df URL: https://github.com/kamailio/kamailio/commit/059eb6f10d604d253f642db608dbfd5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-14T15:16:50+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/059eb6f10d604d253f642db608dbfd5… Patch: https://github.com/kamailio/kamailio/commit/059eb6f10d604d253f642db608dbfd5… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 46a4627a32..aecc47fb70 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2248,8 +2248,8 @@ Chapter 2. Developer Guide NULL only for DLGCB_CREATED callback type, which is not a per dialog type. * int type - types of callbacks; more types may be register for the - same callback function; only DLGCB_CREATED must be register alone. - Possible types: + same callback function; only DLGCB_LOADED and DLGCB_CREATED must be + registered alone. Possible types: + DLGCB_LOADED + DLGCB_CREATED - called when a new dialog is created - it's a global type (not associated to any dialog)

1 0

git:master:0412210e: dialog: extend doc that DLGCB_LOADED needs to be loaded alone as well
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: master Commit: 0412210eeaf525359da614eb2f73ccf6e9291f7e URL: https://github.com/kamailio/kamailio/commit/0412210eeaf525359da614eb2f73ccf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T15:03:23+02:00 dialog: extend doc that DLGCB_LOADED needs to be loaded alone as well --- Modified: src/modules/dialog/doc/dialog_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/0412210eeaf525359da614eb2f73ccf… Patch: https://github.com/kamailio/kamailio/commit/0412210eeaf525359da614eb2f73ccf… --- diff --git a/src/modules/dialog/doc/dialog_devel.xml b/src/modules/dialog/doc/dialog_devel.xml index d00268b9b5..b29eb3af12 100644 --- a/src/modules/dialog/doc/dialog_devel.xml +++ b/src/modules/dialog/doc/dialog_devel.xml @@ -33,7 +33,7 @@ <listitem> <para><emphasis>int type</emphasis> - types of callbacks; more types may be register for the same callback function; only - DLGCB_CREATED must be register alone. Possible types: + DLGCB_LOADED and DLGCB_CREATED must be registered alone. Possible types: <itemizedlist> <listitem> <para><emphasis>DLGCB_LOADED</emphasis>

1 0

git:5.2:c6eab378: ims_isc: fixed the RURI trigger point match
by Henning Westerholt 13 Sep '19

13 Sep '19

Module: kamailio Branch: 5.2 Commit: c6eab3787b46f60e860ca7a90b6abf7c21be9f0e URL: https://github.com/kamailio/kamailio/commit/c6eab3787b46f60e860ca7a90b6abf7… Author: Jeff Gross <jeff(a)grosssoftware.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-13T21:32:55+02:00 ims_isc: fixed the RURI trigger point match - use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point (cherry picked from commit 36ee7fa70ee43cffc8e7f2c279fb97862daf3f9b) --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/c6eab3787b46f60e860ca7a90b6abf7… Patch: https://github.com/kamailio/kamailio/commit/c6eab3787b46f60e860ca7a90b6abf7… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index f02cf98bab..037d0507c7 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -189,22 +189,30 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { */ static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { char buf[256]; + char buf2[256]; regex_t comp; if (spt->request_uri.len >= sizeof(buf)) { - LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + LM_ERR("RURI regexp \"%.*s\" is too long to be compiled (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + if (msg->first_line.u.request.uri.len >= sizeof(buf2)) { + LM_ERR("RURI \"%.*s\" is too long to be processed (max %d bytes)\n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s, (int) (sizeof(buf2) - 1)); return FALSE; } /* compile the regex for content */ memcpy(buf, spt->request_uri.s, spt->request_uri.len); buf[spt->request_uri.len] = 0; - if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + if (regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); return FALSE; } - if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + memcpy(buf2, msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len); + buf2[msg->first_line.u.request.uri.len] = 0; + if (regexec(&(comp), buf2, 0, NULL, 0) == 0) //regex match { regfree(&(comp)); return TRUE;

1 0

git:5.1:9e239575: ims_isc: fixed the RURI trigger point match
by Henning Westerholt 13 Sep '19

13 Sep '19

Module: kamailio Branch: 5.1 Commit: 9e239575dbee0a33beffe9a60a916dd99d9f364e URL: https://github.com/kamailio/kamailio/commit/9e239575dbee0a33beffe9a60a916dd… Author: Jeff Gross <jeff(a)grosssoftware.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-13T21:32:59+02:00 ims_isc: fixed the RURI trigger point match - use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point (cherry picked from commit 36ee7fa70ee43cffc8e7f2c279fb97862daf3f9b) --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/9e239575dbee0a33beffe9a60a916dd… Patch: https://github.com/kamailio/kamailio/commit/9e239575dbee0a33beffe9a60a916dd… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index f02cf98bab..037d0507c7 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -189,22 +189,30 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { */ static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { char buf[256]; + char buf2[256]; regex_t comp; if (spt->request_uri.len >= sizeof(buf)) { - LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + LM_ERR("RURI regexp \"%.*s\" is too long to be compiled (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + if (msg->first_line.u.request.uri.len >= sizeof(buf2)) { + LM_ERR("RURI \"%.*s\" is too long to be processed (max %d bytes)\n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s, (int) (sizeof(buf2) - 1)); return FALSE; } /* compile the regex for content */ memcpy(buf, spt->request_uri.s, spt->request_uri.len); buf[spt->request_uri.len] = 0; - if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + if (regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); return FALSE; } - if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + memcpy(buf2, msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len); + buf2[msg->first_line.u.request.uri.len] = 0; + if (regexec(&(comp), buf2, 0, NULL, 0) == 0) //regex match { regfree(&(comp)); return TRUE;

1 0

[kamailio/kamailio] ims_isc: fixed the RURI trigger point match (#2065)
by grosssoftware 13 Sep '19

13 Sep '19

- use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point   #### 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/2065 -- Commit Summary -- * ims_isc: fixed the RURI trigger point match -- File Changes -- M src/modules/ims_isc/checker.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2065.patch https://github.com/kamailio/kamailio/pull/2065.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/2065

2 2

git:master:36ee7fa7: ims_isc: fixed the RURI trigger point match
by Henning Westerholt 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 36ee7fa70ee43cffc8e7f2c279fb97862daf3f9b URL: https://github.com/kamailio/kamailio/commit/36ee7fa70ee43cffc8e7f2c279fb978… Author: Jeff Gross <jeff(a)grosssoftware.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-13T21:30:23+02:00 ims_isc: fixed the RURI trigger point match - use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/36ee7fa70ee43cffc8e7f2c279fb978… Patch: https://github.com/kamailio/kamailio/commit/36ee7fa70ee43cffc8e7f2c279fb978… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index 07381c79ab..de325687c0 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -189,22 +189,30 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { */ static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { char buf[256]; + char buf2[256]; regex_t comp; if (spt->request_uri.len >= sizeof(buf)) { - LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + LM_ERR("RURI regexp \"%.*s\" is too long to be compiled (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + if (msg->first_line.u.request.uri.len >= sizeof(buf2)) { + LM_ERR("RURI \"%.*s\" is too long to be processed (max %d bytes)\n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s, (int) (sizeof(buf2) - 1)); return FALSE; } /* compile the regex for content */ memcpy(buf, spt->request_uri.s, spt->request_uri.len); buf[spt->request_uri.len] = 0; - if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + if (regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); return FALSE; } - if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + memcpy(buf2, msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len); + buf2[msg->first_line.u.request.uri.len] = 0; + if (regexec(&(comp), buf2, 0, NULL, 0) == 0) //regex match { regfree(&(comp)); return TRUE;

1 0

git:master:57332eb6: pkg/kamailio/deb: version set 5.3.0~pre1 [skip ci]
by Victor Seva 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 57332eb67ca2fc086c27b19332b16a1a826f03a7 URL: https://github.com/kamailio/kamailio/commit/57332eb67ca2fc086c27b19332b16a1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-09-13T14:30:30+02:00 pkg/kamailio/deb: version set 5.3.0~pre1 [skip ci] --- 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/57332eb67ca2fc086c27b19332b16a1… Patch: https://github.com/kamailio/kamailio/commit/57332eb67ca2fc086c27b19332b16a1…

1 0

git:master:a0ca4cd4: tls: openssl_mutex_shared - add a date to the note about libssl workaround validity
by GitHub 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: a0ca4cd43f098d10aa5aadcc18453cbd0120dcef URL: https://github.com/kamailio/kamailio/commit/a0ca4cd43f098d10aa5aadcc18453cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-13T13:39:23+02:00 tls: openssl_mutex_shared - add a date to the note about libssl workaround validity --- Modified: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/a0ca4cd43f098d10aa5aadcc18453cb… Patch: https://github.com/kamailio/kamailio/commit/a0ca4cd43f098d10aa5aadcc18453cb… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md index 0be8aaac64..d5002b3335 100644 --- a/src/modules/tls/utils/openssl_mutex_shared/README.md +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -1,9 +1,9 @@ # OpenSSL Shared Mutex # **IMPORTANT: the workaround of using this preloaded shared library is no longer -needed starting with Kamailio v5.3.0-pre1. The code of this shared library -has been included in the core of Kamailio and the same behaviour is now -achieved by default.** +needed starting with Kamailio v5.3.0-pre1 (git master branch after September 14, 2019). +The code of this shared library has been included in the core of Kamailio and the +same behaviour is now achieved by default.** This is a shared library required as a short term workaround for using Kamailio with OpenSSL (libssl) v1.1. It has to be pre-loaded before starting Kamailio.

1 0

git:master:321eb14d: tls: openssl_mutex_shared - note that its code was imported in the core
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 321eb14d23c42a1b22ff4d5a735247e4c53acde0 URL: https://github.com/kamailio/kamailio/commit/321eb14d23c42a1b22ff4d5a735247e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T13:11:09+02:00 tls: openssl_mutex_shared - note that its code was imported in the core --- Modified: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/321eb14d23c42a1b22ff4d5a735247e… Patch: https://github.com/kamailio/kamailio/commit/321eb14d23c42a1b22ff4d5a735247e… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md index 26f5de84b4..0be8aaac64 100644 --- a/src/modules/tls/utils/openssl_mutex_shared/README.md +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -1,5 +1,10 @@ # OpenSSL Shared Mutex # +**IMPORTANT: the workaround of using this preloaded shared library is no longer +needed starting with Kamailio v5.3.0-pre1. The code of this shared library +has been included in the core of Kamailio and the same behaviour is now +achieved by default.** + This is a shared library required as a short term workaround for using Kamailio with OpenSSL (libssl) v1.1. It has to be pre-loaded before starting Kamailio.

1 0

git:master:1185b5f9: Makefile.defs: version set to 5.3.0-pre1
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 1185b5f90eb3d608b66247dbec284d94188452e2 URL: https://github.com/kamailio/kamailio/commit/1185b5f90eb3d608b66247dbec284d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T13:07:51+02:00 Makefile.defs: version set to 5.3.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1185b5f90eb3d608b66247dbec284d9… Patch: https://github.com/kamailio/kamailio/commit/1185b5f90eb3d608b66247dbec284d9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2a8a80cb2b..fe0e4a90fb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:a8c811e6: core: main - functions to set PTHREAD_PROCESS_SHARED for pthread mutex and rwlock
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: a8c811e69e964821b73d0861a9547a301253d172 URL: https://github.com/kamailio/kamailio/commit/a8c811e69e964821b73d0861a9547a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T13:00:17+02:00 core: main - functions to set PTHREAD_PROCESS_SHARED for pthread mutex and rwlock - code relocated from src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c - simpler option to initialize kamailio with the workaround for libssl v1.1+ without using the preloaded library approach --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/a8c811e69e964821b73d0861a9547a3… Patch: https://github.com/kamailio/kamailio/commit/a8c811e69e964821b73d0861a9547a3… --- diff --git a/src/main.c b/src/main.c index 5af5284c55..03d39b46d4 100644 --- a/src/main.c +++ b/src/main.c @@ -30,6 +30,12 @@ * sip router core part. */ +#ifdef KSR_PTHREAD_MUTEX_SHARED +#define _GNU_SOURCE +#include <pthread.h> +#include <dlfcn.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -2814,3 +2820,72 @@ int main(int argc, char** argv) } return -1; } + + +#ifdef KSR_PTHREAD_MUTEX_SHARED + +/** + * code to set PTHREAD_PROCESS_SHARED attribute for phtread mutex to cope + * with libssl 1.1+ thread-only mutex initialization + */ + +#define SYMBOL_EXPORT __attribute__((visibility("default"))) + +int SYMBOL_EXPORT pthread_mutex_init (pthread_mutex_t *__mutex, + const pthread_mutexattr_t *__mutexattr) +{ + static int (*real_pthread_mutex_init)(pthread_mutex_t *__mutex, + const pthread_mutexattr_t *__mutexattr) = 0; + pthread_mutexattr_t attr; + int ret; + + if (!real_pthread_mutex_init) { + real_pthread_mutex_init = dlsym(RTLD_NEXT, "pthread_mutex_init"); + if (!real_pthread_mutex_init) { + return -1; + } + } + + if (__mutexattr) { + pthread_mutexattr_t attr = *__mutexattr; + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + return real_pthread_mutex_init(__mutex, &attr); + } + + pthread_mutexattr_init(&attr); + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + ret = real_pthread_mutex_init(__mutex, &attr); + pthread_mutexattr_destroy(&attr); + + return ret; +} + +int SYMBOL_EXPORT pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock, + const pthread_rwlockattr_t *__restrict __attr) +{ + static int (*real_pthread_rwlock_init)(pthread_rwlock_t *__restrict __rwlock, + const pthread_rwlockattr_t *__restrict __attr) = 0; + pthread_rwlockattr_t attr; + int ret; + + if (!real_pthread_rwlock_init) { + real_pthread_rwlock_init = dlsym(RTLD_NEXT, "pthread_rwlock_init"); + if (!real_pthread_rwlock_init) { + return -1; + } + } + + if (__attr) { + pthread_rwlockattr_t attr = *__attr; + pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + return real_pthread_rwlock_init(__rwlock, &attr); + } + + pthread_rwlockattr_init(&attr); + pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + ret = real_pthread_rwlock_init(__rwlock, &attr); + pthread_rwlockattr_destroy(&attr); + + return ret; +} +#endif

1 0

git:master:79619717: Makefile.defs: detect if libssl version is 1.1+
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 79619717aa67c219fc36dfaac8d06919b8f2018e URL: https://github.com/kamailio/kamailio/commit/79619717aa67c219fc36dfaac8d0691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T12:57:38+02:00 Makefile.defs: detect if libssl version is 1.1+ - link against pthread to be able to set PTHREAD_PROCESS_SHARED attribute for mutex and rwlock initialization --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/79619717aa67c219fc36dfaac8d0691… Patch: https://github.com/kamailio/kamailio/commit/79619717aa67c219fc36dfaac8d0691… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 69416e8003..2a8a80cb2b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -178,6 +178,42 @@ CC_EXTRA_OPTS ?= # extra LD command line options LD_EXTRA_OPTS ?= + +# enable workaround for libssl 1.1+ to set shared mutex attribute +LIBSSL_SET_MUTEX_SHARED ?= +ifneq ($(LIBSSL_SET_MUTEX_SHARED), 1) + +ifeq ($(CROSS_COMPILE),) +LIBSSL_PKGCONFIG=$(shell \ + if pkg-config --exists libssl; then \ + echo 'pkg-config libssl'; \ + fi) +endif + +ifneq ($(LIBSSL_PKGCONFIG),) + +# numerical version (good for comparisons: A.B.C => A*1000000+B*1000+C) +LIBSSL_VERNUM:= $(shell $(LIBSSL_PKGCONFIG) --modversion | sed -e 's/^[^0-9]*//' \ + -e 's/^$[0-9][0-9]*\(\.[0-9][0-9]*$*\).*$$/\1/g' | \ + (IFS=. read A B C D; R=0; \ + [ -n "$$A" ] && R=`expr $$R \* 1000 + $$A` && \ + [ -n "$$B" ] && R=`expr $$R \* 1000 + $$B` && \ + [ -n "$$C" ] && R=`expr $$R \* 1000 + $$C`; echo $$R ) ) + +# libssl version greater or equal than 1.1 +ifeq ($(shell [ $(LIBSSL_VERNUM) -ge 1001000 ] && echo libssl11plus), libssl11plus) +LIBSSL_SET_MUTEX_SHARED := 1 +endif + +endif + +endif + +ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) +CC_EXTRA_OPTS+= -pthread -DKSR_PTHREAD_MUTEX_SHARED +LD_EXTRA_OPTS+= -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions +endif + ifeq ($(OS), solaris) #use GNU versions INSTALL ?= ginstall

1 0

[kamailio/kamailio] pkg/kamailio: added rpm version and release configuration (#2050)
by sergey-safarov 13 Sep '19

13 Sep '19

#### 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 Allow update version information in RPM spec file You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2050 -- Commit Summary -- * pkg/kamailio: added rpm version and release configuration -- File Changes -- M pkg/kamailio/Makefile (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2050.patch https://github.com/kamailio/kamailio/pull/2050.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/2050

2 6

git:master:9f514da4: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 12 Sep '19

12 Sep '19

Module: kamailio Branch: master Commit: 9f514da4f0e601d246ffdeee837ca4c5f0488084 URL: https://github.com/kamailio/kamailio/commit/9f514da4f0e601d246ffdeee837ca4c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-12T23:47:23+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/9f514da4f0e601d246ffdeee837ca4c… Patch: https://github.com/kamailio/kamailio/commit/9f514da4f0e601d246ffdeee837ca4c… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 022c65f341..bd73411bae 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -684,7 +684,8 @@ modparam("acc", "early_media", 1) 6.2. failed_transaction_flag (integer) Per transaction flag which says if the transaction should be accounted - also in case of failure (status>=300). + also in case of failure (SIP status code >= 300). This flag triggers + accouting when the whole transaction fails (on the server side). Default value is not-set (no flag). @@ -818,12 +819,12 @@ modparam("acc", "log_flag", 2) Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial - forking and want to log all attempts. + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag). @@ -882,8 +883,14 @@ modparam("acc", "db_flag", 2) 6.16. db_missed_flag (integer) - Request flag which needs to be set to account missed calls -- database - specific. + Request flag which needs to be set to account missed calls via + database. This can be used to e.g. account failures during the call + setup phase from the callee (client) side, for example if you do + forking to several destinations. + + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag).

1 0

git:5.2:f7ad4bdc: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.2 Commit: f7ad4bdc2398d37d9226c7a07cdbe0fe604a9cba URL: https://github.com/kamailio/kamailio/commit/f7ad4bdc2398d37d9226c7a07cdbe0f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-12T23:47:08+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/f7ad4bdc2398d37d9226c7a07cdbe0f… Patch: https://github.com/kamailio/kamailio/commit/f7ad4bdc2398d37d9226c7a07cdbe0f… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 022c65f341..bd73411bae 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -684,7 +684,8 @@ modparam("acc", "early_media", 1) 6.2. failed_transaction_flag (integer) Per transaction flag which says if the transaction should be accounted - also in case of failure (status>=300). + also in case of failure (SIP status code >= 300). This flag triggers + accouting when the whole transaction fails (on the server side). Default value is not-set (no flag). @@ -818,12 +819,12 @@ modparam("acc", "log_flag", 2) Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial - forking and want to log all attempts. + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag). @@ -882,8 +883,14 @@ modparam("acc", "db_flag", 2) 6.16. db_missed_flag (integer) - Request flag which needs to be set to account missed calls -- database - specific. + Request flag which needs to be set to account missed calls via + database. This can be used to e.g. account failures during the call + setup phase from the callee (client) side, for example if you do + forking to several destinations. + + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag).

1 0

git:5.1:24ef2099: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.1 Commit: 24ef2099dedbf6d562a9cec52b6b1537ca86d8b0 URL: https://github.com/kamailio/kamailio/commit/24ef2099dedbf6d562a9cec52b6b153… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-12T23:46:53+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/24ef2099dedbf6d562a9cec52b6b153… Patch: https://github.com/kamailio/kamailio/commit/24ef2099dedbf6d562a9cec52b6b153… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index c8dd133d59..e7d0cfbeba 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -680,7 +680,8 @@ modparam("acc", "early_media", 1) 6.2. failed_transaction_flag (integer) Per transaction flag which says if the transaction should be accounted - also in case of failure (status>=300). + also in case of failure (SIP status code >= 300). This flag triggers + accouting when the whole transaction fails (on the server side). Default value is not-set (no flag). @@ -814,12 +815,12 @@ modparam("acc", "log_flag", 2) Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial - forking and want to log all attempts. + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag). @@ -878,8 +879,14 @@ modparam("acc", "db_flag", 2) 6.16. db_missed_flag (integer) - Request flag which needs to be set to account missed calls -- database - specific. + Request flag which needs to be set to account missed calls via + database. This can be used to e.g. account failures during the call + setup phase from the callee (client) side, for example if you do + forking to several destinations. + + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag).

1 0

git:5.1:468403d9: acc: extend documentation related to flag usage
by Henning Westerholt 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.1 Commit: 468403d98d8aec4a833e3f9a9be1913efe9897c8 URL: https://github.com/kamailio/kamailio/commit/468403d98d8aec4a833e3f9a9be1913… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-12T23:40:58+02:00 acc: extend documentation related to flag usage (cherry picked from commit 40905046baab49fb3baf0f2fdded1307b023d08a) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/468403d98d8aec4a833e3f9a9be1913… Patch: https://github.com/kamailio/kamailio/commit/468403d98d8aec4a833e3f9a9be1913… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 2588243f7c..36753ae10c 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -489,7 +489,9 @@ modparam("acc", "early_media", 1) <title><varname>failed_transaction_flag</varname> (integer)</title> <para> Per transaction flag which says if the transaction should be - accounted also in case of failure (status>=300). + accounted also in case of failure (SIP status code >= 300). + This flag triggers accouting when the whole transaction fails + (on the server side). </para> <para> Default value is not-set (no flag). @@ -679,12 +681,12 @@ modparam("acc", "log_flag", 2) <para> Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. </para> <para> - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial forking and want to log all attempts. </para> <para> @@ -775,8 +777,15 @@ modparam("acc", "db_flag", 2) <section id="acc.p.db_missed_flag"> <title><varname>db_missed_flag</varname> (integer)</title> <para> - Request flag which needs to be set to account missed - calls -- database specific. + Request flag which needs to be set to account missed calls via database. + This can be used to e.g. account failures during the call setup phase + from the callee (client) side, for example if you do forking to several + destinations. + </para> + <para> + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial + forking and want to log all attempts. </para> <para> Default value is not-set (no flag).

1 0

git:5.2:daab9563: acc: extend documentation related to flag usage
by Henning Westerholt 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.2 Commit: daab9563d3edcdf59028ca5b4004bc1d6edecced URL: https://github.com/kamailio/kamailio/commit/daab9563d3edcdf59028ca5b4004bc1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-12T23:40:52+02:00 acc: extend documentation related to flag usage (cherry picked from commit 40905046baab49fb3baf0f2fdded1307b023d08a) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/daab9563d3edcdf59028ca5b4004bc1… Patch: https://github.com/kamailio/kamailio/commit/daab9563d3edcdf59028ca5b4004bc1… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 61e27a196e..a0794ca562 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -489,7 +489,9 @@ modparam("acc", "early_media", 1) <title><varname>failed_transaction_flag</varname> (integer)</title> <para> Per transaction flag which says if the transaction should be - accounted also in case of failure (status>=300). + accounted also in case of failure (SIP status code >= 300). + This flag triggers accouting when the whole transaction fails + (on the server side). </para> <para> Default value is not-set (no flag). @@ -679,12 +681,12 @@ modparam("acc", "log_flag", 2) <para> Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. </para> <para> - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial forking and want to log all attempts. </para> <para> @@ -775,8 +777,15 @@ modparam("acc", "db_flag", 2) <section id="acc.p.db_missed_flag"> <title><varname>db_missed_flag</varname> (integer)</title> <para> - Request flag which needs to be set to account missed - calls -- database specific. + Request flag which needs to be set to account missed calls via database. + This can be used to e.g. account failures during the call setup phase + from the callee (client) side, for example if you do forking to several + destinations. + </para> + <para> + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial + forking and want to log all attempts. </para> <para> Default value is not-set (no flag).

1 0

git:master:40905046: acc: extend documentation related to flag usage
by Henning Westerholt 12 Sep '19

12 Sep '19

Module: kamailio Branch: master Commit: 40905046baab49fb3baf0f2fdded1307b023d08a URL: https://github.com/kamailio/kamailio/commit/40905046baab49fb3baf0f2fdded130… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-12T21:53:21+02:00 acc: extend documentation related to flag usage --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40905046baab49fb3baf0f2fdded130… Patch: https://github.com/kamailio/kamailio/commit/40905046baab49fb3baf0f2fdded130… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 61e27a196e..a0794ca562 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -489,7 +489,9 @@ modparam("acc", "early_media", 1) <title><varname>failed_transaction_flag</varname> (integer)</title> <para> Per transaction flag which says if the transaction should be - accounted also in case of failure (status>=300). + accounted also in case of failure (SIP status code >= 300). + This flag triggers accouting when the whole transaction fails + (on the server side). </para> <para> Default value is not-set (no flag). @@ -679,12 +681,12 @@ modparam("acc", "log_flag", 2) <para> Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. </para> <para> - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial forking and want to log all attempts. </para> <para> @@ -775,8 +777,15 @@ modparam("acc", "db_flag", 2) <section id="acc.p.db_missed_flag"> <title><varname>db_missed_flag</varname> (integer)</title> <para> - Request flag which needs to be set to account missed - calls -- database specific. + Request flag which needs to be set to account missed calls via database. + This can be used to e.g. account failures during the call setup phase + from the callee (client) side, for example if you do forking to several + destinations. + </para> + <para> + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial + forking and want to log all attempts. </para> <para> Default value is not-set (no flag).

1 0

git:master:8a678c24: core: main - set default send tcp sockets to tls if no tcp is available
by Daniel-Constantin Mierla 11 Sep '19

11 Sep '19

Module: kamailio Branch: master Commit: 8a678c244aa34cf352fb614693c6e6d505ce2dfe URL: https://github.com/kamailio/kamailio/commit/8a678c244aa34cf352fb614693c6e6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-11T12:05:18+02:00 core: main - set default send tcp sockets to tls if no tcp is available --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/8a678c244aa34cf352fb614693c6e6d… Patch: https://github.com/kamailio/kamailio/commit/8a678c244aa34cf352fb614693c6e6d… --- diff --git a/src/main.c b/src/main.c index ba64af67db..5af5284c55 100644 --- a/src/main.c +++ b/src/main.c @@ -1567,12 +1567,20 @@ int main_loop(void) /* get first ipv4/ipv6 socket*/ if ((si->address.af==AF_INET)&& ((sendipv4_tls==0) || - (sendipv4_tls->flags&(SI_IS_LO|SI_IS_MCAST)))) + (sendipv4_tls->flags&(SI_IS_LO|SI_IS_MCAST)))) { sendipv4_tls=si; + if(sendipv4_tcp==0) { + sendipv4_tcp=si; + } + } if( ((sendipv6_tls==0) || (sendipv6_tls->flags&(SI_IS_LO|SI_IS_MCAST))) && - (si->address.af==AF_INET6)) + (si->address.af==AF_INET6)) { sendipv6_tls=si; + if(sendipv6_tcp==0) { + sendipv6_tcp=si; + } + } } } #endif /* USE_TLS */

1 0

git:master:f40df55a: core: tcp - set default local socket for tls when lookup fails
by Daniel-Constantin Mierla 11 Sep '19

11 Sep '19

Module: kamailio Branch: master Commit: f40df55af2f50789ca4a8b89a213f7323b1932f2 URL: https://github.com/kamailio/kamailio/commit/f40df55af2f50789ca4a8b89a213f73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-11T12:42:58+02:00 core: tcp - set default local socket for tls when lookup fails - GH #2028 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/f40df55af2f50789ca4a8b89a213f73… Patch: https://github.com/kamailio/kamailio/commit/f40df55af2f50789ca4a8b89a213f73… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 668103e676..e86fc872a8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1373,18 +1373,31 @@ inline static int tcp_do_connect( union sockaddr_union* server, su2ip_addr(&ip, &my_name); find_socket: #ifdef USE_TLS - if (unlikely(type==PROTO_TLS)) + if (unlikely(type==PROTO_TLS)) { *res_si=find_si(&ip, 0, PROTO_TLS); - else -#endif + } else { *res_si=find_si(&ip, 0, PROTO_TCP); - + } +#else + *res_si=find_si(&ip, 0, PROTO_TCP); +#endif + if (unlikely(*res_si==0)){ LM_WARN("%s: could not find corresponding" " listening socket for %s, using default...\n", su2a(server, sizeof(*server)), ip_addr2a(&ip)); +#ifdef USE_TLS + if (unlikely(type==PROTO_TLS)) { + if (server->s.sa_family==AF_INET) *res_si=sendipv4_tls; + else *res_si=sendipv6_tls; + } else { + if (server->s.sa_family==AF_INET) *res_si=sendipv4_tcp; + else *res_si=sendipv6_tcp; + } +#else if (server->s.sa_family==AF_INET) *res_si=sendipv4_tcp; else *res_si=sendipv6_tcp; +#endif } *res_local_addr=*from; return s;

1 0

git:master:9d8f6e25: core: safety protection on handing incoming messages without setting local socket
by Daniel-Constantin Mierla 11 Sep '19

11 Sep '19

Module: kamailio Branch: master Commit: 9d8f6e25e30a48e6a1c55cfa112317b3da42207a URL: https://github.com/kamailio/kamailio/commit/9d8f6e25e30a48e6a1c55cfa112317b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-11T09:37:00+02:00 core: safety protection on handing incoming messages without setting local socket --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/9d8f6e25e30a48e6a1c55cfa112317b… Patch: https://github.com/kamailio/kamailio/commit/9d8f6e25e30a48e6a1c55cfa112317b… --- diff --git a/src/core/receive.c b/src/core/receive.c index 33dd7f17eb..b780440030 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -221,7 +221,7 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) * WARNING: buf must be 0 terminated (buf[len]=0) or some things might * break (e.g.: modules/textops) */ -int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) +int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) { struct sip_msg *msg; struct run_act_ctx ctx; @@ -239,6 +239,12 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) int errsipmsg = 0; int exectime = 0; + if(rcv_info->bind_address==NULL) { + LM_ERR("critical - incoming message without local socket [%.*s ...]\n", + (len>128)?128:len, buf); + return -1; + } + if(ksr_evrt_received_mode!=0) { if(ksr_evrt_received(buf, len, rcv_info)<0) { LM_DBG("dropping the received message\n");

1 0

git:master:ab0a69eb: pkg/kamailio: added rpm spec version and release configuration [skip ci]
by Sergey Safarov 10 Sep '19

10 Sep '19

Module: kamailio Branch: master Commit: ab0a69eb01953be97ccdfdb230e5af06bac9649c URL: https://github.com/kamailio/kamailio/commit/ab0a69eb01953be97ccdfdb230e5af0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-10T13:43:39+03:00 pkg/kamailio: added rpm spec version and release configuration [skip ci] --- Modified: pkg/kamailio/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ab0a69eb01953be97ccdfdb230e5af0… Patch: https://github.com/kamailio/kamailio/commit/ab0a69eb01953be97ccdfdb230e5af0… --- diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile index 63c024c158..a221ff085c 100644 --- a/pkg/kamailio/Makefile +++ b/pkg/kamailio/Makefile @@ -6,8 +6,10 @@ else ifneq ($(MAKECMDGOALS),cfg) $(error Please start "make cfg" first) endif -RPMBUILD_TOP := /tmp/rpmbuild -DIST_ARCHIVE = ${shell echo "kamailio-$(RELEASE)_src.tar.gz" | sed -e "s/-dev[0-9]//" } +RPMBUILD_TOP := /tmp/kamailio_rpmbuild +RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" } +RPM_REL = ${shell echo "$(RELEASE)." | grep -o -P "dev[0-9]\." } +DIST_ARCHIVE = ${shell echo "kamailio-$(RPM_VER)_src.tar.gz"} APK_VERSION = ${shell echo "$(RELEASE)" | grep -o "^[0-9.]*"} RPMBUILD_OPT= --define "_topdir $(RPMBUILD_TOP)" GIT_TAG = ${shell git rev-parse HEAD 2> /dev/null} @@ -38,7 +40,10 @@ apk: src.rpm: tar mkdir -p ${RPMBUILD_TOP}/SOURCES mv ../../kamailio-$(RELEASE)_src.tar.gz ${RPMBUILD_TOP}/SOURCES/${DIST_ARCHIVE} - sed -i -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' obs/kamailio.spec + sed -e 's/%define ver .*/%define ver ${RPM_VER}/' \ + -e 's/%define rel .*/%define rel ${RPM_REL}0%{dist}/' \ + -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' \ + -i obs/kamailio.spec rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../.. rm -Rf ${RPMBUILD_TOP}

1 0

[kamailio/kamailio] cfg parse error behaviour on a mismatch of #!ifdef/#!endif statements (#2057)
by Henning Westerholt 10 Sep '19

10 Sep '19

The #!ifdef/#endif statement parsing of the kamailio.cfg does not work correctly on a mismatch of #!ifdef/#!define statements. In some cases will just ignore the #!defines and parses the cfg file without the statements. version: kamailio 5.3.0-pre0 (x86_64/linux) ed10d7 > henning@linux:~/repositories/kamailio/src> ./kamailio -c -f ../etc/test-define.cfg > 0(9501) CRITICAL: <core> [core/cfg.y:3539]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/src/../etc/test-define.cfg, line 12, column 8: syntax error > 0(9501) CRITICAL: <core> [core/cfg.y:3539]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/src/../etc/test-define.cfg, line 12, column 8: unknown config variable > 0(9501) CRITICAL: <core> [core/cfg.y:3536]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/src/../etc/test-define.cfg, line 12, column 9-11: > ERROR: bad config file (3 errors) Test cfg to show the problem: ``` henning@linux:~/repositories/kamailio/etc> cat test-define.cfg #!KAMAILIO #!define foo #!ifdef foobar1 #!ifdef foobar2 #!endif #!endif #!endif #!ifdef bar invalid=123 #else children=8 #!endif request_route { ; } ``` The "bar" condition is parsed, even if the #!define was not set. The WARN message is also not shown in this error case. Probably the easist fix would be to stop kamailio startup on a mismatch of #!ifdef/#endif statements and output ERROR instead of the current WARN. -- 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/2057

2 10

git:5.1:26da74e4: core: ensure index of preprocessor directive conditions is not negative
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: 5.1 Commit: 26da74e4f8af192d876ac1d78eee9319f378c154 URL: https://github.com/kamailio/kamailio/commit/26da74e4f8af192d876ac1d78eee931… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:52:15+02:00 core: ensure index of preprocessor directive conditions is not negative - avoid accessing the array at negative index for else processing (cherry picked from commit 8f6e826576e52270f21c22a7d94b3026cc22c172) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/26da74e4f8af192d876ac1d78eee931… Patch: https://github.com/kamailio/kamailio/commit/26da74e4f8af192d876ac1d78eee931… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index cd6808d063..c470232067 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1896,14 +1896,24 @@ static void pp_ifdef() static void pp_else() { + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } pp_ifdef_stack[pp_sptr-1] ^= 1; pp_update_state(); } static void pp_endif() { - pp_sptr--; pp_ifdef_level_update(-1); + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } + pp_sptr--; pp_update_state(); }

1 0

git:5.2:71efcfbb: core: ensure index of preprocessor directive conditions is not negative
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: 5.2 Commit: 71efcfbb059e72cb05572ef7d3f58ac2e7dba397 URL: https://github.com/kamailio/kamailio/commit/71efcfbb059e72cb05572ef7d3f58ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:52:11+02:00 core: ensure index of preprocessor directive conditions is not negative - avoid accessing the array at negative index for else processing (cherry picked from commit 8f6e826576e52270f21c22a7d94b3026cc22c172) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/71efcfbb059e72cb05572ef7d3f58ac… Patch: https://github.com/kamailio/kamailio/commit/71efcfbb059e72cb05572ef7d3f58ac… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 6a0d23d76f..6aa890f155 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1922,14 +1922,24 @@ static void pp_ifdef() static void pp_else() { + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } pp_ifdef_stack[pp_sptr-1] ^= 1; pp_update_state(); } static void pp_endif() { - pp_sptr--; pp_ifdef_level_update(-1); + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } + pp_sptr--; pp_update_state(); }

1 0

git:5.1:ee4f8d48: nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062)
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: 5.1 Commit: ee4f8d48806c5f9ad324de1c121b73222a4ef783 URL: https://github.com/kamailio/kamailio/commit/ee4f8d48806c5f9ad324de1c121b732… Author: Pintu Lohar <plohar(a)sk.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:17:46+02:00 nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062) - Allocated buffer is not freed when contact fetch is failed - Leak frequently occur when database disconnect and reconnect (cherry picked from commit 79fecc643d0a17b4de25f54ae269d1bee1f0cb00) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ee4f8d48806c5f9ad324de1c121b732… Patch: https://github.com/kamailio/kamailio/commit/ee4f8d48806c5f9ad324de1c121b732… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100644 new mode 100755 index c616aa42eb..47584d2ac8 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1953,6 +1953,8 @@ static void nh_timer(unsigned int ticks, void *timer_idx) + iteration, natping_processes * natping_interval, options); if(rval < 0) { + if(buf != NULL) + pkg_free(buf); LM_ERR("failed to fetch contacts\n"); goto done; }

1 0

git:5.2:79dd00cd: nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062)
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: 5.2 Commit: 79dd00cdb3f02868e847c6c20932360c403a73d0 URL: https://github.com/kamailio/kamailio/commit/79dd00cdb3f02868e847c6c20932360… Author: Pintu Lohar <plohar(a)sk.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:17:42+02:00 nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062) - Allocated buffer is not freed when contact fetch is failed - Leak frequently occur when database disconnect and reconnect (cherry picked from commit 79fecc643d0a17b4de25f54ae269d1bee1f0cb00) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/79dd00cdb3f02868e847c6c20932360… Patch: https://github.com/kamailio/kamailio/commit/79dd00cdb3f02868e847c6c20932360… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100644 new mode 100755 index 27015b7bd8..f78878a0b0 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1951,6 +1951,8 @@ static void nh_timer(unsigned int ticks, void *timer_idx) + iteration, natping_processes * natping_interval, options); if(rval < 0) { + if(buf != NULL) + pkg_free(buf); LM_ERR("failed to fetch contacts\n"); goto done; }

1 0

git:master:79fecc64: nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062)
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: master Commit: 79fecc643d0a17b4de25f54ae269d1bee1f0cb00 URL: https://github.com/kamailio/kamailio/commit/79fecc643d0a17b4de25f54ae269d1b… Author: Pintu Lohar <plohar(a)sk.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:15:26+02:00 nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062) - Allocated buffer is not freed when contact fetch is failed - Leak frequently occur when database disconnect and reconnect --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/79fecc643d0a17b4de25f54ae269d1b… Patch: https://github.com/kamailio/kamailio/commit/79fecc643d0a17b4de25f54ae269d1b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100644 new mode 100755 index 4426b93478..e77c9470a8 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2003,6 +2003,8 @@ static void nh_timer(unsigned int ticks, void *timer_idx) + iteration, natping_processes * natping_interval, options); if(rval < 0) { + if(buf != NULL) + pkg_free(buf); LM_ERR("failed to fetch contacts\n"); goto done; }

1 0

[kamailio/kamailio] nathelper: Fixed memory leak (#2062)
by pintulohargcetts 10 Sep '19

10 Sep '19

- Allocated buffer is not freed when contact fetch is failed - Leak frequently occurs when database disconnects and reconnects   #### 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) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Found the leak during stress test and intentionally disconnecting database access You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2062 -- Commit Summary -- * nathelper: Fixed memory leak -- File Changes -- M src/modules/nathelper/nathelper.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2062.patch https://github.com/kamailio/kamailio/pull/2062.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/2062

2 2

git:5.2:d128b317: db_mysql: database URL supports IPv6 address as hostname
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: 5.2 Commit: d128b3170c6e82ecd5751351885f9098490068f5 URL: https://github.com/kamailio/kamailio/commit/d128b3170c6e82ecd5751351885f909… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:53:50+02:00 db_mysql: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit a7588f382605991bef4499de8c89b10a9468c8cf) --- Modified: src/modules/db_mysql/my_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d128b3170c6e82ecd5751351885f909… Patch: https://github.com/kamailio/kamailio/commit/d128b3170c6e82ecd5751351885f909… --- diff --git a/src/modules/db_mysql/my_uri.c b/src/modules/db_mysql/my_uri.c index 8ad5b60b61..1da887080a 100644 --- a/src/modules/db_mysql/my_uri.c +++ b/src/modules/db_mysql/my_uri.c @@ -95,12 +95,13 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char* begin; char* prev_token; @@ -156,6 +157,11 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; @@ -184,19 +190,33 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; case '/': - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

1 0

git:5.2:d6bc471a: db_postgres: database URL supports IPv6 address as hostname
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: 5.2 Commit: d6bc471aa41447d605eab42ee0596a2e47e3be29 URL: https://github.com/kamailio/kamailio/commit/d6bc471aa41447d605eab42ee0596a2… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:54:00+02:00 db_postgres: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit f99b4926c817e181f83f92ffa15510ff133d0a15) --- Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d6bc471aa41447d605eab42ee0596a2… Patch: https://github.com/kamailio/kamailio/commit/d6bc471aa41447d605eab42ee0596a2… --- diff --git a/src/modules/db_postgres/pg_uri.c b/src/modules/db_postgres/pg_uri.c index 3e4f9a32bc..ce7ac1d989 100644 --- a/src/modules/db_postgres/pg_uri.c +++ b/src/modules/db_postgres/pg_uri.c @@ -109,12 +109,13 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char *begin; char *prev_token; @@ -172,6 +173,11 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) @@ -212,9 +218,14 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; @@ -223,7 +234,7 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) break; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if(dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) @@ -233,6 +244,15 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

1 0

git:5.2:5a4debab: lib: database URL supports IPv6 address as hostname
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: 5.2 Commit: 5a4debabd3c6e997200947453503a972b9dcab0f URL: https://github.com/kamailio/kamailio/commit/5a4debabd3c6e997200947453503a97… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:53:21+02:00 lib: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit 9e29e262f0107cedbf2e2d61d045b05c5a5fc410) --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/5a4debabd3c6e997200947453503a97… Patch: https://github.com/kamailio/kamailio/commit/5a4debabd3c6e997200947453503a97… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index ef985e52ad..8a43def2d9 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -100,12 +100,13 @@ static int parse_db_url(struct db_id* id, const str* url) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - unsigned int len, i, j, a, foundanother; + unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; @@ -188,6 +189,11 @@ static int parse_db_url(struct db_id* id, const str* url) begin = url->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; @@ -224,19 +230,33 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST: switch(url->s[i]) { + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; begin = url->s + i + 1; break; case '/': - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(url->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(url->s[i]) { case '/':

1 0

[kamailio/kamailio] db can't parse ipv6 address from config (#2060)
by Alexey Vasilyev 09 Sep '19

09 Sep '19

### Description If in kamailio.cfg I write IPv6 address for Database URL like this: ``` #!ifndef DBURL #!define DBURL "mysql://kamailio:kamailiorw@[2001:5c8:4e00:11:a213:ba2d:579a:3e3d]/kamailio" #!endif ``` Then kamailio can't connect to database. #### Reproduction Just try to use database server with IPv6-address in kamailio.cfg #### Log Messages ``` Sep 8 14:35:40 c7-01 /sbin/kamailio[10680]: ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Unknown MySQL server host '[2001' (2) Sep 8 14:35:40 c7-01 /sbin/kamailio[10680]: ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool Sep 8 14:35:40 c7-01 /sbin/kamailio[10680]: ERROR: usrloc [dlist.c:646]: register_udomain(): failed to open database connection ``` ### Possible Solutions Correct parsing of config file. ### Additional Information ``` version: kamailio 5.3.0-dev7 (x86_64/linux) 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. ``` * **Operating System**: CentOS 7 ``` Linux sip.aaa.de 3.10.0-957.27.2.el7.x86_64 #1 SMP Mon Jul 29 17:46:05 UTC 2019 x86_64 x86_64 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/2060

2 2

[kamailio/kamailio] Db ipv6-address parsing in config file (#2061)
by Alexey Vasilyev 09 Sep '19

09 Sep '19

#### 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 - [x] Related to issue #2060 #### Description Added parsing of IPv6 address in config file for DB URL. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2061 -- Commit Summary -- * lib: database URL supports IPv6 address as hostname * db_mysql: database URL supports IPv6 address as hostname * db_postgres: database URL supports IPv6 address as hostname -- File Changes -- M src/lib/srdb1/db_id.c (26) M src/modules/db_mysql/my_uri.c (26) M src/modules/db_postgres/pg_uri.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2061.patch https://github.com/kamailio/kamailio/pull/2061.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/2061

3 5

git:master:f99b4926: db_postgres: database URL supports IPv6 address as hostname
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: f99b4926c817e181f83f92ffa15510ff133d0a15 URL: https://github.com/kamailio/kamailio/commit/f99b4926c817e181f83f92ffa15510f… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:51:59+02:00 db_postgres: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname --- Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/f99b4926c817e181f83f92ffa15510f… Patch: https://github.com/kamailio/kamailio/commit/f99b4926c817e181f83f92ffa15510f… --- diff --git a/src/modules/db_postgres/pg_uri.c b/src/modules/db_postgres/pg_uri.c index 89c12dc069..50132c16f9 100644 --- a/src/modules/db_postgres/pg_uri.c +++ b/src/modules/db_postgres/pg_uri.c @@ -110,12 +110,13 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char *begin; char *prev_token; @@ -173,6 +174,11 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) @@ -213,9 +219,14 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; @@ -224,7 +235,7 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) break; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if(dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) @@ -234,6 +245,15 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

1 0

git:master:9e29e262: lib: database URL supports IPv6 address as hostname
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 9e29e262f0107cedbf2e2d61d045b05c5a5fc410 URL: https://github.com/kamailio/kamailio/commit/9e29e262f0107cedbf2e2d61d045b05… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:51:59+02:00 lib: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/9e29e262f0107cedbf2e2d61d045b05… Patch: https://github.com/kamailio/kamailio/commit/9e29e262f0107cedbf2e2d61d045b05… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 35bf228a8f..74788ff9bd 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -102,12 +102,13 @@ static int parse_db_url(struct db_id* id, const str* url) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - unsigned int len, i, j, a, foundanother; + unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; @@ -190,6 +191,11 @@ static int parse_db_url(struct db_id* id, const str* url) begin = url->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; @@ -226,19 +232,33 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST: switch(url->s[i]) { + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; begin = url->s + i + 1; break; case '/': - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(url->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(url->s[i]) { case '/':

1 0

git:master:a7588f38: db_mysql: database URL supports IPv6 address as hostname
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: a7588f382605991bef4499de8c89b10a9468c8cf URL: https://github.com/kamailio/kamailio/commit/a7588f382605991bef4499de8c89b10… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:51:59+02:00 db_mysql: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname --- Modified: src/modules/db_mysql/my_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/a7588f382605991bef4499de8c89b10… Patch: https://github.com/kamailio/kamailio/commit/a7588f382605991bef4499de8c89b10… --- diff --git a/src/modules/db_mysql/my_uri.c b/src/modules/db_mysql/my_uri.c index 48267ba95c..8ab819e3ed 100644 --- a/src/modules/db_mysql/my_uri.c +++ b/src/modules/db_mysql/my_uri.c @@ -96,12 +96,13 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char* begin; char* prev_token; @@ -157,6 +158,11 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; @@ -185,19 +191,33 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; case '/': - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

1 0

git:master:68df10a2: Revert "github: small additition related to file line endings and windows editors"
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 68df10a2e8cb47d9e788a8bbc38e1f7be91cea78 URL: https://github.com/kamailio/kamailio/commit/68df10a2e8cb47d9e788a8bbc38e1f7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:35:49+02:00 Revert "github: small additition related to file line endings and windows editors" - This reverts commit d80bccc3b85256fe0d440cc47c90fc1020ae1d8d. - not needed anymore, git should take care of this automatically now --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/68df10a2e8cb47d9e788a8bbc38e1f7… Patch: https://github.com/kamailio/kamailio/commit/68df10a2e8cb47d9e788a8bbc38e1f7… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 28c16586a7..ea6ba9cdd8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -65,8 +65,6 @@ and commit history, there are several *rules* required for each contribution. * code **should** be formatted with **clang-format** or to match the style of the component that the commit applies to. The `.clang-format` file is part of Kamailio source code tree, in the root folder. - * code **should** be use Linux style line endings and not Windows style - (CRLF). If you use a Windows editor, please configure it this way. ### Commit Message Rules ###

1 0

git:master:1b85430f: lost: added generic P-A-I body parsing
by wkampich 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 1b85430f6c783ad73ad29596dbd77a54773b5030 URL: https://github.com/kamailio/kamailio/commit/1b85430f6c783ad73ad29596dbd77a5… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: wkampich <wolfgang.kampichler(a)gmail.com> Date: 2019-09-06T16:24:02+02:00 lost: added generic P-A-I body parsing - the P-A-I body parsing function now uses parse_to() to allow display name and uri params in the P-A-I body. - besides: code refactoring and clean up log output. --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/1b85430f6c783ad73ad29596dbd77a5… Patch: https://github.com/kamailio/kamailio/commit/1b85430f6c783ad73ad29596dbd77a5…

2 2

git:master:6ca88a4d: git: add .gitattributes file to normalize line endings for new added text files
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 6ca88a4df74c095dac919efae6f74190fc44999b URL: https://github.com/kamailio/kamailio/commit/6ca88a4df74c095dac919efae6f7419… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:29:18+02:00 git: add .gitattributes file to normalize line endings for new added text files --- Added: .gitattributes --- Diff: https://github.com/kamailio/kamailio/commit/6ca88a4df74c095dac919efae6f7419… Patch: https://github.com/kamailio/kamailio/commit/6ca88a4df74c095dac919efae6f7419… --- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..4b13bce0f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,31 @@ +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +# +# scripts +*.sh text +*.py text +*.pl text +# source code +*.c text +*.h text +*.cpp +# documentation +*.xml text +*.xsl text +*.xslt text +README text +Changelog text +*.md text +# build and packaging +Makefile* text +*.init text +*.service text +*.spec text +*.sysconfig text +*.default text +*.tmpfiles text +*.lintian-overrides text +*.in text +changelog text +control text +copyright text

1 0

git:master:162c32a3: sca: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 162c32a32971b0a2e1681eefd9f9ab20f482cc01 URL: https://github.com/kamailio/kamailio/commit/162c32a32971b0a2e1681eefd9f9ab2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:29:09+02:00 sca: end of line normalization to linux line ending format --- Modified: src/modules/sca/sca_util.c --- Diff: https://github.com/kamailio/kamailio/commit/162c32a32971b0a2e1681eefd9f9ab2… Patch: https://github.com/kamailio/kamailio/commit/162c32a32971b0a2e1681eefd9f9ab2…

1 0

git:master:73207ad1: lost: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 73207ad1038aa50c502bb29bca24913f11e49c3a URL: https://github.com/kamailio/kamailio/commit/73207ad1038aa50c502bb29bca24913… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:28:45+02:00 lost: end of line normalization to linux line ending format --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/pidf.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/73207ad1038aa50c502bb29bca24913… Patch: https://github.com/kamailio/kamailio/commit/73207ad1038aa50c502bb29bca24913…

1 0

git:master:da7ce6eb: janssonrpcc: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: da7ce6eba4f7ec2716dcb5f9084e0830fa2ac716 URL: https://github.com/kamailio/kamailio/commit/da7ce6eba4f7ec2716dcb5f9084e083… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:28:22+02:00 janssonrpcc: end of line normalization to linux line ending format --- Modified: src/modules/janssonrpcc/unit_tests/Makefile Modified: src/modules/janssonrpcc/unit_tests/seatest/seatest.c Modified: src/modules/janssonrpcc/unit_tests/seatest/seatest.h --- Diff: https://github.com/kamailio/kamailio/commit/da7ce6eba4f7ec2716dcb5f9084e083… Patch: https://github.com/kamailio/kamailio/commit/da7ce6eba4f7ec2716dcb5f9084e083…

1 0

git:master:904af9ae: ims_registrar_scscf: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 904af9ae6c317c095bb37ed741c7a7daf0ecddaf URL: https://github.com/kamailio/kamailio/commit/904af9ae6c317c095bb37ed741c7a7d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:28:04+02:00 ims_registrar_scscf: end of line normalization to linux line ending format --- Modified: src/modules/ims_registrar_scscf/CxDataType_Rel7.xsd --- Diff: https://github.com/kamailio/kamailio/commit/904af9ae6c317c095bb37ed741c7a7d… Patch: https://github.com/kamailio/kamailio/commit/904af9ae6c317c095bb37ed741c7a7d…

1 0

git:master:00f082d1: pkg: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 00f082d1a8b49241b928a9cc5439b6ef96e12b40 URL: https://github.com/kamailio/kamailio/commit/00f082d1a8b49241b928a9cc5439b6e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:27:30+02:00 pkg: end of line normalization to linux line ending format --- Modified: pkg/kamailio/solaris/kamailio-manifest.xml --- Diff: https://github.com/kamailio/kamailio/commit/00f082d1a8b49241b928a9cc5439b6e… Patch: https://github.com/kamailio/kamailio/commit/00f082d1a8b49241b928a9cc5439b6e… --- diff --git a/pkg/kamailio/solaris/kamailio-manifest.xml b/pkg/kamailio/solaris/kamailio-manifest.xml index 2ac20890d3..81ee3a3c07 100644 --- a/pkg/kamailio/solaris/kamailio-manifest.xml +++ b/pkg/kamailio/solaris/kamailio-manifest.xml @@ -1,43 +1,43 @@ -<?xml version="1.0"?> -<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> - - - -<service_bundle type='manifest' name='kamailio'> - <service name='network/kamailio' type='service' version='1'> - <create_default_instance enabled='false' /> - <single_instance/> - - <dependency name='multi-user' grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/milestone/multi-user' /> - </dependency> - - <dependency name='multi-user-server' grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/milestone/multi-user-server' /> - </dependency> - - <dependency name='cswmysql5' grouping='require_all' restart_on='none' type='service'> -  - <service_fmri value='svc:/network/cswmysql5:default' /> - </dependency> - - <exec_method type='method' name='start' exec='/sbin/kamctl start' timeout_seconds='30' /> - - <exec_method type='method' name='stop' exec='/sbin/kamctl stop' timeout_seconds='60' /> - - <exec_method type='method' name='restart' exec='/sbin/kamctl restart' timeout_seconds='-1' /> - - <stability value='Unstable' /> - <template> - <common_name> - <loctext xml:lang='C'> Kamailio </loctext> - </common_name> - </template> - </service> -</service_bundle> +<?xml version="1.0"?> +<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> + + + +<service_bundle type='manifest' name='kamailio'> + <service name='network/kamailio' type='service' version='1'> + <create_default_instance enabled='false' /> + <single_instance/> + + <dependency name='multi-user' grouping='require_all' restart_on='none' type='service'> + <service_fmri value='svc:/milestone/multi-user' /> + </dependency> + + <dependency name='multi-user-server' grouping='require_all' restart_on='none' type='service'> + <service_fmri value='svc:/milestone/multi-user-server' /> + </dependency> + + <dependency name='cswmysql5' grouping='require_all' restart_on='none' type='service'> +  + <service_fmri value='svc:/network/cswmysql5:default' /> + </dependency> + + <exec_method type='method' name='start' exec='/sbin/kamctl start' timeout_seconds='30' /> + + <exec_method type='method' name='stop' exec='/sbin/kamctl stop' timeout_seconds='60' /> + + <exec_method type='method' name='restart' exec='/sbin/kamctl restart' timeout_seconds='-1' /> + + <stability value='Unstable' /> + <template> + <common_name> + <loctext xml:lang='C'> Kamailio </loctext> + </common_name> + </template> + </service> +</service_bundle>

1 0

siptrace warning
by Juha Heinanen 09 Sep '19

09 Sep '19

On masterm, I noticed that I have started to get a warning from siptrace mod_init() even when there is nothing to warn about: Sep 7 15:21:45 salmon /usr/bin/sip-proxy[30966]: WARNING: siptrace [siptrace.c:338]: mod_init(): can't load dlg api. Will not install dialog callbacks. -- Juha

3 5

git:master:37ec84b6: Merge branch 'master' of https://github.com/kamailio/kamailio
by wkampich 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 37ec84b6718bf34c325f5cb522f7e41d8d345849 URL: https://github.com/kamailio/kamailio/commit/37ec84b6718bf34c325f5cb522f7e41… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: wkampich <wolfgang.kampichler(a)gmail.com> Date: 2019-09-06T16:27:25+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio --- Modified: src/core/daemonize.c Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/37ec84b6718bf34c325f5cb522f7e41… Patch: https://github.com/kamailio/kamailio/commit/37ec84b6718bf34c325f5cb522f7e41… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 98bf04dc78..d6692523c7 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -350,14 +350,14 @@ int daemonize(char* name, int status_wait) } pid=getpid(); if ((pid_stream=fopen(pid_file, "w"))==NULL){ - LM_WARN("unable to create pid file %s: %s\n", + LM_WARN("unable to create pid file %s: %s, check directory permissions\n", pid_file, strerror(errno)); goto error; }else{ fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PID file: %s\n", strerror(errno)); goto error; } } @@ -385,7 +385,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pgid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PGID file: %s\n", strerror(errno)); goto error; } } diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 3b026f9978..49065938af 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -219,8 +219,13 @@ void pp_ifdef_level_update(int val) void pp_ifdef_level_check(void) { if(_pp_ifdef_level!=0) { - LM_WARN("different number of preprocessor directives:" - " N(#!IF[N]DEF) - N(#!ENDIF) = %d\n", _pp_ifdef_level); + if (_pp_ifdef_level > 0) { + LM_WARN("different number of preprocessor directives:" + " %d more #!if[n]def as #!endif\n", _pp_ifdef_level); + } else { + LM_WARN("different number of preprocessor directives:" + " %d more #!endif as #!if[n]def\n", (_pp_ifdef_level)*-1); + } } else { LM_DBG("same number of pairing preprocessor directives" " #!IF[N]DEF - #!ENDIF\n"); diff --git a/src/main.c b/src/main.c index 1b7004d8b0..ba64af67db 100644 --- a/src/main.c +++ b/src/main.c @@ -2211,7 +2211,8 @@ int main(int argc, char** argv) cfg_stream=fopen (cfg_file, "r"); } if (cfg_stream==0){ - fprintf(stderr, "ERROR: loading config file(%s): %s\n", cfg_file, + fprintf(stderr, "ERROR: loading config file(%s): %s," + " check file and directory permissions\n", cfg_file, strerror(errno)); goto error; } @@ -2551,8 +2552,8 @@ int main(int argc, char** argv) /* create runtime dir if doesn't exist */ if (stat(runtime_dir, &st) == -1) { if(mkdir(runtime_dir, 0700) == -1) { - LM_ERR("failed to create runtime dir %s\n", runtime_dir); - fprintf(stderr, "failed to create runtime dir %s\n", runtime_dir); + LM_ERR("failed to create runtime dir %s, check directory permissions\n", runtime_dir); + fprintf(stderr, "failed to create runtime dir %s, check directory permissions\n", runtime_dir); goto error; } if(sock_uid!=-1 || sock_gid!=-1) {

2 1

git:master:56bf76bb: kamailio.cfg: set_forward_no_connect() only for initial requests going through nat
by Daniel-Constantin Mierla 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 56bf76bba043ae02eefa8263d352caa7bb3af213 URL: https://github.com/kamailio/kamailio/commit/56bf76bba043ae02eefa8263d352caa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-09T09:09:49+02:00 kamailio.cfg: set_forward_no_connect() only for initial requests going through nat --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/56bf76bba043ae02eefa8263d352caa… Patch: https://github.com/kamailio/kamailio/commit/56bf76bba043ae02eefa8263d352caa… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 20871fbc62..c41b933e5c 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -559,10 +559,6 @@ route[RELAY] { route[REQINIT] { # no connect for sending replies set_reply_no_connect(); - if(has_totag()) { - # no connect for requests within dialog - set_forward_no_connect(); - } #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while @@ -834,7 +830,11 @@ route[NATMANAGE] { if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal - set_forward_no_connect(); + if (is_request()) { + if(has_totag()) { + set_forward_no_connect(); + } + } } #!endif return;

1 0

git:master:ce19d921: siptrace: turn warn into info message about loading dlg api
by Daniel-Constantin Mierla 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: ce19d9212feb0ff4b017b5eaa71e4637a71aa4b9 URL: https://github.com/kamailio/kamailio/commit/ce19d9212feb0ff4b017b5eaa71e463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-09T08:34:08+02:00 siptrace: turn warn into info message about loading dlg api - dialog tracking is optional --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ce19d9212feb0ff4b017b5eaa71e463… Patch: https://github.com/kamailio/kamailio/commit/ce19d9212feb0ff4b017b5eaa71e463… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 211ddac363..35bfb1c78a 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -335,9 +335,8 @@ static int mod_init(void) } if (load_dlg_api(&dlgb) < 0) { - LM_WARN("can't load dlg api. Will not install dialog callbacks.\n"); - } - else { + LM_INFO("can't load dlg api. Will not install dialog callbacks.\n"); + } else { if (dlgb.register_dlgcb(NULL, DLGCB_CREATED, trace_dialog, NULL, NULL) != 0) { LM_ERR("failed to register dialog callbacks! Tracing dialogs won't be available\n"); }

2 3

git:master:d80bccc3: github: small additition related to file line endings and windows editors
by Henning Westerholt 08 Sep '19

08 Sep '19

Module: kamailio Branch: master Commit: d80bccc3b85256fe0d440cc47c90fc1020ae1d8d URL: https://github.com/kamailio/kamailio/commit/d80bccc3b85256fe0d440cc47c90fc1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-08T22:57:27+02:00 github: small additition related to file line endings and windows editors --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/d80bccc3b85256fe0d440cc47c90fc1… Patch: https://github.com/kamailio/kamailio/commit/d80bccc3b85256fe0d440cc47c90fc1… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ea6ba9cdd8..28c16586a7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -65,6 +65,8 @@ and commit history, there are several *rules* required for each contribution. * code **should** be formatted with **clang-format** or to match the style of the component that the commit applies to. The `.clang-format` file is part of Kamailio source code tree, in the root folder. + * code **should** be use Linux style line endings and not Windows style + (CRLF). If you use a Windows editor, please configure it this way. ### Commit Message Rules ###

1 0

git:master:26c13797: core: fix log message with the proper preprocessor directive name
by Daniel-Constantin Mierla 08 Sep '19

08 Sep '19

Module: kamailio Branch: master Commit: 26c137977d2892f67e80f07759bec17ddfe99172 URL: https://github.com/kamailio/kamailio/commit/26c137977d2892f67e80f07759bec17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-06T20:48:31+02:00 core: fix log message with the proper preprocessor directive name --- Modified: pkg/docker Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/26c137977d2892f67e80f07759bec17… Patch: https://github.com/kamailio/kamailio/commit/26c137977d2892f67e80f07759bec17… --- diff --git a/pkg/docker b/pkg/docker index 5d6f46a758..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5d6f46a758e0d98fa4258925d40aa1521b1e27d0 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 53f33431df..a640bd158f 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1955,7 +1955,7 @@ static void pp_endif() { pp_ifdef_level_update(-1); if(pp_sptr==0) { - LM_WARN("invalid position for preprocessor directive 'else'" + LM_WARN("invalid position for preprocessor directive 'endif'" " - at %s line %d\n", (finame)?finame:"cfg", line); return; }

2 1

git:5.2:de9a03f1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 08 Sep '19

08 Sep '19

Module: kamailio Branch: 5.2 Commit: de9a03f1353456d8e0165cd673d660c3d8e1e27e URL: https://github.com/kamailio/kamailio/commit/de9a03f1353456d8e0165cd673d660c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-08T22:16:41+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/de9a03f1353456d8e0165cd673d660c… Patch: https://github.com/kamailio/kamailio/commit/de9a03f1353456d8e0165cd673d660c… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index ec3af10e5e..ef76592a83 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -235,6 +235,7 @@ loadmodule "db_redis.so" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" #!define DBURL_PERM "redis://127.0.0.1:6379/8" +#!define DBURL_DLG "redis://127.0.0.1:6379/9" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "version=entry:table_name") @@ -242,6 +243,9 @@ modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:p artition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +modparam("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&di +alog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -250,6 +254,8 @@ modparam("acc_db", "db_url", DBURL_ACC) modparam("auth_db", "db_url", DBURL_AUTH) ... modparam("permissions", "db_url", DBURL_PERM) +... +modparam("dialog", "db_url", DBURL_DLG) ... Samples adding records for address table using 'redis-cli':

1 0

git:5.2:307939e8: db_redis: add examples about usage with dialog module
by Henning Westerholt 08 Sep '19

08 Sep '19

Module: kamailio Branch: 5.2 Commit: 307939e892877603357af11ff452ca8c62d7bef5 URL: https://github.com/kamailio/kamailio/commit/307939e892877603357af11ff452ca8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-08T22:10:30+02:00 db_redis: add examples about usage with dialog module (cherry picked from commit 86990ab53c4b5e5ede49b95e17b02f96ae00a01c) --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/307939e892877603357af11ff452ca8… Patch: https://github.com/kamailio/kamailio/commit/307939e892877603357af11ff452ca8… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 0c8ba2ed04..6439c79b6f 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -226,12 +226,15 @@ loadmodule "db_redis.so" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" #!define DBURL_PERM "redis://127.0.0.1:6379/8" +#!define DBURL_DLG "redis://127.0.0.1:6379/9" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:partition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +modparam("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&dialog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -240,6 +243,8 @@ modparam("acc_db", "db_url", DBURL_ACC) modparam("auth_db", "db_url", DBURL_AUTH) ... modparam("permissions", "db_url", DBURL_PERM) +... +modparam("dialog", "db_url", DBURL_DLG) ... </programlisting> </example>

1 0

git:master:e7468184: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 08 Sep '19

08 Sep '19

Module: kamailio Branch: master Commit: e7468184151c20919428ab10dc72391f25c93d4f URL: https://github.com/kamailio/kamailio/commit/e7468184151c20919428ab10dc72391… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-08T10:31:59+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/e7468184151c20919428ab10dc72391… Patch: https://github.com/kamailio/kamailio/commit/e7468184151c20919428ab10dc72391… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index ec3af10e5e..ef76592a83 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -235,6 +235,7 @@ loadmodule "db_redis.so" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" #!define DBURL_PERM "redis://127.0.0.1:6379/8" +#!define DBURL_DLG "redis://127.0.0.1:6379/9" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "version=entry:table_name") @@ -242,6 +243,9 @@ modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:p artition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +modparam("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&di +alog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -250,6 +254,8 @@ modparam("acc_db", "db_url", DBURL_ACC) modparam("auth_db", "db_url", DBURL_AUTH) ... modparam("permissions", "db_url", DBURL_PERM) +... +modparam("dialog", "db_url", DBURL_DLG) ... Samples adding records for address table using 'redis-cli':

1 0

[kamailio/kamailio] db_redis: add examples about usage with dialog module (#2059)
by Federico Cabiddu 08 Sep '19

08 Sep '19

Small contribution to db_redis module documentation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2059 -- Commit Summary -- * db_redis: add examples about usage with dialog module -- File Changes -- M src/modules/db_redis/doc/db_redis_admin.xml (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2059.patch https://github.com/kamailio/kamailio/pull/2059.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/2059

2 2

git:master:a638c714: Merge pull request #2059 from kamailio/grumvalski/db_redis_keys_doc
by GitHub 08 Sep '19

08 Sep '19

Module: kamailio Branch: master Commit: a638c71454499d78363c5f213769c57a78772278 URL: https://github.com/kamailio/kamailio/commit/a638c71454499d78363c5f213769c57… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-08T10:21:34+02:00 Merge pull request #2059 from kamailio/grumvalski/db_redis_keys_doc db_redis: add examples about usage with dialog module --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a638c71454499d78363c5f213769c57… Patch: https://github.com/kamailio/kamailio/commit/a638c71454499d78363c5f213769c57… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 0c8ba2ed04..6439c79b6f 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -226,12 +226,15 @@ loadmodule "db_redis.so" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" #!define DBURL_PERM "redis://127.0.0.1:6379/8" +#!define DBURL_DLG "redis://127.0.0.1:6379/9" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:partition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +modparam("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&dialog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -240,6 +243,8 @@ modparam("acc_db", "db_url", DBURL_ACC) modparam("auth_db", "db_url", DBURL_AUTH) ... modparam("permissions", "db_url", DBURL_PERM) +... +modparam("dialog", "db_url", DBURL_DLG) ... </programlisting> </example>

1 0

git:master:86990ab5: db_redis: add examples about usage with dialog module
by Federico Cabiddu 08 Sep '19

08 Sep '19

Module: kamailio Branch: master Commit: 86990ab53c4b5e5ede49b95e17b02f96ae00a01c URL: https://github.com/kamailio/kamailio/commit/86990ab53c4b5e5ede49b95e17b02f9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T09:56:43+02:00 db_redis: add examples about usage with dialog module --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/86990ab53c4b5e5ede49b95e17b02f9… Patch: https://github.com/kamailio/kamailio/commit/86990ab53c4b5e5ede49b95e17b02f9… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 0c8ba2ed04..6439c79b6f 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -226,12 +226,15 @@ loadmodule "db_redis.so" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" #!define DBURL_PERM "redis://127.0.0.1:6379/8" +#!define DBURL_DLG "redis://127.0.0.1:6379/9" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:partition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +modparam("db_redis", "keys", "dialog=entry:hash_entry,hash_id&cid:callid") +modparam("db_redis", "keys", "dialog_vars=entry:hash_entry,hash_id,dialog_key&dialog:hash_entry,hash_id") ... modparam("usrloc", "db_url", DBURL_USRLOC) ... @@ -240,6 +243,8 @@ modparam("acc_db", "db_url", DBURL_ACC) modparam("auth_db", "db_url", DBURL_AUTH) ... modparam("permissions", "db_url", DBURL_PERM) +... +modparam("dialog", "db_url", DBURL_DLG) ... </programlisting> </example>

1 0

git:5.2:761758b1: dialog: check xdata length when loading profile from db
by Federico Cabiddu 08 Sep '19

08 Sep '19

Module: kamailio Branch: 5.2 Commit: 761758b1d8a7ebdb72caf8d5442a38988cf2e951 URL: https://github.com/kamailio/kamailio/commit/761758b1d8a7ebdb72caf8d5442a389… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T10:20:56+02:00 dialog: check xdata length when loading profile from db (cherry picked from commit d05dfc20632fde1d65017ff5d7f41713a9c79825) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/761758b1d8a7ebdb72caf8d5442a389… Patch: https://github.com/kamailio/kamailio/commit/761758b1d8a7ebdb72caf8d5442a389… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1b9d704cf6..b15cc86485 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -452,7 +452,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

1 0

git:5.1:75dc482c: dialog: check xdata length when loading profile from db
by Federico Cabiddu 08 Sep '19

08 Sep '19

Module: kamailio Branch: 5.1 Commit: 75dc482cf327e3a707281f903c7e75d3b28cf52c URL: https://github.com/kamailio/kamailio/commit/75dc482cf327e3a707281f903c7e75d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T10:20:36+02:00 dialog: check xdata length when loading profile from db (cherry picked from commit d05dfc20632fde1d65017ff5d7f41713a9c79825) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/75dc482cf327e3a707281f903c7e75d… Patch: https://github.com/kamailio/kamailio/commit/75dc482cf327e3a707281f903c7e75d… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 8e8b5b088b..92d469852e 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -414,7 +414,7 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

1 0

[kamailio/kamailio] dialog: check xdata length when loading profile from db (#2058)
by Federico Cabiddu 08 Sep '19

08 Sep '19

#### 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  When using a backend not supporting "NULL", like Redis, which store it as an empty string, xdata.s can be not null (it contains '\0'). This leads to an error trying to read it as a json document. Not really a bug, but it leads to the error "invalid json doc [[]]" being printed each time a dialog is loaded from db (Redis). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2058 -- Commit Summary -- * dialog: check xdata length when loading profile from db -- File Changes -- M src/modules/dialog/dlg_db_handler.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2058.patch https://github.com/kamailio/kamailio/pull/2058.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/2058

2 2

git:master:5a380e95: Merge pull request #2058 from kamailio/grumvalski/dlg_check_xdata_len
by GitHub 08 Sep '19

08 Sep '19

Module: kamailio Branch: master Commit: 5a380e95b0914f9ae3b24ce9638404ad0b0afd6b URL: https://github.com/kamailio/kamailio/commit/5a380e95b0914f9ae3b24ce9638404a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-08T10:17:13+02:00 Merge pull request #2058 from kamailio/grumvalski/dlg_check_xdata_len dialog: check xdata length when loading profile from db --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/5a380e95b0914f9ae3b24ce9638404a… Patch: https://github.com/kamailio/kamailio/commit/5a380e95b0914f9ae3b24ce9638404a… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2c89685ffc..56c7ef39a2 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -457,7 +457,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

1 0

git:master:d05dfc20: dialog: check xdata length when loading profile from db
by Federico Cabiddu 08 Sep '19

08 Sep '19

Module: kamailio Branch: master Commit: d05dfc20632fde1d65017ff5d7f41713a9c79825 URL: https://github.com/kamailio/kamailio/commit/d05dfc20632fde1d65017ff5d7f4171… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-09-08T09:01:10+02:00 dialog: check xdata length when loading profile from db --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/d05dfc20632fde1d65017ff5d7f4171… Patch: https://github.com/kamailio/kamailio/commit/d05dfc20632fde1d65017ff5d7f4171… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2c89685ffc..56c7ef39a2 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -457,7 +457,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg_set_toroute(dlg, &toroute_name); GET_STR_VALUE(xdata, values, 21, 0, 0); - if(xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) + if(xdata.len > 0 && xdata.s!=NULL && dlg->state!=DLG_STATE_DELETED) { srjson_InitDoc(&jdoc, NULL); jdoc.buf = xdata;

1 0

git:master:8f6e8265: core: ensure index of preprocessor directive conditions is not negative
by Daniel-Constantin Mierla 06 Sep '19

06 Sep '19

Module: kamailio Branch: master Commit: 8f6e826576e52270f21c22a7d94b3026cc22c172 URL: https://github.com/kamailio/kamailio/commit/8f6e826576e52270f21c22a7d94b302… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-06T20:35:08+02:00 core: ensure index of preprocessor directive conditions is not negative - avoid accessing the array at negative index for else processing --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/8f6e826576e52270f21c22a7d94b302… Patch: https://github.com/kamailio/kamailio/commit/8f6e826576e52270f21c22a7d94b302… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 00fd4b5e49..53f33431df 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1942,14 +1942,24 @@ static void pp_ifdef() static void pp_else() { + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } pp_ifdef_stack[pp_sptr-1] ^= 1; pp_update_state(); } static void pp_endif() { - pp_sptr--; pp_ifdef_level_update(-1); + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } + pp_sptr--; pp_update_state(); }

1 0

git:5.2:cf9b59a5: core: spelling fix in error message related to pid/pgid chown
by Henning Westerholt 06 Sep '19

06 Sep '19

Module: kamailio Branch: 5.2 Commit: cf9b59a54a49201bd1022a3fb1b7688b45ed3536 URL: https://github.com/kamailio/kamailio/commit/cf9b59a54a49201bd1022a3fb1b7688… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T12:14:26+02:00 core: spelling fix in error message related to pid/pgid chown (cherry picked from commit 21afc6081c3044b4f754e6a34ea67fd98f2e3af9) --- Modified: src/core/daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/cf9b59a54a49201bd1022a3fb1b7688… Patch: https://github.com/kamailio/kamailio/commit/cf9b59a54a49201bd1022a3fb1b7688… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 98bf04dc78..7301ddc7c8 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -357,7 +357,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PID file: %s\n", strerror(errno)); goto error; } } @@ -385,7 +385,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pgid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PGID file: %s\n", strerror(errno)); goto error; } }

1 0

git:5.1:412ea460: core: spelling fix in error message related to pid/pgid chown
by Henning Westerholt 06 Sep '19

06 Sep '19

Module: kamailio Branch: 5.1 Commit: 412ea460b57f1c84cecd9fe834f51158339e986e URL: https://github.com/kamailio/kamailio/commit/412ea460b57f1c84cecd9fe834f5115… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T12:14:31+02:00 core: spelling fix in error message related to pid/pgid chown (cherry picked from commit 21afc6081c3044b4f754e6a34ea67fd98f2e3af9) --- Modified: src/core/daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/412ea460b57f1c84cecd9fe834f5115… Patch: https://github.com/kamailio/kamailio/commit/412ea460b57f1c84cecd9fe834f5115… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 98bf04dc78..7301ddc7c8 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -357,7 +357,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PID file: %s\n", strerror(errno)); goto error; } } @@ -385,7 +385,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pgid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PGID file: %s\n", strerror(errno)); goto error; } }

1 0

git:master:21afc608: core: spelling fix in error message related to pid/pgid chown
by Henning Westerholt 06 Sep '19

06 Sep '19

Module: kamailio Branch: master Commit: 21afc6081c3044b4f754e6a34ea67fd98f2e3af9 URL: https://github.com/kamailio/kamailio/commit/21afc6081c3044b4f754e6a34ea67fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T12:13:19+02:00 core: spelling fix in error message related to pid/pgid chown --- Modified: src/core/daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/21afc6081c3044b4f754e6a34ea67fd… Patch: https://github.com/kamailio/kamailio/commit/21afc6081c3044b4f754e6a34ea67fd… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 4fa33ac063..d6692523c7 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -357,7 +357,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PID file: %s\n", strerror(errno)); goto error; } } @@ -385,7 +385,7 @@ int daemonize(char* name, int status_wait) fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); if(chown(pgid_file, pid_uid, pid_gid)<0) { - LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + LM_ERR("failed to chown PGID file: %s\n", strerror(errno)); goto error; } }

1 0

git:master:919dd727: core: improve error messages on permission problems for cfg/pid files and runtime dir
by Henning Westerholt 06 Sep '19

06 Sep '19

Module: kamailio Branch: master Commit: 919dd72712561f03bc0f303390c06366fe7acddb URL: https://github.com/kamailio/kamailio/commit/919dd72712561f03bc0f303390c0636… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T12:09:38+02:00 core: improve error messages on permission problems for cfg/pid files and runtime dir --- Modified: src/core/daemonize.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/919dd72712561f03bc0f303390c0636… Patch: https://github.com/kamailio/kamailio/commit/919dd72712561f03bc0f303390c0636… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 98bf04dc78..4fa33ac063 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -350,7 +350,7 @@ int daemonize(char* name, int status_wait) } pid=getpid(); if ((pid_stream=fopen(pid_file, "w"))==NULL){ - LM_WARN("unable to create pid file %s: %s\n", + LM_WARN("unable to create pid file %s: %s, check directory permissions\n", pid_file, strerror(errno)); goto error; }else{ diff --git a/src/main.c b/src/main.c index 1b7004d8b0..ba64af67db 100644 --- a/src/main.c +++ b/src/main.c @@ -2211,7 +2211,8 @@ int main(int argc, char** argv) cfg_stream=fopen (cfg_file, "r"); } if (cfg_stream==0){ - fprintf(stderr, "ERROR: loading config file(%s): %s\n", cfg_file, + fprintf(stderr, "ERROR: loading config file(%s): %s," + " check file and directory permissions\n", cfg_file, strerror(errno)); goto error; } @@ -2551,8 +2552,8 @@ int main(int argc, char** argv) /* create runtime dir if doesn't exist */ if (stat(runtime_dir, &st) == -1) { if(mkdir(runtime_dir, 0700) == -1) { - LM_ERR("failed to create runtime dir %s\n", runtime_dir); - fprintf(stderr, "failed to create runtime dir %s\n", runtime_dir); + LM_ERR("failed to create runtime dir %s, check directory permissions\n", runtime_dir); + fprintf(stderr, "failed to create runtime dir %s, check directory permissions\n", runtime_dir); goto error; } if(sock_uid!=-1 || sock_gid!=-1) {

1 0

git:master:ed10d769: core: improve error message related to a mismatch of #!ifdef/#!define statement
by Henning Westerholt 06 Sep '19

06 Sep '19

Module: kamailio Branch: master Commit: ed10d7692b99b1cd6d3975c06d8b0d9d3270779d URL: https://github.com/kamailio/kamailio/commit/ed10d7692b99b1cd6d3975c06d8b0d9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T11:37:44+02:00 core: improve error message related to a mismatch of #!ifdef/#!define statement --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/ed10d7692b99b1cd6d3975c06d8b0d9… Patch: https://github.com/kamailio/kamailio/commit/ed10d7692b99b1cd6d3975c06d8b0d9… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 3b026f9978..49065938af 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -219,8 +219,13 @@ void pp_ifdef_level_update(int val) void pp_ifdef_level_check(void) { if(_pp_ifdef_level!=0) { - LM_WARN("different number of preprocessor directives:" - " N(#!IF[N]DEF) - N(#!ENDIF) = %d\n", _pp_ifdef_level); + if (_pp_ifdef_level > 0) { + LM_WARN("different number of preprocessor directives:" + " %d more #!if[n]def as #!endif\n", _pp_ifdef_level); + } else { + LM_WARN("different number of preprocessor directives:" + " %d more #!endif as #!if[n]def\n", (_pp_ifdef_level)*-1); + } } else { LM_DBG("same number of pairing preprocessor directives" " #!IF[N]DEF - #!ENDIF\n");

1 0

[kamailio/kamailio] $Au incorrectly contains domain or realm (#2056)
by Joel Serrano 06 Sep '19

06 Sep '19

### Description Testing on latest master deb nightly build (`5.3.0~dev7+0~20190904005559.1479+buster`) I've noticed that `$Au` is not being set correctly, at least according to my tests. >From the documentation (https://www.kamailio.org/wiki/cookbooks/devel/pseudovariables#au_-_acc_user…): _$Au - Acc username: username for accounting purposes. It's a selective pseudo variable (inherited from acc module). It returns auth username ($au) if exists or From username ($fU) otherwise._ I have the following log statement in several places in a test box: xlog("L_NOTICE", "[DEBUG] Au=$Au au=$au aU=$aU ar=$ar fU=$fU fu=$fu - \n"); And when I run through them I get the following: Initial log (at the beginning of request_route): ``` Sep 5 01:54:39 csbc01 csbc[20380]: NOTICE: {1 1 REGISTER f597522fd7e52fe99f2a54a834101efa@0:0:0:0:0:0:0:0} <script>: [DEBUG] Au=1063362(a)some.domain au=<null> aU=<null> ar=<null> fU=1063362 fu=sip:1063362@some.domain - ``` After a 401 challenge, the following log statements look like this one: ``` Sep 5 01:54:40 csbc01 csbc[20385]: NOTICE: {1 2 REGISTER f597522fd7e52fe99f2a54a834101efa@0:0:0:0:0:0:0:0} <script>: [DEBUG] Au=1063362(a)some.domain au=1063362 aU=1063362 ar=custom-realm fU=1063362 fu=sip:1063362@some.domain - ``` At this point I would expect `$Au` to not have the `@domain` part in it. And strangely, after an `auth_check()`, it changes again: ``` Sep 5 01:54:40 csbc01 csbc[20385]: NOTICE: {1 2 REGISTER f597522fd7e52fe99f2a54a834101efa@0:0:0:0:0:0:0:0} <script>: [DEBUG] Au=1063362@custom-realm au=1063362 aU=1063362 ar=custom-realm fU=1063362 fu=sip:1063362@some.domain - ``` >From that point onward, it no longer has the domain and now contains the realm. I believe both these behaviors are incorrect, or at least they don't match what the documentation says. ### Troubleshooting @henningw commented about this in the email thread I started: _Hello Joel,_ _I did a quick look into the code, this is basically unchanged since 2008. I also tested 5.2.3, it shows the same behavior._ _NOTICE: {1 1 REGISTER 363545605-1445114084-1880652839} <script>: [DEBUG] Au=82621(a)116.203.XXX.XXX au=<null> aU=<null> fU=82621 fu=sip:82621@116.203.XXX.XXX - root@sip:~# kamcmd core.version kamailio 5.2.3 (x86_64/linux) I certainly would make more sense in a way like it is documented. Can you easily check an older version?_ _Cheers,_ _Henning_ ### Reproduction Print `$Au` in logs before challenge, after a successful auth, and after an `auth_check()` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@csbc01:/etc/kamailio# kamailio -v version: kamailio 5.3.0-dev7 (x86_64/linux) 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: unknown compiled with gcc 8.3.0 root@csbc01:/etc/kamailio# ``` * **Operating System**:  ``` Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster ``` -- 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/2056

4 12

git:master:e3774a8e: pv: add missing implementation for documented acc user pv (GH #2056)
by Henning Westerholt 06 Sep '19

06 Sep '19

Module: kamailio Branch: master Commit: e3774a8e40e4cbe57d286e0426a8fd4e0a4175f1 URL: https://github.com/kamailio/kamailio/commit/e3774a8e40e4cbe57d286e0426a8fd4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-06T09:19:59+02:00 pv: add missing implementation for documented acc user pv (GH #2056) - add missing implementation for documented acc user pseudo-variable - it was documented as $Au, but it works differently since a long time - as discussed in issue GH #2056 add a new pv $AU that works like intended --- 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/e3774a8e40e4cbe57d286e0426a8fd4… Patch: https://github.com/kamailio/kamailio/commit/e3774a8e40e4cbe57d286e0426a8fd4… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index e629d66d10..310acf53d0 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -141,6 +141,9 @@ static pv_export_t mod_pvs[] = { {{"Au", (sizeof("Au")-1)}, /* */ PVT_OTHER, pv_get_acc_username, 0, 0, 0, pv_init_iname, 1}, + {{"AU", (sizeof("AU")-1)}, /* */ + PVT_OTHER, pv_get_acc_user, 0, + 0, 0, pv_init_iname, 1}, {{"bf", (sizeof("bf")-1)}, /* */ PVT_CONTEXT, pv_get_bflags, pv_set_bflags, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index c554ed0cde..18db915cfb 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1572,6 +1572,37 @@ static inline str *cred_realm(struct sip_msg *rq) return realm; } + +int pv_get_acc_user(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str* user; + struct sip_uri puri; + struct to_body* from; + + /* try to take it from credentials */ + user = cred_user(msg); + if (user) { + return pv_get_strval(msg, param, res, user); + } + + /* from from uri */ + if(parse_from_header(msg)<0) + { + LM_ERR("cannot parse FROM header\n"); + return pv_get_null(msg, param, res); + } + if (msg->from && (from=get_from(msg)) && from->uri.len) { + if (parse_uri(from->uri.s, from->uri.len, &puri) < 0 ) { + LM_ERR("bad From URI\n"); + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &(puri.user)); + } + return pv_get_null(msg, param, res); +} + + int pv_get_acc_username(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 86629e66e0..ee45b915cd 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -223,6 +223,9 @@ int pv_get_body_size(struct sip_msg *msg, pv_param_t *param, int pv_get_authattr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_acc_user(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_acc_username(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:748f981c: Revert "pv: fix $Au pseudo-variable, it contains incorrectly domain or realm (GH #2056)"
by Henning Westerholt 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: 748f981c708ebeb8b0f4325060696fd58d152f54 URL: https://github.com/kamailio/kamailio/commit/748f981c708ebeb8b0f4325060696fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-05T21:31:16+02:00 Revert "pv: fix $Au pseudo-variable, it contains incorrectly domain or realm (GH #2056)" This reverts commit aa8f0820318762a393c41623cba3a5795225fb0a. --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/748f981c708ebeb8b0f4325060696fd… Patch: https://github.com/kamailio/kamailio/commit/748f981c708ebeb8b0f4325060696fd… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6b9124e4ba..c554ed0cde 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1575,13 +1575,29 @@ static inline str *cred_realm(struct sip_msg *rq) int pv_get_acc_username(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { + static char buf[MAX_URI_SIZE]; str* user; + str* realm; struct sip_uri puri; struct to_body* from; + str s; /* try to take it from credentials */ user = cred_user(msg); if (user) { + realm = cred_realm(msg); + if (realm) { + s.len = user->len+1+realm->len; + if (s.len > MAX_URI_SIZE) { + LM_ERR("uri too long\n"); + return pv_get_null(msg, param, res); + } + s.s = buf; + memcpy(s.s, user->s, user->len); + (s.s)[user->len] = '@'; + memcpy(s.s+user->len+1, realm->s, realm->len); + return pv_get_strval(msg, param, res, &s); + } return pv_get_strval(msg, param, res, user); } @@ -1596,9 +1612,20 @@ int pv_get_acc_username(struct sip_msg *msg, pv_param_t *param, LM_ERR("bad From URI\n"); return pv_get_null(msg, param, res); } - return pv_get_strval(msg, param, res, &(puri.user)); + s.len = puri.user.len + 1 + puri.host.len; + if (s.len > MAX_URI_SIZE) { + LM_ERR("from URI too long\n"); + return pv_get_null(msg, param, res); + } + s.s = buf; + memcpy(s.s, puri.user.s, puri.user.len); + (s.s)[puri.user.len] = '@'; + memcpy(s.s + puri.user.len + 1, puri.host.s, puri.host.len); + } else { + s.len = 0; + s.s = 0; } - return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &s); } int pv_get_branch(struct sip_msg *msg, pv_param_t *param,

1 0

git:master:aa8f0820: pv: fix $Au pseudo-variable, it contains incorrectly domain or realm (GH #2056)
by Henning Westerholt 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: aa8f0820318762a393c41623cba3a5795225fb0a URL: https://github.com/kamailio/kamailio/commit/aa8f0820318762a393c41623cba3a57… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-05T19:24:01+02:00 pv: fix $Au pseudo-variable, it contains incorrectly domain or realm (GH #2056) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/aa8f0820318762a393c41623cba3a57… Patch: https://github.com/kamailio/kamailio/commit/aa8f0820318762a393c41623cba3a57… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index c554ed0cde..6b9124e4ba 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1575,29 +1575,13 @@ static inline str *cred_realm(struct sip_msg *rq) int pv_get_acc_username(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char buf[MAX_URI_SIZE]; str* user; - str* realm; struct sip_uri puri; struct to_body* from; - str s; /* try to take it from credentials */ user = cred_user(msg); if (user) { - realm = cred_realm(msg); - if (realm) { - s.len = user->len+1+realm->len; - if (s.len > MAX_URI_SIZE) { - LM_ERR("uri too long\n"); - return pv_get_null(msg, param, res); - } - s.s = buf; - memcpy(s.s, user->s, user->len); - (s.s)[user->len] = '@'; - memcpy(s.s+user->len+1, realm->s, realm->len); - return pv_get_strval(msg, param, res, &s); - } return pv_get_strval(msg, param, res, user); } @@ -1612,20 +1596,9 @@ int pv_get_acc_username(struct sip_msg *msg, pv_param_t *param, LM_ERR("bad From URI\n"); return pv_get_null(msg, param, res); } - s.len = puri.user.len + 1 + puri.host.len; - if (s.len > MAX_URI_SIZE) { - LM_ERR("from URI too long\n"); - return pv_get_null(msg, param, res); - } - s.s = buf; - memcpy(s.s, puri.user.s, puri.user.len); - (s.s)[puri.user.len] = '@'; - memcpy(s.s + puri.user.len + 1, puri.host.s, puri.host.len); - } else { - s.len = 0; - s.s = 0; + return pv_get_strval(msg, param, res, &(puri.user)); } - return pv_get_strval(msg, param, res, &s); + return pv_get_null(msg, param, res); } int pv_get_branch(struct sip_msg *msg, pv_param_t *param,

1 0

git:master:20c9e35e: call_obj: fix Doxygen comments.
by Vicente Hernando 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: 20c9e35e811817377dba0290180ff23ee9749827 URL: https://github.com/kamailio/kamailio/commit/20c9e35e811817377dba0290180ff23… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-09-05T15:32:18+02:00 call_obj: fix Doxygen comments. --- Modified: src/modules/call_obj/call_obj_mod.c Modified: src/modules/call_obj/cobj.c Modified: src/modules/call_obj/cobj.h --- Diff: https://github.com/kamailio/kamailio/commit/20c9e35e811817377dba0290180ff23… Patch: https://github.com/kamailio/kamailio/commit/20c9e35e811817377dba0290180ff23…

1 0

git:master:bda770e5: call_obj: software license.
by Vicente Hernando 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: bda770e57200aba4118803a6d332f2440fb0a540 URL: https://github.com/kamailio/kamailio/commit/bda770e57200aba4118803a6d332f24… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-09-05T15:32:04+02:00 call_obj: software license. --- Modified: src/modules/call_obj/call_obj_mod.c Modified: src/modules/call_obj/cobj.c Modified: src/modules/call_obj/cobj.h --- Diff: https://github.com/kamailio/kamailio/commit/bda770e57200aba4118803a6d332f24… Patch: https://github.com/kamailio/kamailio/commit/bda770e57200aba4118803a6d332f24… --- diff --git a/src/modules/call_obj/call_obj_mod.c b/src/modules/call_obj/call_obj_mod.c index 72307e2d86..c136de58e8 100644 --- a/src/modules/call_obj/call_obj_mod.c +++ b/src/modules/call_obj/call_obj_mod.c @@ -1,3 +1,25 @@ +/* + * CALL_OBJ module + * + * Copyright (C) 2017-2019 - Sonoc + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ #include <inttypes.h> diff --git a/src/modules/call_obj/cobj.c b/src/modules/call_obj/cobj.c index cf014b659f..e330a79978 100644 --- a/src/modules/call_obj/cobj.c +++ b/src/modules/call_obj/cobj.c @@ -1,3 +1,26 @@ +/* + * CALL_OBJ module + * + * Copyright (C) 2017-2019 - Sonoc + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + /** * Functionality of call_obj module. */ diff --git a/src/modules/call_obj/cobj.h b/src/modules/call_obj/cobj.h index 85aaab6a69..09417da203 100644 --- a/src/modules/call_obj/cobj.h +++ b/src/modules/call_obj/cobj.h @@ -1,3 +1,26 @@ +/* + * CALL_OBJ module + * + * Copyright (C) 2017-2019 - Sonoc + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + /** * Header for functionality of Call Object module. */

1 0

git:master:7f11960a: pkg/kamailio/deb: version set 5.3.0~pre0
by Victor Seva 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: 7f11960acfec8b182eadee1948f1cbd0e553faa1 URL: https://github.com/kamailio/kamailio/commit/7f11960acfec8b182eadee1948f1cbd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-09-05T11:53:28+02:00 pkg/kamailio/deb: version set 5.3.0~pre0 --- 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/7f11960acfec8b182eadee1948f1cbd… Patch: https://github.com/kamailio/kamailio/commit/7f11960acfec8b182eadee1948f1cbd…

1 0

Development for v5.3.x is frozen
by Daniel-Constantin Mierla 05 Sep '19

05 Sep '19

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

2 2

[kamailio/kamailio] Phonenum module not working when invoked from other than cfg file (#2052)
by balajeesv 05 Sep '19

05 Sep '19

### Description I have kamailio.cfg file for configuration and Lua files for processing messages. What I observed is PHONUM module is not initialized during startup. And when using phonenum module it fails. I am invoking phonenum module in lua with "KSR.phonenum.match". This is in continuation to issue [1883](https://github.com/kamailio/kamailio/issues/1883), which i cannot reopen.Please check this and let me know any further logs required.  ### Troubleshooting #### Reproduction 1. cfg file only have configuration 2. Invoke phonemun module through KEMI "KSR.phonenum.match" in other file 3. Test to validate phonenum  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: app_lua [app_lua_sr.c:1655]: sr_kemi_lua_exec_func_ex(): param[0] for: isflagset is int: 1 Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[0] for: match is str: +919876543210 Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: app_lua [app_lua_sr.c:1651]: sr_kemi_lua_exec_func_ex(): param[1] for: match is str: src Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: phonenum [phonenum_pv.c:312]: phonenum_update_pv(): container not found: +919876543210 Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: app_lua [app_lua_sr.c:934]: lua_sr_pv_get_val(): pv get: $rc Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: [core/pvapi.c:371]: pv_cache_add(): pvar [$rc] added in cache Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: app_lua [app_lua_sr.c:934]: lua_sr_pv_get_val(): pv get: $phn(src=>valid) Aug 29 08:33:27 ip-10-130-74-105 /usr/local/sbin/kamailio[2157]: DEBUG: phonenum [phonenum_pv.c:162]: pv_parse_phonenum_name(): phonenum [src] - key [valid] ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions In kamailio.cfg if I add some dummy route(as below) then Phonenum module is initialized and it is working as expected. route[PHONENUM] { if($phn(src=>valid)==1) { xlog("dummy route\n"); } }  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2052

4 5

git:master:ac0a0d6f: pkg/kamailio/deb: version set 5.3.0~dev8 [skip ci]
by Victor Seva 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: ac0a0d6feebe738830efaa7bdcfae8ca7f41070d URL: https://github.com/kamailio/kamailio/commit/ac0a0d6feebe738830efaa7bdcfae8c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-09-05T08:46:10+02:00 pkg/kamailio/deb: version set 5.3.0~dev8 [skip ci] --- 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/ac0a0d6feebe738830efaa7bdcfae8c… Patch: https://github.com/kamailio/kamailio/commit/ac0a0d6feebe738830efaa7bdcfae8c…

1 0

git:master:101e7985: Makefile.defs: version set to 5.3.0-pre0
by Daniel-Constantin Mierla 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: 101e798573a0a971f1d0f07512cb6267186f1f23 URL: https://github.com/kamailio/kamailio/commit/101e798573a0a971f1d0f07512cb626… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-05T07:03:27+02:00 Makefile.defs: version set to 5.3.0-pre0 - start of pre-release phase (testing) for v5.3.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/101e798573a0a971f1d0f07512cb626… Patch: https://github.com/kamailio/kamailio/commit/101e798573a0a971f1d0f07512cb626… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 7cebfd53de..69416e8003 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev8 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:303e07d6: Makefile.defs: version set to 5.3.0-dev8
by Daniel-Constantin Mierla 05 Sep '19

05 Sep '19

Module: kamailio Branch: master Commit: 303e07d66198fa3891b69fdcf3c71d68805c1558 URL: https://github.com/kamailio/kamailio/commit/303e07d66198fa3891b69fdcf3c71d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-05T07:02:39+02:00 Makefile.defs: version set to 5.3.0-dev8 - end of development for v5.3.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/303e07d66198fa3891b69fdcf3c71d6… Patch: https://github.com/kamailio/kamailio/commit/303e07d66198fa3891b69fdcf3c71d6… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 62d8024c0d..7cebfd53de 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev7 +EXTRAVERSION = -dev8 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] jsonrpcs: fix double free crash (#1839)
by Federico Cabiddu 04 Sep '19

04 Sep '19

#### 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 srjson_DeleteDoc(ctx->jreq) is already called in jsonrpc_clean_context(ctx). Calling it twice causes a crash due to a double free attempt. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1839 -- Commit Summary -- * jsonrpcs: fix double free crash -- File Changes -- M src/modules/jsonrpcs/jsonrpcs_mod.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1839.patch https://github.com/kamailio/kamailio/pull/1839.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/1839

5 9

Planning the next major release - v5.3.0
by Daniel-Constantin Mierla 04 Sep '19

04 Sep '19

Hello, it's about the time to set the milestones to the next major release - v5.3.0. There are 6 new modules and many other enhancements to existing components in git master branch, also during the last irc devel meeting it was proposed to freeze after summer holidays. At this moment I would propose Wednesday, September 4, 2019 to freeze the development. Then the release should be about one month later, after testing interval. In case there are people willing a bit more time for development, we can freeze one week later, September 11, or another date -- your suggestions here. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 4

git:master:f828ad87: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: f828ad875f2cbb13303e59bb090071e5cc168487 URL: https://github.com/kamailio/kamailio/commit/f828ad875f2cbb13303e59bb090071e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-04T00:31:30+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/f828ad875f2cbb13303e59bb090071e… Patch: https://github.com/kamailio/kamailio/commit/f828ad875f2cbb13303e59bb090071e…

1 0

[kamailio/kamailio] module rr: KEMI expose record_route_preset (#2051)
by aalba6675 03 Sep '19

03 Sep '19

#### 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  rr module: expose record_route_preset to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2051 -- Commit Summary -- * module rr: KEMI expose record_route_preset -- File Changes -- M src/modules/rr/rr_mod.c (36) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2051.patch https://github.com/kamailio/kamailio/pull/2051.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/2051

2 2

git:master:c556067b: Merge pull request #2051 from aalba6675/kemi-rr-preset
by GitHub 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: c556067bc3c0d99b7e81ee0bd1a97c1b416617d3 URL: https://github.com/kamailio/kamailio/commit/c556067bc3c0d99b7e81ee0bd1a97c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-04T00:21:16+02:00 Merge pull request #2051 from aalba6675/kemi-rr-preset module rr: KEMI expose record_route_preset --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c556067bc3c0d99b7e81ee0bd1a97c1… Patch: https://github.com/kamailio/kamailio/commit/c556067bc3c0d99b7e81ee0bd1a97c1… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 6e9dda1318..31a6031a5f 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -291,6 +291,35 @@ static int ki_record_route(sip_msg_t *msg) return ki_record_route_params( msg, 0 ); } +/** + * wrapper for record_route_preset(msg, key1, key2) + */ +static int ki_record_route_preset(sip_msg_t *msg, str *key1, str *key2) +{ + if (msg->msg_flags & FL_RR_ADDED) { + LM_ERR("Double attempt to record-route\n"); + return -1; + } + if (key2 && !enable_double_rr) { + LM_ERR("Attempt to double record-route while 'enable_double_rr' param is disabled\n"); + return -1; + } + + if ( record_route_preset( msg, key1)<0 ) + return -1; + + if (!key2) + goto done; + + if ( record_route_preset( msg, key2)<0 ) + return -1; + +done: + msg->msg_flags |= FL_RR_ADDED; + return 1; + +} + /** * config wrapper for record_route(msg, params) */ @@ -317,7 +346,7 @@ static int w_record_route_preset(struct sip_msg *msg, char *key, char *key2) str s; if (msg->msg_flags & FL_RR_ADDED) { - LM_ERR("Duble attempt to record-route\n"); + LM_ERR("Double attempt to record-route\n"); return -1; } if (key2 && !enable_double_rr) { @@ -747,6 +776,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rr"), str_init("record_route_preset"), + SR_KEMIP_INT, ki_record_route_preset, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:e1ab977f: module rr: KEMI expose record_route_preset
by A Alba 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: e1ab977fd9a61864376782f2534cc0d932347d78 URL: https://github.com/kamailio/kamailio/commit/e1ab977fd9a61864376782f2534cc0d… Author: A Alba <ascanio.alba7(a)gmail.com> Committer: A Alba <ascanio.alba7(a)gmail.com> Date: 2019-09-02T01:28:48+08:00 module rr: KEMI expose record_route_preset --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e1ab977fd9a61864376782f2534cc0d… Patch: https://github.com/kamailio/kamailio/commit/e1ab977fd9a61864376782f2534cc0d… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 6e9dda1318..31a6031a5f 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -291,6 +291,35 @@ static int ki_record_route(sip_msg_t *msg) return ki_record_route_params( msg, 0 ); } +/** + * wrapper for record_route_preset(msg, key1, key2) + */ +static int ki_record_route_preset(sip_msg_t *msg, str *key1, str *key2) +{ + if (msg->msg_flags & FL_RR_ADDED) { + LM_ERR("Double attempt to record-route\n"); + return -1; + } + if (key2 && !enable_double_rr) { + LM_ERR("Attempt to double record-route while 'enable_double_rr' param is disabled\n"); + return -1; + } + + if ( record_route_preset( msg, key1)<0 ) + return -1; + + if (!key2) + goto done; + + if ( record_route_preset( msg, key2)<0 ) + return -1; + +done: + msg->msg_flags |= FL_RR_ADDED; + return 1; + +} + /** * config wrapper for record_route(msg, params) */ @@ -317,7 +346,7 @@ static int w_record_route_preset(struct sip_msg *msg, char *key, char *key2) str s; if (msg->msg_flags & FL_RR_ADDED) { - LM_ERR("Duble attempt to record-route\n"); + LM_ERR("Double attempt to record-route\n"); return -1; } if (key2 && !enable_double_rr) { @@ -747,6 +776,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rr"), str_init("record_route_preset"), + SR_KEMIP_INT, ki_record_route_preset, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:26d25b1c: nathelper: docs - added missing xml tags for the new nat test option
by Daniel-Constantin Mierla 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 26d25b1c9e3654642f9f85c02492297ec1c03e75 URL: https://github.com/kamailio/kamailio/commit/26d25b1c9e3654642f9f85c02492297… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-04T00:19:38+02:00 nathelper: docs - added missing xml tags for the new nat test option --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/26d25b1c9e3654642f9f85c02492297… Patch: https://github.com/kamailio/kamailio/commit/26d25b1c9e3654642f9f85c02492297… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 71b8e92479..b5a5b08167 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -666,6 +666,7 @@ fix_nated_register(); URI port differs from the source port of the request (Warning: this is might be legal or even intended combination in non NATted scenarios) </para></listitem> + <listitem><para> <emphasis>256</emphasis> - Test if the SDP connection address is different from source IP address. It will work also with multiple connection address lines.

1 0

[kamailio/kamailio] nathelper: test sdp c line and sip source ip address is matched. (#2045)
by Yasin CANER 03 Sep '19

03 Sep '19

#### 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  test sdp c line and sip source ip address is matched. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2045 -- Commit Summary -- * nathelper: test sdp c line and sip source ip address is matched * nathelper : flag 256 is added to nathelper documentation -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (72) M src/modules/nathelper/nathelper.c (47) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2045.patch https://github.com/kamailio/kamailio/pull/2045.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/2045

3 19

git:master:9a5db075: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 9a5db07510feb5fab0bdd2b7d67446f93c55ee0f URL: https://github.com/kamailio/kamailio/commit/9a5db07510feb5fab0bdd2b7d67446f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-03T23:31:47+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/9a5db07510feb5fab0bdd2b7d67446f… Patch: https://github.com/kamailio/kamailio/commit/9a5db07510feb5fab0bdd2b7d67446f…

1 0

git:master:ce3bfaa8: nathelper: extend nat_uac_test() to test for mismatch between connection and source IP (GH #2045)
by Henning Westerholt 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: ce3bfaa843f0efabe49bd7087e89506f3f211669 URL: https://github.com/kamailio/kamailio/commit/ce3bfaa843f0efabe49bd7087e89506… Author: Yasin Caner <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-03T23:14:16+02:00 nathelper: extend nat_uac_test() to test for mismatch between connection and source IP (GH #2045) - extend nat_uac_test function to test for mismatch between connection and source IP - add documentation for this new flag 256 to module docs as well - based on pull request GH #2045 with smaller adaptions --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3bfaa843f0efabe49bd7087e89506… Patch: https://github.com/kamailio/kamailio/commit/ce3bfaa843f0efabe49bd7087e89506… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index e3c47e2d70..71b8e92479 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -666,6 +666,10 @@ fix_nated_register(); URI port differs from the source port of the request (Warning: this is might be legal or even intended combination in non NATted scenarios) </para></listitem> + <emphasis>256</emphasis> - Test if the SDP connection address is different + from source IP address. It will work also with multiple connection address + lines. + </para></listitem> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 27015b7bd8..6baaa64528 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -100,7 +100,7 @@ MODULE_VERSION #define NAT_UAC_TEST_O_1918 0x20 #define NAT_UAC_TEST_WS 0x40 #define NAT_UAC_TEST_C_PORT 0x80 - +#define NAT_UAC_TEST_SDP_CLINE 0x100 #define DEFAULT_NATPING_STATE 1 @@ -123,6 +123,7 @@ static int fixup_fix_sdp(void **param, int param_no); static int fixup_add_contact_alias(void **param, int param_no); static int add_rcv_param_f(struct sip_msg *, char *, char *); static int nh_sip_reply_received(sip_msg_t *msg); +static int test_sdp_cline(struct sip_msg *msg); static void nh_timer(unsigned int, void *); static int mod_init(void); @@ -1332,6 +1333,54 @@ static int contact_rport(struct sip_msg *msg) } } +/** +* test SDP C line ip address and source IP address match +* if all ip address matches, return 0 +* returns unmatched ip address count +* on parse error, returns -1 +*/ +static int test_sdp_cline(struct sip_msg *msg){ + sdp_session_cell_t* session; + struct ip_addr cline_addr; + int sdp_session_num = 0; + int result = 0; + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp body\n"); + return -1; + } + + for(;;){ + session = get_sdp_session(msg, sdp_session_num); + if(!session) + break; + + if(!(session->ip_addr.len > 0 && session->ip_addr.s)) + break; + + if(session->pf==AF_INET){ + if(str2ipbuf(&session->ip_addr,&cline_addr)<0){ + LM_ERR("Couldn't get sdp c line IP address\n"); + return -1; + } + }else if(session->pf==AF_INET6){ + if(str2ip6buf(&session->ip_addr, &cline_addr)<0){ + LM_ERR("Couldn't get sdp c line IP address\n"); + return -1; + } + }else{ + LM_ERR("Couldn't get sdp address type\n"); + return -1; + } + + if(ip_addr_cmp(&msg->rcv.src_ip,&cline_addr)){ + result++; + } + sdp_session_num++; + } + + return sdp_session_num - result; +} /* * test for occurrence of RFC1918 IP address in SDP */ @@ -1441,6 +1490,12 @@ static int nat_uac_test(struct sip_msg *msg, int tests) if((tests & NAT_UAC_TEST_C_PORT) && (contact_rport(msg) > 0)) return 1; + /** + * test if sdp c line ip address matches with sip source address + */ + if((tests & NAT_UAC_TEST_SDP_CLINE) && (test_sdp_cline(msg) > 0)) + return 1; + /* no test succeeded */ return -1; }

1 0

git:master:9094ee5b: nathelper: also return -1 in case of SDP parsing errors for sdp_1918 check, simplify code
by Henning Westerholt 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 9094ee5b1780b3be1b89b54cb8cc32cda4e8c04b URL: https://github.com/kamailio/kamailio/commit/9094ee5b1780b3be1b89b54cb8cc32c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-03T23:21:45+02:00 nathelper: also return -1 in case of SDP parsing errors for sdp_1918 check, simplify code --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/9094ee5b1780b3be1b89b54cb8cc32c… Patch: https://github.com/kamailio/kamailio/commit/9094ee5b1780b3be1b89b54cb8cc32c… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 6baaa64528..4426b93478 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1388,16 +1388,13 @@ static int sdp_1918(struct sip_msg *msg) { str *ip; int pf; - int ret; int sdp_session_num, sdp_stream_num; sdp_session_cell_t *sdp_session; sdp_stream_cell_t *sdp_stream; - ret = parse_sdp(msg); - if(ret != 0) { - if(ret < 0) - LM_ERR("Unable to parse sdp\n"); - return 0; + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp body\n"); + return -1; } sdp_session_num = 0; @@ -1462,7 +1459,7 @@ static int nat_uac_test(struct sip_msg *msg, int tests) /* * test for occurrences of RFC1918 addresses in SDP body */ - if((tests & NAT_UAC_TEST_S_1918) && sdp_1918(msg)) + if((tests & NAT_UAC_TEST_S_1918) && (sdp_1918(msg) > 0)) return 1; /* * test for occurrences of RFC1918 addresses top Via

1 0

[kamailio/kamailio] Module:phonenum: Issue in fetching resid param fixed (#2054)
by balajeesv 03 Sep '19

03 Sep '19

#### 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  Issue in fetching resid param fixed for phonenum module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2054 -- Commit Summary -- * phonenum_fix -- File Changes -- M src/modules/phonenum/phonenum_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2054.patch https://github.com/kamailio/kamailio/pull/2054.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/2054

2 2

git:master:56f86535: phonenum: proper access to the str type param resid
by Daniel-Constantin Mierla 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 56f86535e0ae3fcf8fa2d0b565c7ab61351678d0 URL: https://github.com/kamailio/kamailio/commit/56f86535e0ae3fcf8fa2d0b565c7ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-03T20:03:05+02:00 phonenum: proper access to the str type param resid --- Modified: src/modules/phonenum/phonenum_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56f86535e0ae3fcf8fa2d0b565c7ab6… Patch: https://github.com/kamailio/kamailio/commit/56f86535e0ae3fcf8fa2d0b565c7ab6… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index 6c9e0b1d1b..ea49e73a86 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -112,8 +112,7 @@ static int phonenum_resid_param(modparam_t type, void* val) { str rname; - rname.s = (char*)val; - rname.len = strlen(rname.s); + rname = *((str*)val); if(sr_phonenum_add_resid(&rname) < 0) { LM_ERR("failed to register result container with id: %.*s\n", rname.len, rname.s);

1 0

[kamailio/kamailio] dialog database varchar(128) too short for IPv6 (#2053)
by Anthony Messina 02 Sep '19

02 Sep '19

Related to #2043. When using the database for dialogs, the `caller_contact` and `callee_contact` columns are too short. The following seems to help. ``` ALTER TABLE kamailio.dialog ALTER COLUMN caller_contact TYPE varchar(255); ALTER TABLE kamailio.dialog ALTER COLUMN callee_contact TYPE varchar(255); ``` -- 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/2053

2 3

git:master:5518bbaa: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 5518bbaa8c27ca0fbfa173e1f7101da90b1aee6d URL: https://github.com/kamailio/kamailio/commit/5518bbaa8c27ca0fbfa173e1f7101da… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T19:16:50+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/5518bbaa8c27ca0fbfa173e1f7101da… Patch: https://github.com/kamailio/kamailio/commit/5518bbaa8c27ca0fbfa173e1f7101da…

1 0

git:master:56e53ed0: uac: docs - fixed missing ending tag
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 56e53ed0ce594a1df30b5a5dcb5b455e0346957d URL: https://github.com/kamailio/kamailio/commit/56e53ed0ce594a1df30b5a5dcb5b455… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T19:10:31+02:00 uac: docs - fixed missing ending tag --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/56e53ed0ce594a1df30b5a5dcb5b455… Patch: https://github.com/kamailio/kamailio/commit/56e53ed0ce594a1df30b5a5dcb5b455… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e6211d398b..1a48b5663e 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1314,7 +1314,7 @@ event_route[uac:reply] { ... </programlisting> </example> - + </section> </section> <section>

1 0

git:master:f99b8731: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: f99b8731a9e91315f75e584f34f15d3c83f086d5 URL: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T18:46:48+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3… Patch: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3…

1 0

git:master:3c980e1a: uac: docs - updates about use of auth_ha1 for remote registrations
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 3c980e1a820bd5981b8f68e393a8404131b49bec URL: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:43:59+02:00 uac: docs - updates about use of auth_ha1 for remote registrations - added docs for rpc uac.reg_add command --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… Patch: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 3ac4cc2a17..e6211d398b 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1278,6 +1278,43 @@ event_route[uac:reply] { </example> </section> + <section id="uac.r.uac.reg_add"> + <para> + Add a new UAC remote registration record. If one with the same + unique id is found, it is deleted. + </para> + <para> + The parameters are: + <itemizedlist> + <listitem><para>l_uuid</para></listitem> + <listitem><para>l_username</para></listitem> + <listitem><para>l_domain</para></listitem> + <listitem><para>r_username</para></listitem> + <listitem><para>r_domain</para></listitem> + <listitem><para>realm</para></listitem> + <listitem><para>auth_username</para></listitem> + <listitem><para>auth_password</para></listitem> + <listitem><para>auth_ha1</para></listitem> + <listitem><para>auth_proxy</para></listitem> + <listitem><para>expires</para></listitem> + <listitem><para>flags</para></listitem> + <listitem><para>reg_delay</para></listitem> + <listitem><para>socket</para></listitem> + </itemizedlist> + </para> + <para> + Use a dot (.) if no value should be set for auth_password or auth_ha1. + </para> + + <example> + <title><function>uac.reg_add</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_add ... +... + </programlisting> + </example> + </section> <section> @@ -1331,8 +1368,14 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>auth_password</emphasis> - authentication password, - e.g.,: xxxxxx + <emphasis>auth_password</emphasis> - authentication password in + clear text, e.g.,: xxxxxx + </para></listitem> + </itemizedlist> + <itemizedlist> + <listitem><para> + <emphasis>auth_ha1</emphasis> - hashed (HA1) authentication password, + it has priority over auth_password. </para></listitem> </itemizedlist> <itemizedlist>

1 0

git:master:163f73fe: lib/srdb1: uac_reg schema - updated notes about auth_password and auth_ha1
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 163f73feb1f423270c3ecab7dec30b5d7cee0964 URL: https://github.com/kamailio/kamailio/commit/163f73feb1f423270c3ecab7dec30b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:43:09+02:00 lib/srdb1: uac_reg schema - updated notes about auth_password and auth_ha1 --- Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/163f73feb1f423270c3ecab7dec30b5… Patch: https://github.com/kamailio/kamailio/commit/163f73feb1f423270c3ecab7dec30b5… --- diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index 2ce0f1262b..bf967f2655 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -94,7 +94,7 @@ <type>string</type> <size>&password_len;</size> <default/> - <description>Authentication password</description> + <description>Authentication password in clear text</description> </column> <column id="auth_ha1"> @@ -102,7 +102,8 @@ <type>string</type> <size>&ha1_len;</size> <default/> - <description>Hashed (HA1) authentication password - currently unused</description> + <description>Hashed (HA1) authentication password - it has priority over + auth_password field.</description> </column> <column id="auth_proxy">

1 0

git:master:9b501c49: uac: use auth_ha1 field if set for remote registrations
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 9b501c49450646b47b740c7cc82a6a755f6f10f5 URL: https://github.com/kamailio/kamailio/commit/9b501c49450646b47b740c7cc82a6a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:23:31+02:00 uac: use auth_ha1 field if set for remote registrations - has priority over auth_password field --- Modified: src/modules/uac/auth.h Modified: src/modules/uac/auth_alg.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/9b501c49450646b47b740c7cc82a6a7… Patch: https://github.com/kamailio/kamailio/commit/9b501c49450646b47b740c7cc82a6a7…

1 0

git:master:b9cfe696: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: b9cfe696db5f7bbcbe6fc8c3ae63b4f9d640e311 URL: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T13:47:22+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… Patch: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 842e2cfcc7..ebe872869b 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -26,6 +26,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -37,8 +38,9 @@ Daniel-Constantin Mierla List of Examples 1.1. Set smode parameter - 1.2. phonenum_match usage - 1.3. phonenum_match_cn usage + 1.2. Set resid parameter + 1.3. phonenum_match usage + 1.4. phonenum_match_cn usage Chapter 1. Admin Guide @@ -53,6 +55,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -95,10 +98,11 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 3.1. smode (int) - Phone number search mode. + Phone number search mode (not in use yet). Default value is “0”. @@ -107,6 +111,23 @@ Chapter 1. Admin Guide modparam("phonenum", "smode", 0) ... +3.2. resid (str) + + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native Kamailio.cfg file, + registration is done when parsing config and finding variables. + + Default value is “” (empty). + + Example 1.2. Set resid parameter +... +modparam("phonenum", "resid", "src") +... +if(phonenum_match("1-484-555-8888", "src")) { + ... +} +... + 4. Functions 4.1. phonenum_match(num, pvc) @@ -115,14 +136,14 @@ modparam("phonenum", "smode", 0) 4.1. phonenum_match(num, pvc) Match num against the libphonenumber and set the attributes inside the - pvc container. The function has to be called before accessing a key - via: $phn(pvc=>key). + pvc result container. The function has to be called before accessing a + key via: $phn(pvc=>key). The parameters can be static strings or strings with variables. It can be used from ANY_ROUTE. - Example 1.2. phonenum_match usage + Example 1.3. phonenum_match usage ... if(phonenum_match("1-484-555-8888", "src")) { if($phn(src=>valid)==1) { @@ -144,7 +165,7 @@ if(phonenum_match("1-484-555-8888", "src")) { It can be used from ANY_ROUTE. - Example 1.3. phonenum_match_cn usage + Example 1.4. phonenum_match_cn usage ... if(phonenum_match_cn("1-484-555-8888", "US", "src")) { if($phn(src=>valid)==1) {

1 0

git:master:67412b4b: phonenum: new param resid to register result container ids
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 67412b4b2b377cca179de2ebe109bd56fb8a63b9 URL: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T13:41:03+02:00 phonenum: new param resid to register result container ids - allow use in KEMI scripting by pre-registering container result id via modparam --- Modified: src/modules/phonenum/phonenum_mod.c Modified: src/modules/phonenum/phonenum_pv.c Modified: src/modules/phonenum/phonenum_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… Patch: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index eaaa43c1aa..6c9e0b1d1b 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -47,6 +47,8 @@ static int w_phonenum_match_cn(struct sip_msg *msg, char *str1, char *str2, char *str3); static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass); +static int phonenum_resid_param(modparam_t type, void* val); + /* clang-format off */ static pv_export_t mod_pvs[] = { { {"phn", sizeof("phn")-1}, PVT_OTHER, pv_get_phonenum, 0, @@ -64,6 +66,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"smode", PARAM_INT, &phonenum_smode}, + {"resid", PARAM_STR|PARAM_USE_FUNC, &phonenum_resid_param}, {0, 0, 0} }; @@ -102,6 +105,22 @@ static void mod_destroy(void) phonenum_destroy_pv(); } +/** + * + */ +static int phonenum_resid_param(modparam_t type, void* val) +{ + str rname; + + rname.s = (char*)val; + rname.len = strlen(rname.s); + if(sr_phonenum_add_resid(&rname) < 0) { + LM_ERR("failed to register result container with id: %.*s\n", + rname.len, rname.s); + return -1; + } + return 0; +} static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass) { diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index a34382239a..6115d9daad 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -111,6 +111,13 @@ sr_phonenum_item_t *sr_phonenum_add_item(str *name) return it; } +int sr_phonenum_add_resid(str *rname) +{ + if(sr_phonenum_add_item(rname)==NULL) { + return -1; + } + return 0; +} int pv_parse_phonenum_name(pv_spec_p sp, str *in) { diff --git a/src/modules/phonenum/phonenum_pv.h b/src/modules/phonenum/phonenum_pv.h index b56d6f47dd..938bbac297 100644 --- a/src/modules/phonenum/phonenum_pv.h +++ b/src/modules/phonenum/phonenum_pv.h @@ -34,6 +34,7 @@ int phonenum_init_pv(int smode); void phonenum_destroy_pv(void); void phonenum_pv_reset(str *pvclass); int phonenum_update_pv(str *tomatch, str *cncode, str *pvclass); +int sr_phonenum_add_resid(str *rname); #endif

1 0

git:master:d2bac426: phonenum: docs for resid parameter
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: d2bac426192c074368bf78014e0d1d0ca97f3274 URL: https://github.com/kamailio/kamailio/commit/d2bac426192c074368bf78014e0d1d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T13:45:16+02:00 phonenum: docs for resid parameter --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d2bac426192c074368bf78014e0d1d0… Patch: https://github.com/kamailio/kamailio/commit/d2bac426192c074368bf78014e0d1d0… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index 402edfdb60..d30c2026ee 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -71,7 +71,7 @@ <section id="phonenum.p.smode"> <title><varname>smode</varname> (int)</title> <para> - Phone number search mode. + Phone number search mode (not in use yet). </para> <para> <emphasis> @@ -87,7 +87,31 @@ modparam("phonenum", "smode", 0) </programlisting> </example> </section> - + <section id="phonenum.p.resid"> + <title><varname>resid</varname> (str)</title> + <para> + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native &kamailio;.cfg file, registration + is done when parsing config and finding variables. + </para> + <para> + <emphasis> + Default value is <quote></quote> (empty). + </emphasis> + </para> + <example> + <title>Set <varname>resid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("phonenum", "resid", "src") +... +if(phonenum_match("1-484-555-8888", "src")) { + ... +} +... +</programlisting> + </example> + </section> </section> <section> @@ -98,7 +122,7 @@ modparam("phonenum", "smode", 0) </title> <para> Match num against the libphonenumber and set the attributes inside - the pvc container. The function has to be called before accessing + the pvc result container. The function has to be called before accessing a key via: $phn(pvc=>key). </para> <para>

1 0

[kamailio/kamailio] to tags generation (#1164)
by Dmitri Savolainen 02 Sep '19

02 Sep '19

### Description Not shure is this relevant issue. according to rfc3261: > When a tag is generated by a UA for insertion into a request or > response, it MUST be globally unique and cryptographically random > with at least 32 bits of randomness. Kamailio has 16 instead and distribution is not good. I look at tags for 419485 sip flows (different callid) and table below (top keys ordered by count): tag suffix; count for different flows with this suffix ed54 6258 d118 5988 56ce 5923 a7a5 5220 de51 2150 82d8 1143 cf52 890 af92 740 7b5f 534 85f7 307 e553 163 7f7e 138 1d55 130 1afe 62 5a69 43 7caa 18 8474 18 9db2 18 11d3 18 f9ff 18 5420 17 dae6 17 908d 17 ede4 17 09ee 17 96be 17 25dc 17 af6d 16 2506 16 3da0 16 f161 16 1c29 16 #### SIP Traffic To: <sip:039*101@host:5071>;tag=555d2c3eafafcba8ac92b676e91bb6ed.58eb -- 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/1164

3 4

git:master:e4ae7c7a: tm: improve from-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164)
by Henning Westerholt 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: e4ae7c7a7c7e8696870535e3399c8b9ddf585a06 URL: https://github.com/kamailio/kamailio/commit/e4ae7c7a7c7e8696870535e3399c8b9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-02T09:54:21+02:00 tm: improve from-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164) - improve from-tag generation for uac request to include more randomness (request uri) - use the recommended size of 32 bit randomness from RFC 3261 - implementation could be further improved by using a cryptographic hash algorithm - related to GH #1164 --- Modified: src/modules/tm/dlg.c Modified: src/modules/tm/rpc_uac.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/e4ae7c7a7c7e8696870535e3399c8b9… Patch: https://github.com/kamailio/kamailio/commit/e4ae7c7a7c7e8696870535e3399c8b9…

1 0

git:master:06e27d36: core: improve to-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164)
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 06e27d3608b7f75003d54dc43b3a067b511f8e7a URL: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T22:55:59+02:00 core: improve to-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164) - improve to-tag generation to include more randomness (callid body if available) - use the recommended size of 32 bit randomness from RFC 3261 - implementation could be further improved by using a cryptographic hash algorithm - related to GH #1164 --- Modified: src/core/crc.h Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… Patch: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… --- diff --git a/src/core/crc.h b/src/core/crc.h index a52348f168..24ba1d0e15 100644 --- a/src/core/crc.h +++ b/src/core/crc.h @@ -5,6 +5,7 @@ #include "str.h" #define CRC16_LEN 4 +#define CRC32_LEN 8 extern unsigned long int crc_32_tab[]; extern unsigned short int ccitt_tab[]; diff --git a/src/core/tags.h b/src/core/tags.h index ddfdaae411..fff879cfab 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -36,10 +36,10 @@ #include "str.h" #include "socket_info.h" -#define TOTAG_VALUE_LEN (MD5_LEN+CRC16_LEN+1) +#define TOTAG_VALUE_LEN (MD5_LEN+CRC32_LEN+1) /*! generate variable part of to-tag for a request; - * it will have length of CRC16_LEN, sufficiently + * it will have length of CRC32_LEN, sufficiently * long buffer must be passed to the function */ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) { @@ -50,9 +50,23 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) if (msg->via1==0) return; /* no via, bad message */ suffix_source[0]=msg->via1->host; suffix_source[1]=msg->via1->port_str; - if (msg->via1->branch) - suffix_source[ss_nr++]=msg->via1->branch->value; + if (msg->via1->branch) { + suffix_source[2]=msg->via1->branch->value; + } else { + suffix_source[2].s = NULL; + suffix_source[2].len = 0; + } crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + + suffix_source[0]=msg->via1->port_str; + suffix_source[1]=msg->via1->host; + if (msg->callid) { + suffix_source[2]=msg->callid->body; + } else { + suffix_source[2].s = NULL; + suffix_source[2].len = 0; + } + crcitt_string_array( tag_suffix+4, suffix_source, ss_nr ); } static void inline init_tags( char *tag, char **suffix,

1 0

git:master:a2e5e6e2: seas: remove a code block related to tag generation which was commented out since 2006
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: a2e5e6e267b15cad23bca8be15bca06383865ed7 URL: https://github.com/kamailio/kamailio/commit/a2e5e6e267b15cad23bca8be15bca06… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T22:55:59+02:00 seas: remove a code block related to tag generation which was commented out since 2006 --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/a2e5e6e267b15cad23bca8be15bca06… Patch: https://github.com/kamailio/kamailio/commit/a2e5e6e267b15cad23bca8be15bca06… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index 7c963e6fe7..cd62848ab0 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -687,15 +687,6 @@ int ac_reply(as_p the_as,unsigned char processor_id,unsigned int flags,char *act }else{ totag.s=NULL; totag.len=0; - /*if(!(ttag=pkg_malloc(TOTAG_VALUE_LEN))){ - LM_ERR("Out of memory !!!\n"); - goto error; - } - totag.s=ttag; - calc_crc_suffix(c->uas.request,seas_tag_suffix); - LM_DBG("seas_tags = %.*s\n",TOTAG_VALUE_LEN,seas_tags); - memcpy(totag.s,seas_tags,TOTAG_VALUE_LEN); - totag.len=TOTAG_VALUE_LEN;*/ } LM_DBG("Using totag=[%.*s]\n",totag.len,totag.s); if(my_msg->content_length)

1 0

git:master:bc96f46f: CONTRIBUTING.md: removed garbage bullet from commit mesage details
by Daniel-Constantin Mierla 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: bc96f46f8a9f0beefffe281398671d216c839f20 URL: https://github.com/kamailio/kamailio/commit/bc96f46f8a9f0beefffe281398671d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-01T19:24:17+02:00 CONTRIBUTING.md: removed garbage bullet from commit mesage details --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/bc96f46f8a9f0beefffe281398671d2… Patch: https://github.com/kamailio/kamailio/commit/bc96f46f8a9f0beefffe281398671d2… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d22cbc0ce2..ea6ba9cdd8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -94,7 +94,6 @@ Please start always with the prefix of the component (subsystem) that is modifie * first line (subject line) has to contain meaningful text about what that commit does, do not put just a reference to bug tracker or pull request items - * t * commit message must describe the changes done by the patch * other details (e.g., how to reproduce, backtrace, sip packets, ...) belong to content (comments) of the pull request. Example:

1 0

git:master:059b8426: lost: a few bug fixes reported from source code analyzer
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 059b8426397f2802ea51db44861387386f7109e5 URL: https://github.com/kamailio/kamailio/commit/059b8426397f2802ea51db448613873… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:04:07+02:00 lost: a few bug fixes reported from source code analyzer --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/059b8426397f2802ea51db448613873… Patch: https://github.com/kamailio/kamailio/commit/059b8426397f2802ea51db448613873…

2 1

5.3 add rr record_route_preset to KEMI?
by Anthony Alba 01 Sep '19

01 Sep '19

Hi Daniel and Kamailio developers, Could you consider adding record_route_preset to KEMI in 5.3? If you like I can do the PR. Hope it is not too late. Regards Anthony Alba

2 1

git:master:0e74c602: rtp_media_server: use portable kamailio rand() wrapper instead of direct library call
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 0e74c602c0822393bc6032574f834e2a9030cc7b URL: https://github.com/kamailio/kamailio/commit/0e74c602c0822393bc6032574f834e2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:14:05+02:00 rtp_media_server: use portable kamailio rand() wrapper instead of direct library call --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/0e74c602c0822393bc6032574f834e2… Patch: https://github.com/kamailio/kamailio/commit/0e74c602c0822393bc6032574f834e2… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 37ddb1b998..8f2b2592aa 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -20,6 +20,7 @@ #include "rtp_media_server.h" #include "../../core/fmsg.h" +#include "../../core/rand/kam_rand.h" MODULE_VERSION @@ -169,7 +170,7 @@ static int mod_init(void) rms->udp_start_port = 50000; LM_INFO("RTP media server module init\n"); rms->udp_end_port = 60000; - rms->udp_last_port = 50000 + rand() % 10000; + rms->udp_last_port = 50000 + kam_rand() % 10000; rms_media_init(); if(!init_rms_dialog_list()) {

1 0

git:master:e98a4ee5: nathelper: use portable kamailio rand() wrapper instead of direct library call
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: e98a4ee55253302144053704c26089f440d5d7ff URL: https://github.com/kamailio/kamailio/commit/e98a4ee55253302144053704c26089f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:17:38+02:00 nathelper: use portable kamailio rand() wrapper instead of direct library call --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/e98a4ee55253302144053704c26089f… Patch: https://github.com/kamailio/kamailio/commit/e98a4ee55253302144053704c26089f… --- diff --git a/src/modules/nathelper/sip_pinger.h b/src/modules/nathelper/sip_pinger.h index 23ea633d03..e84ca6c648 100644 --- a/src/modules/nathelper/sip_pinger.h +++ b/src/modules/nathelper/sip_pinger.h @@ -30,6 +30,7 @@ #include "../../core/str.h" #include "../../core/ut.h" #include "../../core/ip_addr.h" +#include "../../core/rand/kam_rand.h" /* size of buffer used for building SIP PING req */ #define MAX_SIPPING_SIZE 65536 @@ -56,15 +57,15 @@ static void init_sip_ping(void) char *p; /* FROM tag - some random number */ - sipping_fromtag = rand(); + sipping_fromtag = kam_rand(); /* callid fix part - hexa string */ len = 8; p = sipping_callid_buf; - int2reverse_hex(&p, &len, rand()); + int2reverse_hex(&p, &len, kam_rand()); sipping_callid.s = sipping_callid_buf; sipping_callid.len = 8 - len; /* callid counter part */ - sipping_callid_cnt = rand(); + sipping_callid_cnt = kam_rand(); }

1 0

git:master:6cc563b1: lost: use portable kamailio rand() wrapper instead of direct library call
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 6cc563b1b73bfa07911d3e6e3f35d744eb952fbf URL: https://github.com/kamailio/kamailio/commit/6cc563b1b73bfa07911d3e6e3f35d74… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:08:05+02:00 lost: use portable kamailio rand() wrapper instead of direct library call --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/6cc563b1b73bfa07911d3e6e3f35d74… Patch: https://github.com/kamailio/kamailio/commit/6cc563b1b73bfa07911d3e6e3f35d74… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index cfd2dbe3ab..966e93b033 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -45,6 +45,7 @@ #include "../../core/dprint.h" #include "../../core/mem/mem.h" #include "../../core/mem/shm_mem.h" +#include "../../core/rand/kam_rand.h" #include "pidf.h" #include "utilities.h" @@ -85,9 +86,9 @@ void lost_rand_str(char *dest, size_t lgth) char charset[] = "0123456789" "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - srand(time(NULL)); + kam_srand(time(NULL)); while(lgth-- > 0) { - index = (double)rand() / RAND_MAX * (sizeof charset - 1); + index = (double)kam_rand() / RAND_MAX * (sizeof charset - 1); *dest++ = charset[index]; } *dest = '\0';

1 0

git:master:06a17dbf: lib: add a comment that HA1 hash value is currently not used from uacreg module
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 06a17dbf23d2b1d3cc1c7be69e7fb99825a534ee URL: https://github.com/kamailio/kamailio/commit/06a17dbf23d2b1d3cc1c7be69e7fb99… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:04:07+02:00 lib: add a comment that HA1 hash value is currently not used from uacreg module --- Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/06a17dbf23d2b1d3cc1c7be69e7fb99… Patch: https://github.com/kamailio/kamailio/commit/06a17dbf23d2b1d3cc1c7be69e7fb99… --- diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index d6257d0cf4..2ce0f1262b 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -102,7 +102,7 @@ <type>string</type> <size>&ha1_len;</size> <default/> - <description>Hashed (HA1) authentication password</description> + <description>Hashed (HA1) authentication password - currently unused</description> </column> <column id="auth_proxy">

1 0

git:master:8aeca29b: pkg/docker: updated submodule [skip ci]
by Sergey Safarov 31 Aug '19

31 Aug '19

Module: kamailio Branch: master Commit: 8aeca29b0666a6c6fbca7e7488677aad1a45e44e URL: https://github.com/kamailio/kamailio/commit/8aeca29b0666a6c6fbca7e7488677aa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-08-31T13:05:32+03:00 pkg/docker: updated submodule [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/8aeca29b0666a6c6fbca7e7488677aa… Patch: https://github.com/kamailio/kamailio/commit/8aeca29b0666a6c6fbca7e7488677aa… --- diff --git a/pkg/docker b/pkg/docker index b92a1c899b..5d6f46a758 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 +Subproject commit 5d6f46a758e0d98fa4258925d40aa1521b1e27d0

1 0

git:master:8f98a04c: pkg/kamailio/obs: packaged kemix, lost and xhttp_prom modules
by Sergey Safarov 31 Aug '19

31 Aug '19

Module: kamailio Branch: master Commit: 8f98a04c0f9392db6a74289a184d06da11545ab0 URL: https://github.com/kamailio/kamailio/commit/8f98a04c0f9392db6a74289a184d06d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-08-31T13:03:20+03:00 pkg/kamailio/obs: packaged kemix, lost and xhttp_prom modules --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8f98a04c0f9392db6a74289a184d06d… Patch: https://github.com/kamailio/kamailio/commit/8f98a04c0f9392db6a74289a184d06d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8fd4254eb7..9dec32a876 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1425,7 +1425,9 @@ fi %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc %doc %{_docdir}/kamailio/modules/README.ipops +%doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex +%doc %{_docdir}/kamailio/modules/README.lost %doc %{_docdir}/kamailio/modules/README.malloc_test %doc %{_docdir}/kamailio/modules/README.mangler %doc %{_docdir}/kamailio/modules/README.matrix @@ -1492,6 +1494,7 @@ fi %doc %{_docdir}/kamailio/modules/README.userblacklist %doc %{_docdir}/kamailio/modules/README.usrloc %doc %{_docdir}/kamailio/modules/README.xhttp +%doc %{_docdir}/kamailio/modules/README.xhttp_prom %doc %{_docdir}/kamailio/modules/README.xhttp_rpc %doc %{_docdir}/kamailio/modules/README.xlog %doc %{_docdir}/kamailio/modules/README.xprint @@ -1576,7 +1579,9 @@ fi %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so %{_libdir}/kamailio/modules/ipops.so +%{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so +%{_libdir}/kamailio/modules/lost.so %{_libdir}/kamailio/modules/malloc_test.so %{_libdir}/kamailio/modules/mangler.so %{_libdir}/kamailio/modules/matrix.so @@ -1643,6 +1648,7 @@ fi %{_libdir}/kamailio/modules/userblacklist.so %{_libdir}/kamailio/modules/usrloc.so %{_libdir}/kamailio/modules/xhttp.so +%{_libdir}/kamailio/modules/xhttp_prom.so %{_libdir}/kamailio/modules/xhttp_rpc.so %{_libdir}/kamailio/modules/xlog.so %{_libdir}/kamailio/modules/xprint.so @@ -1875,7 +1881,9 @@ fi %files lua %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.app_lua +%doc %{_docdir}/kamailio/modules/README.app_lua_sr %{_libdir}/kamailio/modules/app_lua.so +%{_libdir}/kamailio/modules/app_lua_sr.so %endif @@ -2217,6 +2225,8 @@ fi %changelog +* Sat Aug 31 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-dev7 + - Packaged kemix, lost and xhttp_prom modules * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 and Fedora 30 dists * Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0

1 0

Info: Upgrading kamcli to work with Python3
by Daniel-Constantin Mierla 30 Aug '19

30 Aug '19

Hello, with the perspective that Python2 is going to be removed from the major Linux distributes starting with the beginning of next year, the work to upgrade kamcli to run with Python3 has been started. >From now on, master branch of kamcli is expected to work only with Python3: * https://github.com/kamailio/kamcli There is still work to be done to upgrade all the code, but any use of it should be done with Python3 and eventual issues to be filed on bug tracker. Of course, pull requests are welcome as always! Who wants to use the version for Python2 has to use the code from git branch v1.2-python2. That branch is probably not going to receive any new feature, it will be kept for use with older systems (as well as a running option during the upgrade period to Python3). Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:72a4d665: tm: void the return for sr_kemi_route() to prevent analyzer warnings
by Daniel-Constantin Mierla 30 Aug '19

30 Aug '19

Module: kamailio Branch: master Commit: 72a4d665607d3c38278a744d3af3588ed54d2a05 URL: https://github.com/kamailio/kamailio/commit/72a4d665607d3c38278a744d3af3588… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-30T09:09:33+02:00 tm: void the return for sr_kemi_route() to prevent analyzer warnings --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/72a4d665607d3c38278a744d3af3588… Patch: https://github.com/kamailio/kamailio/commit/72a4d665607d3c38278a744d3af3588… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 350be35bdd..331bdbdf71 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -593,7 +593,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, } else { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ctx); - sr_kemi_route(keng, &pmsg, EVENT_ROUTE, + (void)sr_kemi_route(keng, &pmsg, EVENT_ROUTE, &_tm_event_callback_lres_sent, &evname); sr_kemi_act_ctx_set(bctx); }

1 0

git:master:932bbdb1: sl: void the return for sr_kemi_route() to prevent analyzer warnings
by Daniel-Constantin Mierla 30 Aug '19

30 Aug '19

Module: kamailio Branch: master Commit: 932bbdb19f48808fe6f40849e4798124ef4da127 URL: https://github.com/kamailio/kamailio/commit/932bbdb19f48808fe6f40849e479812… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-30T09:04:43+02:00 sl: void the return for sr_kemi_route() to prevent analyzer warnings --- Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/932bbdb19f48808fe6f40849e479812… Patch: https://github.com/kamailio/kamailio/commit/932bbdb19f48808fe6f40849e479812… --- diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 83cf15bb5d..5e36a5542e 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -293,7 +293,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) } else if (keng!=NULL) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ctx); - sr_kemi_route(keng, msg, EVENT_ROUTE, + (void)sr_kemi_route(keng, msg, EVENT_ROUTE, &_sl_event_callback_lres_sent, &evname); sr_kemi_act_ctx_set(bctx); } @@ -448,7 +448,7 @@ int sl_filter_ACK(struct sip_msg *msg, unsigned int flags, void *bar ) init_run_actions_ctx(&ctx); bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ctx); - sr_kemi_route(keng, msg, EVENT_ROUTE, + (void)sr_kemi_route(keng, msg, EVENT_ROUTE, &_sl_event_callback_fl_ack, &evname); sr_kemi_act_ctx_set(bctx); }

1 0

[kamailio/kamailio] tls_domain subdomain matching broken (#2049)
by Laszlo 29 Aug '19

29 Aug '19

Concerns the following code: https://github.com/kamailio/kamailio/blob/master/src/modules/tls/tls_domain… Let's say `sname = sip.example.com` and `p->server_name = example.com`. ``` dotpos = sname->len - p->server_name.len; > dotpos = len("sip.example.com") - len("example.com") > dotpos = 15 - 11 = 4 if (sname->s[dotpos] == '.') > if ("sip.example.com"[4] == '.') ``` `sip.example.com"[4]` is "e", not "." so the if clause will always fail and subdomains will never be matched. -- 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/2049

2 2

git:master:16beec2b: tls: proper dot position for matching subdomains
by Daniel-Constantin Mierla 29 Aug '19

29 Aug '19

Module: kamailio Branch: master Commit: 16beec2b7660d416a05f069695b4ce18e8b4e795 URL: https://github.com/kamailio/kamailio/commit/16beec2b7660d416a05f069695b4ce1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-29T18:51:17+02:00 tls: proper dot position for matching subdomains - reported by GH #2049 --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/16beec2b7660d416a05f069695b4ce1… Patch: https://github.com/kamailio/kamailio/commit/16beec2b7660d416a05f069695b4ce1… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fff4603eba..1ca62ff200 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1563,7 +1563,7 @@ tls_domain_t* tls_lookup_cfg(tls_domains_cfg_t* cfg, int type, if ((p->server_name_mode==KSR_TLS_SNM_INCDOM || p->server_name_mode==KSR_TLS_SNM_SUBDOM) && (p->server_name.len<sname->len)) { - dotpos = sname->len - p->server_name.len; + dotpos = sname->len - p->server_name.len - 1; if(sname->s[dotpos] == '.' && strncasecmp(p->server_name.s, sname->s + dotpos + 1,

1 0

git:master:152801ea: sl: docs - set section ids in expected format
by Daniel-Constantin Mierla 29 Aug '19

29 Aug '19

Module: kamailio Branch: master Commit: 152801eaef0d95a6cee027391b809bfe2289ef3d URL: https://github.com/kamailio/kamailio/commit/152801eaef0d95a6cee027391b809bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-29T14:36:00+02:00 sl: docs - set section ids in expected format --- Modified: pkg/docker Modified: src/modules/sl/doc/sl_functions.xml Modified: src/modules/sl/doc/sl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/152801eaef0d95a6cee027391b809bf… Patch: https://github.com/kamailio/kamailio/commit/152801eaef0d95a6cee027391b809bf… --- diff --git a/pkg/docker b/pkg/docker index 424756ff7a..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 424756ff7aca572466a99059f76d44ce57e01646 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 diff --git a/src/modules/sl/doc/sl_functions.xml b/src/modules/sl/doc/sl_functions.xml index bdef94866e..1bb12b76c4 100644 --- a/src/modules/sl/doc/sl_functions.xml +++ b/src/modules/sl/doc/sl_functions.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <section id="sl.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Functions</title> - <section id="sl_send_reply"> + <section id="sl.f.sl_send_reply"> <title> <function>sl_send_reply(code, reason)</function> </title> @@ -49,14 +49,14 @@ sl_send_reply("404", "Not found"); </programlisting> </example> </section> - - <section id="send_reply"> + + <section id="sl.f.send_reply"> <title> <function moreinfo="none">send_reply(code, reason)</function> </title> <para> - For the current request, a reply is sent back having the given code - and text reason. The reply is sent stateful or stateless, depending of + For the current request, a reply is sent back having the given code + and text reason. The reply is sent stateful or stateless, depending of the <acronym>TM</acronym> module: if a transaction exists for the current request, then the reply is sent statefully, otherwise stateless. </para> @@ -88,7 +88,7 @@ send_reply("403", "Invalid user - $fU"); </example> </section> - <section id="sl_reply_error"> + <section id="sl.f.sl_reply_error"> <title> <function>sl_reply_error()</function> </title> @@ -107,7 +107,7 @@ sl_reply_error(); </example> </section> - <section id="sl_forward_reply"> + <section id="sl.f.sl_forward_reply"> <title> <function moreinfo="none">sl_forward_reply([ code, [ reason ] ])</function> </title> diff --git a/src/modules/sl/doc/sl_params.xml b/src/modules/sl/doc/sl_params.xml index 6c22e26a90..a6db7657da 100644 --- a/src/modules/sl/doc/sl_params.xml +++ b/src/modules/sl/doc/sl_params.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <section id="sl.parameters" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Parameters</title> - <section id="default_code"> + <section id="sl.p.default_code"> <title><varname>default_code</varname> (int)</title> <para> Default reply status code. @@ -24,7 +24,7 @@ modparam("sl", "default_code", 505) </example> </section> - <section id="default_reason"> + <section id="sl.p.default_reason"> <title><varname>default_reason</varname> (str)</title> <para> Default reply reason phrase. @@ -42,7 +42,7 @@ modparam("sl", "default_reason", "Server Error") </example> </section> - <section id="bind_tm"> + <section id="sl.p.bind_tm"> <title><varname>bind_tm</varname> (int)</title> <para> Controls if SL module should attempt to bind to TM module in order @@ -61,7 +61,7 @@ modparam("sl", "bind_tm", 0) # feature disabled </example> </section> - <section id="rich_redirect"> + <section id="sl.p.rich_redirect"> <title><varname>rich_redirect</varname> (int)</title> <para> When sending a 3xx class reply, include additional branch info

1 0

[kamailio/kamailio] Phonenum module not initialized with KEMI framework (#1883)
by balajeesv 29 Aug '19

29 Aug '19

### Description phonenum module is not working with KEMI framework, when debugged I found phonenum module functions "pv_parse_phonenum_name" "sr_phonenum_add_item" are not invoked with KEMI framework. With default config file these modules are invoked from config parser.  I am using lua KEMI framework and included phonenum module ### Troubleshooting #### Reproduction 1. Any KEMI Framework 2. Include phonenum module 3. Test to validate phonenum  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1883

2 4

git:master:8beae91f: modules: readme files regenerated - sl ... [skip ci]
by Kamailio Dev 28 Aug '19

28 Aug '19

Module: kamailio Branch: master Commit: 8beae91f8a33b16f3ca66de3d0ec7449af63994a URL: https://github.com/kamailio/kamailio/commit/8beae91f8a33b16f3ca66de3d0ec744… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-28T21:02:05+02:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/8beae91f8a33b16f3ca66de3d0ec744… Patch: https://github.com/kamailio/kamailio/commit/8beae91f8a33b16f3ca66de3d0ec744… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 2091f2486d..71825ac919 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -22,6 +22,8 @@ Daniel-Constantin Mierla 2.2. default_reason (str) 2.3. bind_tm (int) 2.4. rich_redirect (int) + 2.5. event_callback_fl_ack (str) + 2.6. event_callback_lres_sent (str) 3. Functions @@ -68,10 +70,12 @@ Daniel-Constantin Mierla 1.2. default_reason example 1.3. bind_tm example 1.4. rich_redirect example - 1.5. sl_send_reply usage - 1.6. send_reply usage - 1.7. sl_reply_error usage + 1.5. event_callback_fl_ack example + 1.6. event_callback_lres_sent example + 1.7. sl_send_reply usage 1.8. send_reply usage + 1.9. sl_reply_error usage + 1.10. send_reply usage Chapter 1. Admin Guide @@ -84,6 +88,8 @@ Chapter 1. Admin Guide 2.2. default_reason (str) 2.3. bind_tm (int) 2.4. rich_redirect (int) + 2.5. event_callback_fl_ack (str) + 2.6. event_callback_lres_sent (str) 3. Functions @@ -158,6 +164,8 @@ Chapter 1. Admin Guide 2.2. default_reason (str) 2.3. bind_tm (int) 2.4. rich_redirect (int) + 2.5. event_callback_fl_ack (str) + 2.6. event_callback_lres_sent (str) 2.1. default_code (int) @@ -208,6 +216,32 @@ modparam("sl", "bind_tm", 0) # feature disabled modparam("sl", "rich_redirect", 3) ... +2.5. event_callback_fl_ack (str) + + The name of the KEMI callback function to be executed instead of + event_route[sl:filtered-ack]. This function receives a string + parameter. + + Default value: not set. + + Example 1.5. event_callback_fl_ack example +... +modparam("sl", "event_callback_fl_ack", "ksr_event_sl_filtered_ack") +... + +2.6. event_callback_lres_sent (str) + + The name of the KEMI callback function to be executed instead of + event_route[sl:local-response]. This function receives a string + parameter. + + Default value: not set. + + Example 1.6. event_callback_lres_sent example +... +modparam("sl", "event_callback_lres_sent", "ksr_event_sl_local_response") +... + 3. Functions 3.1. sl_send_reply(code, reason) @@ -236,7 +270,7 @@ modparam("sl", "rich_redirect", 3) * code - Return code. * reason - Reason phrase. - Example 1.5. sl_send_reply usage + Example 1.7. sl_send_reply usage ... sl_send_reply("404", "Not found"); ... @@ -256,7 +290,7 @@ sl_send_reply("404", "Not found"); be used on ONREPLY_ROUTE executed by tm module (upon a t_on_reply() callback). - Example 1.6. send_reply usage + Example 1.8. send_reply usage ... send_reply("404", "Not found"); ... @@ -269,7 +303,7 @@ send_reply("403", "Invalid user - $fU"); error. Usually this function should be used after a script function that returned an error code. - Example 1.7. sl_reply_error usage + Example 1.9. sl_reply_error usage ... sl_reply_error(); ... @@ -287,7 +321,7 @@ sl_reply_error(); This function can be used from ONREPLY_ROUTE. - Example 1.8. send_reply usage + Example 1.10. send_reply usage ... if(status=="408") sl_forward_reply("404", "Not found");

1 0

git:master:cc0b27a2: sl: added kemi callbacks for event routes
by Daniel-Constantin Mierla 28 Aug '19

28 Aug '19

Module: kamailio Branch: master Commit: cc0b27a26081a0716edcea03d86ff63296b1fdab URL: https://github.com/kamailio/kamailio/commit/cc0b27a26081a0716edcea03d86ff63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-28T20:55:39+02:00 sl: added kemi callbacks for event routes - new parameters * event_callback_fl_ack - name of callback function for filtered-ack * event_callback_lres_sent - name of callback function for local-response --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/cc0b27a26081a0716edcea03d86ff63… Patch: https://github.com/kamailio/kamailio/commit/cc0b27a26081a0716edcea03d86ff63… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 10361b12e1..930a576b78 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -66,6 +66,9 @@ static str default_reason = STR_STATIC_INIT("Internal Server Error"); static int sl_bind_tm = 1; static struct tm_binds tmb; +str _sl_event_callback_fl_ack = STR_NULL; +str _sl_event_callback_lres_sent = STR_NULL; + static int w_sl_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_sl_reply_error(struct sip_msg* msg, char* str1, char* str2); @@ -117,6 +120,8 @@ static param_export_t params[] = { {"default_reason", PARAM_STR, &default_reason}, {"bind_tm", PARAM_INT, &sl_bind_tm}, {"rich_redirect", PARAM_INT, &sl_rich_redirect}, + {"event_callback_fl_ack", PARAM_STR, &_sl_event_callback_fl_ack}, + {"event_callback_lres_sent", PARAM_STR, &_sl_event_callback_lres_sent}, {0, 0, 0} }; diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 7cdce0cda2..83cf15bb5d 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -37,6 +37,7 @@ #include "../../core/route.h" #include "../../core/receive.h" #include "../../core/onsend.h" +#include "../../core/kemi.h" #include "sl_stats.h" #include "sl_funcs.h" #include "sl.h" @@ -58,6 +59,9 @@ static int _sl_evrt_local_response = -1; /* default disabled */ /* send path and flags in 3xx class reply */ int sl_rich_redirect = 0; +extern str _sl_event_callback_fl_ack; +extern str _sl_event_callback_lres_sent; + /*! * lookup sl event routes */ @@ -131,6 +135,9 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) int backup_rt; struct run_act_ctx ctx; + run_act_ctx_t *bctx; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("sl:local-response"); struct sip_msg pmsg; if (msg->first_line.u.request.method_value==METHOD_ACK) @@ -206,7 +213,8 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) ret = msg_send(&dst, buf.s, buf.len); mhomed=backup_mhomed; - if (unlikely(_sl_evrt_local_response >= 0)) + keng = sr_kemi_eng_get(); + if (_sl_evrt_local_response >= 0 || keng!=NULL) { if (likely(build_sip_msg_from_buf(&pmsg, buf.s, buf.len, inc_msg_no()) == 0)) @@ -279,7 +287,16 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[_sl_evrt_local_response], &pmsg, 0); + + if(_sl_evrt_local_response>=0) { + run_top_route(event_rt.rlist[_sl_evrt_local_response], &pmsg, 0); + } else if (keng!=NULL) { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + sr_kemi_route(keng, msg, EVENT_ROUTE, + &_sl_event_callback_lres_sent, &evname); + sr_kemi_act_ctx_set(bctx); + } set_route_type(backup_rt); p_onsend=0; @@ -390,6 +407,10 @@ int sl_reply_error(struct sip_msg *msg ) int sl_filter_ACK(struct sip_msg *msg, unsigned int flags, void *bar ) { str *tag_str; + run_act_ctx_t ctx; + run_act_ctx_t *bctx; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("sl:filtered-ack"); if (msg->first_line.u.request.method_value!=METHOD_ACK) goto pass_it; @@ -419,9 +440,17 @@ int sl_filter_ACK(struct sip_msg *msg, unsigned int flags, void *bar ) LM_DBG("SL local ACK found -> dropping it!\n" ); update_sl_filtered_acks(); sl_run_callbacks(SLCB_ACK_FILTERED, msg, 0, 0, 0, 0); + keng = sr_kemi_eng_get(); if(unlikely(_sl_filtered_ack_route>=0)) { run_top_route(event_rt.rlist[_sl_filtered_ack_route], msg, 0); + } else if(keng!=NULL) { + init_run_actions_ctx(&ctx); + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + sr_kemi_route(keng, msg, EVENT_ROUTE, + &_sl_event_callback_fl_ack, &evname); + sr_kemi_act_ctx_set(bctx); } return 0; }

1 0

git:master:f1953708: sl: docs for new params event_callback_fl_ack and event_callback_lres_sent
by Daniel-Constantin Mierla 28 Aug '19

28 Aug '19

Module: kamailio Branch: master Commit: f1953708c37f0abd020cffff44991b47c4cacfdd URL: https://github.com/kamailio/kamailio/commit/f1953708c37f0abd020cffff44991b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-28T20:55:39+02:00 sl: docs for new params event_callback_fl_ack and event_callback_lres_sent --- Modified: src/modules/sl/doc/sl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/f1953708c37f0abd020cffff44991b4… Patch: https://github.com/kamailio/kamailio/commit/f1953708c37f0abd020cffff44991b4… --- diff --git a/src/modules/sl/doc/sl_params.xml b/src/modules/sl/doc/sl_params.xml index 79db29ab88..6c22e26a90 100644 --- a/src/modules/sl/doc/sl_params.xml +++ b/src/modules/sl/doc/sl_params.xml @@ -91,4 +91,42 @@ modparam("sl", "rich_redirect", 3) </example> </section> + <section id="sl.p.event_callback_fl_ack"> + <title><varname>event_callback_fl_ack</varname> (str)</title> + <para> + The name of the KEMI callback function to be executed instead of + event_route[sl:filtered-ack]. This function receives a string parameter. + </para> + <para> + Default value: not set. + </para> + <example> + <title>event_callback_fl_ack example</title> + <programlisting format="linespecific"> +... +modparam("sl", "event_callback_fl_ack", "ksr_event_sl_filtered_ack") +... +</programlisting> + </example> + </section> + + <section id="sl.p.event_callback_lres_sent"> + <title><varname>event_callback_lres_sent</varname> (str)</title> + <para> + The name of the KEMI callback function to be executed instead of + event_route[sl:local-response]. This function receives a string parameter. + </para> + <para> + Default value: not set. + </para> + <example> + <title>event_callback_lres_sent example</title> + <programlisting format="linespecific"> +... +modparam("sl", "event_callback_lres_sent", "ksr_event_sl_local_response") +... +</programlisting> + </example> + </section> + </section>

1 0

controlling presence with new module `pua_json`
by Bill Neely 28 Aug '19

28 Aug '19

Has anyone been successful in using this procedure with Grandstream phone behind NAT? Bill

2 1

[kamailio/kamailio] topos_d and topos_t database varchar(128) too short for IPv6 (#2043)
by Anthony Messina 27 Aug '19

27 Aug '19

With the default `*_contact ` address columns as `varchar(128)`, TOPOS is unable to handle inserting values into the database when using IPv6, which often has contact information hitting or exceeding 256 chars (tested with PostgreSQL). Perhaps these columns can be switched to the `text` type. -- 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/2043

3 7

git:master:b6763b85: kamctl: regenerate database creation scripts after scheme extensions
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: b6763b8527b627b1bec158b3a3a9c0ef8148cb6c URL: https://github.com/kamailio/kamailio/commit/b6763b8527b627b1bec158b3a3a9c0e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T22:00:12+02:00 kamctl: regenerate database creation scripts after scheme extensions --- Modified: utils/kamctl/db_sqlite/avpops-create.sql Modified: utils/kamctl/db_sqlite/carrierroute-create.sql Modified: utils/kamctl/db_sqlite/dialog-create.sql Modified: utils/kamctl/db_sqlite/msilo-create.sql Modified: utils/kamctl/db_sqlite/pdt-create.sql Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/db_sqlite/purple-create.sql Modified: utils/kamctl/db_sqlite/registrar-create.sql Modified: utils/kamctl/db_sqlite/rls-create.sql Modified: utils/kamctl/db_sqlite/siptrace-create.sql Modified: utils/kamctl/db_sqlite/speeddial-create.sql Modified: utils/kamctl/db_sqlite/topos-create.sql Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/mysql/avpops-create.sql Modified: utils/kamctl/mysql/carrierroute-create.sql Modified: utils/kamctl/mysql/dialog-create.sql Modified: utils/kamctl/mysql/msilo-create.sql Modified: utils/kamctl/mysql/pdt-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/mysql/purple-create.sql Modified: utils/kamctl/mysql/registrar-create.sql Modified: utils/kamctl/mysql/rls-create.sql Modified: utils/kamctl/mysql/siptrace-create.sql Modified: utils/kamctl/mysql/speeddial-create.sql Modified: utils/kamctl/mysql/topos-create.sql Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/avpops-create.sql Modified: utils/kamctl/oracle/carrierroute-create.sql Modified: utils/kamctl/oracle/dialog-create.sql Modified: utils/kamctl/oracle/msilo-create.sql Modified: utils/kamctl/oracle/pdt-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/oracle/purple-create.sql Modified: utils/kamctl/oracle/registrar-create.sql Modified: utils/kamctl/oracle/rls-create.sql Modified: utils/kamctl/oracle/siptrace-create.sql Modified: utils/kamctl/oracle/speeddial-create.sql Modified: utils/kamctl/oracle/topos-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/avpops-create.sql Modified: utils/kamctl/postgres/carrierroute-create.sql Modified: utils/kamctl/postgres/dialog-create.sql Modified: utils/kamctl/postgres/msilo-create.sql Modified: utils/kamctl/postgres/pdt-create.sql Modified: utils/kamctl/postgres/presence-create.sql Modified: utils/kamctl/postgres/purple-create.sql Modified: utils/kamctl/postgres/registrar-create.sql Modified: utils/kamctl/postgres/rls-create.sql Modified: utils/kamctl/postgres/siptrace-create.sql Modified: utils/kamctl/postgres/speeddial-create.sql Modified: utils/kamctl/postgres/topos-create.sql Modified: utils/kamctl/postgres/uac-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/b6763b8527b627b1bec158b3a3a9c0e… Patch: https://github.com/kamailio/kamailio/commit/b6763b8527b627b1bec158b3a3a9c0e…

1 0

git:master:5d9109a0: lib: change topos DB scheme for *contact from uri_len to contact_len, 512 (GH #2043)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 5d9109a0b901f3d959ee01a3b234841671a72c9b URL: https://github.com/kamailio/kamailio/commit/5d9109a0b901f3d959ee01a3b234841… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:58:41+02:00 lib: change topos DB scheme for *contact from uri_len to contact_len, 512 (GH #2043) --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/5d9109a0b901f3d959ee01a3b234841… Patch: https://github.com/kamailio/kamailio/commit/5d9109a0b901f3d959ee01a3b234841… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 12a235f73b..f0ee77473f 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -84,7 +84,7 @@ <column id="a_contact"> <name>a_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - A side</description> </column> @@ -92,7 +92,7 @@ <column id="b_contact"> <name>b_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - B side</description> </column> @@ -100,7 +100,7 @@ <column id="as_contact"> <name>as_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server A side</description> </column> @@ -108,7 +108,7 @@ <column id="bs_contact"> <name>bs_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server B side</description> </column> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index ca7eab9d5f..0fdda01590 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -137,7 +137,7 @@ <column id="a_contact"> <name>a_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - A side</description> </column> @@ -145,7 +145,7 @@ <column id="b_contact"> <name>b_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - B side</description> </column> @@ -153,7 +153,7 @@ <column id="as_contact"> <name>as_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server A side</description> </column> @@ -161,7 +161,7 @@ <column id="bs_contact"> <name>bs_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server B side</description> </column>

1 0

git:master:f318c29b: lib: use socket_len for location received and topos IP address DB scheme (no change table definitions)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: f318c29bb86208a95a65ed6f00b12647f2c86b6f URL: https://github.com/kamailio/kamailio/commit/f318c29bb86208a95a65ed6f00b1264… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:49:31+02:00 lib: use socket_len for location received and topos IP address DB scheme (no change table definitions) --- Modified: src/lib/srdb1/schema/location.xml Modified: src/lib/srdb1/schema/topos_d.xml --- Diff: https://github.com/kamailio/kamailio/commit/f318c29bb86208a95a65ed6f00b1264… Patch: https://github.com/kamailio/kamailio/commit/f318c29bb86208a95a65ed6f00b1264… --- diff --git a/src/lib/srdb1/schema/location.xml b/src/lib/srdb1/schema/location.xml index f923394144..7ca7d29af4 100644 --- a/src/lib/srdb1/schema/location.xml +++ b/src/lib/srdb1/schema/location.xml @@ -71,7 +71,7 @@ <column> <name>received</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <null/> <default><null/></default> <description>Received IP:PORT in the format SIP:IP:PORT</description> diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index e544bdd0db..12a235f73b 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -186,7 +186,7 @@ <column id="a_srcaddr"> <name>a_srcaddr</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Source address - A side</description> </column> @@ -194,7 +194,7 @@ <column id="b_srcaddr"> <name>b_srcaddr</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Source address - B side</description> </column>

1 0

git:master:a222ad2f: lib: change uri_len from 128 to 255 for DB scheme (GH #2043)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: a222ad2f384aeb025de7caa345cfc1e49b45defe URL: https://github.com/kamailio/kamailio/commit/a222ad2f384aeb025de7caa345cfc1e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:56:54+02:00 lib: change uri_len from 128 to 255 for DB scheme (GH #2043) --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/a222ad2f384aeb025de7caa345cfc1e… Patch: https://github.com/kamailio/kamailio/commit/a222ad2f384aeb025de7caa345cfc1e… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 933777de2d..acd7028967 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -6,7 +6,7 @@ <!ENTITY password_len "64"> <!ENTITY ha1_len "128"> <!ENTITY realm_len "64"> -<!ENTITY uri_len "128"> +<!ENTITY uri_len "255"> <!ENTITY xcap_uri_len "255"> <!ENTITY id_len "64"> <!ENTITY table_id_len "10">

1 0

git:master:7f205a7b: - lib: use new introduced socket_len in topos and uacreg DB scheme (no actual change in definition)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 7f205a7bee0df7f1966f77250f765e5947fcd4dc URL: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:41:33+02:00 - lib: use new introduced socket_len in topos and uacreg DB scheme (no actual change in definition) --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… Patch: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 5b13333d62..e544bdd0db 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -202,7 +202,7 @@ <column id="a_socket"> <name>a_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - A side</description> </column> @@ -210,7 +210,7 @@ <column id="b_socket"> <name>b_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - B side</description> </column> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index c6bc095aeb..ca7eab9d5f 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -209,7 +209,7 @@ <column id="a_socket"> <name>a_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - A side</description> </column> @@ -217,7 +217,7 @@ <column id="b_socket"> <name>b_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - B side</description> </column> diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index 985b27f8ec..d6257d0cf4 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -137,7 +137,7 @@ <column id="socket"> <name>socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Used socket for sending out requests</description> </column>

1 0

git:master:c5bd1556: lib: use domain_len for dialog socket in database scheme (no change in table definitions)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: c5bd15567e56c4798aa15e670550e313bb0bf7c4 URL: https://github.com/kamailio/kamailio/commit/c5bd15567e56c4798aa15e670550e31… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:37:49+02:00 lib: use domain_len for dialog socket in database scheme (no change in table definitions) --- Modified: src/lib/srdb1/schema/dialog.xml --- Diff: https://github.com/kamailio/kamailio/commit/c5bd15567e56c4798aa15e670550e31… Patch: https://github.com/kamailio/kamailio/commit/c5bd15567e56c4798aa15e670550e31… --- diff --git a/src/lib/srdb1/schema/dialog.xml b/src/lib/srdb1/schema/dialog.xml index 8ff717b364..272b60d17a 100644 --- a/src/lib/srdb1/schema/dialog.xml +++ b/src/lib/srdb1/schema/dialog.xml @@ -136,14 +136,14 @@ <column> <name>caller_sock</name> <type>string</type> - <size>64</size> + <size>&domain_len;</size> <description>Local socket used to communicate with caller</description> </column> <column> <name>callee_sock</name> <type>string</type> - <size>64</size> + <size>&domain_len;</size> <description>Local socket used to communicate with callee</description> </column>

1 0

git:master:ab3ad7ed: lib: add new DB scheme entity 'socket_len' with length 128 to prepare the change of uri_len
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: ab3ad7ed318f3b76c75c716ad1c0e280bb478262 URL: https://github.com/kamailio/kamailio/commit/ab3ad7ed318f3b76c75c716ad1c0e28… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:38:14+02:00 lib: add new DB scheme entity 'socket_len' with length 128 to prepare the change of uri_len --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/ab3ad7ed318f3b76c75c716ad1c0e28… Patch: https://github.com/kamailio/kamailio/commit/ab3ad7ed318f3b76c75c716ad1c0e28… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 17a47baf83..933777de2d 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,5 +1,6 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> +<!ENTITY socket_len "128"> <!ENTITY from_tag_len "128"> <!ENTITY to_tag_len "128"> <!ENTITY password_len "64">

1 0

controlling presence with new module `pua_json`
by Bill Neely 27 Aug '19

27 Aug '19

Has anyone been successful in using this procedure with Grandstream phones behind NAT?

1 0

RFC: about sl and tm local-response event routes
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Hello, just discovered what I consider to be an inconsistency in naming and behaviour for event_route blocks for local-request and local-response and starting a discussion here to see how to move on. The event_route[tm:local-request] is executed before sending there local generated request out (allowing also to change its content, drop, etc...). This event route is quite popular event route used when the local generated requests need to be checked or updates. The event_route[tm:local-response] is executed after the response is sent out, obviously no possibility to change anymore the content. I haven't checked the code for event_route[sl:local-response], but based on commit message should be the same. I haven't used the local-response so far at all, today after a discussion on sr-users I wanted to enable kemi callback for tm:local-response and I noticed that behaviour in the code, even I expected to be like local-request (before sending out). I am not sure how much used are the event routes for tm:local-response and sl:local-response, I haven't seen any questions about them so far on mailing lists, that's why I am asking here if would make sense to rename them like tm:local-response-sent and sl:local-response-sent to properly reflect when they are executed. I am expecting that they are very few used so far, so no big head ache with upgrades and bringing some consistency around (this change to be part of next major release). It can stay like now with proper documentation, however in the future if one want and event route for local responses before being sent out, there will be more confusion, imo ... Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

4 5

git:master:88350ffb: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 88350ffb64c9655f195bf9e96be9645589094370 URL: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T13:31:45+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645… Patch: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645…

1 0

git:master:a2b8e829: tm: new parameter event_callback_lres_sent
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: a2b8e8296f3a56b9ba96f043e3297e4e65d95a58 URL: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: new parameter event_callback_lres_sent - set the name of callback function to be executed in KEMI scripts for event_route[tm:local-response] --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… Patch: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 25ece75fa6..350be35bdd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -98,6 +98,8 @@ static int goto_on_reply=0; int goto_on_sl_reply=0; extern str on_sl_reply_name; +extern str _tm_event_callback_lres_sent; + /* remap 503 response code to 500 */ extern int tm_remap_503_500; /* send path and flags in 3xx class reply */ @@ -454,7 +456,10 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, struct tmcb_params onsend_params; int rt, backup_rt; struct run_act_ctx ctx; + struct run_act_ctx *bctx; struct sip_msg pmsg; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("tm:local-response-sent"); init_cancel_info(&cancel_data); if (!buf) @@ -558,17 +563,20 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, &onsend_params); } - if(_tm_local_response_sent_lookup == 0) { - rt = route_lookup(&event_rt, "tm:local-response"); - _tm_local_response_sent_lookup = 1; - } else { - rt = -1; + if(_tm_event_callback_lres_sent.len>0 + && _tm_event_callback_lres_sent.s!=NULL) { + keng = sr_kemi_eng_get(); + } + rt = -1; + if(likely(keng==NULL)) { + if(_tm_local_response_sent_lookup == 0) { + rt = route_lookup(&event_rt, "tm:local-response"); + _tm_local_response_sent_lookup = 1; + } } - if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) - { + if ((rt >= 0 && event_rt.rlist[rt] != NULL) || (keng != NULL)) { if (likely(build_sip_msg_from_buf(&pmsg, buf, len, - inc_msg_no()) == 0)) - { + inc_msg_no()) == 0)) { struct onsend_info onsnd_info; onsnd_info.to=&(trans->uas.response.dst.to); @@ -580,11 +588,21 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], &pmsg, 0); + if(keng == NULL) { + run_top_route(event_rt.rlist[rt], &pmsg, 0); + } else { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + sr_kemi_route(keng, &pmsg, EVENT_ROUTE, + &_tm_event_callback_lres_sent, &evname); + sr_kemi_act_ctx_set(bctx); + } set_route_type(backup_rt); p_onsend=0; free_sip_msg(&pmsg); + } else { + LM_ERR("failed to build sip msg structure\n"); } } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 99e20afcd3..6cbdaf1776 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -218,6 +218,7 @@ str contact_flows_avp = {0, 0}; str ulattrs_xavp_name = {NULL, 0}; str on_sl_reply_name = {NULL, 0}; int tm_remap_503_500 = 1; +str _tm_event_callback_lres_sent = {NULL, 0}; int tm_failure_exec_mode = 0; @@ -469,6 +470,7 @@ static param_export_t params[]={ {"event_callback", PARAM_STR, &tm_event_callback }, {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, {"rich_redirect" , PARAM_INT, &tm_rich_redirect }, + {"event_callback_lres_sent", PARAM_STR, &_tm_event_callback_lres_sent }, {0,0,0} };

1 0

git:master:e78d2ffb: tm: docs for event_callback_lres_sent param
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: e78d2ffb2537f4272fd9a796e640edb4e4a75736 URL: https://github.com/kamailio/kamailio/commit/e78d2ffb2537f4272fd9a796e640edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: docs for event_callback_lres_sent param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/e78d2ffb2537f4272fd9a796e640edb… Patch: https://github.com/kamailio/kamailio/commit/e78d2ffb2537f4272fd9a796e640edb… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index e17137c0cd..4c583ca782 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1431,7 +1431,37 @@ modparam("tm", "event_callback", "ksr_tm_event") ... -- event callback function implemented in Lua function ksr_tm_event(evname) - KSR.info("===== htable module triggered event: " .. evname .. "\n"); + KSR.info("===== tm module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + + <section id="tm.p.event_callback_lres_sent"> + <title><varname>event_callback_lres</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[tm:local-response] block. The function receives + a string parameter with the name of the event, respectively + "tm:local-response". + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback_lres_sent</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tm", "event_callback_lres_sent", "ksr_tm_event_response_sent") +... +-- event callback function implemented in Lua +function ksr_tm_event_response_sent(evname) + KSR.info("===== tm module triggered event: " .. evname .. "\n"); return 1; end ...

1 0

git:master:234f201e: tm: lookup envet route for local-response only once
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 234f201e180289414d6a45b7ecfe696273a54182 URL: https://github.com/kamailio/kamailio/commit/234f201e180289414d6a45b7ecfe696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: lookup envet route for local-response only once --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/234f201e180289414d6a45b7ecfe696… Patch: https://github.com/kamailio/kamailio/commit/234f201e180289414d6a45b7ecfe696… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 30006ae8a6..25ece75fa6 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -441,6 +441,8 @@ inline static void start_final_repl_retr( struct cell *t ) +static int _tm_local_response_sent_lookup = 0; + static int _reply_light( struct cell *trans, char* buf, unsigned int len, unsigned int code, char *to_tag, unsigned int to_tag_len, int lock, @@ -556,7 +558,12 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, &onsend_params); } - rt = route_lookup(&event_rt, "tm:local-response"); + if(_tm_local_response_sent_lookup == 0) { + rt = route_lookup(&event_rt, "tm:local-response"); + _tm_local_response_sent_lookup = 1; + } else { + rt = -1; + } if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) { if (likely(build_sip_msg_from_buf(&pmsg, buf, len,

1 0

git:master:613fba97: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 613fba9704b497e6181802a7aa68fb3b476d4897 URL: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T13:01:47+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… Patch: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 8cbefc75b8..d76abbe728 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -3014,8 +3014,8 @@ event_route [tm:local-request] { 6.3. event_route[tm:local-response] - Executed when the tm module is about to send a local generated, - transaction stateful response. + Executed after the tm module sent a local generated, transaction + stateful response. Example 1.98. event_route[tm:local-response] usage ...

1 0

git:master:d3211fdf: tm: event_route[local-response] is actually executed after response is sent
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: d3211fdff1cfb9596a5339eff2184f1a91508bd2 URL: https://github.com/kamailio/kamailio/commit/d3211fdff1cfb9596a5339eff2184f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T12:49:20+02:00 tm: event_route[local-response] is actually executed after response is sent - change back after previous commit - somehow it is incoherent with event_route[local-request] that is before sending out, allowing to change the content --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/d3211fdff1cfb9596a5339eff2184f1… Patch: https://github.com/kamailio/kamailio/commit/d3211fdff1cfb9596a5339eff2184f1… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index 22cce59abc..5c6111a075 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -79,7 +79,7 @@ event_route [tm:local-request] { <function moreinfo="none">event_route[tm:local-response]</function> </title> <para> - Executed when the tm module is about to send a local generated, + Executed after the tm module sent a local generated, transaction stateful response. </para> <example>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev