sr-dev November 2022

sr-dev@lists.kamailio.org

11 participants
218 discussions

git:5.5:fbb5e7a7: tm: backup and restore X/AVP values from initial transaction in DNS failover processing
by Henning Westerholt 29 Nov '22

29 Nov '22

Module: kamailio Branch: 5.5 Commit: fbb5e7a736ce0798a7393ada6e0f109a490d027a URL: https://github.com/kamailio/kamailio/commit/fbb5e7a736ce0798a7393ada6e0f109… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-29T10:31:23Z tm: backup and restore X/AVP values from initial transaction in DNS failover processing - restore X/AVP values from initial transaction in DNS failover processing - the X/AVP context gets lost, so we need to re-create it from the transaction - otherwise modules that depends on the X/AVPs, e.g. topology hiding will not work - tested with one load-balancer and two proxy servers - previous fix d6b1c20d3ad94 was reverted, we now properly backup and restore (cherry picked from commit 399b34c6bd4e5cbfcf4dcb699755c393229fcb99) (cherry picked from commit 2b5b3a7fb5a26dc467a60e5e70c8b3515f57bc85) --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/fbb5e7a736ce0798a7393ada6e0f109… Patch: https://github.com/kamailio/kamailio/commit/fbb5e7a736ce0798a7393ada6e0f109… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 26734df2ee8..3db6993b29e 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -360,6 +360,7 @@ inline static void final_response_handler( int branch_ret; int prev_branch; ticks_t now; + tm_xlinks_t backup_xd; #endif #ifdef EXTRA_DEBUG @@ -450,11 +451,15 @@ inline static void final_response_handler( branch_ret = add_uac_dns_fallback( t, t->uas.request, &t->uac[r_buf->branch], 0); prev_branch = -1; + /* restore X/AVP values from initial transaction */ + tm_xdata_swap(t, &backup_xd, 0); while((branch_ret >= 0) && (branch_ret != prev_branch)) { prev_branch = branch_ret; branch_ret = t_send_branch(t, branch_ret, t->uas.request, 0, 0); } + /* restore X/AVP values from backup data */ + tm_xdata_swap(t, &backup_xd, 1); } } #endif

1 0

git:5.6:2b5b3a7f: tm: backup and restore X/AVP values from initial transaction in DNS failover processing
by Henning Westerholt 29 Nov '22

29 Nov '22

Module: kamailio Branch: 5.6 Commit: 2b5b3a7fb5a26dc467a60e5e70c8b3515f57bc85 URL: https://github.com/kamailio/kamailio/commit/2b5b3a7fb5a26dc467a60e5e70c8b35… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-29T10:30:36Z tm: backup and restore X/AVP values from initial transaction in DNS failover processing - restore X/AVP values from initial transaction in DNS failover processing - the X/AVP context gets lost, so we need to re-create it from the transaction - otherwise modules that depends on the X/AVPs, e.g. topology hiding will not work - tested with one load-balancer and two proxy servers - previous fix d6b1c20d3ad94 was reverted, we now properly backup and restore (cherry picked from commit 399b34c6bd4e5cbfcf4dcb699755c393229fcb99) --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/2b5b3a7fb5a26dc467a60e5e70c8b35… Patch: https://github.com/kamailio/kamailio/commit/2b5b3a7fb5a26dc467a60e5e70c8b35… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index a662920cab3..4c821ba871f 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -360,6 +360,7 @@ inline static void final_response_handler( int branch_ret; int prev_branch; ticks_t now; + tm_xlinks_t backup_xd; #endif #ifdef EXTRA_DEBUG @@ -450,11 +451,15 @@ inline static void final_response_handler( branch_ret = add_uac_dns_fallback( t, t->uas.request, &t->uac[r_buf->branch], 0); prev_branch = -1; + /* restore X/AVP values from initial transaction */ + tm_xdata_swap(t, &backup_xd, 0); while((branch_ret >= 0) && (branch_ret != prev_branch)) { prev_branch = branch_ret; branch_ret = t_send_branch(t, branch_ret, t->uas.request, 0, 0); } + /* restore X/AVP values from backup data */ + tm_xdata_swap(t, &backup_xd, 1); } } #endif

1 0

git:master:03356132: app_python3: Makefile - extend python3-config lookup
by Daniel-Constantin Mierla 29 Nov '22

