sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:5.2:24b46f0e: core: remove unused seq variable in build_iface_list function

by Henning Westerholt

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;

5 years, 3 months

git:5.2:d3ee5a3e: tools: fix python exception usage in route_graph.py tool

by Henning Westerholt

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:

5 years, 3 months

git:5.2:1ef44dbf: tools: use correct check of None instead of wrong comparison in route_graph.py tool

by Henning Westerholt

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_":

5 years, 3 months

git:5.2:35292bc1: core: fix possible int overflow (conversion after multiplication) in cfg code

by Henning Westerholt

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; }

5 years, 3 months

git:master:f89b0e2e: core: remove pointless assert, block_size returns size_t so it will be always >= 0

by Henning Westerholt

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);

5 years, 3 months

git:master:d1f5a2a2: core: fix possible int overflow (conversion after multiplication) in cfg code

by Henning Westerholt

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; }

5 years, 3 months

Re: [sr-dev] [SR-Users] Info: initialization of libssl 1.1.+ with PTHREAD_PROCESS_SHARED attribute for pthread mutex and rwlock

by Henning Westerholt

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/

5 years, 3 months

git:master:d0ed04ae: xcap_server: free xpath object before reusing the variable

by Daniel-Constantin Mierla

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;

5 years, 3 months

git:master:b54573ca: xmlrpc: reset fields in case of error for building fake via

by Daniel-Constantin Mierla

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; }

5 years, 3 months

git:master:f58c3ce7: tools: add reply_route support to route_graph.py tool

by Henning Westerholt

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]:

5 years, 3 months

← Newer
1
...
18
19
20
21
22
23
24
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019