sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
319 discussions

git:master:b6d03564: siptrace: added sip_trace_msg(dst, corlid, vmsg)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b6d03564570839553bd0eeed28c06102bfa9fc46 URL: https://github.com/kamailio/kamailio/commit/b6d03564570839553bd0eeed28c0610… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-08T14:11:08+02:00 siptrace: added sip_trace_msg(dst, corlid, vmsg) - send sip trace with the message provided as parmameter --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/b6d03564570839553bd0eeed28c0610… Patch: https://github.com/kamailio/kamailio/commit/b6d03564570839553bd0eeed28c0610… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 81926cc1ba..b2638137c4 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -90,6 +90,7 @@ static int w_sip_trace0(struct sip_msg *, char *p1, char *p2); static int w_sip_trace1(struct sip_msg *, char *dest, char *p2); static int w_sip_trace2(struct sip_msg *, char *dest, char *correlation_id); static int w_sip_trace3(struct sip_msg *, char *dest, char *correlation_id, char *trace_type); +static int w_sip_trace_msg(sip_msg_t *msg, char *dest, char *correlation_id, char *vmsg); static int fixup_siptrace(void **param, int param_no); static int fixup_free_siptrace(void **param, int param_no); static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2); @@ -216,6 +217,8 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"sip_trace", (cmd_function)w_sip_trace3, 3, fixup_siptrace, fixup_free_siptrace, ANY_ROUTE}, + {"sip_trace_msg", (cmd_function)w_sip_trace_msg, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, 0, ANY_ROUTE}, {"hlog", (cmd_function)w_hlog2, 2, fixup_spve_spve, 0, @@ -774,12 +777,12 @@ static int fixup_siptrace(void **param, int param_no) str sflags; enum siptrace_type_t trace_type; - if(param_no < 1 || param_no > 3) { + if(param_no < 1 || param_no > 4) { LM_DBG("params:%s\n", (char *)*param); return 0; } - if (param_no == 1 || param_no == 2) { + if (param_no == 1 || param_no == 2 || param_no == 4) { /* correlation id */ return fixup_spve_all(param, param_no); } else if (param_no == 3) { @@ -806,7 +809,7 @@ static int fixup_siptrace(void **param, int param_no) static int fixup_free_siptrace(void **param, int param_no) { - if (param_no == 1 || param_no == 2) { + if (param_no == 1 || param_no == 2 || param_no == 4) { /* correlation id */ return fixup_free_spve_all(param, param_no); } if (param_no == 3) { @@ -1163,6 +1166,67 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * (correlation_id)?&correlation_id_str:NULL, NULL, trace_type); } +/** + * + */ +static int w_sip_trace_msg(sip_msg_t *msg, char *dest, char *correlation_id, char *vmsg) +{ + str vmsg_str = {0, 0}; + sip_msg_t *nmsg = NULL; + sip_msg_t tmsg; + char tbuf[BUF_SIZE]; + int ret; + + if (vmsg) { + if(fixup_get_svalue(msg, (gparam_t*)vmsg, &vmsg_str) != 0) { + LM_ERR("unable to parse the msg data parameter\n"); + return -1; + } + memset(&tmsg, 0, sizeof(sip_msg_t)); + memcpy(tbuf, vmsg_str.s, vmsg_str.len); + tbuf[vmsg_str.len] = 0; + tmsg.buf = tbuf; + tmsg.len = vmsg_str.len; + if (parse_msg(tmsg.buf, tmsg.len, &tmsg)!=0) { + LM_ERR("parse msg failed\n"); + return -1; + } + if (parse_headers(msg, HDR_EOH_F, 0)==-1) { + LM_DBG("parsing headers failed [[%.*s]]\n", + msg->len, msg->buf); + goto error; + } + + if(parse_from_header(msg)<0) { + LM_ERR("cannot parse FROM header\n"); + goto error; + } + + if(parse_to_header(msg)<0 || msg->to==NULL) { + LM_ERR("cannot parse TO header\n"); + goto error; + } + tmsg.id = msg->id; + tmsg.pid = msg->pid; + tmsg.rcv = msg->rcv; + nmsg = &tmsg; + } else { + nmsg = msg; + } + + ret = w_sip_trace3(msg, dest, correlation_id, NULL); + + if(nmsg != msg) { + free_sip_msg(&tmsg); + } + + return ret; + +error: + free_sip_msg(&tmsg); + return -1; +} + /** * link call-id, method, from-tag and to-tag */