29 Nov '22

Module: kamailio Branch: master Commit: 03356132aef31a35b94bd47b4146cbce3e1c4ce9 URL: https://github.com/kamailio/kamailio/commit/03356132aef31a35b94bd47b4146cbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-29T09:33:24+01:00 app_python3: Makefile - extend python3-config lookup --- Modified: src/modules/app_python3/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/03356132aef31a35b94bd47b4146cbc… Patch: https://github.com/kamailio/kamailio/commit/03356132aef31a35b94bd47b4146cbc… --- diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile index b3c1e8760b..c357ebc09e 100644 --- a/src/modules/app_python3/Makefile +++ b/src/modules/app_python3/Makefile @@ -1,4 +1,4 @@ -# +# # WARNING: do not run this directly, it should be run by the main Makefile include ../../Makefile.defs @@ -6,21 +6,34 @@ auto_gen= NAME=app_python3.so # If you have multiple Python versions installed make sure to modify the -# the following to point to the correct instance. Module has been tested -# to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, -# but no testing has been done with that. -PYTHON3?=python3 +# the following to point to the correct instance. +PYTHON3?=$(shell which python3) +ifeq ($(PYTHON3),) +PYTHON3=python +endif + +PYTHON3CONFIG=$(shell which ${PYTHON3}-config) +ifeq ($(PYTHON3CONFIG),) +python_version_full := $(wordlist 2,4,$(subst ., ,$(shell ${PYTHON3} --version 2>&1))) +python_version_major := $(word 1,${python_version_full}) +python_version_minor := $(word 2,${python_version_full}) +PYTHON3 = python${python_version_major}.${python_version_minor} +PYTHON3CONFIG=$(shell which ${PYTHON3}-config) +ifeq ($(PYTHON3CONFIG),) +PYTHON3CONFIG=${PYTHON3}-config +endif +endif LIBS=${shell \ - tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed 2>/dev/null) || \ - tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \ + tmp_py3_libs=$$(${PYTHON3CONFIG} --ldflags --embed 2>/dev/null) || \ + tmp_py3_libs=$$(${PYTHON3CONFIG} --ldflags); \ echo $$tmp_py3_libs} ifeq ($(OS), freebsd) LIBS+=-pthread endif -DEFS+=${shell ${PYTHON3}-config --includes} +DEFS+=${shell ${PYTHON3CONFIG} --includes} include ../../Makefile.modules

1 0

git:master:8be2b013: app_python: Makefile - look also for python2.7 if python2 is not found
by Daniel-Constantin Mierla 29 Nov '22

29 Nov '22

Module: kamailio Branch: master Commit: 8be2b013b2cd2aa71e1c7e5618d7d4b079a4b5e5 URL: https://github.com/kamailio/kamailio/commit/8be2b013b2cd2aa71e1c7e5618d7d4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-29T08:45:07+01:00 app_python: Makefile - look also for python2.7 if python2 is not found --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/8be2b013b2cd2aa71e1c7e5618d7d4b… Patch: https://github.com/kamailio/kamailio/commit/8be2b013b2cd2aa71e1c7e5618d7d4b… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index 57f9def68f..f95b635d2a 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -13,8 +13,11 @@ PYTHON=$(shell which python2) # workaround for some OS (like MacOS) that don't have a python2 link ifeq ($(PYTHON),) +PYTHON=$(shell which python2.7) +ifeq ($(PYTHON),) PYTHON=python endif +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 0

git:master:6e813fd8: app_python3: removed extra semicolon
by Daniel-Constantin Mierla 29 Nov '22

29 Nov '22

Module: kamailio Branch: master Commit: 6e813fd8e0522f43f5c07b145834cd12dbd006f9 URL: https://github.com/kamailio/kamailio/commit/6e813fd8e0522f43f5c07b145834cd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-29T08:28:37+01:00 app_python3: removed extra semicolon --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/6e813fd8e0522f43f5c07b145834cd1… Patch: https://github.com/kamailio/kamailio/commit/6e813fd8e0522f43f5c07b145834cd1… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 94761755c9..def52db092 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -324,7 +324,7 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg } xret = sr_kemi_exec_func(ket, lmsg, i, vps); - return sr_kemi_apy_return_xval(ket, xret);; + return sr_kemi_apy_return_xval(ket, xret); } /**

