sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
162 discussions

git:master:fde8bd21: http_client: clang-format

by Victor Seva

Module: kamailio Branch: master Commit: fde8bd21dca9c8b45b314b04b21f742363f028b1 URL: https://github.com/kamailio/kamailio/commit/fde8bd21dca9c8b45b314b04b21f742… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-30T12:52:46+02:00 http_client: clang-format --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/fde8bd21dca9c8b45b314b04b21f742… Patch: https://github.com/kamailio/kamailio/commit/fde8bd21dca9c8b45b314b04b21f742… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 2b5a69fcddd..16dfb6cc09b 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -861,17 +861,16 @@ void curl_conn_list_fixup(void) { curl_con_t *cc; cc = _curl_con_root; - while (cc) { - if (!(timeout_mode == 1 || timeout_mode == 2)) { + while(cc) { + if(!(timeout_mode == 1 || timeout_mode == 2)) { /* Timeout is disabled globally. Set timeout to 0 for all connections to reflect this. */ - if (cc->timeout > 0) { + if(cc->timeout > 0) { LM_WARN("curl connection [%.*s]: configured timeout is ignored " - "because timeouts are disabled (timeout_mode)\n", - cc->name.len, cc->name.s); + "because timeouts are disabled (timeout_mode)\n", + cc->name.len, cc->name.s); cc->timeout = 0; } - } - else if (cc->timeout == 0) { + } else if(cc->timeout == 0) { /* Timeout is not configured for that connection. * Use as default global connection_timeout (which can be seconds or milliseconds). */

4 months, 1 week

git:master:bf138374: corex: removed unused parameter from ki_forward_uac()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bf13837461d859887172bf879ab4918f50d12dc6 URL: https://github.com/kamailio/kamailio/commit/bf13837461d859887172bf879ab4918… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-30T11:44:03+02:00 corex: removed unused parameter from ki_forward_uac() --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bf13837461d859887172bf879ab4918… Patch: https://github.com/kamailio/kamailio/commit/bf13837461d859887172bf879ab4918… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 021ed586253..35715581318 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -277,7 +277,7 @@ static void mod_destroy(void) /** * forward request like initial uac sender, with only one via */ -static int ki_forward_uac(sip_msg_t *msg, str *vuri) +static int ki_forward_uac(sip_msg_t *msg) { int ret;

4 months, 1 week

git:master:927acf4c: sca: new function that accepts to/from uri so the kemi exports are still valid

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 927acf4c4e9bfaa97eb2b9d4f3163a26b97244aa URL: https://github.com/kamailio/kamailio/commit/927acf4c4e9bfaa97eb2b9d4f3163a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-30T11:39:58+02:00 sca: new function that accepts to/from uri so the kemi exports are still valid --- Modified: src/modules/sca/sca_subscribe.c Modified: src/modules/sca/sca_subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/927acf4c4e9bfaa97eb2b9d4f3163a2… Patch: https://github.com/kamailio/kamailio/commit/927acf4c4e9bfaa97eb2b9d4f3163a2… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 9453e2de790..ca42fd138e9 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1155,7 +1155,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, return rc; } -int ki_sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) +int ki_sca_handle_subscribe_uris(sip_msg_t *msg, str *uri_to, str *uri_from) { sca_subscription req_sub; sca_subscription *sub = NULL; @@ -1423,9 +1423,13 @@ int ki_sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) return (rc); } +int ki_sca_handle_subscribe(sip_msg_t *msg) +{ + return ki_sca_handle_subscribe_uris(msg, NULL, NULL); +} int sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) { - return ki_sca_handle_subscribe(msg, uri_to, uri_from); + return ki_sca_handle_subscribe_uris(msg, uri_to, uri_from); } int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, diff --git a/src/modules/sca/sca_subscribe.h b/src/modules/sca/sca_subscribe.h index f4b802c81fc..cd6ab482d0e 100644 --- a/src/modules/sca/sca_subscribe.h +++ b/src/modules/sca/sca_subscribe.h @@ -94,6 +94,7 @@ int sca_subscription_aor_has_subscribers(int, str *); int sca_subscription_delete_subscriber_for_event( sca_mod *, str *, str *, str *); int sca_subscription_terminate(sca_mod *, str *, int, str *, int, int); -int ki_sca_handle_subscribe(sip_msg_t *msg, str *, str *); +int ki_sca_handle_subscribe(sip_msg_t *msg); +int ki_sca_handle_subscribe_uris(sip_msg_t *msg, str *, str *); #endif // SCA_SUBSCRIBE_H