1 year

[kamailio/kamailio] siptrace - custom sip message hep replication (PR #3442)

by Daniel-Constantin Mierla

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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) - [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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Enhancements to siptrace module to allow HEP replication of custom sip message given as parameter. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3442 -- Commit Summary -- * siptrace: added sip_trace_msg(dst, corlid, vmsg) * siptrace; fix parameter inside sip_trace_msg() * siptrace: sip_trace_msg() exported with 3 parameters * siptrace: reworked sip_trace_msg() to specify source and target addresses -- File Changes -- M src/modules/siptrace/siptrace.c (68) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3442.patch https://github.com/kamailio/kamailio/pull/3442.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3442 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3442(a)github.com>

1 year

git:master:f9cbe7ad: pkg/kamailio/deb: version set 5.8.0~dev0 [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: f9cbe7ad01331e97852872c29b612409bf571c8d URL: https://github.com/kamailio/kamailio/commit/f9cbe7ad01331e97852872c29b61240… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-04T21:46:22+02:00 pkg/kamailio/deb: version set 5.8.0~dev0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/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/f9cbe7ad01331e97852872c29b61240… Patch: https://github.com/kamailio/kamailio/commit/f9cbe7ad01331e97852872c29b61240…

1 year

git:5.7:14cb08ed: pkg/kamailio/deb: version set 5.7.0~rc0 [skip ci]

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 14cb08ed98740bd286b89edb2b0555aebd7d69c2 URL: https://github.com/kamailio/kamailio/commit/14cb08ed98740bd286b89edb2b0555a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-04T21:44:23+02:00 pkg/kamailio/deb: version set 5.7.0~rc0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/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/14cb08ed98740bd286b89edb2b0555a… Patch: https://github.com/kamailio/kamailio/commit/14cb08ed98740bd286b89edb2b0555a…

1 year

[kamailio/kamailio] lcr: crash on ki_load_gws*() if called via KEMI (Issue #3435)

by Victor Seva

### Description crash happens if `lcr_id` passed to any of the functions ``KSR.lcr.load_gws*()`` is not defined in the lcr_gw table. ### Debugging Data ``` Core was generated by `/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. (gdb) bt #0 ki_load_gws_furi (_m=0x7f1e66521100, lcr_id=3, ruri_user=0x7ffe1f856360, from_uri=0x7ffe1f856370) at lcr_mod.c:2312 #1 0x00007f1e65d8ca35 in sr_apy_kemi_exec_func_ex (ket=0x7f1e655c27f0 <sr_kemi_lcr_exports+144>, self=0x7f1e60ecd090, args=0x7f1e60dd07c0, idx=544) at apy_kemi.c:1354 #2 0x00007f1e65d90477 in sr_apy_kemi_exec_func (self=0x7f1e60ecd090, args=0x7f1e60dd07c0, idx=544) at apy_kemi.c:1829 #3 0x00007f1e65d9b6ff in sr_apy_kemi_exec_func_544 (self=0x7f1e60ecd090, args=0x7f1e60dd07c0) at apy_kemi_export.c:4395 #4 0x00007f1e658d4c74 in ?? () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #5 0x00007f1e6588ea50 in _PyObject_MakeTpCall () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #6 0x00007f1e658402f2 in _PyEval_EvalFrameDefault () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #7 0x00007f1e65837033 in ?? () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #8 0x00007f1e6583f4b7 in _PyEval_EvalFrameDefault () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #9 0x00007f1e65837033 in ?? () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #10 0x00007f1e6583f4b7 in _PyEval_EvalFrameDefault () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #11 0x00007f1e65837033 in ?? () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #12 0x00007f1e658916a4 in ?? () from /lib/x86_64-linux-gnu/libpython3.9.so.1.0 #13 0x00007f1e65da52fc in apy_exec (_msg=0x7f1e66521100, fname=0x7f1e65dae11d "ksr_request_route", fparam=0x0, emode=1) at python_exec.c:139 #14 0x00007f1e65d62cae in sr_kemi_config_engine_python (msg=0x7f1e66521100, rtype=1, rname=0x0, rparam=0x0) at apy_kemi.c:66 #15 0x000056247fc0a6e4 in sr_kemi_route (keng=0x562480066420 <_sr_kemi_eng_list>, msg=0x7f1e66521100, rtype=1, ename=0x0, edata=0x0) at core/kemi.c:3784 #16 0x000056247fc9da66 in receive_msg (buf=0x562480105280 <buf> "INVITE sip:0031686807515@34.91.122.173 SIP/2.0\r\nRecord-Route: <sip:94.247.7.211;lr;ftag=tj0p4Q1r8H5ap>\r\nVia: SIP/2.0/UDP 94.247.7.211;TH=div;branch=z9hG4bKdc26.e6a724746d6ff0bf5231906a5f1c8734.0\r\nVia:"..., len=1202, rcv_info=0x7ffe1f857090) at core/receive.c:502 #17 0x000056247fe01a5d in udp_rcv_loop () at core/udp_server.c:544 #18 0x000056247fb1a09b in main_loop () at main.c:1722 #19 0x000056247fb2720c in main (argc=10, argv=0x7ffe1f857ab8) at main.c:3078 (gdb) p lcr_count_param $1 = 1 (gdb) p lcr_id $2 = 3 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3435 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3435(a)github.com>

1 year

Development is open for future release of v5.8.x series

by Daniel-Constantin Mierla

Hello, the branch 5.7 was created, therefore the master branch is open for adding new features, to be part of future release series v5.8.x (or whatever version is decided for next series). Any bug fix committed to master that applies to 5.7.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 5.7 or 5.6. Expect that v5.7.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v5.8.0 should be out after another 8-10 months of development, plus 1-2 months of testing, so sometime during the first part of 2024. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

1 year

Branch 5.7 has been created

by Daniel-Constantin Mierla

Hello, the branch 5.7 has been created, to be used for releasing v5.7.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.7 cd kamailio-5.7 git checkout -b 5.7 origin/5.7 Pushing commits in this branch: git push origin 5.7:5.7 Note that 5.7 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.7 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.7 will be out, respectively Kamailio v5.7.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

1 year

git:master:c88e506f: lcr: fix crash be calling load_gw* via KEMI

by Victor Seva

Module: kamailio Branch: master Commit: c88e506fe6a1ba0f588c5866a63ffb18fa25478a URL: https://github.com/kamailio/kamailio/commit/c88e506fe6a1ba0f588c5866a63ffb1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-04T20:53:09+02:00 lcr: fix crash be calling load_gw* via KEMI move the check of lcr_id to the helper fixes #3435 --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c88e506fe6a1ba0f588c5866a63ffb1… Patch: https://github.com/kamailio/kamailio/commit/c88e506fe6a1ba0f588c5866a63ffb1… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 1f713a9e404..be945fb8af8 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2298,6 +2298,11 @@ static int ki_load_gws_furi( } } + if((lcr_id < 1) || (lcr_id > lcr_count_param)) { + LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); + return -1; + } + /* Use rules and gws with index lcr_id */ rules = rule_pt[lcr_id]; gws = gw_pt[lcr_id]; @@ -2492,10 +2497,7 @@ static int load_gws(struct sip_msg *_m, int argc, action_u_t argv[]) LM_ERR("invalid lcr_id parameter %s\n", argv[0].u.string); return -1; } - if((lcr_id < 1) || (lcr_id > lcr_count_param)) { - LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); - return -1; - } + if(argc > 1) { ruri_user = argv[1].u.str; } else {

1 year

[kamailio/kamailio] lcr: fix crash be calling load_gw* via KEMI (PR #3436)

by Victor Seva

#### 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 - [ ] Tested changes locally - [ x] Related to issue #3435 #### Description move the check of lcr_id to the helper so every ``ki_load_gw*()`` will be protected You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3436 -- Commit Summary -- * lcr: fix crash be calling load_gw* via KEMI -- File Changes -- M src/modules/lcr/lcr_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3436.patch https://github.com/kamailio/kamailio/pull/3436.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3436 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3436(a)github.com>

1 year

git:master:1c924f9b: Makefile.defs: version set to 5.8.0-dev0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c924f9bc9d880f9c32fe5cb4d23722f27107be6 URL: https://github.com/kamailio/kamailio/commit/1c924f9bc9d880f9c32fe5cb4d23722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-04T20:45:00+02:00 Makefile.defs: version set to 5.8.0-dev0 - master branch is open for new features to be part of future release series 5.8.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1c924f9bc9d880f9c32fe5cb4d23722… Patch: https://github.com/kamailio/kamailio/commit/1c924f9bc9d880f9c32fe5cb4d23722… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 07625c9f97a..a40cfa55cd3 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 7 +PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 year

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023