1 0

git:master:9dbf3aef: app_python: updates to use generic kemi function execution from core
by Daniel-Constantin Mierla 29 Nov '22

29 Nov '22

Module: kamailio Branch: master Commit: 9dbf3aefa4de2e794fba12978a9640e803fb483e URL: https://github.com/kamailio/kamailio/commit/9dbf3aefa4de2e794fba12978a9640e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-29T08:10:46+01:00 app_python: updates to use generic kemi function execution from core - replaced code to retrieve the function parameters from python to be more compact by walking the tuples list --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9dbf3aefa4de2e794fba12978a9640e… Patch: https://github.com/kamailio/kamailio/commit/9dbf3aefa4de2e794fba12978a9640e…

1 0

Make some commands in kamailio rtpengine module asynchronous
by Aditya Gupta 28 Nov '22

28 Nov '22

Hello! We needed some commands in rtpengine module to be asynchronous that is offer, answer and delete. I needed help for this. Firstly, I went through the evapi module to understand how asynchronous commands were implemented by suspending request/responses and then by continuing. But I couldn't see anywhere where the suspended commands were being continued. Thank you.

4 4

Re: [sr-dev] Make some commands in kamailio rtpengine module asynchronous
by Aditya Gupta 28 Nov '22

28 Nov '22

Hey! I've raised a PR<https://github.com/kamailio/kamailio/pull/3286> against the master. It has passed all the build checks successfully. I'm looking forward to someone's code review. Thank you. ________________________________ From: Henning Westerholt <hw(a)gilawa.com> Sent: Monday, November 28, 2022 3:09:20 PM To: Aditya Gupta <aditya.gupta(a)alumni.iiit.ac.in>; Kamailio (SER) - Development Mailing List <sr-dev(a)lists.kamailio.org> Subject: RE: Make some commands in kamailio rtpengine module asynchronous Hello, as mentioned, there are people using rtpengine with larger installations (like some racks of rtpengine). But we are of course always open for improvements of our code base. ?? If there are some changes that are needed in rtpengine daemon code as well, it probably needs to be raised in their issue tracker later on. But for this topic, they need to comment on that. Regarding pull-requests for Kamailio, they should be done against development (master) branch in github. After creating the PR somebody of our developer team will have a look and review it. Usually there are some comments or adaptions necessary before merging the code into your repository. Looking forward to your PR, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: Aditya Gupta <aditya.gupta(a)alumni.iiit.ac.in> Sent: Monday, November 28, 2022 10:15 AM To: Henning Westerholt <hw(a)gilawa.com>; Kamailio (SER) - Development Mailing List <sr-dev(a)lists.kamailio.org> Subject: Re: Make some commands in kamailio rtpengine module asynchronous We have 2 rtpengines in production and thousands of calls coming in. Few of them get timed out because they don't get processed in time by rtpengine. Simply by making 3 commands; offer, answer and delete. It can help us a lot with this. I think I've understood what needs to be done and, in a day, or two I'll raise a PR with the changes for rtpengine module. After that I guess there are some changes that needs to be done in sipwise/rtpengine media servers which seems complicated at this point. I'm hoping for your support in improving my PR for now. Against which branch should I raise my PR?? Thank you ________________________________ From: Henning Westerholt <hw(a)gilawa.com<mailto:hw@gilawa.com>> Sent: Monday, November 28, 2022 1:47:00 PM To: Kamailio (SER) - Development Mailing List <sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org>> Cc: Aditya Gupta <aditya.gupta(a)alumni.iiit.ac.in<mailto:aditya.gupta@alumni.iiit.ac.in>> Subject: RE: Make some commands in kamailio rtpengine module asynchronous Hello, what is the motivation behind this? Are you seeing performance issues in a production environment that could not solved e.g., by adding some more rtpengine resources? Regarding implementation, you could also have a look for example at the http_async_client module, which might be a bit more easy to understand regarding the async implementation in Kamailio. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: sr-dev <sr-dev-bounces(a)lists.kamailio.org<mailto:sr-dev-bounces@lists.kamailio.org>> On Behalf Of Aditya Gupta Sent: Thursday, November 24, 2022 2:47 PM To: sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org> Subject: [sr-dev] Make some commands in kamailio rtpengine module asynchronous Hello! We needed some commands in rtpengine module to be asynchronous that is offer, answer and delete. I needed help for this. Firstly, I went through the evapi module to understand how asynchronous commands were implemented by suspending request/responses and then by continuing. But I couldn't see anywhere where the suspended commands were being continued. Thank you.