4 months, 1 week

git:master:4a57efa0: sca: remove function name from log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a57efa0f7ed2560420e10d0fe70037a14a12c12 URL: https://github.com/kamailio/kamailio/commit/4a57efa0f7ed2560420e10d0fe70037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-30T11:36:29+02:00 sca: remove function name from log message --- Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/4a57efa0f7ed2560420e10d0fe70037… Patch: https://github.com/kamailio/kamailio/commit/4a57efa0f7ed2560420e10d0fe70037… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index e75738872ac..9453e2de790 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1326,8 +1326,7 @@ int ki_sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) released = sca_appearance_owner_release_all( &req_sub.target_aor, &req_sub.subscriber); if(released) { - LM_INFO("sca_handle_subscribe: released %d appearances " - "for subscriber %.*s\n", + LM_INFO("released %d appearances for subscriber %.*s\n", released, STR_FMT(&req_sub.subscriber)); } }

4 months, 1 week

git:master:0a2517f6: siputils: export sip_parse_headers() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a2517f6e1b6a49eafd1846c1d65b4420ed404f5 URL: https://github.com/kamailio/kamailio/commit/0a2517f6e1b6a49eafd1846c1d65b44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-29T11:46:23+02:00 siputils: export sip_parse_headers() to kemi --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/0a2517f6e1b6a49eafd1846c1d65b44… Patch: https://github.com/kamailio/kamailio/commit/0a2517f6e1b6a49eafd1846c1d65b44… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index ffbeacd00a5..cdae4ff1f18 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -608,6 +608,17 @@ static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2) return ki_hdr_date_check(msg, tdiff); } +/** + * + */ +static int ki_sip_parse_headers(sip_msg_t *msg) +{ + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + return -1; + } + return 1; +} + /** * */ @@ -784,6 +795,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("sip_parse_headers"), + SR_KEMIP_INT, ki_sip_parse_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

4 months, 1 week

git:master:2d790270: pkg/kamailio/deb: remove app_mono from builds

by Victor Seva

Module: kamailio Branch: master Commit: 2d7902708fa214d34cb4123857eba95257c659b1 URL: https://github.com/kamailio/kamailio/commit/2d7902708fa214d34cb4123857eba95… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-29T11:28:38+02:00 pkg/kamailio/deb: remove app_mono from builds related #3963 --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/kamailio.postinst Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/kamailio.postinst Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/kamailio.postinst Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/kamailio.postinst Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/kamailio.postinst Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/kamailio.postinst Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/kamailio.postinst Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/kamailio.postinst Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/noble/control Modified: pkg/kamailio/deb/noble/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/kamailio.postinst Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/kamailio.postinst Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/kamailio.postinst Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/kamailio.postinst Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/kamailio.postinst Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/kamailio.postinst Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/2d7902708fa214d34cb4123857eba95… Patch: https://github.com/kamailio/kamailio/commit/2d7902708fa214d34cb4123857eba95…

4 months, 1 week

git:master:4d87f292: app_python3: bump to 3.12 for el8/el9

by S-P Chan

Module: kamailio Branch: master Commit: 4d87f29248d36d873784827204f272116050343d URL: https://github.com/kamailio/kamailio/commit/4d87f29248d36d873784827204f2721… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-08-29T16:27:44+08:00 app_python3: bump to 3.12 for el8/el9 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/4d87f29248d36d873784827204f2721… Patch: https://github.com/kamailio/kamailio/commit/4d87f29248d36d873784827204f2721… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a9a33082316..f642623b4eb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -812,9 +812,9 @@ Requires: python2, kamailio = %ver BuildRequires: python2, python2-devel %endif %if %{with python3} -%if 0%{?rhel} == 8 -Requires: python39, kamailio = %ver -BuildRequires: python39, python39-devel +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +Requires: python3.12, kamailio = %ver +BuildRequires: python3.12, python3.12-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1212,7 +1212,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

4 months, 1 week

[kamailio/kamailio] Kemi app_python3 throws a TypeError (Issue #3915)

by michelpelletier07

### Description I am using Kemi with the app_python3 module. I was getting what appeared to be random TypeError exceptions thrown within the Kamailio app_python3 module. I later discovered that this only happened when calling a Kamailio function that exceeded the duration specified in the latency_limit_action core parameter. Also, the line printed in the logs displayed Null values in the 'file:' and 'func:' fields. #### Reproduction To reproduce the issue: 1. You must be using Kemi with the app_python3 module, with the cfgengine set to python. 2. Set the following in your kamailio.cfg file: ``` latency_log=2 latency_limit_action=100000 ``` 3. Run a Kemi function call that takes more time than the latency_limi_action set above. You may have to lower it if your computer is a fast runner. Here is my suggested code: ``` jsreload = dict() jsreload["jsonrpc"] = "2.0" jsreload["method"] = "tls.reload" jsreload["id"] = 1 KSR.jsonrpcs.exec(json.dumps(jsreload)) ``` 4. Use python version 3.11 #### Log Messages 45(324) INFO: app_python3 [apy_kemi.c:377]: sr_apy_kemi_exec_func(): alert - action KSR.jsonrpcs.exec(...) took too long [752946 ms] (file:(null) func:(null) line:491) 45(324) ERROR: app_python3 [python_support.c:167]: python_handle_exception(): apy_exec: ksr_rtimer_dodebug(rtimer): Unhandled exception in the Python code: TypeError: expected bytes, str found The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/etc/kamailio/kamailio.py", line 491, in ksr_rtimer_dodebug KSR.jsonrpcs.exec(json.dumps(jsreload)) SystemError: <built-in function exec> returned a result with an exception set ### Possible Solutions The solution is to replace PyBytes_AsString(..) calls with calls to PyUnicode_AsUTF8(..) in the PY_VERSION_HEX >= 0x030B0000 block of apy_kemi.c. The PyBytes_AsString expects a Bytes value but reeives a Unicode value instead, thus causing the TypeError exception. Enclosed is a patch file with the fix implemented: [kamailio-5.8.2.patch.txt](https://github.com/user-attachments/files/1619573… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.8.2 (x86_64/linux) 3fa5f4 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_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: 3fa5f4 compiled on 09:58:55 Jul 12 2024 with gcc 12.2.0 ``` * **Operating System**:  ``` # uname -a Linux xxxxxxxxxxxxxxxxxxx 5.10.0-30-amd64 #1 SMP Debian 5.10.218-1 (2024-06-01) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3915 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3915(a)github.com>

4 months, 1 week

[kamailio/kamailio] app_python3: Fixes Kemi TypeError thrown when latency_limit_action is… (PR #3959)

by michelpelletier07

- [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 # 3915 #### Description  Replace PyBytes_AsString(..) calls with calls to PyUnicode_AsUTF8(..) in the PY_VERSION_HEX >= 0x030B0000 block of apy_kemi.c. The PyBytes_AsString expects a Bytes value but receives a Unicode value instead, thus causing the TypeError exception. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3959 -- Commit Summary -- * app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded. -- File Changes -- M src/modules/app_python3/apy_kemi.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3959.patch https://github.com/kamailio/kamailio/pull/3959.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3959 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3959(a)github.com>

4 months, 1 week

git:master:6cae3661: app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded.

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6cae3661419d8d79fc8fb0463f6787b06911fa9d URL: https://github.com/kamailio/kamailio/commit/6cae3661419d8d79fc8fb0463f6787b… Author: Michel Pelletier <michel(a)voip.ms> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-29T10:21:54+02:00 app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded. Replace PyBytes_AsString(..) calls with calls to PyUnicode_AsUTF8(..) in the PY_VERSION_HEX >= 0x030B0000 block of apy_kemi.c. The PyBytes_AsString expects a Bytes value but receives a Unicode value instead, thus causing the TypeError exception. --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/6cae3661419d8d79fc8fb0463f6787b… Patch: https://github.com/kamailio/kamailio/commit/6cae3661419d8d79fc8fb0463f6787b… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 718d8ecedaf..0c1ab535809 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -379,8 +379,8 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len > 0) ? ket->mname.s : "", (ket->mname.len > 0) ? "." : "", ket->fname.s, tdiff, - (pcode) ? PyBytes_AsString(pcode->co_filename) : "", - (pcode) ? PyBytes_AsString(pcode->co_name) : "", + (pcode) ? PyUnicode_AsUTF8(pcode->co_filename) : "", + (pcode) ? PyUnicode_AsUTF8(pcode->co_name) : "", (pframe) ? PyFrame_GetLineNumber(pframe) : 0); #else LOG(cfg_get(core, core_cfg, latency_log),

4 months, 1 week

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024