1 0

[kamailio/kamailio] accounting module inserts random data into reason header fields (Issue #3287)
by Henning Westerholt 28 Nov '22

28 Nov '22

The accounting module seems to inserts random data into reason header fields, see attached screenshot. This was observed after an upgrade to Kamailio 5.5.4 from an 5.4.9. I did a quick review of the changes between both branches, and the commit c5f6ff37f61f99e0 seems to be touching this functionality. It might be some missing initialization for the locally generated replies reason phrase. ![grafik](https://user-images.githubusercontent.com/6481937/204288275-9e937539-c242-43fa-babd-f098a3542940.png) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3287 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3287(a)github.com>

2 4

git:5.5:0ad72e16: acc: Fix reason code for locally generated replies. (#3137)
by Henning Westerholt 28 Nov '22

28 Nov '22

Module: kamailio Branch: 5.5 Commit: 0ad72e16757e86b6e3be9095d2e6282e9ba1690f URL: https://github.com/kamailio/kamailio/commit/0ad72e16757e86b6e3be9095d2e6282… Author: Frits Wiersma <cfwiersma(a)solcon.nl> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-28T13:30:11Z acc: Fix reason code for locally generated replies. (#3137) * acc: Fix reason code for locally generated replies. - Use heap memory for the reason code instead of the stack memory. - See issue #2981 * acc: Remove code which was commented out. - Code was commented out in the previous pull request. (#3137). - This has now been corrected. (cherry picked from commit e74cb2371ab879874a8981818139024f1c2beb9e) --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/0ad72e16757e86b6e3be9095d2e6282… Patch: https://github.com/kamailio/kamailio/commit/0ad72e16757e86b6e3be9095d2e6282… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index e045b8c95ac..169a4222fbf 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -93,25 +93,20 @@ void env_set_totag(struct cell *t, struct sip_msg *reply) tmb.t_get_reply_totag(t->uas.request, &acc_env.to_tag); } -int env_set_reason(struct sip_msg *reply, str *buff) { - int i; - char *p; +int env_set_reason(struct sip_msg *reply, str *buff, int code) { + if (reply!=FAKED_REPLY || !buff || !buff->s || buff->len < 20) return 0; if (strncmp(buff->s, "SIP/2.0 ", 8) != 0) { LM_ERR("not a SIP reply\n"); return 0; } - p = buff->s + 12; - for (i=12;i<buff->len;i++) { - if (*p == '\r' || *p == '\n') { - acc_env.reason.s = buff->s+12; - acc_env.reason.len = i-12; - LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); - return 1; - } - p++; - } + + /* Set the reason to a pointer in heap memory. It will contain the last seen FAKED_REPLY */ + acc_env.reason.s = error_text(code); + acc_env.reason.len = strlen(acc_env.reason.s); + LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); + return 0; } @@ -139,7 +134,8 @@ static inline void env_set_code_status( int code, struct sip_msg *reply) acc_env.code_s.s = int2bstr((unsigned long)code, code_buf, &acc_env.code_s.len); /* reason */ - if (acc_env.reason.len == 0) { /* already extracted in case of locally generated replies */ + /* In case of an ACK the reply == NULL, but the reason must be set when report_ack is 1 */ + if (acc_env.reason.len == 0 || reply==NULL) { /* already extracted in case of locally generated replies */ acc_env.reason.s = error_text(code); acc_env.reason.len = strlen(acc_env.reason.s); } @@ -719,7 +715,7 @@ static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ) LM_DBG("acc callback called for t(%p) event type %d, reply code %d\n", t, type, ps->code); if (type&TMCB_RESPONSE_OUT) { - env_set_reason(ps->rpl, &ps->send_buf); + env_set_reason(ps->rpl, &ps->send_buf, ps->code); acc_onreply( t, ps->req, ps->rpl, ps->code); } else if (type&TMCB_E2EACK_IN) { acc_onack( t, t->uas.request, ps->req, ps->code);

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2022