- sr-dev - kamailio.org

git:master:c3c75bf2: secfilter: cfg functions execute the kemi functions
by Daniel-Constantin Mierla 02 Sep '24

02 Sep '24

Module: kamailio Branch: master Commit: c3c75bf23fd07db1b5a2b83fa06eddc86ae2ed0f URL: https://github.com/kamailio/kamailio/commit/c3c75bf23fd07db1b5a2b83fa06eddc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-02T08:44:30+02:00 secfilter: cfg functions execute the kemi functions - cfg functions may get the option to have cfg variables, which can break the old approach without any warning - itnernal function rename to not use common cfg wrapper prefix and also have pointer to parameter, not value - small formatting updates --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/c3c75bf23fd07db1b5a2b83fa06eddc… Patch: https://github.com/kamailio/kamailio/commit/c3c75bf23fd07db1b5a2b83fa06eddc…

1 0

[kamailio/kamailio] secfilter: export all functions to KEMI (PR #3946)
by bazrafshan.m.h 02 Sep '24

02 Sep '24

- all secfilter functions are exported to KEMI   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * All secfilter functions are exported to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3946 -- Commit Summary -- * secfilter: export all functions to KEMI -- File Changes -- M src/modules/secfilter/secfilter.c (103) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3946.patch https://github.com/kamailio/kamailio/pull/3946.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3946 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3946(a)github.com>

2 3

git:master:5c5bf3a7: secfilter: export all functions to KEMI
by Daniel-Constantin Mierla 02 Sep '24

02 Sep '24

Module: kamailio Branch: master Commit: 5c5bf3a7c974d0378aba0ce07730e54377d69f41 URL: https://github.com/kamailio/kamailio/commit/5c5bf3a7c974d0378aba0ce07730e54… Author: Moheb <bazrafshan.m.h(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-02T08:22:40+02:00 secfilter: export all functions to KEMI - all secfilter functions are exported to KEMI --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/5c5bf3a7c974d0378aba0ce07730e54… Patch: https://github.com/kamailio/kamailio/commit/5c5bf3a7c974d0378aba0ce07730e54…

1 0

git:master:fde8bd21: http_client: clang-format
by Victor Seva 30 Aug '24

30 Aug '24

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). */

1 0

git:master:bf138374: corex: removed unused parameter from ki_forward_uac()
by Daniel-Constantin Mierla 30 Aug '24

30 Aug '24

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;

1 0

git:master:927acf4c: sca: new function that accepts to/from uri so the kemi exports are still valid
by Daniel-Constantin Mierla 30 Aug '24

30 Aug '24

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

1 0

git:master:4a57efa0: sca: remove function name from log message
by Daniel-Constantin Mierla 30 Aug '24

30 Aug '24

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

1 0

git:master:0a2517f6: siputils: export sip_parse_headers() to kemi
by Daniel-Constantin Mierla 29 Aug '24

29 Aug '24

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

1 0

git:master:2d790270: pkg/kamailio/deb: remove app_mono from builds
by Victor Seva 29 Aug '24

29 Aug '24

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…

1 0

git:master:4d87f292: app_python3: bump to 3.12 for el8/el9
by S-P Chan 29 Aug '24

29 Aug '24

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 \

1 0

[kamailio/kamailio] Kemi app_python3 throws a TypeError (Issue #3915)
by michelpelletier07 29 Aug '24

29 Aug '24

### 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 8

[kamailio/kamailio] app_python3: Fixes Kemi TypeError thrown when latency_limit_action is… (PR #3959)
by michelpelletier07 29 Aug '24

29 Aug '24

- [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>

2 2

git:master:6cae3661: app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded.
by Daniel-Constantin Mierla 29 Aug '24

29 Aug '24

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

1 0

[kamailio/kamailio] Start up failed: waiting for child one too long (Issue #3960)
by Chen Ziyan 29 Aug '24

29 Aug '24

### Start up failed with error " waiting for child one too long" execute start up command, and suddenly failed. ` sudo /usr/local/sbin/kamailio -m 128 -M 8 -E -e -dd -f /usr/local/etc/kamailio/kamailio.cfg ` ### Troubleshooting #### Reproduction Maybe the problem of my env. #### Debugging Data #### Log Messages the log: 0(2749) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 192.168.5.167:5061 Aliases: udp: 192.168.5.167:5061 0(2749) INFO: <core> [core/tcp_main.c:5218]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(2751) INFO: rr [../outbound/api.h:53]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(2751) INFO: rr [rr_mod.c:185]: mod_init(): outbound module not available 0(2751) WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value (null)) - ignoring 0(2751) INFO: auth [auth_mod.c:342]: mod_init(): qop set, but nonce-count (nonce_count) support disabled 0(2751) WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value (null)) - ignoring 0(2751) WARNING: tls [tls_mod.c:364]: mod_init(): tls support is disabled (set enable_tls=1 in the config to enable it) 0(2751) INFO: <core> [main.c:3233]: main(): processes (at least): 24 - shm size: 134217728 - pkg size: 8388608 0(2751) INFO: <core> [core/udp_server.c:163]: probe_max_receive_buffer(): SO_RCVBUF is initially 16777216 for fd 9 0(2751) INFO: <core> [core/udp_server.c:233]: probe_max_receive_buffer(): SO_RCVBUF is finally 16777216 on fd 9 0(2751) INFO: <core> [core/udp_server.c:264]: probe_max_send_buffer(): SO_SNDBUF is initially 16777216 for fd 9 0(2751) INFO: <core> [core/udp_server.c:334]: probe_max_send_buffer(): SO_SNDBUF is finally 16777216 on fd 9 1(2754) WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value (null)) - ignoring 1(2754) NOTICE: ndb_redis [redis_client.c:257]: redisc_init(): Connecting to 10.20.80.33:6380 0(2751) ERROR: <core> [main.c:1825]: main_loop(): waiting for child one too long - wait time: 1000000 1(2754) INFO: <core> [main.c:888]: sig_usr(): signal 15 received 0(2751) INFO: snmpstats [snmpstats.c:399]: mod_destroy(): The SNMPStats module got the kill signal 0(2751) INFO: snmpstats [snmpstats.c:403]: mod_destroy(): Shutting down the AgentX Sub-Agent! 0(2751) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized` what does that mean? ` 0(2751) ERROR: <core> [main.c:1825]: main_loop(): waiting for child one too long - wait time: 1000000` How can I solve that? #### SIP Traffic ### Possible Solutions ### Additional Information * **Operating System**: ` LSB Version: :core-4.1-amd64:core-4.1-noarch Distributor ID: CentOS Description: CentOS Linux release 7.9.2009 (Core) Release: 7.9.2009 Codename: Core ` Kamailio-5.8.2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3960 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3960(a)github.com>

2 2

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,noble #2750
by kamailio＠sipwise.com 28 Aug '24

28 Aug '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 2.90 MiB...] Setting up libterm-readkey-perl (2.38-2build4) ... Setting up libfont-ttf-perl (1.06-2) ... Setting up libtext-levenshteinxs-perl (0.03-5build4) ... Setting up libperlio-gzip-perl (0.20-1build4) ... Setting up libhtml-html5-entities-perl (0.004-3) ... Setting up libsereal-decoder-perl (5.004+ds-1build3) ... Setting up libmarkdown2:amd64 (2.2.7-2build1) ... Setting up liburi-perl (5.27-1) ... Setting up iso-codes (4.16.0-1) ... Setting up libnet-ipv6addr-perl (1.02-1) ... Setting up gpg (2.4.4-2ubuntu17) ... Setting up libdata-validate-ip-perl (0.31-1) ... Setting up libemail-address-xs-perl (1.05-1build4) ... Setting up libnet-ssleay-perl:amd64 (1.94-1build4) ... Setting up libhttp-date-perl (6.06-1) ... Setting up libfile-basedir-perl (0.09-2) ... Setting up libfile-listing-perl (6.16-1) ... Setting up libnet-http-perl (6.23-1) ... Setting up libtext-markdown-discount-perl (0.16-1build3) ... Setting up libexception-class-perl (1.45-1) ... Setting up libdevel-callchecker-perl:amd64 (0.008-2build3) ... Setting up libxml-sax-perl (1.02+dfsg-3) ... update-perl-sax-parsers: Registering Perl SAX parser XML::SAX::PurePerl with priority 10... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Creating config file /etc/perl/XML/SAX/ParserDetails.ini with new version Setting up libdata-validate-uri-perl (0.07-3) ... Setting up libdata-optlist-perl (0.114-1) ... Setting up libxml-libxml-perl (2.0207+dfsg+really+2.0134-1build4) ... update-perl-sax-parsers: Registering Perl SAX parser XML::LibXML::SAX::Parser with priority 50... update-perl-sax-parsers: Registering Perl SAX parser XML::LibXML::SAX with priority 50... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Replacing config file /etc/perl/XML/SAX/ParserDetails.ini with new version Setting up libwww-robotrules-perl (6.02-1) ... Setting up libhtml-parser-perl:amd64 (3.81-1build3) ... Setting up libio-socket-ssl-perl (2.085-1) ... Setting up libsub-exporter-perl (0.990-1) ... Setting up libhttp-message-perl (6.45-1ubuntu1) ... Setting up libhtml-form-perl (6.11-1) ... Setting up libiterator-perl (0.03+ds1-2) ... Setting up libhttp-negotiate-perl (6.01-2) ... Setting up libiterator-util-perl (0.02+ds1-2) ... Setting up libhttp-cookies-perl (6.11-1) ... Setting up libhtml-tree-perl (5.07-3) ... Setting up libparams-classify-perl:amd64 (0.015-2build5) ... Setting up libcgi-pm-perl (4.63-1) ... Setting up libmodule-runtime-perl (0.016-2) ... Setting up libconst-fast-perl (0.014-2) ... Setting up libdata-dpath-perl (0.59-1) ... Setting up libmodule-implementation-perl (0.09-2) ... Setting up libpackage-stash-perl (0.40-1) ... Setting up libimport-into-perl (1.002005-2) ... Setting up libmoo-perl (2.005005-1) ... Setting up liblist-someutils-perl (0.59-1) ... Setting up libmoox-aliases-perl (0.001006-2) ... Setting up libb-hooks-endofscope-perl (0.28-1) ... Setting up libnamespace-clean-perl (0.27-2) ... Setting up liblwp-protocol-https-perl (6.13-1) ... Setting up libwww-perl (6.76-1) ... Setting up libhtml-tokeparser-simple-perl (3.16-4) ... Setting up libwww-mechanize-perl (2.18-1ubuntu1) ... Processing triggers for sgml-base (1.31) ... Processing triggers for libc-bin (2.39-0ubuntu8.3) ... Setting up lintian (2.117.0ubuntu1.1) ... Processing triggers for man-db (2.12.0-4build2) ... Not building database; man-db/auto-update is not 'true'. + lintian --version Lintian v2.117.0ubuntu1.1 ++ cd /build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774/debian/.. ++ pwd -P + package_dir=/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 ++ basename /build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 + PACKAGE_NAME=kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 + echo 'Found package name: kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774' Found package name: kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 + lintian_out=/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt + DSC_EXIT=0 + ls /build/kamailio_6.0.0~dev2+ubuntu24.04.20240828080003.2774.dsc + su -s /bin/bash -c 'set -o pipefail; lintian "/build"/*.dsc 2>&1 | tee "/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt"' - pbuilder su: warning: cannot change directory to /nonexistent: No such file or directory W: kamailio source: build-depends-on-obsolete-package Build-Depends: libncurses5-dev => libncurses-dev W: kamailio source: build-depends-on-obsolete-package Build-Depends: pkg-config => pkgconf W: kamailio source: package-uses-deprecated-debhelper-compat-version 9 W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:257] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:50] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:54] W: kamailio source: superfluous-file-pattern src/code/atomic/* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/atomic_ops.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/basex.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/bit_*.c [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/char_msg_val.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/compiler_opt.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/core_stats.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/counters.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/endianness.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/futexlock.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/hashes.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/io_wait.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/list.h [debian/copyright:115] W: kamailio source: superfluous-file-pattern src/core/mem/dl_* [debian/copyright:210] W: kamailio source: superfluous-file-pattern src/core/mem/ll_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/sf_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/shm_mem.c [debian/copyright:56] W: kamailio source: superfluous-file-pattern src/core/parser/case_p_* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/parser/case_reas.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/lib/srutils/srjson.* [debian/copyright:236] W: kamailio source: superfluous-file-pattern src/modules/malloc_test/malloc_test.c [debian/copyright:27] + CHANGES_EXIT=0 + su -s /bin/bash -c 'set -o pipefail; lintian "/build"/*.changes 2>&1 | tee -a "/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt"' - pbuilder su: warning: cannot change directory to /nonexistent: No such file or directory E: kamailio: depends-on-obsolete-package Depends: lsb-base W: kamailio source: build-depends-on-obsolete-package Build-Depends: libncurses5-dev => libncurses-dev W: kamailio source: build-depends-on-obsolete-package Build-Depends: pkg-config => pkgconf W: kamailio-geoip-modules: description-synopsis-starts-with-article W: kamailio-geoip2-modules: description-synopsis-starts-with-article W: kamailio-lua-modules: description-synopsis-starts-with-article W: kamailio-mono-modules: description-synopsis-starts-with-article W: kamailio-python3-modules: description-synopsis-starts-with-article W: kamailio-ruby-modules: description-synopsis-starts-with-article W: kamailio: extended-description-line-too-long line 13 W: kamailio: extended-description-line-too-long line 8 W: kamailio-erlang-modules: extended-description-line-too-long line 5 W: kamailio-extra-modules: extended-description-line-too-long line 7 W: kamailio-kazoo-modules: extended-description-line-too-long line 5 W: kamailio-ldap-modules: extended-description-line-too-long line 6 W: kamailio-nats-modules: extended-description-line-too-long line 5 W: kamailio-nats-modules: extended-description-line-too-long line 6 W: kamailio-outbound-modules: extended-description-line-too-long line 5 W: kamailio-berkeley-bin: no-manual-page [usr/sbin/kambdb_recover] W: kamailio: package-contains-upstream-installation-documentation [usr/share/doc/kamailio/INSTALL.gz] W: kamailio-autheph-modules: package-has-long-file-name kamailio-autheph-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-berkeley-bin: package-has-long-file-name kamailio-berkeley-bin_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-berkeley-modules: package-has-long-file-name kamailio-berkeley-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-cnxcc-modules: package-has-long-file-name kamailio-cnxcc-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-cpl-modules: package-has-long-file-name kamailio-cpl-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-erlang-modules: package-has-long-file-name kamailio-erlang-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-extra-modules: package-has-long-file-name kamailio-extra-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-geoip-modules: package-has-long-file-name kamailio-geoip-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-geoip2-modules: package-has-long-file-name kamailio-geoip2-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-ims-modules: package-has-long-file-name kamailio-ims-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-json-modules: package-has-long-file-name kamailio-json-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-kazoo-modules: package-has-long-file-name kamailio-kazoo-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-ldap-modules: package-has-long-file-name kamailio-ldap-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-lua-modules: package-has-long-file-name kamailio-lua-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-lwsc-modules: package-has-long-file-name kamailio-lwsc-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-memcached-modules: package-has-long-file-name kamailio-memcached-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-microhttpd-modules: package-has-long-file-name kamailio-microhttpd-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mongodb-modules: package-has-long-file-name kamailio-mongodb-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mono-modules: package-has-long-file-name kamailio-mono-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mqtt-modules: package-has-long-file-name kamailio-mqtt-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mysql-modules: package-has-long-file-name kamailio-mysql-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-nats-modules: package-has-long-file-name kamailio-nats-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-outbound-modules: package-has-long-file-name kamailio-outbound-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-perl-modules: package-has-long-file-name kamailio-perl-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-phonenum-modules: package-has-long-file-name kamailio-phonenum-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-postgres-modules: package-has-long-file-name kamailio-postgres-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-presence-modules: package-has-long-file-name kamailio-presence-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-python3-modules: package-has-long-file-name kamailio-python3-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-rabbitmq-modules: package-has-long-file-name kamailio-rabbitmq-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-radius-modules: package-has-long-file-name kamailio-radius-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-redis-modules: package-has-long-file-name kamailio-redis-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-ruby-modules: package-has-long-file-name kamailio-ruby-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-sctp-modules: package-has-long-file-name kamailio-sctp-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-secsipid-modules: package-has-long-file-name kamailio-secsipid-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-snmpstats-modules: package-has-long-file-name kamailio-snmpstats-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-sqlite-modules: package-has-long-file-name kamailio-sqlite-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-systemd-modules: package-has-long-file-name kamailio-systemd-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-tls-modules: package-has-long-file-name kamailio-tls-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-tls-wolfssl-modules: package-has-long-file-name kamailio-tls-wolfssl-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-unixodbc-modules: package-has-long-file-name kamailio-unixodbc-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-utils-modules: package-has-long-file-name kamailio-utils-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-websocket-modules: package-has-long-file-name kamailio-websocket-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-xml-modules: package-has-long-file-name kamailio-xml-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-xmpp-modules: package-has-long-file-name kamailio-xmpp-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio: package-has-unnecessary-activation-of-ldconfig-trigger W: kamailio-ims-modules: package-has-unnecessary-activation-of-ldconfig-trigger W: kamailio source: package-uses-deprecated-debhelper-compat-version 9 W: kamailio-dbg: priority-extra-is-replaced-by-priority-optional W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:257] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:50] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:54] W: kamailio source: superfluous-file-pattern src/code/atomic/* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/atomic_ops.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/basex.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/bit_*.c [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/char_msg_val.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/compiler_opt.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/core_stats.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/counters.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/endianness.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/futexlock.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/hashes.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/io_wait.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/list.h [debian/copyright:115] W: kamailio source: superfluous-file-pattern src/core/mem/dl_* [debian/copyright:210] W: kamailio source: superfluous-file-pattern src/core/mem/ll_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/sf_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/shm_mem.c [debian/copyright:56] W: kamailio source: superfluous-file-pattern src/core/parser/case_p_* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/parser/case_reas.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/lib/srutils/srjson.* [debian/copyright:236] W: kamailio source: superfluous-file-pattern src/modules/malloc_test/malloc_test.c [debian/copyright:27] + CHANGES_EXIT=2 + sed -i 's%\x1B\[[0-9;]*\?[mGKH]%%g' /build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt + [[ 0 =~ [01] ]] + [[ 2 =~ [01] ]] + echo 'Error: lintian execution failed [DSC_EXIT=0 CHANGES_EXIT=2]' Error: lintian execution failed [DSC_EXIT=0 CHANGES_EXIT=2] + exit 2 I: unmounting /tmp/apt-jdg_6zCV7q filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.2412 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/noble-amd64.building.2080 + '[' -r /run/lock/noble-amd64.update.2080 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.xeas4rqOLf ']' + rm -rf /tmp/tmp.xeas4rqOLf + '[' -n /tmp/apt-jdg_6zCV7q ']' + sudo rm -rf /tmp/apt-jdg_6zCV7q + '[' -n 193 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=2429 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Wed Aug 28 08:47:37 UTC 2024 [running 2429 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Wed Aug 28 08:47:37 UTC 2024 [running 2429 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error? Recording fingerprints

1 1

git:master:98825a7b: pkg/kamailio/deb: fix noble lintian errors [skip ci]
by Victor Seva 28 Aug '24

28 Aug '24

Module: kamailio Branch: master Commit: 98825a7bef452cae015e7491cfba1c7aad6051e2 URL: https://github.com/kamailio/kamailio/commit/98825a7bef452cae015e7491cfba1c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-28T11:02:07+02:00 pkg/kamailio/deb: fix noble lintian errors [skip ci] --- Modified: pkg/kamailio/deb/debian/backports/noble Modified: pkg/kamailio/deb/noble/control --- Diff: https://github.com/kamailio/kamailio/commit/98825a7bef452cae015e7491cfba1c7… Patch: https://github.com/kamailio/kamailio/commit/98825a7bef452cae015e7491cfba1c7… --- diff --git a/pkg/kamailio/deb/debian/backports/noble b/pkg/kamailio/deb/debian/backports/noble index 80cbb8cabd8..039846bb1b1 100755 --- a/pkg/kamailio/deb/debian/backports/noble +++ b/pkg/kamailio/deb/debian/backports/noble @@ -29,6 +29,12 @@ sed -i -e '/^ python,/d' -e '/python-dev/d' \ sed -i -e '/^PACKAGE_GROUPS += python$/d' ${DIST}/rules sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += python' ${DIST}/rules +# no lsb-base +sed -i -e '/lsb-base/d' ${DIST}/control + +# libncurses +sed -i -e 's/libncurses5-dev/libncurses-dev/g' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/noble/control b/pkg/kamailio/deb/noble/control index af303e03a89..0991c8676b3 100644 --- a/pkg/kamailio/deb/noble/control +++ b/pkg/kamailio/deb/noble/control @@ -31,7 +31,7 @@ Build-Depends: libmono-2.0-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmosquitto-dev, libnats-dev, - libncurses5-dev, + libncurses-dev, libpcre2-dev, libperl-dev, libphonenumber-dev (>= 7), @@ -73,7 +73,6 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, - lsb-base, python3, ${misc:Depends}, ${shlibs:Depends},

1 0

git:master:6502872d: usrloc: mark contacts with keepalive sent
by Daniel-Constantin Mierla 28 Aug '24

28 Aug '24

Module: kamailio Branch: master Commit: 6502872d35d9bd7043bf54cd1d640dd64ae87115 URL: https://github.com/kamailio/kamailio/commit/6502872d35d9bd7043bf54cd1d640dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-28T10:52:55+02:00 usrloc: mark contacts with keepalive sent - properly detect if the contact record has to be expired or not --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/6502872d35d9bd7043bf54cd1d640dd… Patch: https://github.com/kamailio/kamailio/commit/6502872d35d9bd7043bf54cd1d640dd… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index e5a013b45a3..16fb66021c1 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -148,7 +148,8 @@ int ul_ka_urecord(urecord_t *ur) } } - if(ul_keepalive_timeout > 0 && uc->last_keepalive > 0) { + if(ul_keepalive_timeout > 0 && uc->last_keepalive > 0 + && (uc->flags & FL_KASENT)) { if(uc->last_keepalive + ul_keepalive_timeout < tnow) { /* set contact as expired in 10s */ LM_DBG("set expired contact on keepalive (%u + %u < %u)" @@ -257,7 +258,9 @@ int ul_ka_urecord(urecord_t *ur) kabuf_len, kabuf); kamsg.s = kabuf; kamsg.len = kabuf_len; - ul_ka_send(&kamsg, &idst); + if(ul_ka_send(&kamsg, &idst) >= 0) { + uc->flags |= FL_KASENT; + } } } return 0; diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index 54f7986080d..370baf0da86 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -63,6 +63,7 @@ typedef enum flags FL_MEM = 1 << 0, /*!< Update memory only */ FL_DMQRPL = 1 << 1, /*!< DMQ replication */ FL_EXPCLB = 1 << 2, /*!< Expired callback executed */ + FL_KASENT = 1 << 3, /*!< Keepalive sent to contact */ FL_ALL = (int)0xFFFFFFFF /*!< All flags set */ } flags_t;

1 0

[kamailio/kamailio] kafka: build .deb package with kafka.so (PR #3952)
by Stefan Mititelu 28 Aug '24

28 Aug '24

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Noticed that kafka.so is not included in any existing deb packages. However, librdkafka-dev is generally available library in debian. I've added deb package build for "kamailio-kafka-modules", for bullseye, bookworm and sid. Maybe this can be backported to at least 5.8 stable branch?! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3952 -- Commit Summary -- * kafka: build .deb package with kafka.so -- File Changes -- M pkg/kamailio/deb/bookworm/control (17) M pkg/kamailio/deb/bookworm/rules (1) M pkg/kamailio/deb/bullseye/control (17) M pkg/kamailio/deb/bullseye/rules (1) M pkg/kamailio/deb/sid/control (17) M pkg/kamailio/deb/sid/rules (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3952.patch https://github.com/kamailio/kamailio/pull/3952.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3952 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3952(a)github.com>

3 4

git:master:c2ea356b: pkg/kamailio/deb: add kafka package
by Victor Seva 28 Aug '24

28 Aug '24

Module: kamailio Branch: master Commit: c2ea356b9178c989083111dbc3bf13d993640dc8 URL: https://github.com/kamailio/kamailio/commit/c2ea356b9178c989083111dbc3bf13d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T16:11:26+02:00 pkg/kamailio/deb: add kafka package fixes #3952 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/noble/control Modified: pkg/kamailio/deb/noble/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/c2ea356b9178c989083111dbc3bf13d… Patch: https://github.com/kamailio/kamailio/commit/c2ea356b9178c989083111dbc3bf13d…

1 0

Build failed in Jenkins: kamailiodev-nightly-source » nobel,master #2773
by kamailio＠sipwise.com 28 Aug '24

28 Aug '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> Changes: ------------------------------------------ Started by upstream project "kamailiodev-nightly-source" build number 2773 originally caused by: Started by an SCM change Running as SYSTEM Building in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> The recommended git tool is: NONE No credentials specified Cloning the remote Git repository Cloning repository https://github.com/kamailio/kamailio.git > git init <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git --version # 'git version 2.30.2' > git fetch --tags --force --progress -- https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 Avoid second fetch Checking out Revision 7a390e0a297278b6d319c78f74b8179ed6a25c3b (origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 7a390e0a297278b6d319c78f74b8179ed6a25c3b # timeout=10 Commit message: "modules: readme files regenerated - tm ... [skip ci]" First time build. Skipping changelog. [master] $ /bin/sh -xe /tmp/jenkins3068275780796088845.sh + rm -f ./source rm: cannot remove './source': Is a directory + true [master] $ /bin/sh -xe /tmp/jenkins1623617668519911366.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-generate-source SHELL=/bin/bash RUN_TESTS_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-… distribution=nobel JENKINS_SERVER_COOKIE=fcec2c59d7edfc8c RUN_CHANGES_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightl… PWD=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> HUDSON_HOME=/var/lib/jenkins LOGNAME=jenkins BUILD_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distr… JOB_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distrib… BUILD_NUMBER=2773 BUILD_DISPLAY_NAME=#2773 HOME=/var/lib/jenkins GIT_CHECKOUT_DIR=source LANG=en_US.UTF-8 JENKINS_URL=https://kamailio.sipwise.com/ JOB_BASE_NAME=distribution=nobel,label=master JOB_NAME=kamailiodev-nightly-source/distribution=nobel,label=master INVOCATION_ID=b15ffde9f5b24f79be26749736a9dcc1 RUN_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source… JOB_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source… WORKSPACE=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> HUDSON_URL=https://kamailio.sipwise.com/ NODE_NAME=master label=master USER=jenkins HUDSON_SERVER_COOKIE=fcec2c59d7edfc8c GIT_URL=https://github.com/kamailio/kamailio.git SHLVL=1 BUILD_TAG=jenkins-kamailiodev-nightly-source-distribution=nobel,label=master-2773 EXECUTOR_NUMBER=0 HUDSON_COOKIE=fdd22e15-d23d-4ab7-8db3-ee318fc0e02f JENKINS_HOME=/var/lib/jenkins GIT_COMMIT=7a390e0a297278b6d319c78f74b8179ed6a25c3b NODE_LABELS=master JOURNAL_STREAM=8:8417688 WORKSPACE_TMP=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin RUN_ARTIFACTS_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nigh… CI=true GIT_BRANCH=origin/master BUILD_ID=2773 OLDPWD=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> _=/usr/bin/env nobel not supported Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

- URL: https://github.com/kamailio/kamailio/commit/e11c132cbf57ea1ae6289e734f60110… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:52:15+02:00 stun: check message len for response (cherry picked from commit 87e1a4a7f5d565a59a362f22e9372697f2f2f2af) - URL: https://github.com/kamailio/kamailio/commit/a3f40f3c407d34b25717416b3ac500e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:52:51+02:00 rls: remove unnecessary assignment (cherry picked from commit c97145862119e9001874cd07de9b20ad8e96ff54) - URL: https://github.com/kamailio/kamailio/commit/ffa4eeded62507f15e4e9b26aa5b3ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:53:05+02:00 pua: use long for time value diff operation (cherry picked from commit fc8bee5b87e95e43bda2635e65457b2025eab6f9) - URL: https://github.com/kamailio/kamailio/commit/743ebe918b89a42ce94b10fb9dc2fe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:53:38+02:00 evrexec: remove unnecessary safety exit loop (cherry picked from commit d5076b557728b3f9d80df391ae71e2eab2c896dc) - URL: https://github.com/kamailio/kamailio/commit/89339b1fa6f08024a44d898ed9877f0… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-08-27T12:54:11+02:00 nathelper: fixed handle_ruri_alias() for alias being an IPv6 (cherry picked from commit 52ab6f3dcf5ad8d967be8bdecaa64ef31cbfbe33) - URL: https://github.com/kamailio/kamailio/commit/fc29c81bbc6e3fb0709e3367e2f1d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:54:43+02:00 core: remove unnecessary cleanup when locating a module (cherry picked from commit eda03789f693bb72ec4ee05a8b2b4723e5080504) - URL: https://github.com/kamailio/kamailio/commit/0ffd281b77ac48f24c04655cd962b48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:55:43+02:00 dispatcher: remove reference to MI in comments (cherry picked from commit 8c3b5ab3818c86b90b02e20aa4631654e0b51745) - URL: https://github.com/kamailio/kamailio/commit/b307c7eb8e58b43dca41deb3493b088… Author: emvondo <106535097+emvondo(a)users.noreply.github.com> Date: 2024-08-27T12:56:17+02:00 siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919) * siprepo: fix int params and wrong copy data in siprepo_msg_async_pull --------- Co-authored-by: emvondo <bycl2332(a)orange.com> (cherry picked from commit a3a63655dbcbf1bc8067f34c36f4a7295b2a1745) - URL: https://github.com/kamailio/kamailio/commit/92a3cc4549073d70b1b229149b29017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:56:27+02:00 core: init res inside select_cfg_var() (cherry picked from commit a471d34d6162387a1427f5d0c5b3c6079a2b0bdc) - URL: https://github.com/kamailio/kamailio/commit/d69e65fa4e9448701729ac8f41b069d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:56:42+02:00 core: set digit 0 in the md5 buffer in case of error inside char_msg_val() (cherry picked from commit 15b2a5467f11e009ae4efad1ee29af860326095f) - URL: https://github.com/kamailio/kamailio/commit/7ca33c475b52703216f7d8d4e6c7853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:57:11+02:00 core: remove unnecessary check after using the structure (cherry picked from commit 84ea36b4b79c07c4fc0a8c9e119184433353764e) - URL: https://github.com/kamailio/kamailio/commit/445659c38bd54e26d085d8c5b07bfb8… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2024-08-27T12:57:27+02:00 tcpops: fix memory leak in $tcp(conid) - reference counter to tcp session not decremented, so shm for session never free (cherry picked from commit acf50d86b502af36e3635d61745feaa5c577231d) - URL: https://github.com/kamailio/kamailio/commit/39d4d48abf9e3e2e1edd2f22780fb1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:09+02:00 core: removed unnecessary destroy (cherry picked from commit 20f2096d314253e7e74688da664de2830289a276) - URL: https://github.com/kamailio/kamailio/commit/fa8f0a401980f5dccdfe35983fb5b55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:26+02:00 topoh: 0-init alocated structures (cherry picked from commit dc71c0a5791ebc1306648b5ed338613050e32f5c) - URL: https://github.com/kamailio/kamailio/commit/e006c2c53d6b013253f6a95b96c0f81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:33+02:00 xprint: check to avoid double free (cherry picked from commit 5a1f80f266069dbc453b44a856f225c254e7c050) - URL: https://github.com/kamailio/kamailio/commit/4732a4a88df9f4cbd2260564b942691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:53+02:00 tls: remove uselss pv format parsing in pv_parse_alt_name() (cherry picked from commit 7c06997a1b6e77ae0642d369f532219dc35ef8e0) - URL: https://github.com/kamailio/kamailio/commit/dd4d5e44a60a658772e8288d9419359… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:02+02:00 tls: check lenght when parsing pv alt name (cherry picked from commit 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4) - URL: https://github.com/kamailio/kamailio/commit/e016d1ada08edca0adacd42ffa67ffd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:11+02:00 utils: jump to error on pkg allocation failure (cherry picked from commit 34749ab13b31504358761c964f794b283931394c) - URL: https://github.com/kamailio/kamailio/commit/f57accd1820b26b40f14d4204654021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:20+02:00 erlang: init xavps for safety destroy on error (cherry picked from commit 29510872607deb3238411b358c422d004fb307b7) - URL: https://github.com/kamailio/kamailio/commit/c447bf60d528d8fdc1f5aee52a796ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:31+02:00 jsonrpcc: free allocated pkg buffer on error (cherry picked from commit 796bcc038d7885e01dbad34abc68bf612062c533) - URL: https://github.com/kamailio/kamailio/commit/5baf49a179194ba0eaa5e7f4caba613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:38+02:00 jsonrpcc: declare variables are the beginning of function (cherry picked from commit 7ba313f6f96ffa6042c163027c0c7bb65106fef7) - URL: https://github.com/kamailio/kamailio/commit/61eb4fe44e66a952ba14e39e1c66487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:50+02:00 core: cfg select - check res before initializing (cherry picked from commit a6c415713bb209b03ff110d4ae891173d04ac471) - URL: https://github.com/kamailio/kamailio/commit/f8201e6d4848081a2dd564e0d5b216f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:10+02:00 janssonrpcc: free new servers list on error (cherry picked from commit b4efe7725728392d0c8921c006d6fbc6455e9b8f) - URL: https://github.com/kamailio/kamailio/commit/bbfb24d3cb841b37e6e1b84892b68da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:21+02:00 xprint: return on mod init error case (cherry picked from commit 660a019263b81d318700c205531bf4e042c912cf) - URL: https://github.com/kamailio/kamailio/commit/dfc2531cf7db70e315613b3242d1b5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:33+02:00 core: cfg select - check res when getting the variable (cherry picked from commit 3333611a3ef9078cbcb9867db88921f0c48fce1b) - URL: https://github.com/kamailio/kamailio/commit/1eb7db2f18724b91d18c6b30b529b51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:40+02:00 db_berkeley: buffer size set to the argument of strftime() (cherry picked from commit e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b) - URL: https://github.com/kamailio/kamailio/commit/bc8ea1022718c94fbdf9bb93c35759e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:58+02:00 core: tcp - use long long constants for operations (cherry picked from commit fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52) - URL: https://github.com/kamailio/kamailio/commit/2e4920fd292b6f1d064a75503dd3be3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:06+02:00 cplc: use long long constants for operations (cherry picked from commit 49a9c0a0f391c2e9fc45dff7c37a087dde0f7ba3) - URL: https://github.com/kamailio/kamailio/commit/e14522cab01eba9c5fa636a7c0f6ed4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:31+02:00 corex: small formatting of iflag list (cherry picked from commit 70606e3ea575228b3ccc662d6f9048aa0eb899ce) - URL: https://github.com/kamailio/kamailio/commit/d102f40856512d2c51707bf5ec5a6c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:41+02:00 corex: proper check for iflag lookup return code (cherry picked from commit fdb0ef987ca2b013104b06ece006f67bf8ae07d3) - URL: https://github.com/kamailio/kamailio/commit/a024fb3c028b8df18a9b855fff99bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:52+02:00 corex: switch to unsigned long long for iflag lookup (cherry picked from commit 072c44330297c653675b5078fb0facdc399a5ab4) - URL: https://github.com/kamailio/kamailio/commit/57b9c66cb7811c045caceb2f61047e0… Author: Morten Tryfoss <morten(a)tryfoss.no> Date: 2024-08-27T14:22:30+02:00 cdp: Error log caused crash (cherry picked from commit 4aaaca60ef2207100dd3f4e16ae63428aadc7dc5) - URL: https://github.com/kamailio/kamailio/commit/92e999228eb75856911386d280ab483… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:22:53+02:00 phonenum: export match_cn() to kemi (cherry picked from commit e9dd041ce6af9ee4b9cc2e29b4417787a8056776) - URL: https://github.com/kamailio/kamailio/commit/e9d5d37271e03cdec6cf87647e488c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:03+02:00 phonenum: add fixup free functions to exports structure (cherry picked from commit 7d2fd09103680454aaaba30f5e46f83b362513eb) - URL: https://github.com/kamailio/kamailio/commit/ee5853b4eab6553821113ff64e9eed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:36+02:00 msilo: added fixup free functions to exports structure (cherry picked from commit b6dea98ada293a3bbad004aa1b194d4bf44a60ab) - URL: https://github.com/kamailio/kamailio/commit/f32d67f1b4b08a8cc8dbae917e1a2d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:45+02:00 msilo: removed duplicatred exported function (cherry picked from commit b712ddc4db9a9c1bb30b236a0a86082108b23f07) - URL: https://github.com/kamailio/kamailio/commit/b2bfdd8eb6b40b1e70a2876cee46890… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T14:24:27+02:00 pua_dialoginfo: add section ID's to documentation (cherry picked from commit aba56a5aa3b8fa4f07d0c52cd7fd2d56103ca56c) - URL: https://github.com/kamailio/kamailio/commit/6a22677e281de00dc0088ad23d7c7a5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T14:24:46+02:00 pua_dialoginfo: reformat exported structures more human friendly (cherry picked from commit 748da56717800c36c43bb6fe3739011f3d3105e0) - URL: https://github.com/kamailio/kamailio/commit/a9769ca3692f11fe36e86b29af37d94… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Date: 2024-08-27T14:29:05+02:00 pua_reginfo: free pkg memory after getting the content of each XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs. (cherry picked from commit ed6730aa64e0e7c1580584d6f808e76a665e5882) - URL: https://github.com/kamailio/kamailio/commit/2dbc8b5bf3353fdd3b05f265075e6a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:30:17+02:00 core: use defined type for flags inside build_req_buf_from_sip_req() - partial backport from 9ff1080cc6452343e6bc2de00350b2f7bcecf6d2

1 0

git:master:7a390e0a: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 7a390e0a297278b6d319c78f74b8179ed6a25c3b URL: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T12:46:11+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… Patch: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 35c2e5d0ec0..dbeff43d002 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1631,8 +1631,12 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) 3.44. headers_mode (int) - Control if headers from incoming CANCEL should be propagated to - hop-by-hop generated CANCEL. + Control how headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. If bit (flag) 1 is set (value 1), + propagate the headers that are not branch specific (e.g., From, To). If + bit (flag) 2 is set, in case processing ends in stateless forwarding by + tm, forward CANCEL with a single Via header (the one added by + Kamailio). Default value: 0 (do not propagate).

1 0

git:master:b67bb7a1: tm: docs for header_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: b67bb7a1bc4c710d33e242cea94a192297660c75 URL: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:42:13+02:00 tm: docs for header_mode flag 2 --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Patch: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ffef9a4eec3..e8a16182e42 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1377,8 +1377,12 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) <section id="headers_mode"> <title><varname>headers_mode</varname> (int)</title> <para> - Control if headers from incoming CANCEL should be propagated to - hop-by-hop generated CANCEL. + Control how headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. If bit (flag) 1 is set (value 1), + propagate the headers that are not branch specific (e.g., From, To). + If bit (flag) 2 is set, in case processing ends in stateless + forwarding by tm, forward CANCEL with a single Via header (the one + added by &kamailio;). </para> <para> Default value: 0 (do not propagate).

1 0

git:master:f409ffa0: corex: handle return code from core functions for uac forwarding
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: f409ffa05fcefc11dbfaef0cfedcc7cee0911b2a URL: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: handle return code from core functions for uac forwarding --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… Patch: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 585b65b0836..021ed586253 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -279,7 +279,13 @@ static void mod_destroy(void) */ static int ki_forward_uac(sip_msg_t *msg, str *vuri) { - return forward_uac_uri(msg, NULL); + int ret; + + ret = forward_uac_uri(msg, NULL); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -287,7 +293,13 @@ static int ki_forward_uac(sip_msg_t *msg, str *vuri) */ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { - return forward_uac_uri(msg, vuri); + int ret; + + ret = forward_uac_uri(msg, vuri); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -295,7 +307,13 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) */ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) { - return forward_uac_uri(msg, NULL); + int ret; + + ret = forward_uac_uri(msg, NULL); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -303,6 +321,7 @@ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) */ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) { + int ret; str vuri = STR_NULL; if(fixup_get_svalue(msg, (gparam_t *)puri, &vuri)) { @@ -310,7 +329,11 @@ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) return -1; } - return forward_uac_uri(msg, &vuri); + ret = forward_uac_uri(msg, &vuri); + if(ret >= 0) { + return 1; + } + return -1; } /**

1 0

git:master:31c77b2f: core: propagate return code for forward uac helpers
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 31c77b2f81e23666fbd8d6d249d6b8ddce06483a URL: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: propagate return code for forward uac helpers --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… Patch: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… --- diff --git a/src/core/forward.c b/src/core/forward.c index 97953ee7b85..ff73d957642 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -688,6 +688,9 @@ int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request in stateless mode + */ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info) { @@ -695,6 +698,9 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request like initial uac sender, with only one via + */ int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info) { @@ -723,11 +729,8 @@ int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode(msg, dst, port, send_info, BUILD_NO_VIA1_UPDATE); msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - return -1; + return ret; } /** @@ -787,11 +790,8 @@ int forward_uac_uri(sip_msg_t *msg, str *vuri) ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - return -1; + return ret; } int update_sock_struct_from_via(

1 0

git:master:efcb697e: corex: export to kemi the forward uac functions
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: efcb697e34f767ccb243c181c9d557d136eada2e URL: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: export to kemi the forward uac functions --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… Patch: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index a5d05dbaea2..585b65b0836 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -274,6 +274,14 @@ 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) +{ + return forward_uac_uri(msg, NULL); +} + /** * forward request like initial uac sender, with only one via */ @@ -1528,6 +1536,16 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("forward_uac"), + SR_KEMIP_INT, ki_forward_uac, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("forward_uac_uri"), + SR_KEMIP_INT, ki_forward_uac_uri, + { SR_KEMIP_STR, 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 } } };

1 0

git:master:69b43802: tm: new headers_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 69b4380222121321412afc70dfafe39961551f41 URL: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 tm: new headers_mode flag 2 - statelss uac-style forwarding of CANCEL --- Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Patch: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index cf30afedfa7..9568b6adb1b 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -61,6 +61,7 @@ extern int tm_failure_exec_mode; extern int tm_dns_reuse_rcv_socket; +extern int tm_headers_mode; static int goto_on_branch = 0, branch_route = 0; /* E2E_CANCEL_HOP_BY_HOP - cancel hop by hop */ @@ -1902,7 +1903,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, #endif /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, &host, port, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, &host, port, &dst); + } goto end; } else { init_dest_info(&dst); @@ -1910,7 +1915,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, proxy2su(&dst.to, proxy); /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, 0, 0, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, 0, 0, &dst); + } goto end; } } diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 49c801d2e8f..9adc4613421 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -70,7 +70,6 @@ (_d) += (_len); \ } while(0) -#define TM_CANCEL_HEADERS_COPY 1 extern int tm_headers_mode; /* Build a local request based on a previous request; main diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index c06d1e6adf6..f6ad810d377 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -28,6 +28,9 @@ #include "h_table.h" #include "t_reply.h" +#define TM_CANCEL_HEADERS_COPY (1) +#define TM_CANCEL_FORWARD_UAC (1 << 1) + char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to, sip_msg_t *imsg, struct cancel_reason *reason);

1 0

git:master:233dda7b: core: helper function to forward uac style with dst attributes
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 233dda7b9a1ca6954c35f2f0b271cb9bc4c813d9 URL: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: helper function to forward uac style with dst attributes --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Patch: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 3d2e743cdbd..97953ee7b85 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -695,6 +695,41 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info) +{ + int ret; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode(msg, dst, port, send_info, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + /** * forward request like initial uac sender, with only one via */ diff --git a/src/core/forward.h b/src/core/forward.h index 5b414a7a64b..31086c6512b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,8 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info); int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

git:master:f58c1a0b: corex: updates to forward-uac functions after code relocation
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: f58c1a0b74cce2f3abca540d0d6cb826d3d7b637 URL: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: updates to forward-uac functions after code relocation --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Patch: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c6852759114..a5d05dbaea2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -279,63 +279,7 @@ static void mod_destroy(void) */ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { - int ret; - dest_info_t dst; - sip_uri_t *u; - sip_uri_t next_hop; - sr_lump_t *anchor; - hdr_field_t *hf; - msg_flags_t msg_flags_bk; - - if(msg == NULL) { - LM_WARN("invalid msg parameter\n"); - return -1; - } - - if(parse_headers(msg, HDR_EOH_F, 0) == -1) { - LM_ERR("error while parsing message\n"); - return -1; - } - /* remove incoming Via headers */ - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->type != HDR_VIA_T) { - continue; - } - anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - if(anchor == 0) { - LM_ERR("cannot remove Via header\n"); - return -1; - } - } - - init_dest_info(&dst); - if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { - if(msg->dst_uri.len) { - ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); - u = &next_hop; - } else { - ret = parse_sip_msg_uri(msg); - u = &msg->parsed_uri; - } - } else { - ret = parse_uri(vuri->s, vuri->len, &next_hop); - u = &next_hop; - } - if(ret < 0) { - LM_ERR("forward - bad uri dropping packet\n"); - return -1; - } - dst.proto = u->proto; - msg_flags_bk = msg->msg_flags; - msg->msg_flags |= FL_VIA_NORECEIVED; - ret = forward_request_mode( - msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); - msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - - return -1; + return forward_uac_uri(msg, vuri); } /** @@ -343,7 +287,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) */ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) { - return ki_forward_uac_uri(msg, NULL); + return forward_uac_uri(msg, NULL); } /** @@ -358,7 +302,7 @@ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) return -1; } - return ki_forward_uac_uri(msg, &vuri); + return forward_uac_uri(msg, &vuri); } /**

1 0

git:master:a8162b51: core: relocated function for stateless forwarding uac style
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: a8162b513443fd688ab66e470748cc948c811a6a URL: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: relocated function for stateless forwarding uac style --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Patch: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 1d2b1d5d650..3d2e743cdbd 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -40,6 +40,7 @@ #include "hash_func.h" #include "config.h" #include "parser/msg_parser.h" +#include "parser/parse_uri.h" #include "char_msg_val.h" #include "route.h" #include "events.h" @@ -694,6 +695,70 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request like initial uac sender, with only one via + */ +int forward_uac_uri(sip_msg_t *msg, str *vuri) +{ + int ret; + dest_info_t dst; + sip_uri_t *u; + sip_uri_t next_hop; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(msg == NULL) { + LM_WARN("invalid msg parameter\n"); + return -1; + } + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + init_dest_info(&dst); + if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + } else { + ret = parse_uri(vuri->s, vuri->len, &next_hop); + u = &next_hop; + } + if(ret < 0) { + LM_ERR("forward - bad uri dropping packet\n"); + return -1; + } + dst.proto = u->proto; + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode( + msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via) { diff --git a/src/core/forward.h b/src/core/forward.h index a90ce3446ce..5b414a7a64b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,7 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

git:master:bf9dec59: tm: implement headers_mode option for build_local()
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: bf9dec59480cb8bed1deaa7670454b57045b8b90 URL: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 tm: implement headers_mode option for build_local() --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… Patch: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index c195193d6e6..49c801d2e8f 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -187,6 +187,28 @@ char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, LM_BUG("unhandled reason cause %d\n", reason->cause); } *len += reason_len; + if(imsg != NULL && (tm_headers_mode & TM_CANCEL_HEADERS_COPY)) { + for(hdr = imsg->headers; hdr; hdr = hdr->next) { + switch(hdr->type) { + case HDR_CALLID_T: + case HDR_CSEQ_T: + case HDR_VIA_T: + case HDR_TO_T: + case HDR_FROM_T: + case HDR_ROUTE_T: + case HDR_MAXFORWARDS_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_CONTENTLENGTH_T: + case HDR_REASON_T: + case HDR_EOH_T: + /* skip these headers - they were added already */ + break; + default: + *len += hdr->len; + } + } + } *len += CRLF_LEN; /* end of msg. */ cancel_buf = shm_malloc(*len + 1); @@ -258,6 +280,29 @@ char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, } } } + if(imsg != NULL && (tm_headers_mode & TM_CANCEL_HEADERS_COPY)) { + for(hdr = imsg->headers; hdr; hdr = hdr->next) { + switch(hdr->type) { + case HDR_CALLID_T: + case HDR_CSEQ_T: + case HDR_VIA_T: + case HDR_TO_T: + case HDR_FROM_T: + case HDR_ROUTE_T: + case HDR_MAXFORWARDS_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_CONTENTLENGTH_T: + case HDR_REASON_T: + case HDR_EOH_T: + /* skip these headers - they were added already */ + break; + default: + append_str(p, hdr->name.s, hdr->len); + } + } + } + append_str(p, CRLF, CRLF_LEN); /* msg. end */ *p = 0;

1 0

git:master:aba3c191: corex: backup and restor internal flags for forward uac mode
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: aba3c191e4d00666cb4a9e0c646057df4976d133 URL: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: backup and restor internal flags for forward uac mode --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… Patch: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 7e121f8bb61..c6852759114 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -285,6 +285,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) sip_uri_t next_hop; sr_lump_t *anchor; hdr_field_t *hf; + msg_flags_t msg_flags_bk; if(msg == NULL) { LM_WARN("invalid msg parameter\n"); @@ -325,9 +326,11 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) return -1; } dst.proto = u->proto; + msg_flags_bk = msg->msg_flags; msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; if(ret >= 0) { return 1; }

1 0

git:master:a30839fc: modules: readme files regenerated - pua_dialoginfo ... [skip ci]
by Kamailio Dev 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: a30839fceabbab3be18e01ec6f39c9e0d542f6b6 URL: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T10:16:10+02:00 modules: readme files regenerated - pua_dialoginfo ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e… Patch: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e…

1 0

[kamailio/kamailio] pua and pua_dialoginfo improvements (PR #3955)
by Victor Seva 27 Aug '24

27 Aug '24

#### 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) - [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 #### Description We are seeing a lot of error messages like: > ERROR: <null> pua [pua_db.c:895]: get_record_puadb(): Too many rows found (2) After some investigation I come up with a couple of fixes: * pua: improve the query to support caller|callee with same pres_id (same dialog) * pua_dialoginfo: support uuid to generate pres_id to improve randomness You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3955 -- Commit Summary -- * pua: get_record_puadb() add pres_uri to the query * pua_dialoginfo: use_uuid parameter * pua_dialoginfo: document use_uuid parameter -- File Changes -- M src/modules/pua/pua_db.c (18) M src/modules/pua/pua_db.h (5) M src/modules/pua/send_publish.c (5) M src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml (11) M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (25) M src/modules/pua_dialoginfo/pua_dialoginfo.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3955.patch https://github.com/kamailio/kamailio/pull/3955.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3955 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3955(a)github.com>

1 2

git:master:c06ed186: pua_dialoginfo: document use_uuid parameter
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: c06ed1864f37e5574345601489427a8623d24e34 URL: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: document use_uuid parameter --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Patch: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml index 17ae58a27fa..d1eda128f23 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml @@ -50,6 +50,11 @@ <surname>Gaisnon</surname> <email>frederic.gaisnon(a)gmail.com</email> </editor> + <editor> + <firstname>Victor</firstname> + <surname>Seva</surname> + <email>vseva(a)sipwise.com</email> + </editor> </authorgroup> <copyright> <year>2006</year> @@ -63,6 +68,10 @@ <year>2021</year> <holder>MomentTech</holder> </copyright> + <copyright> + <year>2024</year> + <holder>Sipwise</holder> + </copyright> </bookinfo> <toc></toc> @@ -70,5 +79,3 @@ </book> - - diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index cad923058ac..6093c3516b6 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -211,6 +211,11 @@ <emphasis>pua</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis>uuid</emphasis> if <varname>use_uuid</varname> is enabled. + </para> + </listitem> </itemizedlist> </para> </section> @@ -233,6 +238,25 @@ <section> <title>Parameters</title> + <section id="pua_dialoginfo.p.use_uuid"> + <title><varname>use_uuid</varname> (int)</title> + <para> + If this parameter is set, the pres_id will be generated using libuuid via uuid module. + uuid module has to be loaded before pua_dialoginfo in this case. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>use_uuid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "use_uuid", 1) +... +</programlisting> + </example> + </section> + <section id="pua_dialoginfo.p.include_callid"> <title><varname>include_callid</varname> (int)</title> <para>

1 0

git:master:6ba2fba3: pua_dialoginfo: use_uuid parameter
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 6ba2fba382704b0c693a1ca5745db6203c12f2a0 URL: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: use_uuid parameter generate pres_id using libuuid via uuid module --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Patch: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index d1782380b07..35757128ff7 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -51,6 +51,7 @@ MODULE_VERSION /* Default module parameter values */ +#define DEF_USE_UUID 0 #define DEF_INCLUDE_CALLID 1 #define DEF_INCLUDE_LOCALREMOTE 1 #define DEF_INCLUDE_TAGS 1 @@ -91,6 +92,7 @@ static str callee_entity_when_publish_disabled = {0, 0}; /* pubruri_callee */ static str local_identity_dlg_var = STR_NULL; /* Module parameter variables */ +int use_uuid = DEF_USE_UUID; int include_callid = DEF_INCLUDE_CALLID; int include_localremote = DEF_INCLUDE_LOCALREMOTE; int include_tags = DEF_INCLUDE_TAGS; @@ -123,6 +125,7 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { + {"use_uuid", INT_PARAM, &use_uuid}, {"include_callid", INT_PARAM, &include_callid}, {"include_localremote", INT_PARAM, &include_localremote}, {"include_tags", INT_PARAM, &include_tags}, @@ -733,8 +736,16 @@ struct dlginfo_cell *get_dialog_data(struct dlg_cell *dlg, int type, int len; // generate new random uuid - if(sruid_next_safe(&_puadi_sruid) < 0) { - return NULL; + if(use_uuid) { + _puadi_sruid.uid.len = SRUID_SIZE; + if(sruid_uuid_generate(_puadi_sruid.uid.s, &_puadi_sruid.uid.len) < 0) { + LM_ERR("uuid not generated\n"); + return NULL; + } + } else { + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } } LM_DBG("uuid generated: '%.*s'\n", _puadi_sruid.uid.len, _puadi_sruid.uid.s);

1 0

git:master:bbb86944: pua: get_record_puadb() add pres_uri to the query
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: bbb869441feb141d6732926973a6a95224d70a17 URL: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua: get_record_puadb() add pres_uri to the query if pres_uri is present, added to the query to avoid this kind of errors: > pua [pua_db.c:895]: get_record_puadb(): Too many rows found (2) Since there's always in our case two records with the same pres_id (callee|caller): | 27 | sip:testgroup1010@invite-group-parallel.scenarios-pbx.test | DIALOG_PUBLISH.padi-66c6f28a-108ad-4 | 32 | 1724318050 | 1724338210 | 1024 | a.1724314250.67760.9.0 | | 29 | sip:testuser1003@invite-group-parallel.scenarios-pbx.test | DIALOG_PUBLISH.padi-66c6f28a-108ad-4 | 32 | 1724318050 | 1724338210 | 1024 | a.1724314250.67757.8.0 | --- Modified: src/modules/pua/pua_db.c Modified: src/modules/pua/pua_db.h Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… Patch: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index f66c3b210f7..67f02736836 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -2,6 +2,7 @@ * pua db - presence user agent database support * * Copyright (C) 2011 Crocodile RCS Ltd + * Copyright (C) 2024 Victor Seva (Sipwise) * * This file is part of Kamailio, a free SIP server. * @@ -790,17 +791,26 @@ int insert_record_puadb(ua_pres_t *pres) /******************************************************************************/ -ua_pres_t *get_record_puadb( - str pres_id, str *etag, ua_pres_t *result, db1_res_t **dbres) +ua_pres_t *get_record_puadb(str *pres_uri, str pres_id, str *etag, + ua_pres_t *result, db1_res_t **dbres) { - db_key_t q_cols[2]; - db_val_t q_vals[2], *values; + db_key_t q_cols[3]; + db_val_t q_vals[3], *values; db_row_t *rows; db1_res_t *res; int n_query_cols = 0, nr_rows; db_query_f query_fn = pua_dbf.query_lock ? pua_dbf.query_lock : pua_dbf.query; + if(pres_uri != NULL) { + q_cols[n_query_cols] = &str_pres_uri_col; + q_vals[n_query_cols].type = DB1_STR; + q_vals[n_query_cols].nul = 0; + q_vals[n_query_cols].val.str_val.s = pres_uri->s; + q_vals[n_query_cols].val.str_val.len = pres_uri->len; + n_query_cols++; + } + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; diff --git a/src/modules/pua/pua_db.h b/src/modules/pua/pua_db.h index 788d1656207..cd448b0467d 100644 --- a/src/modules/pua/pua_db.h +++ b/src/modules/pua/pua_db.h @@ -2,6 +2,7 @@ * pua_db headers - presence user agent db headers * * Copyright (C) 2011 Crocodile RCS Ltd + * Copyright (C) 2024 Victor Seva (Sipwise) * * This file is part of Kamailio, a free SIP server. * @@ -58,8 +59,8 @@ int update_dialog_puadb(ua_pres_t *pres, int expires, str *contact); list_entry_t *get_subs_list_puadb(str *did); int insert_record_puadb(ua_pres_t *pres); -ua_pres_t *get_record_puadb( - str pres_id, str *etag, ua_pres_t *result, db1_res_t **res); +ua_pres_t *get_record_puadb(str *pres_uri, str pres_id, str *etag, + ua_pres_t *result, db1_res_t **res); int delete_record_puadb(ua_pres_t *pres); int update_record_puadb(ua_pres_t *pres, int expires, str *contact); int update_version_puadb(ua_pres_t *pres); diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 53644265633..4a06870f7a5 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -309,7 +309,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) if(pua_dbf.affected_rows != NULL || dbmode != PUA_DB_ONLY) { if(find_and_update_record(hentity, hash_code, lexpire, &etag) > 0) goto done; - } else if((db_presentity = get_record_puadb( + } else if((db_presentity = get_record_puadb(hentity->pres_uri, hentity->id, &hentity->etag, &dbpres, &res)) != NULL) { update_record_puadb(hentity, lexpire, &etag); @@ -468,7 +468,8 @@ int send_publish(publ_info_t *publ) dbpres.pres_uri = &pres_uri; dbpres.watcher_uri = &watcher_uri; dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); + presentity = get_record_puadb( + publ->pres_uri, publ->id, publ->etag, &dbpres, &res); } else { ua_pres_t pres;

1 0

git:master:30d9ef64: pkg/kamailio/deb: add Ubuntu 24.04 (Noble Numbat) support [skip ci]
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 30d9ef64d7162d53290c1f18d0b89a33010084a1 URL: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:02:33+02:00 pkg/kamailio/deb: add Ubuntu 24.04 (Noble Numbat) support [skip ci] --- Added: pkg/kamailio/deb/debian/backports/noble Added: pkg/kamailio/deb/noble/changelog Added: pkg/kamailio/deb/noble/compat Added: pkg/kamailio/deb/noble/control Added: pkg/kamailio/deb/noble/copyright Added: pkg/kamailio/deb/noble/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/noble/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio.README.Debian Added: pkg/kamailio/deb/noble/kamailio.default Added: pkg/kamailio/deb/noble/kamailio.examples Added: pkg/kamailio/deb/noble/kamailio.init Added: pkg/kamailio/deb/noble/kamailio.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio.postinst Added: pkg/kamailio/deb/noble/kamailio.service Added: pkg/kamailio/deb/noble/kamailio@.service Added: pkg/kamailio/deb/noble/rules Added: pkg/kamailio/deb/noble/source.lintian-overrides Added: pkg/kamailio/deb/noble/source/format Added: pkg/kamailio/deb/noble/watch --- Diff: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3… Patch: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3…

1 0

git:master:2581d7aa: modules: readme files regenerated - sca ... [skip ci]
by Kamailio Dev 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 2581d7aa2fd9c14c76b75274ea42fb94a87c4684 URL: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T09:46:09+02:00 modules: readme files regenerated - sca ... [skip ci] --- Modified: src/modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9… Patch: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9…

1 0

[kamailio/kamailio] sca: add support custom [to|from]_uri (PR #3930)
by Victor Seva 27 Aug '24

27 Aug '24

#### 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 #### Description This is the first step to merge the functionality that is already used in Sipwise kamailio flavor * module parameters [from|to]_uri_avp to store * sca_handle_subscribe() support [from|to_uri] parameters Add the possibility of define what is the URI value for To and/or From instead of the values from the SIP message You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3930 -- Commit Summary -- * sca: add support custom [to|from]_uri -- File Changes -- M src/modules/sca/doc/sca.xml (58) M src/modules/sca/doc/sca_admin.xml (52) M src/modules/sca/sca.c (115) M src/modules/sca/sca.h (5) M src/modules/sca/sca_call_info.c (190) M src/modules/sca/sca_subscribe.c (96) M src/modules/sca/sca_subscribe.h (5) M src/modules/sca/sca_util.c (184) M src/modules/sca/sca_util.h (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3930.patch https://github.com/kamailio/kamailio/pull/3930.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3930 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3930(a)github.com>

1 1

git:master:c9a9fcd4: sca: add support custom [to|from]_uri
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: c9a9fcd4429de8c7da7cb3ab9cebe077edea91bf URL: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:37:56+02:00 sca: add support custom [to|from]_uri * module parameters [from|to]_uri_avp to store * sca_handle_subscribe() support [from|to_uri] parameters Add the possibility of define what is the URI value for To and/or From instead of the values from the SIP message --- Modified: src/modules/sca/doc/sca.xml Modified: src/modules/sca/doc/sca_admin.xml Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca.h Modified: src/modules/sca/sca_call_info.c Modified: src/modules/sca/sca_subscribe.c Modified: src/modules/sca/sca_subscribe.h Modified: src/modules/sca/sca_util.c Modified: src/modules/sca/sca_util.h --- Diff: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07… Patch: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07…

1 0

[kamailio/kamailio] fix(pua_reginfo): free pkg memory after getting the XML attribute (PR #3953)
by Andrew Pogrebennyk 27 Aug '24

27 Aug '24

fix(pua_reginfo): free pkg memory after getting the XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3953 -- Commit Summary -- * fix(pua_reginfo): free pkg memory after getting the content of each XML attribute -- File Changes -- M src/modules/pua_reginfo/notify.c (86) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3953.patch https://github.com/kamailio/kamailio/pull/3953.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3953 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3953(a)github.com>

2 14

git:master:ed6730aa: pua_reginfo: free pkg memory after getting the content of each XML attribute
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: ed6730aa64e0e7c1580584d6f808e76a665e5882 URL: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:35:47+02:00 pua_reginfo: free pkg memory after getting the content of each XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs. --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76… Patch: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76…

1 0

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 44 to 45 (PR #3957)
by dependabot[bot] 27 Aug '24

27 Aug '24

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 44 to 45. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v45</h2> <h1>Changes in v45.0.0</h1> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li>With changes detected using GitHub's API setting <code>output_renamed_files_as_deleted_and_added</code> to <code>true</code>, would now include the previous file name in the list of deleted files instead of the current file name.</li> </ul> <h2>What's Changed</h2> <ul> <li>chore(deps): update dependency <code>@types/node</code> to v22.0.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2219&q… <li>Upgraded to v44.5.7 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2218&q… <li>chore(deps): update dependency ts-jest to v29.2.4 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2221&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.0.3 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2222&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.1.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2223&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.7.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2224&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.8.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2227&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2229&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.3.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2230&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.4.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2231&q… <li>fix(deps): update dependency <code>@octokit/rest</code> to v21.0.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2232&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2226&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.4.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2233&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.4.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2237&q… <li>fix: remove unsupported input by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2238&q… <li>chore: conditionally skip certain test for foked prs by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2240&q… <li>chore: debug env vars by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2241&q… <li>fix: update test skip logic to use custom env by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2242&q… <li>Renamed Files decomposed into Deleted: previous_filename and Added:filename by <a href="https://github.com/Whadup"><code>@Whadup</code… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2236&q… <li>docs: add Whadup as a contributor for code by <a href="https://github.com/allcontributors"><code>@allcon… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2239&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2243&q… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Whadup"><code>@Whadup</code… made their first contribution in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2236&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v44...v45.0.… <hr /> <h2>v45.0.0</h2> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li>With changes detected using GitHub's API setting <code>output_renamed_files_as_deleted_and_added</code> to <code>true</code>, would now include the previous file name in the list of deleted files.</li> </ul> <h2>What's Changed</h2> <ul> <li>chore(deps): update dependency <code>@types/node</code> to v22.0.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2219&q… <li>Upgraded to v44.5.7 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2218&q… <li>chore(deps): update dependency ts-jest to v29.2.4 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2221&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.0.3 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2222&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.1.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2223&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.7.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2224&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.8.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2227&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2229&q… </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v44.5.7...v4… - (2024-08-21)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update test skip logic to use custom env (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2242…) (<a href="https://github.com/tj-actions/changed-files/commit/b4c09741612c0…) - (Tonye Jack)</li> <li>Remove unsupported input (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2238…) (<a href="https://github.com/tj-actions/changed-files/commit/525aabbe28ff9…) - (Tonye Jack)</li> <li><strong>deps:</strong> Update dependency <code>@octokit/rest</code> to v21.0.2 (<a href="https://github.com/tj-actions/changed-files/commit/3ea85a1c0dd32…) - (renovate[bot])</li> </ul> <h2>➕ Add</h2> <ul> <li>Added missing changes and modified dist assets. (<a href="https://github.com/tj-actions/changed-files/commit/598b7212f2ea6…) - (GitHub Action)</li> </ul> <h2>📝 Rename</h2> <ul> <li>Renamed Files decomposed into Deleted: previous_filename and Added:filename (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2236… </ul> <p>Co-authored-by: Tonye Jack <a href="mailto:jtonye@ymail.com">jtonye@ymail.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/f8034fbb842b9…) - (Lukas Pfahler)</p> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2243… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> Co-authored-by: GitHub Action <a href="mailto:action@github.com">action@github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/40853de9f8ce2…) - (tj-actions[bot])</p> <ul> <li>Update tsconfig.json (<a href="https://github.com/tj-actions/changed-files/commit/88201be733611…) - (Tonye Jack)</li> </ul> <h2>📚 Documentation</h2> <ul> <li>Add Whadup as a contributor for code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2239…) (<a href="https://github.com/tj-actions/changed-files/commit/94b94fea13561…) - (allcontributors[bot])</li> </ul> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li>Debug env vars (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2241…) (<a href="https://github.com/tj-actions/changed-files/commit/246859db916b5…) - (Tonye Jack)</li> <li>Conditionally skip certain test for foked prs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2240…) (<a href="https://github.com/tj-actions/changed-files/commit/46a4c027a6ca4…) - (Tonye Jack)</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.4.2 (<a href="https://github.com/tj-actions/changed-files/commit/25b256207da93…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.4.1 (<a href="https://github.com/tj-actions/changed-files/commit/257f12c17b624…) - (renovate[bot])</li> <li><strong>deps:</strong> Lock file maintenance (<a href="https://github.com/tj-actions/changed-files/commit/9b7ba7b107e24…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.4.0 (<a href="https://github.com/tj-actions/changed-files/commit/50693d8df5efe…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.3.0 (<a href="https://github.com/tj-actions/changed-files/commit/87d8f9488bd23…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.2.0 (<a href="https://github.com/tj-actions/changed-files/commit/950331d47c80d…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency eslint-plugin-jest to v28.8.0 (<a href="https://github.com/tj-actions/changed-files/commit/ed00b69562f42…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency eslint-plugin-jest to v28.7.0 (<a href="https://github.com/tj-actions/changed-files/commit/9d768c3d4e4de…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.1.0 (<a href="https://github.com/tj-actions/changed-files/commit/6b79c79980934…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.0.3 (<a href="https://github.com/tj-actions/changed-files/commit/99b60a2a91bd1…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency ts-jest to v29.2.4 (<a href="https://github.com/tj-actions/changed-files/commit/8ae850f052514…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.0.1 (<a href="https://github.com/tj-actions/changed-files/commit/03d95b07db4ba…) - (renovate[bot])</li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/40853de9f8ce2… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2243… <li><a href="https://github.com/tj-actions/changed-files/commit/94b94fea13561… docs: add Whadup as a contributor for code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2239… <li><a href="https://github.com/tj-actions/changed-files/commit/f8034fbb842b9… Renamed Files decomposed into Deleted: previous_filename and Added:filename (...</li> <li><a href="https://github.com/tj-actions/changed-files/commit/b4c09741612c0… fix: update test skip logic to use custom env (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2242… <li><a href="https://github.com/tj-actions/changed-files/commit/246859db916b5… chore: debug env vars (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2241… <li><a href="https://github.com/tj-actions/changed-files/commit/46a4c027a6ca4… chore: conditionally skip certain test for foked prs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2240… <li><a href="https://github.com/tj-actions/changed-files/commit/525aabbe28ff9… fix: remove unsupported input (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2238… <li><a href="https://github.com/tj-actions/changed-files/commit/25b256207da93… chore(deps): update dependency <code>@types/node</code> to v22.4.2</li> <li><a href="https://github.com/tj-actions/changed-files/commit/257f12c17b624… chore(deps): update dependency <code>@types/node</code> to v22.4.1</li> <li><a href="https://github.com/tj-actions/changed-files/commit/598b7212f2ea6… Added missing changes and modified dist assets.</li> <li>Additional commits viewable in <a href="https://github.com/tj-actions/changed-files/compare/v44...v45&qu… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3957 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 44 to 45 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3957.patch https://github.com/kamailio/kamailio/pull/3957.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3957 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3957(a)github.com>

2 1

git:master:1c5983c8: github: [skip ci]: bump tj-actions/changed-files from 44 to 45
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 1c5983c8f7ab7a93b5c96efeaa9600b6f2246d13 URL: https://github.com/kamailio/kamailio/commit/1c5983c8f7ab7a93b5c96efeaa9600b… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:14:23+02:00 github: [skip ci]: bump tj-actions/changed-files from 44 to 45 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 44 to 45. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v44...v45) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/1c5983c8f7ab7a93b5c96efeaa9600b… Patch: https://github.com/kamailio/kamailio/commit/1c5983c8f7ab7a93b5c96efeaa9600b… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index e70f646891c..3acd963b2df 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -33,14 +33,14 @@ jobs: - name: Get changed files if: ${{ ! inputs.force }} id: changed-files - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v45 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v45 with: files: | .devcontainer/**

1 0

git:master:9743c122: corex: set internal flag FL_VIA_NORECEIVED for forward_uac() variants
by Daniel-Constantin Mierla 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: 9743c1226e95e9a9f890d6c22ad1da7b9f9cc543 URL: https://github.com/kamailio/kamailio/commit/9743c1226e95e9a9f890d6c22ad1da7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-26T18:07:47+02:00 corex: set internal flag FL_VIA_NORECEIVED for forward_uac() variants --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9743c1226e95e9a9f890d6c22ad1da7… Patch: https://github.com/kamailio/kamailio/commit/9743c1226e95e9a9f890d6c22ad1da7… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index cf663158fa0..7e121f8bb61 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -325,6 +325,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) return -1; } dst.proto = u->proto; + msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); if(ret >= 0) {

1 0

git:master:3acf1296: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: 3acf129660be4e2d9f4dfa68ad3ec6d25c43fbf1 URL: https://github.com/kamailio/kamailio/commit/3acf129660be4e2d9f4dfa68ad3ec6d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-26T15:46:11+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/3acf129660be4e2d9f4dfa68ad3ec6d… Patch: https://github.com/kamailio/kamailio/commit/3acf129660be4e2d9f4dfa68ad3ec6d… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index d3eda806d4d..f66c7391747 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -107,6 +107,7 @@ Gabriel Vasile 4.41. contact_param_rm(pname) 4.42. contact_param_check(pname) 4.43. hdr_date_check(tdiff) + 4.44. sip_parse_headers() 5. Exported pseudo-variables @@ -170,6 +171,7 @@ Gabriel Vasile 1.50. contact_param_rm usage 1.51. contact_param_check usage 1.52. hdr_date_check usage + 1.53. sip_parse_headers usage Chapter 1. Admin Guide @@ -238,6 +240,7 @@ Chapter 1. Admin Guide 4.41. contact_param_rm(pname) 4.42. contact_param_check(pname) 4.43. hdr_date_check(tdiff) + 4.44. sip_parse_headers() 5. Exported pseudo-variables @@ -455,6 +458,7 @@ modparam("siputils", "e164_max_len", 20) 4.41. contact_param_rm(pname) 4.42. contact_param_check(pname) 4.43. hdr_date_check(tdiff) + 4.44. sip_parse_headers() 4.1. options_reply() @@ -1203,6 +1207,19 @@ if (!hdr_date_check("10")) { } ... +4.44. sip_parse_headers() + + Return true if parsing (fast mode) all SIP headers is successful. + + This function can be used from ANY_ROUTE. + + Example 1.53. sip_parse_headers usage +... +if (sip_parse_headers()) { + ... +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

1 0

git:master:52036e27: siputils: docs for sip_parse_headers() function
by Daniel-Constantin Mierla 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: 52036e2772821459daea6d5ac98a3710d9daec13 URL: https://github.com/kamailio/kamailio/commit/52036e2772821459daea6d5ac98a371… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-26T15:39:20+02:00 siputils: docs for sip_parse_headers() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/52036e2772821459daea6d5ac98a371… Patch: https://github.com/kamailio/kamailio/commit/52036e2772821459daea6d5ac98a371… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index cf08771326c..6850f53e9bf 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1474,6 +1474,27 @@ if (!hdr_date_check("10")) { exit; } ... +</programlisting> + </example> + </section> + <section id="siputils.f.sip_parse_headers"> + <title> + <function moreinfo="none">sip_parse_headers()</function> + </title> + <para> + Return true if parsing (fast mode) all SIP headers is successful. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sip_parse_headers</function> usage</title> + <programlisting format="linespecific"> +... +if (sip_parse_headers()) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:c04e2367: siputils: added function to parse headers
by Daniel-Constantin Mierla 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: c04e236721f9572a2655e39b8c5136bd23f95dd3 URL: https://github.com/kamailio/kamailio/commit/c04e236721f9572a2655e39b8c5136b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-26T15:00:07+02:00 siputils: added function to parse headers - could be useful after applying changes or replacing message buffer content --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/c04e236721f9572a2655e39b8c5136b… Patch: https://github.com/kamailio/kamailio/commit/c04e236721f9572a2655e39b8c5136b… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 372da25b041..ffbeacd00a5 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -111,6 +111,8 @@ static int w_contact_param_check(sip_msg_t *msg, char *pnparam, char *p2); static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2); +static int w_sip_parse_headers(sip_msg_t *msg, char *p1, char *p2); + /* Fixup functions to be defined later */ static int fixup_set_uri(void **param, int param_no); static int fixup_free_set_uri(void **param, int param_no); @@ -208,6 +210,7 @@ static cmd_export_t cmds[] = { fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"hdr_date_check", (cmd_function)w_hdr_date_check, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"sip_parse_headers", (cmd_function)w_sip_parse_headers, 0, 0, 0, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 1, 0, 0, 0}, @@ -605,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 w_sip_parse_headers(sip_msg_t *msg, char *p1, char *p2) +{ + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + return -1; + } + return 1; +} + /** * */

1 0

[kamailio/kamailio] During de-registration procedure, clean-up is not happening if contact has * value (Issue #3848)
by deepak-git-account 24 Aug '24

24 Aug '24

### Description If Deregistration contains * in a contact field as described in RFC-3261, then the Kamailio is not cleaning the in-memory and database record. And the next iteration is not working correctly. Use of the "*" Contact header field value allows a registering UA to remove all bindings associated with an address-of-record without knowing their precise values.  Step:1 REGISTER USER UE-A Step:2: Wait for the certain duration Step:3: De-REGISTER USER UE-A (Contact header is using *) Step:4: Repeat from the step-1 After step:3, clean-up is not happening. Record can be seen in SQL. Note: If de-register contains specific CONTACT header, then cleanup is happening. ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: DEBUG: <script>: Contact headervalue: * May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=25 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=26 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: DEBUG: <script>: Full URI from sip:49404965200004@open-ims.test: sip:49404965200004@open-ims.test May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=33 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=34 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=36 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=37 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=38 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=39 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=46 a=16 n=if May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=43 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=54 a=16 n=if May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=46 a=25 n=is_present_hf May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=47 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=50 a=25 n=append_hf May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=54 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=55 a=25 n=pcscf_save_pending May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: ims_registrar_pcscf [save.c:318]: save_pending(): No contact headers May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: DEBUG: ims_registrar_pcscf [save.c:492]: save_pending(): Error saving pending contact May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=67 a=16 n=if May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=65 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[] c=[] l=0 a=12 n=seturi May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=71 a=26 n=xlog ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.7.5 (x86_64/linux) 58499a-dirty 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 58499a -dirty compiled on 11:23:55 May 8 2024 with gcc 9.4.0 ``` * **Operating System**:  ``` lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3848 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3848(a)github.com>

5 9

Re: [kamailio/kamailio] core: main - safety check for invalid syntax in listen parameter (9783c27)
by Henning Westerholt 23 Aug '24

23 Aug '24

Right now it will just ignore the additional slash and cut the string there: henning@app01:~/repositories/kamailio/src$ killall kamailio; ./kamailio -l udp:127.0.0.1:5060//te/st -f ../etc/test.cfg -Y /tmp/ -E -L modules Listening on udp: 127.0.0.1:5060 name te Aliases: udp: localhost:5060 I think the logic could be extended easily to allow e.g. a fourth field for the listen, when we need it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd864b1de592/145744930(a)github.com>

1 0

Re: [kamailio/kamailio] core: main - safety check for invalid syntax in listen parameter (9783c27)
by Daniel-Constantin Mierla 23 Aug '24

23 Aug '24

Maybe a check should be added that there is no `/` is in the last field now/socket name, so in the future `/` can be used as separator for new fields. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd864b1de592/145744612(a)github.com>

1 0

git:master:fad4fbc3: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: fad4fbc3131ec261cd552d821eaf5a20157cfc65 URL: https://github.com/kamailio/kamailio/commit/fad4fbc3131ec261cd552d821eaf5a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-23T12:31:10+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/fad4fbc3131ec261cd552d821eaf5a2… Patch: https://github.com/kamailio/kamailio/commit/fad4fbc3131ec261cd552d821eaf5a2…

1 0

git:master:f2c31f59: tm: docs for headers_mode parameter
by Daniel-Constantin Mierla 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: f2c31f5948cc8f6df652d193372973b1da748d51 URL: https://github.com/kamailio/kamailio/commit/f2c31f5948cc8f6df652d193372973b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-23T12:18:13+02:00 tm: docs for headers_mode parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2c31f5948cc8f6df652d193372973b… Patch: https://github.com/kamailio/kamailio/commit/f2c31f5948cc8f6df652d193372973b… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 2c42e2cea5e..ffef9a4eec3 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1355,13 +1355,14 @@ modparam("tm", "e2e_cancel_reason", 0) </programlisting> </example> </section> + <section id="e2e_cancel_hop_by_hop"> <title><varname>e2e_cancel_hop_by_hop</varname> (int)</title> <para> Enable/disable sending CANCEL in hop-by-hop mode. </para> <para> - Default value: 1 ( hop-by-hop mode). + Default value: 1 (hop-by-hop mode). </para> <example> <title>Set <varname>e2e_cancel_hop_by_hop</varname> parameter</title> @@ -1373,6 +1374,25 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) </example> </section> + <section id="headers_mode"> + <title><varname>headers_mode</varname> (int)</title> + <para> + Control if headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. + </para> + <para> + Default value: 0 (do not propagate). + </para> + <example> + <title>Set <varname>headers_mode</varname> parameter</title> + <programlisting> +... +modparam("tm", "headers_mode", 1) +... + </programlisting> + </example> + </section> + <section id="remap_503_500"> <title><varname>remap_503_500</varname> (boolean)</title> <para>

1 0

git:master:e84ef549: tm: new parameter headers_mode
by Daniel-Constantin Mierla 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: e84ef54979dd05e92c65f96c7b1336aefd28faa2 URL: https://github.com/kamailio/kamailio/commit/e84ef54979dd05e92c65f96c7b1336a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-23T12:18:13+02:00 tm: new parameter headers_mode - control if headers from incoming CANCEL should be propagated to hop-by-hop generated CANCEL - default 0, do not propagate (exiting behaviour) --- Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_cancel.h Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/e84ef54979dd05e92c65f96c7b1336a… Patch: https://github.com/kamailio/kamailio/commit/e84ef54979dd05e92c65f96c7b1336a…

1 0

git:master:9783c270: core: main - safety check for invalid syntax in listen parameter
by Henning Westerholt 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: 9783c270eae580b22e73349ac72afd864b1de592 URL: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-23T10:17:02Z core: main - safety check for invalid syntax in listen parameter --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… Patch: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… --- diff --git a/src/main.c b/src/main.c index cbe67350004..993181c7326 100644 --- a/src/main.c +++ b/src/main.c @@ -2765,7 +2765,7 @@ int main(int argc, char **argv) fprintf(stderr, "error during processing -l parameter\n"); } tbuf_tmp = tbuf; - while ((p = strsep(&tbuf, "/")) != NULL) { + while ((p = strsep(&tbuf, "/")) != NULL && listen_field_count < 3) { listen_fields[listen_field_count++] = p; } /* empty advertise only allowed with a name field */

1 0

[kamailio/kamailio] main: Add support for naming socket in cli (PR #3954)
by Xenofon Karamanos 23 Aug '24

23 Aug '24

#### 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  This PR introduces the socket name support to kamailio cli just like [listen directive](https://www.kamailio.org/wikidocs/cookbooks/devel/core/#listen) does in the config file. You can start kamailio using the `-l` argument to define listening sockets. This PR adds the `name=` part support to match the config file. `kamailio -l test=udp:10.0.0.55:5061/1.1.1.1:5060` Discussion about whether `-l **test=**udp:10.0.0.55:5061/1.1.1.1:5060` or `-l udp:10.0.0.55:5061/1.1.1.1:5060**=test**` can be found in You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3954 -- Commit Summary -- * main: Add support for naming socket in cli -- File Changes -- M src/main.c (41) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3954.patch https://github.com/kamailio/kamailio/pull/3954.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3954 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3954(a)github.com>

2 7

git:master:d44b13cd: core: main - add support for socket names as command line parameters
by Henning Westerholt 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: d44b13cd91183e12aed1a3c5ee41f9d22ddac074 URL: https://github.com/kamailio/kamailio/commit/d44b13cd91183e12aed1a3c5ee41f9d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-23T09:28:24Z core: main - add support for socket names as command line parameters - format: [proto:]addr_lst[:port][/advaddr][/socket_name] - example: -l udp:127.0.0.1:5060/1.1.1.1:5060/local - Listening on: udp: 127.0.0.1:5060 name local advertise udp:1.1.1.1:5060 - based on a pull-request from Xenofon Karamanos (GH #3954) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/d44b13cd91183e12aed1a3c5ee41f9d… Patch: https://github.com/kamailio/kamailio/commit/d44b13cd91183e12aed1a3c5ee41f9d…

1 0

git:master:57144a26: core: add new function pkg_char_dup, similar as shm_char_dup but for PKG memory
by Henning Westerholt 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: 57144a263680e86616dea49e9f2ca9f84a48d777 URL: https://github.com/kamailio/kamailio/commit/57144a263680e86616dea49e9f2ca9f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-23T09:26:06Z core: add new function pkg_char_dup, similar as shm_char_dup but for PKG memory --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/57144a263680e86616dea49e9f2ca9f… Patch: https://github.com/kamailio/kamailio/commit/57144a263680e86616dea49e9f2ca9f… --- diff --git a/src/core/ut.h b/src/core/ut.h index aa51108229b..31b45fe5b4d 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1017,6 +1017,34 @@ static inline int pkg_str_dup(str *dst, const str *src) return 0; } +/** + * \brief Make a copy of a char pointer to a char pointer using pkg_malloc + * \param src source + * \return a pointer to the new allocated char on success, 0 on failure + */ +static inline char *pkg_char_dup(const char *src) +{ + char *rval; + int len; + + if(!src) { + LM_ERR("NULL src or dst\n"); + return NULL; + } + + len = strlen(src) + 1; + rval = (char *)pkg_malloc(len); + if(!rval) { + PKG_MEM_ERROR; + return NULL; + } + + memcpy(rval, src, len); + + return rval; +} + + /** * \brief Compare two str's case sensitive * \param str1 first str

1 0

git:master:e839563d: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 22 Aug '24

22 Aug '24

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

1 0

git:master:c622429b: tm: align comments
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: c622429b1514f49d36519248f90b647f7b7b3144 URL: https://github.com/kamailio/kamailio/commit/c622429b1514f49d36519248f90b647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T13:22:56+02:00 tm: align comments --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/c622429b1514f49d36519248f90b647… Patch: https://github.com/kamailio/kamailio/commit/c622429b1514f49d36519248f90b647… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index b669f1d7762..c9f0bc2cab4 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1348,9 +1348,9 @@ void e2e_cancel(struct sip_msg *cancel_msg, struct cell *t_cancel, for(i = 0; i < t_invite->nr_of_outgoings; i++) { if(cancel_bm & (1 << i)) { /* it's safe to get the reply lock since e2e_cancel is - * called with the cancel as the "current" transaction so - * at most t_cancel REPLY_LOCK is held in this process => - * no deadlock possibility */ + * called with the cancel as the "current" transaction so + * at most t_cancel REPLY_LOCK is held in this process => + * no deadlock possibility */ ret = cancel_branch(t_invite, i, reason, cfg_get(tm, tm_cfg, cancel_b_flags) | ((t_invite->uac[i].request.buffer == NULL) @@ -1391,8 +1391,8 @@ void e2e_cancel(struct sip_msg *cancel_msg, struct cell *t_cancel, if(t_invite->uac[i].last_received >= 100) { /* Provisional reply received on this branch, send CANCEL */ /* we do need to stop the retr. timers if the request is not - * an invite and since the stop_rb_retr() cost is lower than - * the invite check we do it always --andrei */ + * an invite and since the stop_rb_retr() cost is lower than + * the invite check we do it always --andrei */ stop_rb_retr(&t_invite->uac[i].request); if(SEND_BUFFER(&t_cancel->uac[i].request) == -1) { LM_ERR("e2e cancel - send failed\n"); @@ -1409,12 +1409,12 @@ void e2e_cancel(struct sip_msg *cancel_msg, struct cell *t_cancel, &t_cancel->uac[i].request); } else { /* No provisional response received, stop - * retransmission timers */ + * retransmission timers */ if(!(cfg_get(tm, tm_cfg, cancel_b_flags) & F_CANCEL_B_FORCE_RETR)) stop_rb_retr(&t_invite->uac[i].request); /* no need to stop fr, it will be stopped by relay_reply - * put_on_wait -- andrei */ + * put_on_wait -- andrei */ /* Generate faked reply */ if(cfg_get(tm, tm_cfg, cancel_b_flags) & F_CANCEL_B_FAKE_REPLY) {

1 0

git:master:2d2daa0e: tm: docs for e2e_cancel_hop_by_hop parameter
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 2d2daa0e69e57787d974dfae6826f03397109be2 URL: https://github.com/kamailio/kamailio/commit/2d2daa0e69e57787d974dfae6826f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T13:22:56+02:00 tm: docs for e2e_cancel_hop_by_hop parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2d2daa0e69e57787d974dfae6826f03… Patch: https://github.com/kamailio/kamailio/commit/2d2daa0e69e57787d974dfae6826f03… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index b8d7a8a3db4..2c42e2cea5e 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1351,6 +1351,23 @@ modparam("tm", "local_cancel_reason", 0) <programlisting> ... modparam("tm", "e2e_cancel_reason", 0) +... + </programlisting> + </example> + </section> + <section id="e2e_cancel_hop_by_hop"> + <title><varname>e2e_cancel_hop_by_hop</varname> (int)</title> + <para> + Enable/disable sending CANCEL in hop-by-hop mode. + </para> + <para> + Default value: 1 ( hop-by-hop mode). + </para> + <example> + <title>Set <varname>e2e_cancel_hop_by_hop</varname> parameter</title> + <programlisting> +... +modparam("tm", "e2e_cancel_hop_by_hop", 0) ... </programlisting> </example>

1 0

git:master:13895810: tm: compile define E2E_CANCEL_HOP_BY_HOP turned into modparam
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 138958103c4083c5273a6019169514a54623fb45 URL: https://github.com/kamailio/kamailio/commit/138958103c4083c5273a6019169514a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T13:22:56+02:00 tm: compile define E2E_CANCEL_HOP_BY_HOP turned into modparam - easier to control without recompilation with modparam e2e_cancel_hop_by_hop - default 1, same as so far, with E2E_CANCEL_HOP_BY_HOP defined --- Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_fwd.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/138958103c4083c5273a6019169514a… Patch: https://github.com/kamailio/kamailio/commit/138958103c4083c5273a6019169514a…

1 0

git:master:82abbf4c: modules: readme files regenerated - presence_conference ... [skip ci]
by Kamailio Dev 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 82abbf4cce93845352e158db03516236e99ebd87 URL: https://github.com/kamailio/kamailio/commit/82abbf4cce93845352e158db0351623… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-22T12:01:10+02:00 modules: readme files regenerated - presence_conference ... [skip ci] --- Modified: src/modules/presence_conference/README --- Diff: https://github.com/kamailio/kamailio/commit/82abbf4cce93845352e158db0351623… Patch: https://github.com/kamailio/kamailio/commit/82abbf4cce93845352e158db0351623… --- diff --git a/src/modules/presence_conference/README b/src/modules/presence_conference/README index 83ee87aca4d..34c6e6302d1 100644 --- a/src/modules/presence_conference/README +++ b/src/modules/presence_conference/README @@ -108,6 +108,9 @@ modparam("presence_conference", "default_expires", 3600) 4.1. conference_reset + The following MI commands are currently disabled, they need to migrated + to the RPC infrastructure. + 4.1. conference_reset Reset internal data.

1 0

git:master:20f7aa0d: presence_conference: add a note about deactivated MI cmds to docs [skip ci]
by Victor Seva 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 20f7aa0d0fe2f152e47321657983e7fdbaa4727d URL: https://github.com/kamailio/kamailio/commit/20f7aa0d0fe2f152e47321657983e7f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:46:55+02:00 presence_conference: add a note about deactivated MI cmds to docs [skip ci] --- Modified: src/modules/presence_conference/doc/presence_conference_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20f7aa0d0fe2f152e47321657983e7f… Patch: https://github.com/kamailio/kamailio/commit/20f7aa0d0fe2f152e47321657983e7f… --- diff --git a/src/modules/presence_conference/doc/presence_conference_admin.xml b/src/modules/presence_conference/doc/presence_conference_admin.xml index ae6d3f5eed2..d8e9ac79b47 100644 --- a/src/modules/presence_conference/doc/presence_conference_admin.xml +++ b/src/modules/presence_conference/doc/presence_conference_admin.xml @@ -100,7 +100,7 @@ modparam("presence_conference", "default_expires", 3600) <section> <title>MI Commands</title> - + The following MI commands are currently disabled, they need to migrated to the RPC infrastructure. <section> <title> <function moreinfo="none">conference_reset</function>

1 0

git:master:59862ba2: presence_conference: add section ID's to documentation [skip ci]
by Victor Seva 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 59862ba222127b89e5d547dfb86e206ea8d0588d URL: https://github.com/kamailio/kamailio/commit/59862ba222127b89e5d547dfb86e206… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:46:09+02:00 presence_conference: add section ID's to documentation [skip ci] --- Modified: src/modules/presence_conference/doc/presence_conference_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59862ba222127b89e5d547dfb86e206… Patch: https://github.com/kamailio/kamailio/commit/59862ba222127b89e5d547dfb86e206… --- diff --git a/src/modules/presence_conference/doc/presence_conference_admin.xml b/src/modules/presence_conference/doc/presence_conference_admin.xml index 83816723dbe..ae6d3f5eed2 100644 --- a/src/modules/presence_conference/doc/presence_conference_admin.xml +++ b/src/modules/presence_conference/doc/presence_conference_admin.xml @@ -56,7 +56,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="presence_conference.p.use_partial_states"> <title><varname>use_partial_states</varname> (int)</title> <para> Control usage of partial state notifications. @@ -76,19 +76,19 @@ modparam("presence_conference", "use_partial_states", 0) </example> </section> -<section id="presence_conference.p.default_expires"> - <title><varname>default_expires</varname> (int)</title> - <para> - The default expires value used when missing from SUBSCRIBE - message (in seconds). - </para> - <para> - <emphasis>Default value is <quote>3600</quote>. - </emphasis> - </para> - <example> - <title>Set <varname>default_expires</varname> parameter</title> - <programlisting format="linespecific"> + <section id="presence_conference.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> ... modparam("presence_conference", "default_expires", 3600) ... @@ -127,4 +127,3 @@ modparam("presence_conference", "default_expires", 3600) </section> </chapter> -

1 0

git:master:748da567: pua_dialoginfo: reformat exported structures more human friendly
by Victor Seva 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 748da56717800c36c43bb6fe3739011f3d3105e0 URL: https://github.com/kamailio/kamailio/commit/748da56717800c36c43bb6fe3739011… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:23:08+02:00 pua_dialoginfo: reformat exported structures more human friendly --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/748da56717800c36c43bb6fe3739011… Patch: https://github.com/kamailio/kamailio/commit/748da56717800c36c43bb6fe3739011…

1 0

git:master:aba56a5a: pua_dialoginfo: add section ID's to documentation
by Victor Seva 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: aba56a5aa3b8fa4f07d0c52cd7fd2d56103ca56c URL: https://github.com/kamailio/kamailio/commit/aba56a5aa3b8fa4f07d0c52cd7fd2d5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:07:43+02:00 pua_dialoginfo: add section ID's to documentation --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aba56a5aa3b8fa4f07d0c52cd7fd2d5… Patch: https://github.com/kamailio/kamailio/commit/aba56a5aa3b8fa4f07d0c52cd7fd2d5…

1 0

git:master:3c6bc5db: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 3c6bc5db3e2651784d95ef80d6de24973ffc963c URL: https://github.com/kamailio/kamailio/commit/3c6bc5db3e2651784d95ef80d6de249… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-22T10:46:10+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/3c6bc5db3e2651784d95ef80d6de249… Patch: https://github.com/kamailio/kamailio/commit/3c6bc5db3e2651784d95ef80d6de249… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index fa4a34ce706..5b867a911b6 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -65,7 +65,8 @@ Muhammad Shahzad Shafi 4.24. is_faked_msg() 4.25. is_socket_name(sockname) 4.26. forward_uac() - 4.27. forward_reply() + 4.27. forward_uac_uri(vuri) + 4.28. forward_reply() 5. RPC Commands @@ -122,9 +123,10 @@ Muhammad Shahzad Shafi 1.31. is_faked_msg usage 1.32. is_socket_name usage 1.33. forward_uac usage - 1.34. forward_reply usage - 1.35. event_route[network:msg] use cases - 1.36. Sample PERL code for do_compress and do_uncompress + 1.34. forward_uac usage + 1.35. forward_reply usage + 1.36. event_route[network:msg] use cases + 1.37. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -174,7 +176,8 @@ Chapter 1. Admin Guide 4.24. is_faked_msg() 4.25. is_socket_name(sockname) 4.26. forward_uac() - 4.27. forward_reply() + 4.27. forward_uac_uri(vuri) + 4.28. forward_reply() 5. RPC Commands @@ -394,7 +397,8 @@ modparam("corex", "nio_msg_avp", "$avp(msg)") 4.24. is_faked_msg() 4.25. is_socket_name(sockname) 4.26. forward_uac() - 4.27. forward_reply() + 4.27. forward_uac_uri(vuri) + 4.28. forward_reply() 4.1. append_branch([ uri, [ q ] ]) @@ -834,13 +838,31 @@ request_route { } ... -4.27. forward_reply() +4.27. forward_uac_uri(vuri) + + Similar to forward_uac() with the posibility to provide the target + address as a SIP URI via the parameter vuri. The parameter vuri can + contain variables. + + This function can be used in REQUEST_ROUTE. + + Example 1.34. forward_uac usage +... +request_route { + ... + sl_send_reply("200", "OK"); + forward_uac_uri("sip:mirror.com:5080"); + ... +} +... + +4.28. forward_reply() Forward received reply on demand. This function can be used in CORE_ONREPLY_ROUTE. - Example 1.34. forward_reply usage + Example 1.35. forward_reply usage ... route[reply] { forward_reply(); @@ -1023,7 +1045,7 @@ route[reply] { Next is a basic usage example where encoding and decoding is done using PERL. - Example 1.35. event_route[network:msg] use cases + Example 1.36. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -1054,7 +1076,7 @@ event_route[network:msg] { } ... - Example 1.36. Sample PERL code for do_compress and do_uncompress + Example 1.37. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:6c106dec: corex: docs for forward_uac_uri(...)
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 6c106dec657a7f2a0a6f56ab24a7a715ec5d40b0 URL: https://github.com/kamailio/kamailio/commit/6c106dec657a7f2a0a6f56ab24a7a71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T10:33:08+02:00 corex: docs for forward_uac_uri(...) --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c106dec657a7f2a0a6f56ab24a7a71… Patch: https://github.com/kamailio/kamailio/commit/6c106dec657a7f2a0a6f56ab24a7a71… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 61529f94335..b3eb90f6d3c 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -1005,6 +1005,32 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="corex.f.forward_uac_uri"> + <title> + <function moreinfo="none">forward_uac_uri(vuri)</function> + </title> + <para> + Similar to forward_uac() with the posibility to provide the target + address as a SIP URI via the parameter vuri. The parameter vuri can + contain variables. + </para> + <para> + This function can be used in REQUEST_ROUTE. + </para> + <example> + <title><function>forward_uac</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + sl_send_reply("200", "OK"); + forward_uac_uri("sip:mirror.com:5080"); + ... +} +... </programlisting> </example> </section>

1 0

git:master:a651349d: corex: added forward_uac_uri(vuri) function
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: a651349dec416ba649fda4e0665e23c980dce42b URL: https://github.com/kamailio/kamailio/commit/a651349dec416ba649fda4e0665e23c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T10:24:03+02:00 corex: added forward_uac_uri(vuri) function - target address can be provided via parameter --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a651349dec416ba649fda4e0665e23c… Patch: https://github.com/kamailio/kamailio/commit/a651349dec416ba649fda4e0665e23c… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 2b06231f734..cf663158fa0 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -51,6 +51,7 @@ MODULE_VERSION static int nio_intercept = 0; static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2); +static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2); static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2); static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send_udp(sip_msg_t *msg, char *su, char *sq); @@ -117,6 +118,8 @@ static tr_export_t mod_trans[] = { static cmd_export_t cmds[] = { {"forward_uac", (cmd_function)w_forward_uac, 0, 0, 0, REQUEST_ROUTE}, + {"forward_uac_uri", (cmd_function)w_forward_uac_uri, 1, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"forward_reply", (cmd_function)w_forward_reply, 0, 0, 0, CORE_ONREPLY_ROUTE}, {"append_branch", (cmd_function)w_append_branch, 0, @@ -274,7 +277,7 @@ static void mod_destroy(void) /** * forward request like initial uac sender, with only one via */ -static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) +static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { int ret; dest_info_t dst; @@ -305,12 +308,17 @@ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) } init_dest_info(&dst); - if(msg->dst_uri.len) { - ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); - u = &next_hop; + if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } } else { - ret = parse_sip_msg_uri(msg); - u = &msg->parsed_uri; + ret = parse_uri(vuri->s, vuri->len, &next_hop); + u = &next_hop; } if(ret < 0) { LM_ERR("forward - bad uri dropping packet\n"); @@ -326,6 +334,29 @@ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) return -1; } +/** + * forward request like initial uac sender, with only one via + */ +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_forward_uac_uri(msg, NULL); +} + +/** + * forward request to uri like initial uac sender, with only one via + */ +static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) +{ + str vuri = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)puri, &vuri)) { + LM_ERR("cannot get the destination parameter\n"); + return -1; + } + + return ki_forward_uac_uri(msg, &vuri); +} + /** * forward reply based on via */

1 0

Seeking Suggestions for Kamailio Integration with Dovecot
by iamolivasmith＠gmail.com 21 Aug '24

21 Aug '24

Hi everyone, I hope you're all doing well! I'm currently working on a project where I'm integrating Kamailio with Dovecot, and I'm looking for some advice or best practices from those who have experience with this setup. Specifically, I'm interested in how best to configure Kamailio to work seamlessly with Dovecot for handling email traffic. Any tips on optimizing performance, potential pitfalls to avoid, or resources that could guide me through the integration would be greatly appreciated. Also, if there are any particular modules or configurations you’ve found useful, I'd love to hear about them! https://www.igmguru.com/blog/how-to-pass-ccsp-certification-exam Thanks in advance for your help! Best Regards

2 1

[kamailio/kamailio] ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value (PR #3936)
by Dragos Vingarzan 21 Aug '24

21 Aug '24

#### 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:  - [ ] PR should be backported to stable branches - [ ] 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/3936 -- Commit Summary -- * ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value -- File Changes -- M src/modules/ims_qos_npn/rx_avp.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3936.patch https://github.com/kamailio/kamailio/pull/3936.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3936 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3936(a)github.com>

1 1

git:master:7bba70f8: ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value
by Dragos Vingarzan 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: 7bba70f82f9b9928d24e2312025d48aa0ed6a441 URL: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-08-21T13:14:43+02:00 ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value --- Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… Patch: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… --- diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index a2fd3188efe..ca553852648 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -1592,6 +1592,8 @@ char *rx_avp_get_access_class(int32_t ip_can_type, int32_t rat_type) return "3GPP-NR-OTHERSAT"; case 1039: return "3GPP-NR-REDCAP"; + case 1040: + return "3GPP-NR-EREDCAP"; case 2000: return "3GPP2-1X"; case 2001: @@ -1605,7 +1607,7 @@ char *rx_avp_get_access_class(int32_t ip_can_type, int32_t rat_type) switch(ip_can_type) { case -1: default: - snprintf(unknown, 64, "UNKNOWN-IP-CAN-Type-%d/RAT-Type-%d", + snprintf(unknown, 64, "UNKNOWN-IP-CAN-Type-%d-RAT-Type-%d", ip_can_type, rat_type); return unknown; case 1: @@ -2026,6 +2028,9 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) // Fallback to IP-CAN-Type and RAT-Type dst->len += snprintf(dst->s + dst->len, MAX_PANI_LEN - dst->len, "%s;network-provided", c_access_class); + } else { + dst->len += snprintf(dst->s + dst->len, MAX_PANI_LEN - dst->len, + ";network-provided"); } LOG(L_INFO, "P-Access-Network-Info from Diameter is [%.*s]\n", dst->len,

1 0

git:master:a5f4feae: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: a5f4feaec7f61d9c8ce54bdd42634220d116f116 URL: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-21T09:46:11+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… Patch: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 8986ee4df23..fa4a34ce706 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -64,7 +64,8 @@ Muhammad Shahzad Shafi 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 5. RPC Commands @@ -120,9 +121,10 @@ Muhammad Shahzad Shafi 1.30. via_reply_add_xavp_params usage 1.31. is_faked_msg usage 1.32. is_socket_name usage - 1.33. forward_reply usage - 1.34. event_route[network:msg] use cases - 1.35. Sample PERL code for do_compress and do_uncompress + 1.33. forward_uac usage + 1.34. forward_reply usage + 1.35. event_route[network:msg] use cases + 1.36. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -171,7 +173,8 @@ Chapter 1. Admin Guide 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 5. RPC Commands @@ -390,7 +393,8 @@ modparam("corex", "nio_msg_avp", "$avp(msg)") 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 4.1. append_branch([ uri, [ q ] ]) @@ -810,13 +814,33 @@ event_route[dispatcher:dst-down] { } ... -4.26. forward_reply() +4.26. forward_uac() + + Forward received request with a single Via header, the one added by + Kamailio, the other ones being removed. Useful in cases when its reply + should not be sent back (e.g., the reply was already sent out from + Kamailio). + + This function can be used in REQUEST_ROUTE. + + Example 1.33. forward_uac usage +... +request_route { + ... + sl_send_reply("200", "OK"); + $du = "sip:mirror.com:5080"; + forward_uac(); + ... +} +... + +4.27. forward_reply() Forward received reply on demand. This function can be used in CORE_ONREPLY_ROUTE. - Example 1.33. forward_reply usage + Example 1.34. forward_reply usage ... route[reply] { forward_reply(); @@ -999,7 +1023,7 @@ route[reply] { Next is a basic usage example where encoding and decoding is done using PERL. - Example 1.34. event_route[network:msg] use cases + Example 1.35. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -1030,7 +1054,7 @@ event_route[network:msg] { } ... - Example 1.35. Sample PERL code for do_compress and do_uncompress + Example 1.36. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:3debbb5a: corex: docs for forward_uac() function
by Daniel-Constantin Mierla 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: 3debbb5a608c135c628799546ee95c96abe18824 URL: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-21T09:30:50+02:00 corex: docs for forward_uac() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… Patch: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 3d6ff893808..61529f94335 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -977,6 +977,34 @@ event_route[dispatcher:dst-down] { xinfo("matched local socket name\n"); } ... +</programlisting> + </example> + </section> + <section id="corex.f.forward_uac"> + <title> + <function moreinfo="none">forward_uac()</function> + </title> + <para> + Forward received request with a single Via header, the one added + by &kamailio;, the other ones being removed. Useful in cases when + its reply should not be sent back (e.g., the reply was already sent + out from &kamailio;). + </para> + <para> + This function can be used in REQUEST_ROUTE. + </para> + <example> + <title><function>forward_uac</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + sl_send_reply("200", "OK"); + $du = "sip:mirror.com:5080"; + forward_uac(); + ... +} +... </programlisting> </example> </section>

1 0

git:master:ed8486de: corex: new function forward_uac()
by Daniel-Constantin Mierla 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: ed8486de52c29996f64496dcce0f44941cff49d3 URL: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-21T09:23:14+02:00 corex: new function forward_uac() - send out with only one Via, the one added by Kamailio, simulating a request sent by the initial UAC - useful when the reply is not wanted to be sent back (e.g., it was sent back from Kamailio) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… Patch: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index de2fb03b5fd..2b06231f734 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -37,6 +37,7 @@ #include "../../core/onsend.h" #include "../../core/forward.h" #include "../../core/dns_cache.h" +#include "../../core/data_lump.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -49,6 +50,7 @@ MODULE_VERSION static int nio_intercept = 0; +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2); static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2); static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send_udp(sip_msg_t *msg, char *su, char *sq); @@ -113,6 +115,8 @@ static tr_export_t mod_trans[] = { }; static cmd_export_t cmds[] = { + {"forward_uac", (cmd_function)w_forward_uac, 0, + 0, 0, REQUEST_ROUTE}, {"forward_reply", (cmd_function)w_forward_reply, 0, 0, 0, CORE_ONREPLY_ROUTE}, {"append_branch", (cmd_function)w_append_branch, 0, @@ -267,6 +271,61 @@ static void mod_destroy(void) { } +/** + * forward request like initial uac sender, with only one via + */ +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) +{ + int ret; + dest_info_t dst; + sip_uri_t *u; + sip_uri_t next_hop; + sr_lump_t *anchor; + hdr_field_t *hf; + + if(msg == NULL) { + LM_WARN("invalid msg parameter\n"); + return -1; + } + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + init_dest_info(&dst); + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + if(ret < 0) { + LM_ERR("forward - bad uri dropping packet\n"); + return -1; + } + dst.proto = u->proto; + ret = forward_request_mode( + msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + if(ret >= 0) { + return 1; + } + + return -1; +} + /** * forward reply based on via */

1 0

git:master:f41b8ee9: core: helper function to forward request specifying message build mode
by Daniel-Constantin Mierla 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: f41b8ee9990aaee7423505b6216e46b574825c83 URL: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T14:22:56+02:00 core: helper function to forward request specifying message build mode --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… Patch: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… --- diff --git a/src/core/forward.c b/src/core/forward.c index 0276f8a5a2e..1d2b1d5d650 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -482,14 +482,15 @@ int check_self_port(unsigned short port, unsigned short proto) * - send_info->send_flags is filled from the message * - if the send_socket member is null, a send_socket will be * chosen automatically + * mbmode - message build mode (for build_req_buf_from_sip_req()) * WARNING: don't forget to zero-fill all the unused members (a non-zero * random id along with proto==PROTO_TCP can have bad consequences, same for * a bogus send_socket value) * * return: 0 (E_OK) on success; negative (E_*) on failure */ -int forward_request(struct sip_msg *msg, str *dst, unsigned short port, - struct dest_info *send_info) +int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info, unsigned int mbmode) { unsigned int len; char *buf; @@ -582,7 +583,7 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, if(buf) pkg_free(buf); send_info->proto = proto; - buf = build_req_buf_from_sip_req(msg, &len, send_info, 0); + buf = build_req_buf_from_sip_req(msg, &len, send_info, mbmode); if(!buf) { LM_ERR("building failed\n"); ret = E_OUT_OF_MEM; /* most probable */ @@ -686,6 +687,13 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +int forward_request(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info) +{ + return forward_request_mode(msg, dst, port, send_info, 0); +} + + int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via) { diff --git a/src/core/forward.h b/src/core/forward.h index 7b51e1a5559..a90ce3446ce 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -80,6 +80,8 @@ int check_self(str *host, unsigned short port, unsigned short proto); int check_self_port(unsigned short port, unsigned short proto); int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); +int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info, unsigned int mbmode); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

git:master:e0f10477: core: explicit unsigned long long for internal flag constants
by Daniel-Constantin Mierla 20 Aug '24

20 Aug '24

Module: kamailio Branch: master Commit: e0f10477728922cefbbff9d23d846cd5912eb148 URL: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T13:05:42+02:00 core: explicit unsigned long long for internal flag constants --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Patch: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd…

1 0

git:master:9ff1080c: core: new internal flags to skip adding received/rport in incoming via
by Daniel-Constantin Mierla 20 Aug '24

20 Aug '24

Module: kamailio Branch: master Commit: 9ff1080cc6452343e6bc2de00350b2f7bcecf6d2 URL: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T12:26:10+02:00 core: new internal flags to skip adding received/rport in incoming via --- Modified: src/core/msg_translator.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Patch: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f26abd2e79d..5028accb1fb 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -212,6 +212,24 @@ static int check_via_address( return -1; } +/* check if rport has to be added or updated in Via + * - return 1 on true; 0 on false */ +int rport_test(struct sip_msg *msg) +{ + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } + /* check if rport needs to be updated: + * - if FL_FORCE_RPORT is set add it (and del. any previous version) + * - if via already contains an rport add it and overwrite the previous + * rport value if present (if you don't want to overwrite the previous + * version remove the comments) */ + if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) + || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + return 1; + } + return 0; +} /* check if IP address in Via != source IP address of signaling, * or the sender requires adding rport or received values */ @@ -219,6 +237,9 @@ int received_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = msg->via1->received || msg->via1->rport || check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns); @@ -230,6 +251,9 @@ int received_via_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = (check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns) != 0); @@ -2039,7 +2063,7 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, struct lump *path_anchor; struct lump *path_lump; str branch; - unsigned int flags; + msg_flags_t flags; unsigned int udp_mtu; struct dest_info di; int ret; @@ -2108,13 +2132,8 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, } } - /* check if rport needs to be updated: - * - if FL_FORCE_RPORT is set add it (and del. any previous version) - * - if via already contains an rport add it and overwrite the previous - * rport value if present (if you don't want to overwrite the previous - * version remove the comments) */ - if((flags & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + /* check if rport needs to be updated */ + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error00; /* free everything */ @@ -2518,8 +2537,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, } } /* check if rport needs to be updated */ - if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error01; /* free everything */ diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 45e7eb1a714..0627754446a 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -133,8 +133,9 @@ typedef enum request_method /* WARNING: Value (1 << 31) is reserved for use in kamailio * nat_traversal module (flag FL_DO_KEEPALIVE)! */ -#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ -#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ +#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_VIA_NORECEIVED (1ULL << 34) /* no received test for incoming Via */ #define FL_MTU_FB_MASK (FL_MTU_TCP_FB | FL_MTU_TLS_FB | FL_MTU_SCTP_FB)

1 0

Re: [kamailio/kamailio] rtpengine: export API for other modules (GH #3949) (3d002d5)
by Henning Westerholt 19 Aug '24

19 Aug '24

Yes, I commented it in the other issue. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd9ce504335/145517761(a)github.com>

1 0

Re: [kamailio/kamailio] rtpengine: export API for other modules (GH #3949) (3d002d5)
by Farzaneh Soltanzadeh 19 Aug '24

19 Aug '24

Thanks for merging the PR. It seems that the referenced PR is wrong. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd9ce504335/145516854(a)github.com>

1 0

git:master:3d002d56: rtpengine: export API for other modules (GH #3949)
by Henning Westerholt 19 Aug '24

19 Aug '24

Module: kamailio Branch: master Commit: 3d002d561e82b8bb71b225da708bdfd9ce504335 URL: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… Author: Farzaneh Soltanzadeh <fr.soltanzadeh(a)resaa.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-19T12:30:29Z rtpengine: export API for other modules (GH #3949) --- Added: src/modules/rtpengine/api.h Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… Patch: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… --- diff --git a/src/modules/rtpengine/api.h b/src/modules/rtpengine/api.h new file mode 100644 index 00000000000..fa499916238 --- /dev/null +++ b/src/modules/rtpengine/api.h @@ -0,0 +1,66 @@ +/* + * Rtpengine Module + * + * Copyright (C) 2003-2008 Sippy Software, Inc., http://www.sippysoft.com + * Copyright (C) 2014-2015 Sipwise GmbH, http://www.sipwise.com + * + * 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 + */ + +#ifndef _RTPENGINE_API_H_ +#define _RTPENGINE_API_H_ + +#include "../../core/parser/msg_parser.h" + +typedef int (*rtpengine_start_recording_f)( + struct sip_msg *msg, char *str1, char *str2); +typedef int (*rtpengine_answer_f)(struct sip_msg *msg, char *str1, char *str2); +typedef int (*rtpengine_offer_f)(struct sip_msg *msg, char *str1, char *str2); +typedef int (*rtpengine_delete_f)(struct sip_msg *msg, char *str1, char *str2); + +typedef struct rtpengine_api +{ + rtpengine_start_recording_f start_recording; + rtpengine_answer_f answer; + rtpengine_offer_f offer; + rtpengine_delete_f delete; +} rtpengine_api_t; + +typedef int (*bind_rtpengine_f)(rtpengine_api_t *api); + +/** + * @brief Load the RTPENGINE API + */ +static inline int rtpengine_load_api(rtpengine_api_t *api) +{ + bind_rtpengine_f bindrtpengine; + + bindrtpengine = (bind_rtpengine_f)find_export("bind_rtpengine", 0, 0); + if(bindrtpengine == 0) { + LM_ERR("cannot find bind_rtpengine\n"); + return -1; + } + if(bindrtpengine(api) < 0) { + LM_ERR("cannot bind rtpengine api\n"); + return -1; + } + + return 0; +} + + +#endif /* _RTPENGINE_API_H_ */ diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index aefdc7c7d6e..84bf5951752 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -89,6 +89,7 @@ #include "rtpengine_hash.h" #include "bencode.h" #include "config.h" +#include "api.h" MODULE_VERSION @@ -241,6 +242,8 @@ static int parse_viabranch(struct ng_flags_parse *ng_flags, struct sip_msg *msg, static int parse_from_to_tags(struct ng_flags_parse *ng_flags, enum rtpe_operation op, struct sip_msg *msg); +static int bind_rtpengine(rtpengine_api_t *api); + static int rtpengine_offer_answer( struct sip_msg *msg, void *d, enum rtpe_operation op, int more); static int fixup_set_id(void **param, int param_no); @@ -468,6 +471,7 @@ static cmd_export_t cmds[] = { {"rtpengine_query_v", (cmd_function)w_rtpengine_query_v, 2, fixup_rtpengine_query_v, fixup_free_rtpengine_query_v, ANY_ROUTE}, + {"bind_rtpengine", (cmd_function)bind_rtpengine, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -5779,3 +5783,21 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) sr_kemi_modules_add(sr_kemi_rtpengine_exports); return 0; } + + +/** + * load rtpengine module API + */ +static int bind_rtpengine(rtpengine_api_t *api) +{ + if(!api) { + LM_ERR("Invalid parameter value\n"); + return -1; + } + api->start_recording = start_recording_f; + api->answer = rtpengine_answer1_f; + api->offer = rtpengine_offer1_f; + api->delete = rtpengine_delete1_f; + + return 0; +} \ No newline at end of file

1 0

[kamailio/kamailio] secfilter: all functions are exported in KEMI (PR #3940)
by bazrafshan.m.h 19 Aug '24

19 Aug '24

- All `secfilter` functions are now accessible in KEMI. For example, you can use KSR.secf_check_ip() directly by importing the KSR module in Python.   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * Exporting all secfilter functions to KEMI. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3940 -- Commit Summary -- * secfilter is fully KEMIized -- File Changes -- M src/modules/secfilter/secfilter.c (99) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3940.patch https://github.com/kamailio/kamailio/pull/3940.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3940 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3940(a)github.com>

2 5

[kamailio/kamailio] cdp: export all functions in KEMI module (PR #3943)
by bazrafshan.m.h 19 Aug '24

19 Aug '24

- Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings.   #### 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:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * Exporting all cdp functions to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3943 -- Commit Summary -- * cdp: export all functions in KEMI module -- File Changes -- M src/modules/cdp/cdp_mod.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3943.patch https://github.com/kamailio/kamailio/pull/3943.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3943 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3943(a)github.com>

2 3

git:master:b712ddc4: msilo: removed duplicatred exported function
by Daniel-Constantin Mierla 17 Aug '24

17 Aug '24

Module: kamailio Branch: master Commit: b712ddc4db9a9c1bb30b236a0a86082108b23f07 URL: https://github.com/kamailio/kamailio/commit/b712ddc4db9a9c1bb30b236a0a86082… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-17T17:08:31+02:00 msilo: removed duplicatred exported function --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/b712ddc4db9a9c1bb30b236a0a86082… Patch: https://github.com/kamailio/kamailio/commit/b712ddc4db9a9c1bb30b236a0a86082… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 9baa1e4c185..fe2bd8cb53a 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -185,7 +185,6 @@ static cmd_export_t cmds[] = { {"m_store_addrs", (cmd_function)m_store3, 3, fixup_spve_all, fixup_free_spve_all, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, - {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"bind_msilo", (cmd_function)bind_msilo, 1, 0, 0, ANY_ROUTE},

1 0

git:master:b6dea98a: msilo: added fixup free functions to exports structure
by Daniel-Constantin Mierla 17 Aug '24

17 Aug '24

Module: kamailio Branch: master Commit: b6dea98ada293a3bbad004aa1b194d4bf44a60ab URL: https://github.com/kamailio/kamailio/commit/b6dea98ada293a3bbad004aa1b194d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-17T16:30:21+02:00 msilo: added fixup free functions to exports structure --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/b6dea98ada293a3bbad004aa1b194d4… Patch: https://github.com/kamailio/kamailio/commit/b6dea98ada293a3bbad004aa1b194d4… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 91b6a8892a9..9baa1e4c185 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -181,13 +181,13 @@ static cmd_export_t cmds[] = { {"m_store", (cmd_function)m_store1, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_store", (cmd_function)m_store1, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE}, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_store_addrs", (cmd_function)m_store3, 3, fixup_spve_all, fixup_free_spve_all, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 1, fixup_spve_null, - 0, REQUEST_ROUTE}, + fixup_free_spve_null, REQUEST_ROUTE}, {"bind_msilo", (cmd_function)bind_msilo, 1, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:f5f7c913: uac: added fixup free functions to exports structure
by Daniel-Constantin Mierla 16 Aug '24

16 Aug '24

Module: kamailio Branch: master Commit: f5f7c913d4f008b9937677ae2c2d66baa01dcf0e URL: https://github.com/kamailio/kamailio/commit/f5f7c913d4f008b9937677ae2c2d66b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-16T18:03:46+02:00 uac: added fixup free functions to exports structure --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f5f7c913d4f008b9937677ae2c2d66b… Patch: https://github.com/kamailio/kamailio/commit/f5f7c913d4f008b9937677ae2c2d66b… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 90d434ac64d..aabd6c753ed 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -128,15 +128,15 @@ static pv_export_t mod_pvs[] = { /* Exported functions */ static cmd_export_t cmds[] = { {"uac_replace_from", (cmd_function)w_replace_from, 2, fixup_spve_spve, - 0, REQUEST_ROUTE | BRANCH_ROUTE}, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, {"uac_replace_from", (cmd_function)w_replace_from, 1, fixup_spve_spve, - 0, REQUEST_ROUTE | BRANCH_ROUTE}, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, {"uac_restore_from", (cmd_function)w_restore_from, 0, 0, 0, REQUEST_ROUTE}, - {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | BRANCH_ROUTE}, - {"uac_replace_to", (cmd_function)w_replace_to, 1, fixup_spve_spve, 0, - REQUEST_ROUTE | BRANCH_ROUTE}, + {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_spve_spve, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, + {"uac_replace_to", (cmd_function)w_replace_to, 1, fixup_spve_spve, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, {"uac_restore_to", (cmd_function)w_restore_to, 0, 0, 0, REQUEST_ROUTE}, {"uac_auth", (cmd_function)w_uac_auth, 0, 0, 0, FAILURE_ROUTE | BRANCH_FAILURE_ROUTE | EVENT_ROUTE}, @@ -152,7 +152,7 @@ static cmd_export_t cmds[] = { {"uac_reg_lookup_uri", (cmd_function)w_uac_reg_lookup_uri, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"uac_reg_status", (cmd_function)w_uac_reg_status, 1, fixup_spve_null, - 0, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, fixup_spve_igp, fixup_free_spve_igp, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

1 0

git:master:36ae41d5: uac: added field for cseq number for $uac_req(...)
by Daniel-Constantin Mierla 15 Aug '24

15 Aug '24

Module: kamailio Branch: master Commit: 36ae41d5d3efce9c336cf2f675a0cb4fe01933a1 URL: https://github.com/kamailio/kamailio/commit/36ae41d5d3efce9c336cf2f675a0cb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-15T14:46:39+02:00 uac: added field for cseq number for $uac_req(...) --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/36ae41d5d3efce9c336cf2f675a0cb4… Patch: https://github.com/kamailio/kamailio/commit/36ae41d5d3efce9c336cf2f675a0cb4… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index f91a0c75b4f..8fc88b3858d 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -79,6 +79,7 @@ typedef struct _uac_send_info str s_apasswd; char b_evparam[MAX_UACD_SIZE]; str s_evparam; + unsigned int cseqno; unsigned int evroute; unsigned int evcode; unsigned int evtype; @@ -180,6 +181,10 @@ int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, _uac_req.evcode); case 16: return pv_get_uintval(msg, param, res, _uac_req.evtype); + case 17: + return pv_get_uintval(msg, param, res, _uac_req.flags); + case 18: + return pv_get_uintval(msg, param, res, _uac_req.cseqno); default: return pv_get_uintval(msg, param, res, _uac_req.flags); } @@ -214,6 +219,7 @@ int pv_set_uac_req( _uac_req.evroute = 0; _uac_req.evtype = 0; _uac_req.evcode = 0; + _uac_req.cseqno = 0; _uac_req.s_evparam.len = 0; } break; @@ -465,6 +471,17 @@ int pv_set_uac_req( } _uac_req.flags = tval->ri; break; + case 18: + if(tval == NULL) { + _uac_req.cseqno = 0; + return 0; + } + if(!(tval->flags & PV_VAL_INT)) { + LM_ERR("Invalid value type\n"); + return -1; + } + _uac_req.cseqno = tval->ri; + break; } return 0; } @@ -516,6 +533,8 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 15; else if(strncmp(in->s, "evtype", 6) == 0) sp->pvp.pvn.u.isname.name.n = 16; + else if(strncmp(in->s, "cseqno", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 18; else goto error; break; @@ -861,6 +880,7 @@ int uac_req_send(void) uac_r.cbp = (void *)tp; } uac_r.callid = (_uac_req.s_callid.len <= 0) ? NULL : &_uac_req.s_callid; + uac_r.cseqno = _uac_req.cseqno; ret = _uac_send_tmb.t_request(&uac_r, /* UAC Req */ &_uac_req.s_ruri, /* Request-URI */ (_uac_req.s_turi.len <= 0) ? &_uac_req.s_ruri

1 0

git:master:4a468936: tm: added cseq number field to uac_req structure
by Daniel-Constantin Mierla 15 Aug '24

15 Aug '24

Module: kamailio Branch: master Commit: 4a4689366aee9517ed90cf2df1a4e90018b9948d URL: https://github.com/kamailio/kamailio/commit/4a4689366aee9517ed90cf2df1a4e90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-15T14:41:12+02:00 tm: added cseq number field to uac_req structure --- Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/4a4689366aee9517ed90cf2df1a4e90… Patch: https://github.com/kamailio/kamailio/commit/4a4689366aee9517ed90cf2df1a4e90… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 5384d826dd8..b40a1e74d09 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -1086,6 +1086,7 @@ int request(uac_req_t *uac_r, str *ruri, str *to, str *from, str *next_hop) str callid, fromtag; dlg_t *dialog; int res; + unsigned int cseqno; if(check_params(uac_r, to, from) < 0) goto err; @@ -1094,9 +1095,10 @@ int request(uac_req_t *uac_r, str *ruri, str *to, str *from, str *next_hop) generate_callid(&callid); else callid = *uac_r->callid; + cseqno = (uac_r->cseqno > 0) ? uac_r->cseqno : DEFAULT_CSEQ; generate_fromtag(&fromtag, &callid, ruri); - if(new_dlg_uac(&callid, &fromtag, DEFAULT_CSEQ, from, to, &dialog) < 0) { + if(new_dlg_uac(&callid, &fromtag, cseqno, from, to, &dialog) < 0) { LM_ERR("Error while creating temporary dialog\n"); goto err; } diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 6fad3380cd8..05a8614d8f8 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -51,6 +51,7 @@ typedef struct uac_req transaction_cb *cb; void *cbp; str *callid; + unsigned int cseqno; } uac_req_t; /* macro for setting the values of uac_req_t struct */

1 0

git:master:7d2fd091: phonenum: add fixup free functions to exports structure
by Daniel-Constantin Mierla 14 Aug '24

14 Aug '24

Module: kamailio Branch: master Commit: 7d2fd09103680454aaaba30f5e46f83b362513eb URL: https://github.com/kamailio/kamailio/commit/7d2fd09103680454aaaba30f5e46f83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-14T18:37:06+02:00 phonenum: add fixup free functions to exports structure --- Modified: src/modules/phonenum/phonenum_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7d2fd09103680454aaaba30f5e46f83… Patch: https://github.com/kamailio/kamailio/commit/7d2fd09103680454aaaba30f5e46f83… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index 665fa9b2772..c5eda4bdc35 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -58,9 +58,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"phonenum_match", (cmd_function)w_phonenum_match, 2, fixup_spve_spve, - 0, ANY_ROUTE}, + fixup_free_spve_spve, ANY_ROUTE}, {"phonenum_match_cn", (cmd_function)w_phonenum_match_cn, 3, fixup_spve_all, - 0, ANY_ROUTE}, + fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:e9dd041c: phonenum: export match_cn() to kemi
by Daniel-Constantin Mierla 13 Aug '24

13 Aug '24

Module: kamailio Branch: master Commit: e9dd041ce6af9ee4b9cc2e29b4417787a8056776 URL: https://github.com/kamailio/kamailio/commit/e9dd041ce6af9ee4b9cc2e29b441778… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-13T21:01:51+02:00 phonenum: export match_cn() to kemi --- Modified: src/modules/phonenum/phonenum_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e9dd041ce6af9ee4b9cc2e29b441778… Patch: https://github.com/kamailio/kamailio/commit/e9dd041ce6af9ee4b9cc2e29b441778… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index 5f07635099c..665fa9b2772 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -196,6 +196,11 @@ static sr_kemi_t sr_kemi_phonenum_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("phonenum"), str_init("match_cn"), + SR_KEMIP_INT, phonenum_match_cn, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] K crash v5.5.6 with dlg_profile (Issue #3878)
by Olli Attila 13 Aug '24

13 Aug '24

### Description Yesterday we noticed that Kamailio crashed suddenly. There was no major call load on the node, but we did found out that multiple calls were tried to initiate though the node ending with "486 busy here" when the crash happened. User/users tried over and over to make the call happen even though busy was signaled. Our Kamailio is configured to keep count of the dialogs using dialog profiles. ### Troubleshooting Searched logs, what kind of calls were tried to place on the network though the node at the time of the crash and collected the backtrace. #### Debugging Data ``` Kamailio version: kamailio 5.5.6 (x86_64/linux) 72dbb0 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 72dbb0 compiled on 00:00:00 Sep 13 2022 with gcc 11.3.1 OS: Red Hat Enterprise Linux release 9.3 (Plow) Kamailio log when the crash happened: Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417559]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 13 Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417541]: ALERT: <core> [main.c:788]: handle_sigs(): child process 3417545 exited by a signal 11 Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417541]: ALERT: <core> [main.c:791]: handle_sigs(): core was generated Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417541]: INFO: <core> [main.c:813]: handle_sigs(): terminating due to SIGCHLD Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417543]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417551]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417553]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417557]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417544]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417559]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417547]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417548]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417542]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417552]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417554]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417555]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417558]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417556]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Jun 16 19:33:36 voip-proxy3 /usr/sbin/kamailio[3417546]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Core dump bt full trace: GNU gdb (GDB) Red Hat Enterprise Linux 10.2-11.1.el9_3 Copyright (C) 2021 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/sbin/kamailio... Reading symbols from /usr/lib/debug/usr/sbin/kamailio-5.5.6-0.el9.centos.x86_64.debug... warning: Can't open file /dev/zero (deleted) during file-backed mapping note processing [New LWP 3417545] Missing separate debuginfo for /usr/lib64/kamailio/modules/tls.so Try: dnf --enablerepo='*debug*' install /usr/lib/debug/.build-id/08/23cd55ae0236655930f83c342c2b76bc3215c5.debug Missing separate debuginfo for /usr/lib64/kamailio/modules/snmpstats.so Try: dnf --enablerepo='*debug*' install /usr/lib/debug/.build-id/bd/ff4c3b08c64459c940abc2fc0f55abd5518619.debug Missing separate debuginfo for /usr/lib64/kamailio/modules/db_mysql.so Try: dnf --enablerepo='*debug*' install /usr/lib/debug/.build-id/d1/e37f2e0a33abb8554b3f082e8e0a9aefc0bd76.debug Missing separate debuginfo for /usr/lib64/kamailio/modules/dialplan.so Try: dnf --enablerepo='*debug*' install /usr/lib/debug/.build-id/31/e195cc97b19103a6d71de3feff763dc9b21d6d.debug [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamail'. Program terminated with signal SIGSEGV, Segmentation fault. #0 link_profile (linker=0x7f73efb2d3d8, vkey=0x7f73ef18ecb8) at dlg_profile.c:486 486 p_entry->first->prev->next = &linker->hash_linker; Missing separate debuginfos, use: dnf debuginfo-install audit-libs-3.0.7-104.el9.x86_64 bzip2-libs-1.0.8-8.el9.x86_64 glibc-2.34-83.el9_3.12.x86_64 libacl-2.3.1-3.el9.x86_64 libattr-2.5.1-3.el9.x86_64 libcap-2.48-9.el9_2.x86_64 libcap-ng-0.8.2-7.el9.x86_64 libxcrypt-4.4.18-3.el9.x86_64 libzstd-1.5.1-2.el9.x86_64 lm_sensors-libs-3.6.0-10.el9.x86_64 lua-libs-5.4.4-4.el9.x86_64 mariadb-connector-c-3.2.6-1.el9_0.x86_64 net-snmp-agent-libs-5.9.1-11.el9_3.1.x86_64 net-snmp-libs-5.9.1-11.el9_3.1.x86_64 openssl-libs-3.0.7-25.el9_3.x86_64 pcre-8.44-3.el9.3.x86_64 perl-libs-5.32.1-480.el9.x86_64 popt-1.18-8.el9.x86_64 rpm-libs-4.16.1.3-27.el9_3.x86_64 sqlite-libs-3.34.1-7.el9_3.x86_64 xz-libs-5.2.5-8.el9_0.x86_64 zlib-1.2.11-40.el9.x86_64 (gdb) bt full #0 link_profile (linker=0x7f73efb2d3d8, vkey=0x7f73ef18ecb8) at dlg_profile.c:486 hash = 14 p_entry = 0x7f73eee13730 #1 0x00007f73ed45e4f7 in link_dlg_profile (linker=0x7f73efb2d3d8, dlg=0x7f73ef18ec40) at dlg_profile.c:522 d_entry = 0x7f73eee18ea8 #2 0x00007f73ed45f5d6 in set_dlg_profile (msg=0x7f73f30c3230, value=0x7ffcbf7094f0, profile=0x7f73eee13620) at dlg_profile.c:609 dlg = 0x7f73ef18ec40 linker = 0x7f73efb2d3d8 __func__ = "set_dlg_profile" #3 0x00007f73ed3e089a in w_set_dlg_profile_helper (msg=0x7f73f30c3230, profile=0x7f73eee13620, value=0x7ffcbf7094f0) at dialog.c:825 __func__ = "w_set_dlg_profile_helper" #4 0x00007f73ed3e138b in w_set_dlg_profile (msg=0x7f73f30c3230, profile=0x7f73eee13620 "P7\341\356s\177", value=0x7f73f2f6aa88 "`\327\371\362s\177") at dialog.c:852 pve = 0x7f73f2f6aa88 val_s = {s = 0x7f73f2e6dc30 "xxx", len = 31} __func__ = "w_set_dlg_profile" #5 0x00000000004416f6 in do_action (h=0x7ffcbf70ae60, a=0x7f73f2f9edb0, msg=0x7f73f30c3230) at core/action.c:1091 ret = -5 v = 1 dst = {send_sock = 0x817213, to = {s = {sa_family = 18, sa_data = "\000\000\000\000\000\000\320zt\363s\177\000"}, sin = {sin_family = 18, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\320zt\363s\177\000"}, sin6 = {sin6_family = 18, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\320zt\363s\177\000\000\000\000\000\000\000\000\000", __u6_addr16 = {31440, 62324, 32627, 0, 0, 0, 0, 0}, __u6_addr32 = {4084497104, 32627, 0, 0}}}, sin6_scope_id = 4075568768}, sas = {ss_family = 18, __ss_padding = "\000\000\000\000\000\000\320zt\363s\177\000\000\000\000\000\000\000\000\000\000\200>\354\362s\177\000\000@\235p\277\374\177\000\000\060\062\f\363s\177\000\000`\256p\277\374\177\000\000P7\354\362s\177\000\000D\235p\277\374\177\000\000\060\062\f\363s\177\000\000`\256p\277\374\177\000\000\320zt\363s\177\000\000\000\000\000\004\000\000\000\000\260\232p\277\374\177\000\000\200\263\240\355s\177\000", __ss_align = 0}}, id = -1083139152, send_flags = {f = 32764, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0} tmp = 0x1f2dff010 <error: Cannot access memory at address 0x1f2dff010> new_uri = 0x5d23df <rval_expr_eval_int+131> "\211E̋E\314\301\350\037\017\266\300H\205\300\017\204p\036" end = 0x7ffcbf709c20 "\220\235p\277\374\177" crt = 0x7ffcbf709c00 "\220\235p\277\374\177" cmd = 0x7f73f2eb0db0 len = 32627 user = -219400368 uri = {user = {s = 0x7f73f2ec3770 "\002", len = -217304528}, passwd = {s = 0x1f3747ad0 <error: Cannot access memory at address 0x1f3747ad0>, len = 10194964}, host = {s = 0x7ffcbf709900 "\260\231p\277\374\177", len = -311958360}, port = {s = 0x7f73f2ef7a88 "\004", len = -1083138808}, params = {s = 0x7f73f2ec3770 "\002", len = -217304528}, sip_params = { --Type <RET> for more, q to quit, c to continue without paging-- s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, headers = { s = 0x7ffcbf709980 "02\f\363s\177", len = 4519307}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (unknown: 0xf30c3230), transport = { s = 0x7f73f2ef6ee0 <incomplete sequence \344>, len = -1083134368}, ttl = { s = 0x7f73f2e63a28 "SDj4oqe01-38b51cd5c133af2f2994e7b7149891fe-v300g00030::re_analyse_customer", len = 74}, user_param = { s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = 139952309}, maddr = {s = 0x7f73f2ec0ff0 "e\017\354\362s\177", len = -217679816}, method = {s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 0}, lr = { s = 0x817213 "INFO", len = 18}, r2 = {s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, gr = {s = 0x7ffcbf7099b0 "\200>\354\362s\177", len = 5686778}, transport_val = {s = 0x1 <error: Cannot access memory at address 0x1>, len = -1083138808}, ttl_val = {s = 0x7f73f2ec3758 "\026", len = -217304528}, user_param_val = { s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, maddr_val = { s = 0x7ffcbf709ab0 " \234p\277\374\177", len = 6104031}, method_val = {s = 0x7ffcbf709a00 "\260\232p\277\374\177", len = -308238037}, lr_val = {s = 0x7ffcbf709bb0 "\005", len = -219195016}, r2_val = {s = 0x7f73f2ef7a80 "\001", len = -1083139116}, gr_val = { s = 0x7f73f30c3230 "\236\235\177", len = 0}} next_hop = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x817213 "INFO", len = 18}, port = { s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, params = { s = 0x7ffcbf7097d0 "\360\227p\277\374\177", len = 5688750}, sip_params = {s = 0x7ffcbf7097bc "\001", len = -287473952}, headers = { s = 0x9b9000 <ut_buf_int2str> "", len = 0}, port_no = 38720, proto = 49008, type = 32764, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 0xed64fae8), transport = { s = 0x10091dc88 <error: Cannot access memory at address 0x10091dc88>, len = -287473952}, ttl = {s = 0x7ffcbf709750 "p\227p\277\374\177", len = -312148998}, user_param = {s = 0x7f73f2ebe4d8 "(", len = -287473952}, maddr = {s = 0x7ffcbf709770 "\320zt\363s\177", len = -312143558}, method = {s = 0x7ffcbf709770 "\320zt\363s\177", len = 0}, lr = {s = 0x817213 "INFO", len = 18}, r2 = { s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, gr = { s = 0x7ffcbf7097d0 "\360\227p\277\374\177", len = 5628632}, transport_val = {s = 0x7ffcbf709824 "\001", len = -293364992}, ttl_val = { s = 0x9b9000 <ut_buf_int2str> "", len = 1}, user_param_val = {s = 0x817213 "INFO", len = 18}, maddr_val = { s = 0x9b9014 <ut_buf_int2str+20> "1", len = 67108864}, method_val = {s = 0x7ffcbf7097f0 "0\230p\277\374\177", len = 5628752}, lr_val = { s = 0x7ffcbf709824 "\001", len = 1}, r2_val = {s = 0x7ffcbf709830 "", len = 5651808}, gr_val = { s = 0x1bf709830 <error: Cannot access memory at address 0x1bf709830>, len = -1083138808}} u = 0x5 port = 0 dst_host = 0x4000000 i = 4 flags = 0 avp = 0x41c9b8 <dlsym@plt+8> st = {flags = 4077761328, id = 32627, name = {n = 0, s = {s = 0x0, len = -219425232}, re = 0x0}, avp = 0x7f73f30c3230} sct = 0x7f73f2ec3e78 sjt = 0x5d603b <rval_expr_eval_rvint+7593> rve = 0x7f73f2f84a70 --Type <RET> for more, q to quit, c to continue without paging-- mct = 0x7ffcbf709d40 rv = 0x7f73ed5d3474 <w_ds_is_from_list1+946> rv1 = 0x7ffcbf70a284 c1 = {cache_type = 3211826896, val_type = 32764, c = {avp_val = {n = 5686778, s = { s = 0x56c5fa <pv_get_spec_value+879> "\211Ẽ", <incomplete sequence \314>, len = -1083140528}, re = 0x56c5fa <pv_get_spec_value+879>}, pval = {rs = {s = 0x56c5fa <pv_get_spec_value+879> "\211Ẽ", <incomplete sequence \314>, len = -1083140528}, ri = -1083140272, flags = 32764}}, i2s = "\030\021\354\362s\177\000\000\060\062\f\363s\177\000\000\000\227p\277\374\177"} s = {s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864} srevp = {0x817213, 0x12} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = { s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, {type = RVE_FREE_FIXUP_ST, u = { number = 0, string = 0x0, str = {s = 0x0, len = 1}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = { number = 140135975607040, string = 0x7f73f30bdb00 "\220\332\v\363s\177", str = {s = 0x7f73f30bdb00 "\220\332\v\363s\177", len = 2}, data = 0x7f73f30bdb00, attr = 0x7f73f30bdb00, select = 0x7f73f30bdb00}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #6 0x000000000044eee9 in run_actions (h=0x7ffcbf70ae60, a=0x7f73f2f27bf8, msg=0x7f73f30c3230) at core/action.c:1584 t = 0x7f73f2f9edb0 ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 0, tz_dsttime = 0} tdiff = 5628752 __func__ = "run_actions" #7 0x000000000043daae in do_action (h=0x7ffcbf70ae60, a=0x7f73f2ec7fc0, msg=0x7f73f30c3230) at core/action.c:703 ret = -5 v = 1 dst = {send_sock = 0x7ffcbf70a290, to = {s = {sa_family = 50682, sa_data = "V\000\v\000\000\000\a\000\000\000\000\000\000"}, sin = { sin_family = 50682, sin_port = 86, sin_addr = {s_addr = 11}, sin_zero = "\a\000\000\000\000\000\000"}, sin6 = {sin6_family = 50682, sin6_port = 86, sin6_flowinfo = 11, sin6_addr = {__in6_u = {__u6_addr8 = "\a\000\000\000\000\000\000\000\337\023of\000\000\000", __u6_addr16 = {7, 0, 0, 0, 5087, 26223, 0, 0}, __u6_addr32 = {7, 0, 1718555615, 0}}}, sin6_scope_id = 33089760}, sas = { ss_family = 50682, --Type <RET> for more, q to quit, c to continue without paging-- __ss_padding = "V\000\v\000\000\000\a\000\000\000\000\000\000\000\337\023of\000\000\000\000\340\350\370\001\000\000\000\000X\000\000\000\000\000\000\000\337\023of\000\000\000\000\261\071\344-\000\000\000\000#\000\000\000!", '\000' <repeats 11 times>, "\005\000\000\000|\000\000\000\000\000\000\000\247\000\000\000\001\000\000\000\374\177\000\000\060*\000\000\000\000\000\000p\033\306\001\000\000\000\000Ȗ\203\356\000\000\000", __ss_align = 140135982463696}}, id = 0, send_flags = {f = 1, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0} tmp = 0x7f73f2ebc8f0 "\002" new_uri = 0x5d29a4 <rval_expr_eval_int+1608> "\211E̋E\314\301\350\037\017\266\300H\205\300\017\205\272\030" end = 0x7ffcbf70a470 "\340\245p\277\374\177" crt = 0x7f73f2ebc988 "\001" cmd = 0x7f73f315ca68 len = 0 user = 5268014 uri = {user = {s = 0x7f73f30c3230 "\236\235\177", len = -1083134368}, passwd = {s = 0x7ffcbf70a270 "", len = -219409808}, host = { s = 0x7ffcbf70a2b4 "\001", len = -1083137496}, port = {s = 0x7f73f30c3230 "\236\235\177", len = -1083134368}, params = { s = 0x7f73f30c3230 "\236\235\177", len = -1083134368}, sip_params = { s = 0x35343537313433fb <error: Cannot access memory at address 0x35343537313433fb>, len = -994177024}, headers = { s = 0x7f73f37f7dc0 <_nl_C_LC_TIME> "\235\234{\363s\177", len = -994177024}, port_no = 42480, proto = 500, type = ERROR_URI_T, flags = (unknown: 0x2010), transport = {s = 0x71 <error: Cannot access memory at address 0x71>, len = 33089744}, ttl = { s = 0x7f73f37fac80 <main_arena> "", len = 33097952}, user_param = {s = 0x1900000001 <error: Cannot access memory at address 0x1900000001>, len = -1083136992}, maddr = {s = 0x7ffcbf70a120 "\340\350\370\001", len = -1083137536}, method = { s = 0x1f8e8e0 "<134>Jun 16 19:33:35 /usr/sbin/kamailio[3417545]: INFO: <script>: [j4oqe] A_PROFILE = S=hel-sbc;FMTIN=SUBABR;SOTEAC=104;DLGLIMIT=1000", len = -219409800}, lr = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 33089744}, r2 = {s = 0x7f73f37fac80 <main_arena> "", len = -994177024}, gr = {s = 0x0, len = 5697090}, transport_val = {s = 0xb <error: Cannot access memory at address 0xb>, len = 0}, ttl_val = {s = 0x817213 "INFO", len = 18}, user_param_val = { s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, maddr_val = { s = 0x7ffcbf70a300 "p\244p\277\374\177", len = 6106005}, method_val = {s = 0x7ffcbf70a300 "p\244p\277\374\177", len = -211093163}, lr_val = {s = 0x1f4a5f0 ":j\346\001", len = -211240841}, r2_val = {s = 0x7f73f2ec20d0 "\031", len = -1083136992}, gr_val = { s = 0x7f73f30c3230 "\236\235\177", len = -1083134368}} next_hop = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x817213 "INFO", len = 18}, port = { s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 0}, params = {s = 0x7f73f2ec19a8 "\001", len = -1083137360}, sip_params = {s = 0x7f73f30c3230 "\236\235\177", len = -1083134368}, headers = {s = 0x7f73f2ec1278 "\a", len = -1083137356}, port_no = 12848, proto = 62220, type = 32627, flags = (unknown: 0xbf70ae60), transport = { s = 0x7ffcbf70a010 "\320zt\363s\177", len = -217304528}, ttl = {s = 0x7f73f2ebe4d8 "(", len = -1083134368}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x100817213 <error: Cannot access memory at address 0x100817213>, len = 0}, method = { s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, lr = { s = 0x7ffcbf70a060 "02\f\363s\177", len = 5968374}, r2 = { s = 0xecb1845e031780b5 <error: Cannot access memory at address 0xecb1845e031780b5>, len = -217304528}, gr = {s = 0x7f73f2ec0638 "\002", len = -1083134368}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x817213 "INFO", len = 0}, user_param_val = {s = 0x817213 "INFO", --Type <RET> for more, q to quit, c to continue without paging-- len = 18}, maddr_val = {s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864}, method_val = { s = 0x7ffcbf70a190 "", len = 6104031}, lr_val = {s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 0}, r2_val = {s = 0x7ffcbf70a190 "", len = 6119483}, gr_val = {s = 0x7f73f2ec19a0 "\001", len = -1083137360}} u = 0x7ffcbf70a500 port = 0 dst_host = 0x56cdae <pv_printf_mode+1759> i = 5 flags = -1 avp = 0x7f73f3747ad0 <syslog> st = {flags = 3211829568, id = 32764, name = {n = -1083137792, s = {s = 0x7ffcbf70a100 "\001", len = -209736576}, re = 0x7ffcbf70a100}, avp = 0xc06abc75c4be1000} sct = 0x7f73f2ec2800 sjt = 0x4000000 rve = 0x7f73f2ec45a8 mct = 0x7ffcbf70a590 rv = 0x6cbf77 <search_next_avp+1782> rv1 = 0x12 c1 = {cache_type = 3211829024, val_type = 32764, c = {avp_val = {n = 5686778, s = { s = 0x56c5fa <pv_get_spec_value+879> "\211Ẽ", <incomplete sequence \314>, len = 0}, re = 0x56c5fa <pv_get_spec_value+879>}, pval = { rs = {s = 0x56c5fa <pv_get_spec_value+879> "\211Ẽ", <incomplete sequence \314>, len = 0}, ri = -1083137416, flags = 32764}}, i2s = "\200\022\354\362s\177\000\000\060\062\f\363s\177\000\000`\237p\277\374\177"} s = {s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = 67108864} srevp = {0x817213, 0x12} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = { s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, {type = RVE_FREE_FIXUP_ST, u = { number = 0, string = 0x0, str = {s = 0x0, len = 1}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = { number = 140135975607040, string = 0x7f73f30bdb00 "\220\332\v\363s\177", str = {s = 0x7f73f30bdb00 "\220\332\v\363s\177", len = 2}, data = 0x7f73f30bdb00, attr = 0x7f73f30bdb00, select = 0x7f73f30bdb00}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #8 0x000000000044eee9 in run_actions (h=0x7ffcbf70ae60, a=0x7f73f2ec7180, msg=0x7f73f30c3230) at core/action.c:1584 t = 0x7f73f2ec7fc0 --Type <RET> for more, q to quit, c to continue without paging-- ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 0, tz_dsttime = 0} tdiff = 18 __func__ = "run_actions" #9 0x0000000000441544 in do_action (h=0x7ffcbf70ae60, a=0x7f73f2edb190, msg=0x7f73f30c3230) at core/action.c:1070 ret = 1 v = 1 dst = {send_sock = 0x7ffcbf70ab30, to = {s = {sa_family = 12309, sa_data = "o\000\000\000\000\000\030q\006\363s\177\000"}, sin = { sin_family = 12309, sin_port = 111, sin_addr = {s_addr = 0}, sin_zero = "\030q\006\363s\177\000"}, sin6 = {sin6_family = 12309, sin6_port = 111, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\030q\006\363s\177\000\000ȴ\r\363s\177\000", __u6_addr16 = { 28952, 62214, 32627, 0, 46280, 62221, 32627, 0}, __u6_addr32 = {4077285656, 32627, 4077761736, 32627}}}, sin6_scope_id = 3211832254}, sas = {ss_family = 12309, __ss_padding = "o\000\000\000\000\000\030q\006\363s\177\000\000ȴ\r\363s\177\000\000\276\253p\277\374\177\000\000\277\253p\277\374\177\000\000ג\232\000\000\000\000\000\207\217\232\000\000\000\000\000\070\204\210\000\000\000\000\000X\222\210\000\000\000\000\000@\000\000\000\000\000\000\000\020\360\337\362s\177\000\000\317v\331\362s\177", '\000' <repeats 12 times>, "\200\000\000\000\000\000`\333H\000\000\000\000", __ss_align = 2564280}}, id = 3613856, send_flags = {f = 0, blst_imask = 1285}, proto = -72 '\270', proto_pad0 = -55 '\311', proto_pad1 = 65} tmp = 0x6f347e <qm_malloc+2449> "H\213E\270H\203\300\070\351Q\003" new_uri = 0x6fc5e1 <qm_info+46> "H\213E\370H\213P\bH\213E\340H\211\020H\213E\340H\307@(\b" end = 0xe8 <error: Cannot access memory at address 0xe8> crt = 0x7ffcbf70ad50 "P\256p\277\374\177" cmd = 0x7f73f2ea8a48 len = 0 user = 10129593 uri = {user = {s = 0x7ffcbf70a910 "@\251p\277\374\177", len = -306704723}, passwd = { s = 0xcf3747ad0 <error: Cannot access memory at address 0xcf3747ad0>, len = 0}, host = {s = 0x800000 <_IO_stdin_used> "\001", len = 4774584}, port = {s = 0x4002720f8 <error: Cannot access memory at address 0x4002720f8>, len = 8943776}, params = { s = 0x41c9b8 <dlsym@plt+8> "", len = 8}, sip_params = {s = 0x7ffcbf70aa30 "0\253p\277\374\177", len = 7759464}, headers = { s = 0x7ffcbf70a940 "\220\256\r\363s\177", len = 4964313}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (unknown: 0x86f0d4), transport = {s = 0x7ffcbf70aa30 "0\253p\277\374\177", len = 7286805}, ttl = {s = 0x7f73f30dae90 "\001", len = -217682128}, user_param = { s = 0x7ffcbf70aabe "\005\005\270\311A", len = -1083135297}, maddr = {s = 0x9a92d7 <buf+1079> "", len = 10129198}, method = { s = 0x888438 <__func__.3> "parse_via", len = 8950360}, lr = {s = 0x40 <error: Cannot access memory at address 0x40>, len = 7325153}, r2 = { s = 0x7ffcbf70a9d0 "", len = -220205040}, gr = {s = 0x7f73f30db538 "p", len = -220205040}, transport_val = { s = 0x7ffcbf70aa10 "@\252p\277\374\177", len = -306704723}, ttl_val = { s = 0xe00000030 <error: Cannot access memory at address 0xe00000030>, len = 0}, user_param_val = {s = 0x800000 <_IO_stdin_used> "\001", len = 4774048}, maddr_val = {s = 0x4002722a8 <error: Cannot access memory at address 0x4002722a8>, len = 8943776}, method_val = { --Type <RET> for more, q to quit, c to continue without paging-- s = 0x41c9b8 <dlsym@plt+8> "", len = 8}, lr_val = {s = 0x7ffcbf70ab30 "", len = 7759464}, r2_val = { s = 0x7ffcbf70aa40 "\030q\006\363s\177", len = 4964313}, gr_val = {s = 0x0, len = 8843476}} next_hop = {user = {s = 0x400bf70a760 <error: Cannot access memory at address 0x400bf70a760>, len = -274094048}, passwd = { s = 0x7ffcbf70a860 "\030\220\233", len = -291376120}, host = {s = 0x7ffcbf70a770 "\240\247p\277\374\177", len = -221810361}, port = { s = 0x7ffcbf70a780 "\240\247p\277\002", len = -221810334}, params = {s = 0x7ffcbf70a7a0 "", len = -291376120}, sip_params = { s = 0x2bf70a7a0 <error: Cannot access memory at address 0x2bf70a7a0>, len = -220676760}, headers = { s = 0x9a8f04 <buf+100> "=a92.6fd>\r\nVia: SIP/2.0/UDP 172.19.194.20;branch=z9hG4bKa617.ff0b5b66aa6563c47d53617f4dbe74b8.0\r\nVia: SIP/2.0/UDP 172.20.14.4:5060;branch=z9hG4bK87n3qi108gc8rbe9pi50.1\r\nMax-Forwards: 67\r\nFrom: \"HUONE_"..., len = -282320808}, port_no = 43264, proto = 49008, type = 32764, flags = 0, transport = {s = 0x9b8ec0 <def_list> "\210\237\024\357s\177", len = 10194984}, ttl = { s = 0x7f73f3747ad0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330>, len = -274093472}, user_param = { s = 0x7ffcbf70a8d0 "", len = -221447870}, maddr = {s = 0x7ffcbf70a900 "0\252p\277\374\177", len = -274094048}, method = { s = 0x400bf70ac60 <error: Cannot access memory at address 0x400bf70ac60>, len = -274093928}, lr = { s = 0xffffffffbf70a830 <error: Cannot access memory at address 0xffffffffbf70a830>, len = 1}, r2 = { s = 0x50bf70a930 <error: Cannot access memory at address 0x50bf70a930>, len = -274093912}, gr = { s = 0x7f73efb402f0 "KDMQ sip:dialog@172.19.194.28:5060 SIP/2.0\r\nVia: SIP/2.0/UDP 172.19.194.20;branch=z9hG4bK5d89.f6002b35", '0' <repeats 24 times>, ".0\r\nTo: <sip:dialog@172.19.194.28:5060>\r\nFrom: <sip:dialog@172.19.194.20:5"..., len = -1083134880}, transport_val = { s = 0x7ffcbf70a9c8 "", len = -1083135540}, ttl_val = {s = 0xc800000000 <error: Cannot access memory at address 0xc800000000>, len = -274094048}, user_param_val = {s = 0x9b9028 <_xavi_list_head> "", len = 10194976}, maddr_val = {s = 0x9b9018 <_xavp_list_head> "", len = 10194664}, method_val = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, lr_val = {s = 0x817213 "INFO", len = 7325153}, r2_val = {s = 0x7ffcbf70a8d0 "", len = -220205040}, gr_val = {s = 0x7f73f3066fa0 "`", len = -220205040}} u = 0x9a92d7 <buf+1079> port = 0 dst_host = 0x7f73f30db490 i = 2 flags = 32764 avp = 0x875a18 <__func__.21> st = {flags = 4012646488, id = 32627, name = {n = -293601280, s = {s = 0x7f73ee800000 "", len = -1083136048}, re = 0x7f73ee800000}, avp = 0x7f73ed4b0c06 <dmq_tm_callback+2807>} sct = 0x7ffcbf70abe0 sjt = 0x7f73f2dff010 rve = 0x7f73f2ec2f30 mct = 0x7f73edb80ead <pkg_proc_update_stats+115> rv = 0x7f73ed4d8a9c rv1 = 0x72eeb1 <parse_cseq+2542> c1 = {cache_type = 4084497104, val_type = 32627, c = {avp_val = {n = 67108864, s = { s = 0x104000000 <error: Cannot access memory at address 0x104000000>, len = -1083136240}, re = 0x104000000}, pval = {rs = { s = 0x104000000 <error: Cannot access memory at address 0x104000000>, len = -1083136240}, ri = 7335103, flags = 0}}, --Type <RET> for more, q to quit, c to continue without paging-- i2s = "\242\207M\355s\177\000\000\000\000\200\356G\000\000\000\360\210M\355s\177"} s = {s = 0x817213 "INFO", len = -293366072} srevp = {0x7ffcbf70a6d0, 0x6eff50 <futex_release+29>} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NUMBER_ST, u = {number = 2, string = 0x2 <error: Cannot access memory at address 0x2>, str = { s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, data = 0x2, attr = 0x2, select = 0x2}}, {type = RVE_FREE_FIXUP_ST, u = { number = 0, string = 0x0, str = {s = 0x0, len = 1}, data = 0x0, attr = 0x0, select = 0x0}}, {type = MODFIXUP_ST, u = { number = 140135975607040, string = 0x7f73f30bdb00 "\220\332\v\363s\177", str = {s = 0x7f73f30bdb00 "\220\332\v\363s\177", len = 2}, data = 0x7f73f30bdb00, attr = 0x7f73f30bdb00, select = 0x7f73f30bdb00}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #10 0x000000000044eee9 in run_actions (h=0x7ffcbf70ae60, a=0x7f73f2eb81c0, msg=0x7f73f30c3230) at core/action.c:1584 t = 0x7f73f2edb190 ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = -217304528, tz_dsttime = 32627} tdiff = 4077287896 __func__ = "run_actions" #11 0x000000000044f653 in run_top_route (a=0x7f73f2eb81c0, msg=0x7f73f30c3230, c=0x0) at core/action.c:1669 ctx = {rec_lev = 3, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {4294967296, -1391185268927135563, 8483347, 18, 140135982463696, 67108864, -1391185268977467211, 1389635598856192181}, __mask_was_saved = 0, __saved_mask = {__val = {6227793, 4294967752, 140135975629360, 8483347, 18, 140135982463696, 67108864, 140135975632848, 10129605, 140135975252904, 0, 4611686022722355200, 0, 4294967296, 4294967296, 8483347}}}}} p = 0x7ffcbf70ae60 ret = -210470192 sfbk = 0 #12 0x000000000058652e in receive_msg ( buf=0x9a8ea0 <buf> "INVITE sip:yyy@hostname:5060 SIP/2.0\r\nRecord-Route: <sip:172.19.194.20;lr;did=a92.6fd>\r\nVia: SIP/2.0/UDP 172.19.194.20;branch=z9hG4bKa617.ff0b5b66aa6563c47d53617f4dbe74b8.0\r\nVia"..., len=1079, rcv_info=0x7ffcbf70b4d0) at core/receive.c:501 msg = 0x7f73f30c3230 ctx = {rec_lev = 0, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {4702111234474983745, 4702111234474983745, 4702111234474983745, 4702111234474983745, 0, 0, 0, 0}, __mask_was_saved = 437918234, __saved_mask = {__val = {1880844493789993498, 1880844493789993498, --Type <RET> for more, q to quit, c to continue without paging-- 1880844493789993498, 0, 0, 0, 0, 2314885530818453536, 2314885530818453536, 2314885530818453536, 2314885530818453536, 0, 0, 0, 0, 4702111234474983745}}}}} bctx = 0x0 ret = 0 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} diff = 0 inb = { s = 0x9a8ea0 <buf> "INVITE sip:yyy@hostname:5060 SIP/2.0\r\nRecord-Route: <sip:172.19.194.20;lr;did=a92.6fd>\r\nVia: SIP/2.0/UDP 172.19.194.20;branch=z9hG4bKa617.ff0b5b66aa6563c47d53617f4dbe74b8.0\r\nVia"..., len = 1079} netinfo = {data = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0} keng = 0x0 evp = {data = 0x7ffcbf70b040, obuf = {s = 0x0, len = 0}, rcv = 0x7ffcbf70b4d0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} cidlockidx = 0 cidlockset = 0 errsipmsg = 0 exectime = 0 __func__ = "receive_msg" #13 0x00000000006c860a in udp_rcv_loop () at core/udp_server.c:543 len = 1079 buf = "INVITE sip:yyy@hostname:5060 SIP/2.0\r\nRecord-Route: <sip:172.19.194.20;lr;did=a92.6fd>\r\nVia: SIP/2.0/UDP 172.19.194.20;branch=z9hG4bKa617.ff0b5b66aa6563c47d53617f4dbe74b8.0\r\nVia"... tmp = 0x1eee34928 <error: Cannot access memory at address 0x1eee34928> fromaddr = 0x7f73f30d68d8 fromaddrlen = 16 rcvi = {src_ip = {af = 2, len = 4, u = {addrl = {348263340, 0}, addr32 = {348263340, 0, 0, 0}, addr16 = {5036, 5314, 0, 0, 0, 0, 0, 0}, addr = "\254\023\302\024", '\000' <repeats 11 times>}}, dst_ip = {af = 2, len = 4, u = {addrl = {348263340, 0}, addr32 = {348263340, 0, 0, 0}, addr16 = {5036, 5314, 0, 0, 0, 0, 0, 0}, addr = "\254\023\302\024", '\000' <repeats 11 times>}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023Ĭ\023\302\024\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 348263340}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 348263340, 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}, sas = {ss_family = 2, __ss_padding = "\023Ĭ\023\302\024", '\000' <repeats 111 times>, __ss_align = 0}}, bind_address = 0x7f73f2e91490, rflags = 0, proto = 1 '\001', proto_pad0 = 0 '\000', proto_pad1 = 0} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} printbuf = '\000' <repeats 88 times>, "\320>\343\356s\177\000\000\023r\201\000\000\000\000\000\022\000\000\000\000\000\000\000\320zt\363s\177\000\000\000\000\000\004\000\000\000\000гp\277\374\177\000\000m\301b", '\000' <repeats 41 times>, "\004\000\000\000\350\006\353\362\004", '\000' <repeats 91--Type <RET> for more, q to quit, c to continue without paging-- times>... i = -1 j = 43776 l = 4 __func__ = "udp_rcv_loop" #14 0x000000000042c56a in main_loop () at main.c:1730 i = 3 pid = 0 si = 0x7f73f2e91490 si_desc = "udp receiver child=3 sock=172.19.194.20:5060\000\000\000\000@\274p\277\374\177\000\000\023r\201\000\000\000\000\000\022\000\000\000\000\000\000\000\320zt\363s\177\000\000H\212\352\362s\177\000\000j{t\363s\177\000\000\060\000\000\000\060\000\000\000\370\267p\277\374\177\000\000\020\267p\277\374\177\000\000\000\020\276\304u\274j\300" nrprocs = 4 woneinit = 1 __func__ = "main_loop" #15 0x0000000000438191 in main (argc=11, argv=0x7ffcbf70bd58) at main.c:3061 cfg_stream = 0x1b9a2d0 c = -1 r = 0 tmp = 0x7ffcbf70deb7 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x803128 ":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 = 2043858912 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x40 p = 0x1600000 <error: Cannot access memory at address 0x1600000> st = {st_dev = 25, st_ino = 179668, st_nlink = 2, st_mode = 16832, st_uid = 978, st_gid = 978, __pad0 = 0, st_rdev = 0, st_size = 100, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1717103055, tv_nsec = 713677547}, st_mtim = {tv_sec = 1717103910, tv_nsec = 470641633}, st_ctim = {tv_sec = 1717103910, tv_nsec = 470641633}, __glibc_reserved = {0, 0, 0}} --Type <RET> for more, q to quit, c to continue without paging-- tbuf = "\342\\\256\363s\177\000\000\070\033\253\363s\177\000\000йp\277\374\177\000\000\a\000\000\000\000\000\000\000\330\b\253\363s\177\000\000\a\000\000\000#\000\000\000\060j\256\363s\177\000\000\005\067\254\363s\177\000\000\000\000\000\000\000\000\000\000\320I\254\363s\177\000\000\070\000a\363s\177\000\000\020\353\252\363s\177\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\240\271p\277\374\177\000\000\330\032\253\363s\177\000\000\330\032\253\363s\177\000\000\000\000\000\000\000\000\000\000\270\371\252\363s\177\000\000\240\271p\277\374\177\000\000\220u\256\363s\177\000\000\000\000\253\363s\177\000\000\022\f\253\363s\177\000\000F\001\254\363s\177\000\000\344#`\363s\177\000\000\232"... option_index = 12 long_options = {{name = 0x805796 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8004f4 "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x80579b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8057a1 "subst", has_arg = 1, flag = 0x0, val = 1025}, { name = 0x8057a7 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8057b0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x8057ba "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8057c4 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, { name = 0x8057cf "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8057d8 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, { name = 0x8057e3 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x8057e9 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, { name = 0x8057f3 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) (gdb) info locals hash = 14 p_entry = 0x7f73eee13730 (gdb) list 481 p_entry = &linker->profile->entries[hash]; 482 lock_get( &linker->profile->lock ); 483 if (p_entry->first) { 484 linker->hash_linker.prev = p_entry->first->prev; 485 linker->hash_linker.next = p_entry->first; 486 p_entry->first->prev->next = &linker->hash_linker; 487 p_entry->first->prev = &linker->hash_linker; 488 } else { 489 p_entry->first = linker->hash_linker.next 490 = linker->hash_linker.prev = &linker->hash_linker; ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3878 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3878(a)github.com>

3 4

[kamailio/kamailio] Hello, I would like to confirm if our SMS module supports sending long SMS messages ？ (Issue #3822)
by Helloworld1668 13 Aug '24

13 Aug '24

### Description  Hello, when I was testing the SMSC SMS business, I found that the SMS could not be forwarded by the SMSC when the characters were too long, approximately 117 characters. The issue was traced back to the smsops module, which has a limit on the length of the SMS, but it seems that it does not handle SMS segmentation. The error message returned is as follows. Could you please provide some suggestions and help? ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages ``` 2024-04-24T05:59:01.837950514Z 3(24) ERROR: <script>: SMS for "" (Valid: 0 ) 2024-04-24T05:59:14.466167796Z 2(23) ERROR: <script>: 3GPP-SMS: MESSAGE (sip:+8618107550088@ims.mnc011.mcc460.3gppnetwork.org (172.22.0.20:6060) to tel:+8613800138000, bnecb4LQJ(a)10.46.2.1) 2024-04-24T05:59:14.466173859Z 2(23) ERROR: smsops [smsops_impl.c:1055]: decode_3gpp_sms(): Length of TP-User-Data payload exceeds maximum length! 2024-04-24T05:59:14.466175929Z 2(23) ERROR: smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! 2024-04-24T05:59:14.466191554Z 2(23) ERROR: smsops [smsops_impl.c:1055]: decode_3gpp_sms(): Length of TP-User-Data payload exceeds maximum length! 2024-04-24T05:59:14.466194545Z 2(23) ERROR: smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! 2024-04-24T05:59:14.466196517Z 2(23) ERROR: smsops [smsops_impl.c:1055]: decode_3gpp_sms(): Length of TP-User-Data payload exceeds maximum length! 2024-04-24T05:59:14.466198406Z 2(23) ERROR: smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! 2024-04-24T05:59:14.466200311Z 2(23) ERROR: <script>: SMS for "" (Valid: ) 2024-04-24T05:59:14.466255812Z 2(23) ERROR: smsops [smsops_impl.c:1055]: decode_3gpp_sms(): Length of TP-User-Data payload exceeds maximum length! 2024-04-24T05:59:14.466276249Z 2(23) ERROR: smsops [smsops_impl.c:1903]: isRPDATA(): Error getting/decoding RP-Data from request! ``` #### SIP Traffic  ``` ``` ![image](https://github.com/kamailio/kamailio/assets/152272255/808e65ce-9763-4056-9924-77122f6d9c25) ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 4fb8ac -dirty compiled on 03:11:49 Apr 24 2024 with gcc 9.4.0 ``` version: kamailio 5.9.0-dev0 (x86_64/linux) 4fb8ac-dirty 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 ``` * **Operating System**:  ``` Linux sder 4.15.0-128-generic #131-Ubuntu SMP Wed Dec 9 06:57:35 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3822 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3822(a)github.com>

3 5

[kamailio/kamailio] secfilter: export functions to KEMI (PR #3945)
by bazrafshan.m.h 12 Aug '24

12 Aug '24

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * All functions are exported to kemi You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3945 -- Commit Summary -- * secfilter is fully KEMIized * secfilter: fix the failed format check -- File Changes -- M src/modules/secfilter/secfilter.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3945.patch https://github.com/kamailio/kamailio/pull/3945.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3945 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3945(a)github.com>

2 6

[kamailio/kamailio] cdp: Functions are exported in KEMI (PR #3942)
by bazrafshan.m.h 11 Aug '24

11 Aug '24

- Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings.   #### 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:  - [x] PR should be backported to stable branches - [ ] 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/3942 -- Commit Summary -- * cdp: export all functions in KEMI module -- File Changes -- M src/modules/cdp/cdp_mod.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3942.patch https://github.com/kamailio/kamailio/pull/3942.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3942 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3942(a)github.com>

1 1

[kamailio/kamailio] cdp: export functions to KEMI (PR #3941)
by bazrafshan.m.h 11 Aug '24

11 Aug '24

#### 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:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * Exporting all cdp functions to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3941 -- Commit Summary -- * secfilter: all functions are exported in KEMI * cdp: ki_cdp_check_peer() KEMIized * cdp: export all functions in KEMI module -- File Changes -- M src/modules/cdp/cdp_mod.c (34) M src/modules/secfilter/secfilter.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3941.patch https://github.com/kamailio/kamailio/pull/3941.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3941 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3941(a)github.com>

1 1

git:master:8361471e: dispatcher: use char for oc distribution array
by Daniel-Constantin Mierla 10 Aug '24

10 Aug '24

Module: kamailio Branch: master Commit: 8361471e6ec49d3b92443e0ddd728bf665460c02 URL: https://github.com/kamailio/kamailio/commit/8361471e6ec49d3b92443e0ddd728bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-09T16:04:11+02:00 dispatcher: use char for oc distribution array - reduce array size --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/8361471e6ec49d3b92443e0ddd728bf… Patch: https://github.com/kamailio/kamailio/commit/8361471e6ec49d3b92443e0ddd728bf… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 95f0128f9bd..f17963cc3bf 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -143,6 +143,7 @@ static void ds_run_route( struct sip_msg *msg, str *uri, char *route, ds_rctx_t *rctx); void shuffle_uint100array(unsigned int *arr); +void shuffle_char100array(char *arr); int ds_reinit_rweight_on_state_change( int old_state, int new_state, ds_set_t *dset); @@ -442,12 +443,12 @@ void ds_oc_prepare(ds_dest_t *dp) { int i; for(i = 0; i < dp->ocdata.ocrate; i++) { - dp->ocdata.ocdist[i] = 0; + dp->ocdata.ocdist[i] = '0'; } for(i = dp->ocdata.ocrate; i < 100; i++) { - dp->ocdata.ocdist[i] = 1; + dp->ocdata.ocdist[i] = '1'; } - shuffle_uint100array(dp->ocdata.ocdist); + shuffle_char100array(dp->ocdata.ocdist); } /** @@ -525,7 +526,7 @@ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) LM_DBG("time validity not matching\n"); return 0; } - if(dsg->dlist[n].ocdata.ocdist[dsg->dlist[n].ocdata.ocidx] == 1) { + if(dsg->dlist[n].ocdata.ocdist[dsg->dlist[n].ocdata.ocidx] == '1') { /* use it */ ret = 0; } else { @@ -793,6 +794,23 @@ void shuffle_uint100array(unsigned int *arr) } +/* for internal usage; arr must be arr[100] */ +void shuffle_char100array(char *arr) +{ + int k; + int j; + char t; + if(arr == NULL) + return; + for(j = 0; j < 100; j++) { + k = j + (kam_rand() % (100 - j)); + t = arr[j]; + arr[j] = arr[k]; + arr[k] = t; + } +} + + /** * Initialize the relative weight distribution for a destination set * - fill the array of 0..99 elements where to keep the index of the diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index ed0ceb99978..9c1167d6dbe 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -222,10 +222,11 @@ typedef struct _ds_latency_stats { void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count); ds_latency_stats_t *latency_stats_find(int group, str *address); +#define DS_OCDIST_SIZE 104 typedef struct _ds_ocdata { uint32_t ocrate; uint32_t ocidx; - uint32_t ocdist[100]; + char ocdist[DS_OCDIST_SIZE]; struct timeval octime; uint32_t ocseq; uint32_t ocmin;

1 0

[kamailio/kamailio] Falta atributo de seguridad en Cookie de Sesión / Falta atributo de HttpOnly en Cookie de Sesión (Issue #3938)
by Diego Godoy 09 Aug '24

09 Aug '24

Necesito solventar para las instancias de synapsis estos dos vulnerabilidades que comparto a continuación. ![image](https://github.com/user-attachments/assets/39d228bd-d35c-455a-9b6e-bd245870f304) ![image](https://github.com/user-attachments/assets/7b967f7c-433a-404b-85b5-710c38f7034f) Gracias -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3938 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3938(a)github.com>

1 1

[kamailio/kamailio] [doc] xhttp_rpc module docs, the route should be "rpc" not "http_rpc"。 (Issue #3937)
by gao114882 08 Aug '24

08 Aug '24

### Description  <img width="486" alt="企业微信截图_17231113172455" src="https://github.com/user-attachments/assets/2a055290-b200-4954-b902-20997760…"> change this to "rpc" ### Troubleshooting #### Reproduction  #### 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` ``` version: kamailio 5.8.2 (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, 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: compiled on 09:04:36 Aug 8 2024 with gcc 4.8.5``` * **Operating System**:  ``` ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3937 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3937(a)github.com>

1 1

git:master:ad312921: dispatcher: print priority in oclist rpc command
by Daniel-Constantin Mierla 08 Aug '24

08 Aug '24

Module: kamailio Branch: master Commit: ad31292170f632a381c1f95cbf955ca71f046244 URL: https://github.com/kamailio/kamailio/commit/ad31292170f632a381c1f95cbf955ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-08T10:15:19+02:00 dispatcher: print priority in oclist rpc command --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/ad31292170f632a381c1f95cbf955ca… Patch: https://github.com/kamailio/kamailio/commit/ad31292170f632a381c1f95cbf955ca… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 50ddd1f4c45..a9744ba2c10 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -2287,8 +2287,9 @@ static void dispatcher_rpc_oclist(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error root reply"); return; } - if(rpc->struct_add(th, "dSduuujjuu", "group", group, "uri", - &node->dlist[i].uri, "flags", node->dlist[i].flags, "ocrate", + if(rpc->struct_add(th, "dSdduuujjuu", "group", group, "uri", + &node->dlist[i].uri, "flags", node->dlist[i].flags, + "priority", node->dlist[i].priority, "ocrate", node->dlist[i].ocdata.ocrate, "ocidx", node->dlist[i].ocdata.ocidx, "ocseq", node->dlist[i].ocdata.ocseq, "octime_sec",

1 0

git:master:645b34ce: dispatcher: group overload control attributes in a structure
by Daniel-Constantin Mierla 07 Aug '24

07 Aug '24

Module: kamailio Branch: master Commit: 645b34cec9ee459ea33cb14d8f66e5c58a7ef975 URL: https://github.com/kamailio/kamailio/commit/645b34cec9ee459ea33cb14d8f66e5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-07T09:39:27+02:00 dispatcher: group overload control attributes in a structure --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/645b34cec9ee459ea33cb14d8f66e5c… Patch: https://github.com/kamailio/kamailio/commit/645b34cec9ee459ea33cb14d8f66e5c…

1 0

git:master:398c40ab: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 06 Aug '24

06 Aug '24

Module: kamailio Branch: master Commit: 398c40ab7969e738ac92abc8b9c8c557b25ef533 URL: https://github.com/kamailio/kamailio/commit/398c40ab7969e738ac92abc8b9c8c55… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-06T11:16:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/398c40ab7969e738ac92abc8b9c8c55… Patch: https://github.com/kamailio/kamailio/commit/398c40ab7969e738ac92abc8b9c8c55… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 16c10332df7..2a6148504db 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -134,6 +134,7 @@ Federico Cabiddu 5.6. dispatcher.add 5.7. dispatcher.remove 5.8. dispatcher.hash + 5.9. dispatcher.oclist 6. Installation and Running @@ -303,6 +304,7 @@ Chapter 1. Admin Guide 5.6. dispatcher.add 5.7. dispatcher.remove 5.8. dispatcher.hash + 5.9. dispatcher.oclist 6. Installation and Running @@ -1672,6 +1674,7 @@ onreply_route { 5.6. dispatcher.add 5.7. dispatcher.remove 5.8. dispatcher.hash + 5.9. dispatcher.oclist 5.1. dispatcher.set_state @@ -1852,6 +1855,22 @@ kamctl rpc dispatcher.hash 0 alice server.com kamctl rpc dispatcher.hash 4 bob server.com ... +5.9. dispatcher.oclist + + List the overload control attributes for the records in a specific + group. + + Name: dispatcher.oclist + + Parameters: + * _group_: destination group id + + Example: +... +# prototype: kamcli dispatcher.oclist _group_ +kamcli dispatcher.oclist 1 +... + 6. Installation and Running 6.1. Destination List File

1 0

git:master:1a56ff54: dispatcher: docs for dispatcher.oclist rpc command
by Daniel-Constantin Mierla 06 Aug '24

06 Aug '24

Module: kamailio Branch: master Commit: 1a56ff54ec1898b8bbc2aae4ab5f4b19eff6ecf5 URL: https://github.com/kamailio/kamailio/commit/1a56ff54ec1898b8bbc2aae4ab5f4b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-06T11:03:41+02:00 dispatcher: docs for dispatcher.oclist rpc command --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a56ff54ec1898b8bbc2aae4ab5f4b1… Patch: https://github.com/kamailio/kamailio/commit/1a56ff54ec1898b8bbc2aae4ab5f4b1… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index a17e87f68e7..81d5b19cd00 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2334,6 +2334,30 @@ DEST: { kamctl rpc dispatcher.hash 0 alice server.com kamctl rpc dispatcher.hash 4 bob server.com ... +</programlisting> + </section> + <section id="dispatcher.r.oclist"> + <title> + <function moreinfo="none">dispatcher.oclist</function> + </title> + <para> + List the overload control attributes for the records in a specific group. + </para> + <para> + Name: <emphasis>dispatcher.oclist</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_group_: destination group id</para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# prototype: kamcli dispatcher.oclist _group_ +kamcli dispatcher.oclist 1 +... </programlisting> </section>

1 0

git:master:583ab9f2: dispatcher: variables declared at beginning of block
by Daniel-Constantin Mierla 06 Aug '24

06 Aug '24

Module: kamailio Branch: master Commit: 583ab9f29cd7d5c472de2e12087a4c619bc1897f URL: https://github.com/kamailio/kamailio/commit/583ab9f29cd7d5c472de2e12087a4c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-06T10:23:27+02:00 dispatcher: variables declared at beginning of block --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/583ab9f29cd7d5c472de2e12087a4c6… Patch: https://github.com/kamailio/kamailio/commit/583ab9f29cd7d5c472de2e12087a4c6… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4eefbff1ce3..42fb1e45d68 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1962,6 +1962,8 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) int n; str smode; int vmode = DS_RPC_PRINT_NORMAL; + ds_set_t *dslist = NULL; + int dslistnr = 0; n = rpc->scan(ctx, "*S", &smode); if(n == 1) { @@ -1972,8 +1974,8 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) } } - ds_set_t *dslist = ds_get_list(); - int dslistnr = ds_get_list_nr(); + dslist = ds_get_list(); + dslistnr = ds_get_list_nr(); if(dslist == NULL || dslistnr <= 0) { LM_DBG("no destination sets\n");

1 0

git:master:4c481dc9: dispatcher: new rpc command dispatcher.oclist
by Daniel-Constantin Mierla 06 Aug '24

06 Aug '24

Module: kamailio Branch: master Commit: 4c481dc95338d9bb814730d3d4f84ce9670a0ed0 URL: https://github.com/kamailio/kamailio/commit/4c481dc95338d9bb814730d3d4f84ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-06T10:16:04+02:00 dispatcher: new rpc command dispatcher.oclist - list overload control attributes for a specific dispatcher group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/4c481dc95338d9bb814730d3d4f84ce… Patch: https://github.com/kamailio/kamailio/commit/4c481dc95338d9bb814730d3d4f84ce… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 831bfef7e1a..4eefbff1ce3 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -2253,6 +2253,53 @@ static void dispatcher_rpc_hash(rpc_t *rpc, void *ctx) return; } +static const char *dispatcher_rpc_oclist_doc[2] = { + "List overload control details for a group", 0}; + +/* + * RPC command to set the state of a destination address + */ +static void dispatcher_rpc_oclist(rpc_t *rpc, void *ctx) +{ + int group = 0; + int i = 0; + ds_set_t *node = NULL; + void *th = NULL; + + if(rpc->scan(ctx, "d", &group) != 1) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + + /* get the index of the set */ + node = ds_list_lookup(group); + if(node == NULL) { + LM_ERR("destination set [%d] not found\n", group); + rpc->fault(ctx, 404, "Destination Group Not Found"); + return; + } + + for(i = 0; i < node->nr; i++) { + /* add entry node */ + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + if(rpc->struct_add(th, "dSduuujjuu", "group", group, "uri", + &node->dlist[i].uri, "flags", node->dlist[i].flags, "ocrate", + node->dlist[i].attrs.ocrate, "ocidx", node->dlist[i].ocidx, + "ocseq", node->dlist[i].ocseq, "octime_sec", + (unsigned long)node->dlist[i].octime.tv_sec, "octime_usec", + (unsigned long)node->dlist[i].octime.tv_usec, "ocmin", + node->dlist[i].attrs.ocmin, "ocmax", + node->dlist[i].attrs.ocmax) + < 0) { + rpc->fault(ctx, 500, "Internal error main structure"); + return; + } + } +} + /* clang-format off */ rpc_export_t dispatcher_rpc_cmds[] = { {"dispatcher.reload", dispatcher_rpc_reload, @@ -2271,6 +2318,8 @@ rpc_export_t dispatcher_rpc_cmds[] = { dispatcher_rpc_remove_doc, 0}, {"dispatcher.hash", dispatcher_rpc_hash, dispatcher_rpc_hash_doc, 0}, + {"dispatcher.oclist", dispatcher_rpc_oclist, + dispatcher_rpc_oclist_doc, RPC_RET_ARRAY}, {0, 0, 0, 0} }; /* clang-format on */

1 0

[kamailio/kamailio] permissions address failure during checks (Issue #3922)
by Mariah Yang 06 Aug '24

06 Aug '24

r2val(): converting STRING [test] 8(18) DEBUG: permissions [address.c:179]: reload_address_db_table(): Number of rows in address table: 3 8(18) DEBUG: permissions [address.c:191]: reload_address_db_table(): failure during checks of database value 1 (group) in address table 8(18) ERROR: permissions [address.c:233]: reload_address_db_table(): database problem - invalid record mysql> desc ka_address; +---------+-------------+------+-----+---------+-------+ | Field | Type | Null | Key | Default | Extra | +---------+-------------+------+-----+---------+-------+ | id | double | NO | | 0 | | | grp | bigint | NO | | 0 | | | ip_addr | varchar(64) | YES | | NULL | | | mask | bigint | NO | | 0 | | | port | bigint | NO | | 0 | | | tag | varchar(4) | NO | | | | +---------+-------------+------+-----+---------+-------+ when address table use bigint for grp，error happened when load address data -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3922 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3922(a)github.com>

1 4

[kamailio/kamailio] allow address 'grd' 'mask' 'port' fields to be a mysql BIGINT (PR #3923)
by Mariah Yang 06 Aug '24

06 Aug '24

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3923 -- Commit Summary -- * allow address 'grd' 'mask' 'port' fields to be a mysql BIGINT -- File Changes -- M src/modules/permissions/address.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3923.patch https://github.com/kamailio/kamailio/pull/3923.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3923 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3923(a)github.com>

2 6

git:master:4aaaca60: cdp: Error log caused crash
by Morten Tryfoss 05 Aug '24

05 Aug '24

Module: kamailio Branch: master Commit: 4aaaca60ef2207100dd3f4e16ae63428aadc7dc5 URL: https://github.com/kamailio/kamailio/commit/4aaaca60ef2207100dd3f4e16ae6342… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Morten Tryfoss <morten(a)tryfoss.no> Date: 2024-08-05T12:14:04+02:00 cdp: Error log caused crash --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/4aaaca60ef2207100dd3f4e16ae6342… Patch: https://github.com/kamailio/kamailio/commit/4aaaca60ef2207100dd3f4e16ae6342… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index e03307c5e84..67a3a8e6feb 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -605,7 +605,7 @@ static inline int do_receive(serviced_peer_t *sp) version = (unsigned char)(sp->buf[0]); if(version != 1) { LM_ERR("do_receive(): [%.*s] Received Unknown version [%d]\n", - sp->p->fqdn.len, sp->p->fqdn.s, + sp->p ? sp->p->fqdn.len : 0, sp->p ? sp->p->fqdn.s : 0, (unsigned char)sp->buf[0]); goto error_and_reset; } else {

1 0

git:master:14fb25a5: dispatcher: print no-probing flag in the rpc list
by Daniel-Constantin Mierla 05 Aug '24

05 Aug '24

Module: kamailio Branch: master Commit: 14fb25a5d39748e52224225667bae4ab2b428c9b URL: https://github.com/kamailio/kamailio/commit/14fb25a5d39748e52224225667bae4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-05T10:21:08+02:00 dispatcher: print no-probing flag in the rpc list --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/14fb25a5d39748e52224225667bae4a… Patch: https://github.com/kamailio/kamailio/commit/14fb25a5d39748e52224225667bae4a… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 440b4b96030..831bfef7e1a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1855,6 +1855,8 @@ int ds_rpc_print_set( if(node->dlist[j].flags & DS_PROBING_DST) c[1] = 'P'; + else if(node->dlist[j].flags & DS_NOPING_DST) + c[1] = 'N'; else c[1] = 'X';

1 0

git:master:1243755d: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 02 Aug '24

02 Aug '24

Module: kamailio Branch: master Commit: 1243755d20192e7d5d1c492462a0f9f66521abac URL: https://github.com/kamailio/kamailio/commit/1243755d20192e7d5d1c492462a0f9f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-02T12:31:10+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/1243755d20192e7d5d1c492462a0f9f… Patch: https://github.com/kamailio/kamailio/commit/1243755d20192e7d5d1c492462a0f9f… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index c19d629085f..60d805706fb 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -59,7 +59,7 @@ Ovidiu Sas 4.18. subst_user('/re/repl/flags') 4.19. subst_body('/re/repl/flags') 4.20. subst_hf(hf, subexp, flags) - 4.21. subst_hf(itext, subexp, ovp) + 4.21. subst_v(itext, subexp, ovp) 4.22. set_body(txt, content_type) 4.23. set_reply_body(txt, content_type) 4.24. filter_body(content_type) @@ -213,7 +213,7 @@ Chapter 1. Admin Guide 4.18. subst_user('/re/repl/flags') 4.19. subst_body('/re/repl/flags') 4.20. subst_hf(hf, subexp, flags) - 4.21. subst_hf(itext, subexp, ovp) + 4.21. subst_v(itext, subexp, ovp) 4.22. set_body(txt, content_type) 4.23. set_reply_body(txt, content_type) 4.24. filter_body(content_type) @@ -320,7 +320,7 @@ From: medabeda 4.18. subst_user('/re/repl/flags') 4.19. subst_body('/re/repl/flags') 4.20. subst_hf(hf, subexp, flags) - 4.21. subst_hf(itext, subexp, ovp) + 4.21. subst_v(itext, subexp, ovp) 4.22. set_body(txt, content_type) 4.23. set_reply_body(txt, content_type) 4.24. filter_body(content_type) @@ -742,7 +742,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; ... -4.21. subst_hf(itext, subexp, ovp) +4.21. subst_v(itext, subexp, ovp) Sed-like substitution subexp applied to itext, with result stored in opv.

1 0

git:master:40238581: textops: docs - fixed typo in subst_v() function name
by Daniel-Constantin Mierla 02 Aug '24

02 Aug '24

Module: kamailio Branch: master Commit: 40238581af0eea0787547bdacc2ff0fccf19cbba URL: https://github.com/kamailio/kamailio/commit/40238581af0eea0787547bdacc2ff0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-02T12:28:19+02:00 textops: docs - fixed typo in subst_v() function name - unnoticed after copy and paste --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40238581af0eea0787547bdacc2ff0f… Patch: https://github.com/kamailio/kamailio/commit/40238581af0eea0787547bdacc2ff0f… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 57414c05e81..86f02b97336 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -811,7 +811,7 @@ if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; <section id="textops.f.subst_v"> <title> - <function moreinfo="none">subst_hf(itext, subexp, ovp)</function> + <function moreinfo="none">subst_v(itext, subexp, ovp)</function> </title> <para> Sed-like substitution subexp applied to itext, with result stored in opv.

1 0

git:master:e92375c9: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 02 Aug '24

02 Aug '24

Module: kamailio Branch: master Commit: e92375c96eace6340e42bca622e9835df6b5d17f URL: https://github.com/kamailio/kamailio/commit/e92375c96eace6340e42bca622e9835… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-02T11:46:11+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/e92375c96eace6340e42bca622e9835… Patch: https://github.com/kamailio/kamailio/commit/e92375c96eace6340e42bca622e9835…

1 0

git:master:ab59aace: textops: docs for subst_v(...) function
by Daniel-Constantin Mierla 02 Aug '24

02 Aug '24

Module: kamailio Branch: master Commit: ab59aace74cca90be6d341a3f96e72693e939992 URL: https://github.com/kamailio/kamailio/commit/ab59aace74cca90be6d341a3f96e726… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-02T11:42:07+02:00 textops: docs for subst_v(...) function --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ab59aace74cca90be6d341a3f96e726… Patch: https://github.com/kamailio/kamailio/commit/ab59aace74cca90be6d341a3f96e726… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 9c121e51c70..57414c05e81 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -809,6 +809,44 @@ if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; </example> </section> + <section id="textops.f.subst_v"> + <title> + <function moreinfo="none">subst_hf(itext, subexp, ovp)</function> + </title> + <para> + Sed-like substitution subexp applied to itext, with result stored in opv. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>itext</emphasis> - input text, it can contain variables. + </para> + </listitem> + <listitem> + <para><emphasis>subexp</emphasis> - substitution expression + in the same format as of the 'subst' function parameter, it can + contain variables. + </para> + </listitem> + <listitem> + <para><emphasis>opv</emphasis> - variable name where to store the + result. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>subst_v</function> usage</title> + <programlisting format="linespecific"> +... +subst_v("$var(x)", "/:test@/:best@/", "$var(r)"); +... +</programlisting> + </example> + </section> + <section id="textops.f.set_body"> <title> <function moreinfo="none">set_body(txt, content_type)</function>

1 0

git:master:e1954d76: textops: new function subst_v(...)
by Daniel-Constantin Mierla 02 Aug '24

02 Aug '24

Module: kamailio Branch: master Commit: e1954d7624eecdc33137d224c248240e2df90703 URL: https://github.com/kamailio/kamailio/commit/e1954d7624eecdc33137d224c248240… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-02T11:36:25+02:00 textops: new function subst_v(...) - perform sed-like substituion over input text and store in a variable --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e1954d7624eecdc33137d224c248240… Patch: https://github.com/kamailio/kamailio/commit/e1954d7624eecdc33137d224c248240… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6baf40de6ad..d28d7f508cf 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -100,6 +100,7 @@ static int subst_uri_f(struct sip_msg *, char *, char *); static int subst_user_f(struct sip_msg *, char *, char *); static int subst_body_f(struct sip_msg *, char *, char *); static int subst_hf_f(struct sip_msg *, char *, char *, char *); +static int subst_v_f(struct sip_msg *, char *, char *, char *); static int filter_body_f(struct sip_msg *, char *, char *); static int is_present_hf_f(struct sip_msg *msg, char *str_hf, char *foo); static int search_append_body_f(struct sip_msg *, char *, char *); @@ -252,6 +253,8 @@ static cmd_export_t cmds[] = { {"subst_body", (cmd_function)subst_body_f, 1, fixup_substre, 0, ANY_ROUTE}, {"subst_hf", (cmd_function)subst_hf_f, 3, fixup_subst_hf, 0, ANY_ROUTE}, + {"subst_v", (cmd_function)subst_v_f, 3, fixup_spve2_pvar, + fixup_free_spve2_pvar, ANY_ROUTE}, {"filter_body", (cmd_function)filter_body_f, 1, fixup_str_null, 0, ANY_ROUTE}, {"append_time", (cmd_function)append_time_f, 0, 0, 0, @@ -1527,6 +1530,76 @@ static int subst_body_f(struct sip_msg *msg, char *subst, char *ignored) return subst_body_helper_f(msg, (struct subst_expr *)subst); } +/* sed-perl style re: s/regular expression/replacement/flags, like + * subst but with variables */ +static int subst_v_helper_f( + sip_msg_t *msg, str *itext, str *subex, pv_spec_t *pvd) +{ + str *result; + int nmatches; + struct subst_expr *se; + pv_value_t val; + + if(pvd->setf == NULL) { + LM_ERR("the variable is read only\n"); + return -1; + } + se = subst_parser(subex); + if(se == 0) { + LM_ERR("bad subst re: %.*s\n", subex->len, subex->s); + return -1; + } + /* pkg malloc'ed result */ + result = subst_str(itext->s, msg, se, &nmatches); + if(result == NULL) { + if(nmatches < 0) { + LM_ERR("substitution failed\n"); + } + return -1; + } + memset(&val, 0, sizeof(pv_value_t)); + val.rs.s = result->s; + val.rs.len = result->len; + val.flags = PV_VAL_STR; + pvd->setf(msg, &pvd->pvp, (int)EQ_T, &val); + + pkg_free(result->s); + pkg_free(result); + return 1; +} + +/* sed-perl style re: s/regular expression/replacement/flags, like + * subst but with variables */ +static int ki_subst_v(sip_msg_t *msg, str *itext, str *subex, str *opv) +{ + pv_spec_t *pvd = NULL; + + pvd = pv_cache_get(opv); + if(pvd == NULL) { + LM_ERR("failed to get pv spec\n"); + return -1; + } + return subst_v_helper_f(msg, itext, subex, pvd); +} + +static int subst_v_f(sip_msg_t *msg, char *pitext, char *psubex, char *popv) +{ + str itext = STR_NULL; + str subex = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)pitext, &itext) < 0) { + LM_ERR("failed to get header name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)psubex, &subex) < 0) { + LM_ERR("failed to get header name\n"); + return -1; + } + + return subst_v_helper_f(msg, &itext, &subex, (pv_spec_t *)popv); +} + + static inline int find_line_start( char *text, unsigned int text_len, char **buf, unsigned int *buf_len) { @@ -5282,6 +5355,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("subst_v"), + SR_KEMIP_INT, ki_subst_v, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("remove_hf"), SR_KEMIP_INT, ki_remove_hf, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] Mem leak in smsops which leads to the udp receiver process leak memory continuously (Issue #3833)
by paresh-panda 02 Aug '24

02 Aug '24

Hi, I am using Kamailio 5.8.1 ( ubuntu 22.04 Jammy 64 Bit),. Below are the observations. I am running a load of 500 3GPP IMS SMS which kamailio decodes and sends to another application over Rabbit MQ (Kazoo Module). **-m 512 -M 256** , using 512 MB Shared memory and 256MB Package Memory. When the load for 20 mins the available Memory drops from **80% to 25%** And I see below error logs > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:324]: qm_find_free(): qm_find_free(0x7ff912e21010, 192); Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:463]: qm_malloc(): qm_malloc(0x7ff912e21010, 192) called from smsops: smsops_impl.c: decode_3gpp_sms(813), module: smsops; Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:324]: qm_find_free(): qm_find_free(0x7ff912e21010, 192); Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:463]: qm_malloc(): qm_malloc(0x7ff912e21010, 192) called from smsops: smsops_impl.c: decode_3gpp_sms(813), module: smsops; Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/pvapi.c:1136]: pv_parse_format(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1318]: fix_param(): bad PVE format: "PRD-IR92/11 term-Motorola/XT2205-1-T2STS33.105-51-11-1-2-2 device-type/smart-phone" > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:539 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1208]: fix_param(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:540 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1208]: fix_param(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:541 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:542 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:543 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:555 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:556 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1171]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:559 > I am attaching the configuration for reference. Help on this is much appreciated [configfiles.tar.gz](https://github.com/kamailio/kamailio/files/15148792/con… , I am looking into this issue for quite a long time. Thank you! Regards Paresh -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3833 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3833(a)github.com>

5 7

git:master:5b2e4d38: Makefile.defs: set -pthread flag always
by Daniel-Constantin Mierla 01 Aug '24

01 Aug '24

Module: kamailio Branch: master Commit: 5b2e4d38ac3da8693044aa64c1d4e73595d061cf URL: https://github.com/kamailio/kamailio/commit/5b2e4d38ac3da8693044aa64c1d4e73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T12:28:01+02:00 Makefile.defs: set -pthread flag always - needed by the multi-thread udp receiving mode - it was almost always set for libssl tls multi-process mutexes --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5b2e4d38ac3da8693044aa64c1d4e73… Patch: https://github.com/kamailio/kamailio/commit/5b2e4d38ac3da8693044aa64c1d4e73… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 99157d2c017..1f3e0e81606 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -220,8 +220,8 @@ LIBDL="-ldl" endif ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) -CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED -LD_PMUTEX_OPTS = -pthread -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions +CC_PMUTEX_OPTS = -DKSR_PTHREAD_MUTEX_SHARED +LD_PMUTEX_OPTS = -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions else CC_PMUTEX_OPTS = LD_PMUTEX_OPTS = @@ -922,8 +922,8 @@ ifeq ($(use_fast_lock), yes) found_lock_method=yes endif -CFLAGS=-g -LDFLAGS=-g +CFLAGS=-g -pthread +LDFLAGS=-g -pthread C_INCLUDES= # setting CFLAGS ifeq ($(mode), release) @@ -1995,7 +1995,6 @@ ifeq ($(OS), freebsd) ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes - LIBS+= -pthread endif # check for ver >= 4.1 ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) @@ -2017,7 +2016,6 @@ ifeq ($(OS), dragonfly) ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes - LIBS+= -pthread #dlopen is in libc else LIBS= #dlopen is in libc endif

1 0

git:master:6b413cc8: permissions: reworked condition checking group id on db load
by Daniel-Constantin Mierla 01 Aug '24

01 Aug '24

Module: kamailio Branch: master Commit: 6b413cc8c7f9c6db019c98a28ab07cf902ef505e URL: https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:09:34+02:00 permissions: reworked condition checking group id on db load - ensure it is not null and greater than 0 for both types - update of 6afab49 --- Modified: src/modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf… Patch: https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 3f825fba010..05f56d3dc68 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -192,8 +192,13 @@ int reload_address_db_table(address_tables_group_t *atg) ROW_N(row + i)); goto dberror; } - if((VAL_TYPE(val) != DB1_INT && VAL_TYPE(val) != DB1_UINT) - || VAL_NULL(val) || (VAL_INT(val) <= 0)) { + if(VAL_NULL(val)) { + LM_DBG("failure during checks of database value 1 (group) in " + "address table\n"); + goto dberror; + } + if(!((VAL_TYPE(val) == DB1_INT && VAL_INT(val) > 0) + || (VAL_TYPE(val) == DB1_UINT && VAL_UINT(val) > 0))) { LM_DBG("failure during checks of database value 1 (group) in " "address table\n"); goto dberror;

1 0

[kamailio/kamailio] Uint fixes (PR #3828)
by Tyler Moore 01 Aug '24

01 Aug '24

#### 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) - [ ] 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 Adding support for converting unsigned integers from database tables into kamailio pseudo variables usable in the routing config. This is quite useful when pulling `int unsigned` fields from a database, in modules that support "extra fields" in their module parameters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3828 -- Commit Summary -- * permissions: fixup uint support in address table reload * htable: add uint support when packing an htable * lib/srdb1: add uint support for db->pv conversions -- File Changes -- M src/lib/srdb1/db_ut.c (4) M src/modules/htable/ht_db.c (6) M src/modules/permissions/address.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3828.patch https://github.com/kamailio/kamailio/pull/3828.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3828 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3828(a)github.com>

4 9

git:master:d90101e1: lib/srdb1: add uint support for db->pv conversions
by Daniel-Constantin Mierla 01 Aug '24

01 Aug '24

Module: kamailio Branch: master Commit: d90101e1a50ef0c958e8e8a2f361198a28ea336a URL: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 lib/srdb1: add uint support for db->pv conversions - add support for converting unsigned integers into PVs. --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… Patch: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 9975672aeea..76210d5691e 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -596,6 +596,10 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.int_val; break; + case DB1_UINT: + pv.flags = PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.uint_val; + break; case DB1_DATETIME: pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.time_val;

1 0

git:master:772f261f: htable: add uint support when packing an htable
by Daniel-Constantin Mierla 01 Aug '24

01 Aug '24

Module: kamailio Branch: master Commit: 772f261f91685583af3db7cee2c227336eef7c42 URL: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 htable: add uint support when packing an htable - add support for packing unsigned integer values from DB, into hash tables. --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… Patch: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 7a22ff6c484..8b0c667411d 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -132,6 +132,8 @@ static int ht_pack_values( len += RES_ROWS(db_res)[row].values[c].val.blob_val.len; } else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) { len += 12; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) { + len += 12; } else { LM_ERR("unsupported data type for column %d\n", c); return -1; @@ -165,6 +167,11 @@ static int ht_pack_values( RES_ROWS(db_res)[row].values[c].val.int_val, &iv.len); strncpy(p, iv.s, iv.len); p += iv.len; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) { + iv.s = int2str( + RES_ROWS(db_res)[row].values[c].val.uint_val, &iv.len); + strncpy(p, iv.s, iv.len); + p += iv.len; } if(c + 1 < cols) { *p = ht->pack[1];

1 0

git:master:5f4f1f02: permissions: fixup uint support in address table reload
by Daniel-Constantin Mierla 01 Aug '24

01 Aug '24

Module: kamailio Branch: master Commit: 5f4f1f027132a1e4cdc2528a0d65e777a0a01da7 URL: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 permissions: fixup uint support in address table reload - add support for converting unsigned integer values directly, in address table rpc reload. --- Modified: src/modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… Patch: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index c05811f73f9..3f825fba010 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -192,41 +192,49 @@ int reload_address_db_table(address_tables_group_t *atg) ROW_N(row + i)); goto dberror; } - if((VAL_TYPE(val) != DB1_INT) || VAL_NULL(val) || (VAL_INT(val) <= 0)) { + if((VAL_TYPE(val) != DB1_INT && VAL_TYPE(val) != DB1_UINT) + || VAL_NULL(val) || (VAL_INT(val) <= 0)) { LM_DBG("failure during checks of database value 1 (group) in " "address table\n"); goto dberror; } - if((VAL_TYPE(val + 1) != DB1_STRING) - && (VAL_TYPE(val + 1) != DB1_STR)) { + if((VAL_TYPE(val + 1) != DB1_STRING && VAL_TYPE(val + 1) != DB1_STR) + || VAL_NULL(val + 1)) { LM_DBG("failure during checks of database value 2 (IP address) in " - "address table - not a string value\n"); - goto dberror; - } - if(VAL_NULL(val + 1)) { - LM_DBG("failure during checks of database value 2 (IP address) in " - "address table - NULL value not permitted\n"); + "address table\n"); goto dberror; } - if((VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2)) { + if((VAL_TYPE(val + 2) != DB1_INT && VAL_TYPE(val + 2) != DB1_UINT) + || VAL_NULL(val + 2)) { LM_DBG("failure during checks of database value 3 (subnet " "size/CIDR) in address table\n"); goto dberror; } - if((VAL_TYPE(val + 3) != DB1_INT) || VAL_NULL(val + 3)) { + if((VAL_TYPE(val + 3) != DB1_INT && VAL_TYPE(val + 3) != DB1_UINT) + || VAL_NULL(val + 3)) { LM_DBG("failure during checks of database value 4 (port) in " "address table\n"); goto dberror; } + if(VAL_TYPE(val + 4) != DB1_STRING && VAL_TYPE(val + 4) != DB1_STR) { + LM_DBG("failure during checks of database value 5 (tag) in address " + "table\n"); + goto dberror; + } + gid = VAL_UINT(val); ips.s = (char *)VAL_STRING(val + 1); ips.len = strlen(ips.s); mask = VAL_UINT(val + 2); port = VAL_UINT(val + 3); - tagv.s = VAL_NULL(val + 4) ? NULL : (char *)VAL_STRING(val + 4); - if(tagv.s != NULL) { + if(VAL_NULL(val + 4)) { + tagv.s = NULL; + tagv.len = 0; + } else { + tagv.s = (char *)VAL_STRING(val + 4); tagv.len = strlen(tagv.s); } + if(reload_address_insert(atg, gid, &ips, mask, port, &tagv) < 0) { goto dberror; }

1 0

git:master:e273fc10: modules: readme files regenerated - msrp ... [skip ci]
by Kamailio Dev 01 Aug '24

01 Aug '24

Module: kamailio Branch: master Commit: e273fc10d65b41a407797fef0f9953c1615a88a2 URL: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-01T07:31:11+02:00 modules: readme files regenerated - msrp ... [skip ci] --- Modified: src/modules/msrp/README --- Diff: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c… Patch: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c…

1 0

[kamailio/kamailio] msrp: add frame forward (PR #3934)
by Bruno Santos 01 Aug '24

01 Aug '24

#### 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  Add a new forward function to the MSRP module that adds the ability to perform MSRP proxying. The forward function allows frame replaying without multi-path. The frame can be relayed unmodified, or with a custom To/From-Path. If a replacement To-Path is provided, then the From-Path is replace either by the original To-Path or the replacement From-Path. Either the destination must be set prior or a replacement To-Path must be provided. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3934 -- Commit Summary -- * msrp: add forward support with path replacement -- File Changes -- M src/modules/msrp/doc/msrp_admin.xml (38) M src/modules/msrp/msrp_mod.c (72) M src/modules/msrp/msrp_netio.c (129) M src/modules/msrp/msrp_netio.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3934.patch https://github.com/kamailio/kamailio/pull/3934.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3934 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3934(a)github.com>

3 5

git:master:aa417aca: msrp: add forward support with path replacement
by Daniel-Constantin Mierla 01 Aug '24

01 Aug '24

Module: kamailio Branch: master Commit: aa417aca610b1c8a623847c22d9becba9a343241 URL: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becb… Author: Bruno Santos <bsantos(a)cppdev.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T07:25:21+02:00 msrp: add forward support with path replacement - add function to allow forwarding of MSRP frames with optional To/From-Path replacement --- Modified: src/modules/msrp/doc/msrp_admin.xml Modified: src/modules/msrp/msrp_mod.c Modified: src/modules/msrp/msrp_netio.c Modified: src/modules/msrp/msrp_netio.h --- Diff: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becb… Patch: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becb…

1 0

git:master:83f2dd24: dispatcher: return oc seq, min and max attrs in rpc list
by Daniel-Constantin Mierla 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 83f2dd24e404eead32361079fca1fd68976e81c8 URL: https://github.com/kamailio/kamailio/commit/83f2dd24e404eead32361079fca1fd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T16:07:17+02:00 dispatcher: return oc seq, min and max attrs in rpc list --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/83f2dd24e404eead32361079fca1fd6… Patch: https://github.com/kamailio/kamailio/commit/83f2dd24e404eead32361079fca1fd6… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 5d61d00ffd8..440b4b96030 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1869,14 +1869,15 @@ int ds_rpc_print_set( ipbuf[0] = '\0'; ip_addr2sbufz( &node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssddjjujjj", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjjujjjj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, "PROTOID", (int)node->dlist[j].proto, "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, "DNSTIME_USEC", (unsigned long)node->dlist[j].dnstime.tv_usec, "OCRATE", node->dlist[j].attrs.ocrate, "OCIDX", - (unsigned long)node->dlist[j].ocidx, "OCTIME_SEC", + (unsigned long)node->dlist[j].ocidx, "OCSEQ", + (unsigned long)node->dlist[j].ocseq, "OCTIME_SEC", (unsigned long)node->dlist[j].octime.tv_sec, "OCTIME_USEC", (unsigned long)node->dlist[j].octime.tv_usec) @@ -1892,7 +1893,7 @@ int ds_rpc_print_set( rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSSS", "BODY", + if(rpc->struct_add(wh, "SSdddSSSjj", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) @@ -1910,7 +1911,9 @@ int ds_rpc_print_set( "OBPROXY", (node->dlist[j].attrs.obproxy.s) ? &(node->dlist[j].attrs.obproxy) - : &data) + : &data, + "OCMIN", node->dlist[j].attrs.ocmin, "OCMAX", + node->dlist[j].attrs.ocmax) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

1 0

git:master:604fd278: dispatcher: always return attrs in rpc list full mode
by Daniel-Constantin Mierla 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 604fd2787620de87585ba17fb6a6961b3b999331 URL: https://github.com/kamailio/kamailio/commit/604fd2787620de87585ba17fb6a6961… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T16:01:38+02:00 dispatcher: always return attrs in rpc list full mode --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/604fd2787620de87585ba17fb6a6961… Patch: https://github.com/kamailio/kamailio/commit/604fd2787620de87585ba17fb6a6961… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 74ee7cc8e8d..5d61d00ffd8 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1886,7 +1886,8 @@ int ds_rpc_print_set( } } - if(mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s != NULL) { + if((mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s != NULL) + || (mode == DS_RPC_PRINT_FULL)) { if(rpc->struct_add(vh, "{", "ATTRS", &wh) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1;

1 0

git:master:41016d18: dispatcher: range checks for oc rate min/max limits
by Daniel-Constantin Mierla 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 41016d1835c1ab62b7d3c0f6299fae727a6f7ed3 URL: https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T15:57:01+02:00 dispatcher: range checks for oc rate min/max limits --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae7… Patch: https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8295145da0f..5e6f7da8926 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -411,9 +411,15 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) if(dest->attrs.ocmax > 100) { dest->attrs.ocmax = 100; } + if(dest->attrs.ocmax <= 0) { + dest->attrs.ocmax = 100; + } if(dest->attrs.ocmin > 100) { dest->attrs.ocmin = 0; } + if(dest->attrs.ocmin < 0) { + dest->attrs.ocmin = 0; + } if(dest->attrs.ocrate > 100) { dest->attrs.ocrate = 0; }

1 0

git:master:08ee7330: dispatcher: intit oc rate max limit
by Daniel-Constantin Mierla 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 08ee7330922e9e2b4d8fd8d5f63f596c84e2c81c URL: https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T15:50:45+02:00 dispatcher: intit oc rate max limit --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596… Patch: https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index bdb615ad3ea..8295145da0f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -603,6 +603,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) dp->flags = flags; dp->priority = priority; dp->dload = dload; + dp->attrs.ocmax = 100; if(ds_set_attrs(dp, attrs) < 0) { LM_ERR("cannot set attributes!\n");

1 0

git:master:629a5189: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 629a518991ab204a45f625d82fbe8a0ccd247cd6 URL: https://github.com/kamailio/kamailio/commit/629a518991ab204a45f625d82fbe8a0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-31T07:46:11+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/629a518991ab204a45f625d82fbe8a0… Patch: https://github.com/kamailio/kamailio/commit/629a518991ab204a45f625d82fbe8a0… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 6a5e0663bdf..8986ee4df23 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -503,12 +503,14 @@ event_route[network:msg] { 4.7. msg_iflag_set(flagname) Set internal SIP message flag. The parameter flagname can be: - USE_UAC_FROM, USE_UAC_TO or UAC_AUTH. + USE_UAC_FROM, USE_UAC_TO, UAC_AUTH or a number from 0 to 64 (the + meaning of each value can be found in source code). This functions should not be used in configuration file for (re)setting the internal flags, those are done by various functions internally, however, in very particular cases they might be useful (e.g., changing - From/To via textops functions). + From/To via textops functions, or during testing of C code + development). This function can be used from ANY_ROUTE.

1 0

git:master:37e971f7: corex: docs updated for msg_iflag_set()
by Daniel-Constantin Mierla 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 37e971f72c1783266ee29c02434361aaf2c819ed URL: https://github.com/kamailio/kamailio/commit/37e971f72c1783266ee29c02434361a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T07:41:43+02:00 corex: docs updated for msg_iflag_set() --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/37e971f72c1783266ee29c02434361a… Patch: https://github.com/kamailio/kamailio/commit/37e971f72c1783266ee29c02434361a… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 3cdad0aa2a5..3d6ff893808 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -469,13 +469,15 @@ event_route[network:msg] { </title> <para> Set internal SIP message flag. The parameter flagname can be: - USE_UAC_FROM, USE_UAC_TO or UAC_AUTH. + USE_UAC_FROM, USE_UAC_TO, UAC_AUTH or a number from 0 to 64 + (the meaning of each value can be found in source code). </para> <para> This functions should not be used in configuration file for (re)setting the internal flags, those are done by various functions internally, however, in very particular cases they - might be useful (e.g., changing From/To via textops functions). + might be useful (e.g., changing From/To via textops functions, + or during testing of C code development). </para> <para> This function can be used from ANY_ROUTE.

1 0

git:master:82c786fd: corex: functions to manage iflags can get 0..63 parameter value
by Daniel-Constantin Mierla 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 82c786fde7a635738c905899fb6edc9b7d1a2b67 URL: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T07:41:43+02:00 corex: functions to manage iflags can get 0..63 parameter value --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… Patch: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index e853032cd7f..de2fb03b5fd 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -587,6 +587,7 @@ static msg_iflag_name_t _msg_iflag_list[] = { static unsigned long long msg_lookup_flag(str *fname) { int i; + for(i = 0; _msg_iflag_list[i].name.len > 0; i++) { if(fname->len == _msg_iflag_list[i].name.len && strncasecmp(_msg_iflag_list[i].name.s, fname->s, fname->len) @@ -594,7 +595,22 @@ static unsigned long long msg_lookup_flag(str *fname) return _msg_iflag_list[i].value; } } - return 0; + if(fname->len < 1 || fname->len > 2) { + return 0; + } + if(!(fname->s[0] >= '0' && fname->s[0] <= '9')) { + return 0; + } + if(fname->len == 1) { + return 1ULL << (fname->s[0] - '0'); + } + if(!(fname->s[1] >= '0' && fname->s[1] <= '9')) { + return 0; + } + if((10 * (fname->s[0] - '0') - (fname->s[1] - '0')) > 63) { + return 0; + } + return 1ULL << (10 * (fname->s[0] - '0') - (fname->s[1] - '0')); } /**

1 0

[kamailio/kamailio] Kamailio crash with DMQ!? (Issue #3905)
by Benjamin 30 Jul '24

30 Jul '24

### Description Kamailio version 5.7.4 crashed with a core file. Maybe it's related to the dmq module. #### Debugging Data ``` (gdb) bt full #0 atomic_inc_int (var=0x7f5700000000) at ../../core/parser/../mem/../atomic/atomic_x86.h:236 No locals. #1 cfg_update_local (no_cbs=<optimized out>) at ../../core/cfg/cfg_struct.h:381 group = <optimized out> last_cb = 0x7f57c99545e0 prev_cb = <optimized out> group = <optimized out> last_cb = <optimized out> prev_cb = <optimized out> __func__ = "cfg_update_local" #2 worker_loop (id=id@entry=2) at worker.c:57 worker = <optimized out> current_job = <optimized out> peer_response = {resp_code = 1, content_type = {s = 0x55ea7b42cfca <init_mod_child+90> "\205\300\017\210\r\002", len = 15}, reason = {s = 0x0, len = 2}, body = { s = 0x7ffcf6347c30 "\001", len = 2069833640}} ret_value = <optimized out> not_parsed = <optimized out> dmq_node = 0x0 __func__ = "worker_loop" #3 0x00007f57d9426a11 in child_init (rank=<optimized out>) at dmq.c:321 i = 2 newpid = <optimized out> __func__ = "child_init" #4 0x000055ea7b42cfca in init_mod_child (m=0x7f57dd005640, rank=rank@entry=0) at core/sr_module.c:911 ret = 0 __func__ = "init_mod_child" #5 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd005b90, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #6 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd006910, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #7 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd006e70, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #8 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd008660, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #9 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd0089d0, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #10 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd008d70, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #11 0x000055ea7b43239e in init_child (rank=rank@entry=0) at core/sr_module.c:990 ret = <optimized out> type = <optimized out> __func__ = "init_child" #12 0x000055ea7b288365 in main_loop () at main.c:1929 i = <optimized out> pid = <optimized out> si = 0x0 si_desc = "udp receiver child=15 sock=172.20.21.4:5060\000\000\000\000\000H\211\064\366\374\177\000\000\301'C{\352U\000\000\276\000\000\000\002\000\000\000\017\247`{\352U\000\000\062\323b{\352U\000\000U\024\000\000\000\000\000\000\004\000_{\352U\000\000\000\272\030D\344\223ԃ\270Rc{\352U\000\000\004\000\000\000\000\000\000" nrprocs = <optimized out> woneinit = 1 __func__ = "main_loop" error = <optimized out> #13 0x000055ea7b27be9e in main (argc=<optimized out>, argv=<optimized out>) at main.c:3213 cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0x7ffcf6349e4e "" tmp_len = -554008000 port = 32599 proto = 0 ahost = 0x0 aport = 0 options = 0x55ea7b5f2cc8 ":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 = 1892320457 rfd = <optimized out> debug_save = <optimized out> debug_flag = <optimized out> dont_fork_cnt = <optimized out> n_lst = <optimized out> p = <optimized out> st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = {tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 20 times>, " ", '\000' <repeats 35 times>, "\006\000\000\000\000\000\000\200", '\000' <repeats 56 times>, "\006\000\000\000\000\000\000\200", '\000' <repeats 168 times>... option_index = 9 long_options = {{name = 0x55ea7b5f12ea "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55ea7b5fa98e "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x55ea7b60a690 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55ea7b5f12ef "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55ea7b5f12f5 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55ea7b5f12fe "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55ea7b5f1308 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55ea7b5f1312 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55ea7b5f131d "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x55ea7b5f1326 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55ea7b5faaab "debug", has_arg = 1, flag = 0x0, val = 1032}, { name = 0x55ea7b5f1331 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55ea7b5f133b "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x55ea7b5f1342 "all-errors", has_arg = 0, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals No locals. (gdb) list 231 in ../../core/parser/../mem/../atomic/atomic_x86.h ``` #### Log Messages ``` Jul 2 15:24:44 hostname kernel: kamailio[1098]: segfault at 7f5700000000 ip 00007f57d94467a0 sp 00007ffcf6347b00 error 6 in dmq.so[7f57d9426000+23000] ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (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, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: compiled with gcc 10.2.1 ``` * **Operating System**: ``` Debian: 11.10 - Bullseye Linux 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/3905 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3905(a)github.com>

3 14

[kamailio/kamailio] Suspected mem leak in the pua and request for ideas (Issue #3928)
by Andrew Pogrebennyk 30 Jul '24

30 Jul '24

Hi! it seems the pua module in send_subscribe ( ) is leaking some memory because the hentity is not released. According to memory allocations the shmem allocated for hentity is not cleaned. ``` 1454582 file = 0x70e59fd30209 "usrloc: ../../core/ut.h", func = 0x70e59fd326c8 <__func__.16> "shm_str_dup", mname = 0x70e59fd2fdf0 "usrloc", line = 722 698090 file = 0x604218f2fcd5 "core: core/xavp.c", func = 0x604218f31988 <__func__.9> "xavp_new_value", mname = 0x604218f2fcd0 "core", line = 100 360187 file = 0x70e59fd30663 "usrloc: ucontact.c", func = 0x70e59fd326b8 <__func__.17> "new_ucontact", mname = 0x70e59fd2fdf0 "usrloc", line = 94 34208 file = 0x70e59fc91ae9 "pua: send_subscribe.c", func = 0x70e59fc94c80 <__func__.2> "subscribe_cbparam", mname = 0x70e59fc917e0 "pua", line = 773 5569 file = 0x70e59fc91ae9 "pua: send_subscribe.c", func = 0x70e59fc94ca0 <__func__.1> "subs_cbparam_indlg", mname = 0x70e59fc917e0 "pua", line = 861 64 file = 0x70e5a231f424 "tmx: tmx_pretran.c", func = 0x70e5a2320230 <__func__.0> "tmx_check_pretran", mname = 0x70e5a231f420 "tmx", line = 271 64 file = 0x70e5a231f424 "tmx: tmx_pretran.c", func = 0x70e5a2320230 <__func__.0> "tmx_check_pretran", mname = 0x70e5a231f420 "tmx", line = 250 7 file = 0x70e59fc86854 "pua: event_list.c", func = 0x70e59fc86ad0 <__func__.1> "add_pua_event", mname = 0x70e59fc86850 "pua", line = 72 3 file = 0x70e5a297c249 "license: ../../core/ut.h", func = 0x70e5a297d4f8 <__func__.3> "shm_str_dup", mname = 0x70e5a297c000 "license", line = 722 3 file = 0x70e59fd329d4 "usrloc: udomain.c", func = 0x70e59fd35660 <__func__.22> "build_stat_name", mname = 0x70e59fd328a0 "usrloc", line = 56 ``` According to mod_stats for shmem over RPC the pua module was taking double as much memory as usrloc on the busy system. I have tried to address the issue shown on lines 773 and 861 and added clearing of hentity at the end of send_subscribe () : but it had caused the subscribe_200 outside of dialog to crash kamailio because of running the tm callback that accesses the hentity which is already free'd So I thought perhaps another approach is required and the tm callback should clean it, while I must say i do not 100% clear understand why this needs to be so complicated compared to other modules. Perhaps i have missed another bug and overcomplicated things because the uac_r seems to be cleaned just fine. The issue around the hentity does not seem to be solved in the latest releases while this is 5.3-something custom build. Anyway my last resort that could help is convert to use tm to clear memory once it is done, in tm/uac.c : t_uac_prepare() is registering a callback with release function ``` if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, *(uac_r->cb), uac_r->cbp, NULL)!=1){ ret=E_OUT_OF_MEM; LM_ERR("short of tmcb shmem\n"); goto error1; } int insert_tmcb(struct tmcb_head_list *cb_list, int types, transaction_cb f, void *param, release_tmcb_param rel_func) { ``` is there any example of using such a relfunc in the other modules? Or anyone else has see the pua causing a mem leak when it is subscribed to reginfo from the config? I would appreciate some ideas what could be the issue and the solution. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3928 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3928(a)github.com>

4 8

git:master:fe56aa38: tls_wolfssl: legacy clean-up
by S-P Chan 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: fe56aa38a88a9961141bbcc2fc26d384af63734e URL: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-30T19:47:06+08:00 tls_wolfssl: legacy clean-up --- Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… Patch: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… --- diff --git a/src/modules/tls_wolfssl/tls_init.c b/src/modules/tls_wolfssl/tls_init.c index 2c8c4a4965c..8f2f994e961 100644 --- a/src/modules/tls_wolfssl/tls_init.c +++ b/src/modules/tls_wolfssl/tls_init.c @@ -221,7 +221,6 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) #endif return p; } - #else /*TLS_MALLOC_DBG */ static void *ser_malloc(size_t size) { @@ -234,6 +233,7 @@ static void *ser_realloc(void *ptr, size_t size) } #endif + static void ser_free(void *ptr) { if(ptr) { @@ -241,45 +241,6 @@ static void ser_free(void *ptr) } } -#if 0 -// up align memory allocations to 16 bytes for -// wolfSSL --enable-aligndata=yes (the default) -static const int MAX_ALIGN = __alignof__(max_align_t); - -static void* ser_malloc(size_t size) -{ - char* ptr = shm_malloc(size + MAX_ALIGN); - int pad = MAX_ALIGN - ((long) ptr % MAX_ALIGN); // 8 or 16 bytes - - memset(ptr, pad, pad); - return ptr + pad; -} - -static void* ser_realloc(void *ptr, size_t new_size) -{ - if(!ptr) return ser_malloc(new_size); - - int pad = *((char*)ptr - 1); // 8 or 16 bytes - char *real_ptr = (char*)ptr - pad; - - char *new_ptr = shm_realloc(real_ptr, new_size+MAX_ALIGN); - int new_pad = MAX_ALIGN - ((long) new_ptr % MAX_ALIGN); - if (new_pad != pad) { - memmove(new_ptr + new_pad, new_ptr + pad, new_size); - memset(new_ptr, new_pad, new_pad); - } - - return new_ptr + new_pad; -} - -static void ser_free(void *ptr) -{ - if (ptr) { - int pad = *((unsigned char *)ptr - 1); - shm_free((unsigned char*)ptr - pad); - } -} -#endif /* * Initialize TLS socket diff --git a/src/modules/tls_wolfssl/tls_wolfssl_mod.c b/src/modules/tls_wolfssl/tls_wolfssl_mod.c index e95cecb7be5..9a195b76b39 100644 --- a/src/modules/tls_wolfssl/tls_wolfssl_mod.c +++ b/src/modules/tls_wolfssl/tls_wolfssl_mod.c @@ -262,22 +262,6 @@ static struct tls_hooks tls_h = { }; -#if 0 -/* - * Create TLS configuration from modparams - */ -static tls_domains_cfg_t* tls_use_modparams(void) -{ - tls_domains_cfg_t* ret; - - ret = tls_new_cfg(); - if (!ret) return; - - -} -#endif - - static int mod_init(void) { int method;

1 0

git:master:072c4433: corex: switch to unsigned long long for iflag lookup
by Daniel-Constantin Mierla 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: 072c44330297c653675b5078fb0facdc399a5ab4 URL: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T09:07:36+02:00 corex: switch to unsigned long long for iflag lookup --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… Patch: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index f055af88c8d..e853032cd7f 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -584,7 +584,7 @@ static msg_iflag_name_t _msg_iflag_list[] = { /** * */ -static int msg_lookup_flag(str *fname) +static unsigned long long msg_lookup_flag(str *fname) { int i; for(i = 0; _msg_iflag_list[i].name.len > 0; i++) { @@ -594,21 +594,22 @@ static int msg_lookup_flag(str *fname) return _msg_iflag_list[i].value; } } - return -1; + return 0; } + /** * */ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -621,14 +622,14 @@ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) */ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -641,14 +642,14 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) */ static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; }

1 0

git:master:fdb0ef98: corex: proper check for iflag lookup return code
by Daniel-Constantin Mierla 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: fdb0ef987ca2b013104b06ece006f67bf8ae07d3 URL: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T08:55:08+02:00 corex: proper check for iflag lookup return code --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… Patch: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 4f3214049b6..f055af88c8d 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -608,7 +608,7 @@ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv == 1) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -628,7 +628,7 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv < 0) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -648,7 +648,7 @@ static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv < 0) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; }

1 0

git:master:70606e3e: corex: small formatting of iflag list
by Daniel-Constantin Mierla 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: 70606e3ea575228b3ccc662d6f9048aa0eb899ce URL: https://github.com/kamailio/kamailio/commit/70606e3ea575228b3ccc662d6f9048a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T08:44:03+02:00 corex: small formatting of iflag list --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70606e3ea575228b3ccc662d6f9048a… Patch: https://github.com/kamailio/kamailio/commit/70606e3ea575228b3ccc662d6f9048a… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 6739e4cee16..4f3214049b6 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -571,10 +571,14 @@ typedef struct _msg_iflag_name int value; } msg_iflag_name_t; +/* clang-format off */ static msg_iflag_name_t _msg_iflag_list[] = { - {str_init("USE_UAC_FROM"), FL_USE_UAC_FROM}, - {str_init("USE_UAC_TO"), FL_USE_UAC_TO}, - {str_init("UAC_AUTH"), FL_UAC_AUTH}, {{0, 0}, 0}}; + {str_init("USE_UAC_FROM"), FL_USE_UAC_FROM}, + {str_init("USE_UAC_TO"), FL_USE_UAC_TO}, + {str_init("UAC_AUTH"), FL_UAC_AUTH}, + {{0, 0}, 0} +}; +/* clang-format on */ /**

1 0

git:master:f4e14a94: tls_wolfssl: upstream v5.7.2-stable
by S-P Chan 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: f4e14a945d69e1555aa76431202693f0c855c916 URL: https://github.com/kamailio/kamailio/commit/f4e14a945d69e1555aa76431202693f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-30T07:43:14+08:00 tls_wolfssl: upstream v5.7.2-stable --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/f4e14a945d69e1555aa76431202693f… Patch: https://github.com/kamailio/kamailio/commit/f4e14a945d69e1555aa76431202693f… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 66596ad9e1d..00e42151ca0 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 66596ad9e1d7efa8479656872cf09c9c1870a02e +Subproject commit 00e42151ca061463ba6a95adb2290f678cbca472

1 0

git:master:280c6cd0: tls_wolfssl: Makefile logging: reduce to info level
by S-P Chan 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: 280c6cd0fac7be75dede54c8e4a96ccf03312371 URL: https://github.com/kamailio/kamailio/commit/280c6cd0fac7be75dede54c8e4a96cc… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-30T07:39:57+08:00 tls_wolfssl: Makefile logging: reduce to info level --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/280c6cd0fac7be75dede54c8e4a96cc… Patch: https://github.com/kamailio/kamailio/commit/280c6cd0fac7be75dede54c8e4a96cc… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index dda5ad4779e..e327def77c1 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -62,4 +62,4 @@ clean-all: clean-wolfssl clean-module .PHONY: clean-wolfssl clean-module clean-all # debugging for dependency on lib/wolfssl -$(warning sources = $(sources), auto_gen = $(auto_gen), objs = $(objs)) +$(info sources = $(sources), auto_gen = $(auto_gen), objs = $(objs))

1 0

[kamailio/kamailio] pkg: Add systemd template for starting multiple kamailio services (PR #3904)
by Xenofon Karamanos 29 Jul '24

29 Jul '24

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR aims to allow multiple kamailio instances with different configs to be managed by systemd. The new `kamailio@.service` is the systemd template file, where one can provide an instance name after `systemctl start kamailio@dev`, to start a new kamailio instance with name `kamailio-dev` and use config file found in `/etc/kamailio/kamailio-dev.cfg`. I tested that this file and its content can work by placing the file in `/etc/systemd/system/kamailio@.service` and using the above `dev` instance name as an example. Kamailio loads and handles any new messages along with the default kamailio service. My question right now, as I am not really familiar with the packaging workflow, is this an appropriate way to accomplish it. If yes what should be modified to install this alongside the normal `kamailio.service`. Any feedback and review is appreciated and greatly needed! Thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3904 -- Commit Summary -- * pkg: Add systemd template for starting multiple kamailio services -- File Changes -- A pkg/kamailio/deb/debian/kamailio@.service (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3904.patch https://github.com/kamailio/kamailio/pull/3904.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3904 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3904(a)github.com>

3 21

git:master:097cd735: pkg/kamailio/deb: refresh after service template added
by Victor Seva 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: 097cd7353efc251fb764e6f7c88e3330c794d369 URL: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-29T12:31:10+02:00 pkg/kamailio/deb: refresh after service template added at a8cb23903b271a1b78456fed5da8e10474aee405 --- Added: pkg/kamailio/deb/bionic/kamailio@.service Added: pkg/kamailio/deb/bookworm/kamailio@.service Added: pkg/kamailio/deb/bullseye/kamailio@.service Added: pkg/kamailio/deb/buster/kamailio@.service Added: pkg/kamailio/deb/focal/kamailio@.service Added: pkg/kamailio/deb/jammy/kamailio@.service Added: pkg/kamailio/deb/jessie/kamailio@.service Added: pkg/kamailio/deb/precise/kamailio@.service Added: pkg/kamailio/deb/sid/kamailio@.service Added: pkg/kamailio/deb/stretch/kamailio@.service Added: pkg/kamailio/deb/trusty/kamailio@.service Added: pkg/kamailio/deb/wheezy/kamailio@.service Added: pkg/kamailio/deb/xenial/kamailio@.service --- Diff: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333… Patch: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333…

1 0

git:master:add65a47: sdpops: use proper include guard for the file
by Daniel-Constantin Mierla 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: add65a4799c1650ea36c657d190fa0027e798404 URL: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T11:24:00+02:00 sdpops: use proper include guard for the file --- Modified: src/modules/sdpops/sdpops_path.h --- Diff: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… Patch: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… --- diff --git a/src/modules/sdpops/sdpops_path.h b/src/modules/sdpops/sdpops_path.h index 0e7d7088a97..620d9981a00 100644 --- a/src/modules/sdpops/sdpops_path.h +++ b/src/modules/sdpops/sdpops_path.h @@ -20,8 +20,8 @@ */ -#ifndef _SDPOPS_DATA_H_ -#define _SDPOPS_DATA_H_ +#ifndef _SDPOPS_PATH_H_ +#define _SDPOPS_PATH_H_ #include "../../core/str.h" #include "../../core/parser/sdp/sdp.h"

1 0

git:master:49a9c0a0: cplc: use long long constants for operations
by Daniel-Constantin Mierla 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: 49a9c0a0f391c2e9fc45dff7c37a087dde0f7ba3 URL: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T10:07:43+02:00 cplc: use long long constants for operations --- Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… Patch: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… --- diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index b22fe5e8cf9..aea3265d8e8 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -264,8 +264,9 @@ int cpl_ac_print(cpl_ac_tm_p _atp) return -1; } - printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (unsigned long long)_atp->time, - _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); + printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", + (unsigned long long)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, + _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year + 1900, _atp->t.tm_mon + 1, _atp->t.tm_mday); printf("Year day: %d\nYear week-day: %d\nYear week: %d\n", _atp->t.tm_yday, @@ -994,8 +995,8 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) ? REC_MATCH : REC_NOMATCH; #ifdef USE_YWEEK_U - _t0 -= _trp->ts.tm_wday * 24 * 3600; - _t1 -= _atp->t.tm_wday * 24 * 3600; + _t0 -= 24ULL * _trp->ts.tm_wday * 3600; + _t1 -= 24ULL * _atp->t.tm_wday * 3600; #else _t0 -= ((_trp->ts.tm_wday + 6) % 7) * 24 * 3600; _t1 -= ((_atp->t.tm_wday + 6) % 7) * 24 * 3600; @@ -1004,7 +1005,7 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) ? REC_MATCH : REC_NOMATCH; case FREQ_MONTHLY: - _t0 = (_atp->t.tm_year - _trp->ts.tm_year) * 12 + _atp->t.tm_mon + _t0 = 12ULL * (_atp->t.tm_year - _trp->ts.tm_year) + _atp->t.tm_mon - _trp->ts.tm_mon; return (_t0 % _trp->interval == 0) ? REC_MATCH : REC_NOMATCH; case FREQ_YEARLY:

1 0

git:master:fc2f34e8: core: tcp - use long long constants for operations
by Daniel-Constantin Mierla 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52 URL: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T09:44:47+02:00 core: tcp - use long long constants for operations --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… Patch: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8fa6566c14b..fd60918fe34 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -449,9 +449,9 @@ int tcp_read_headers(struct tcp_connection *c, rd_conn_flags_t *read_flags) if(bytes <= 0) return bytes; gettimeofday(&tvnow, NULL); - tvdiff = 1000000 * (tvnow.tv_sec - r->tvrstart.tv_sec) + tvdiff = 1000000LL * (tvnow.tv_sec - r->tvrstart.tv_sec) + (tvnow.tv_usec - r->tvrstart.tv_usec); - if(tvdiff >= ksr_tcp_msg_read_timeout * 1000000) { + if(tvdiff >= 1000000LL * ksr_tcp_msg_read_timeout) { LM_ERR("message reading timeout after %lld usec\n", tvdiff); r->parsed = r->buf; r->content_len = 0;

1 0

Contribute with AUR package
by Nikos Toutountzoglou 29 Jul '24

29 Jul '24

Dear Sirs, I have adopted an orphaned AUR package and tried to fine tune it to be used with Your great Kamailio open source project. I can continue to maintain it in the AUR space. If anything needs to be modified in the package please let me know. Link to the package: https://aur.archlinux.org/packages/kamailio or web search !aur kamailio Regards, Nikos

2 1

git:master:e86d6ee3: db_berkeley: buffer size set to the argument of strftime()
by Daniel-Constantin Mierla 27 Jul '24

27 Jul '24

Module: kamailio Branch: master Commit: e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b URL: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-27T18:16:40+02:00 db_berkeley: buffer size set to the argument of strftime() --- Modified: src/modules/db_berkeley/km_bdb_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… Patch: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… --- diff --git a/src/modules/db_berkeley/km_bdb_lib.c b/src/modules/db_berkeley/km_bdb_lib.c index 06feb6e4bac..4761084c974 100644 --- a/src/modules/db_berkeley/km_bdb_lib.c +++ b/src/modules/db_berkeley/km_bdb_lib.c @@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp) { char *s; char fn[1024]; - char d[64]; + char d[128]; FILE *fp = NULL; struct tm *t; int bl;

1 0

git:master:3333611a: core: cfg select - check res when getting the variable
by Daniel-Constantin Mierla 26 Jul '24

26 Jul '24

Module: kamailio Branch: master Commit: 3333611a3ef9078cbcb9867db88921f0c48fce1b URL: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 core: cfg select - check res when getting the variable --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Patch: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index e6c599a204e..b4e9e6ebef7 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -212,7 +212,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) group = (cfg_group_t *)s->params[1].v.p; var = (cfg_mapping_t *)s->params[2].v.p; - if(!group || !var) + if(!group || !var || !res) return -1; /* use the module's handle to access the variable, so the variables

1 0

git:master:660a0192: xprint: return on mod init error case
by Daniel-Constantin Mierla 26 Jul '24

26 Jul '24

Module: kamailio Branch: master Commit: 660a019263b81d318700c205531bf4e042c912cf URL: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 xprint: return on mod init error case --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Patch: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index b6fc5066556..fda12a82fc3 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1899,6 +1899,7 @@ int xl_mod_init() s = NULL; str_ipaddr.len = 0; PKG_MEM_ERROR_FMT("for str_ipaddr\n"); + return -1; } } else if(strncmp(str_ipaddr.s, s, str_ipaddr.len) != 0) {

1 0

[kamailio/kamailio] Advertise in listen directive doesn't let to use hostname without port (Issue #3932)
by Evgenii Buchnev 26 Jul '24

26 Jul '24

Hey Team, Thank you for the awesome software ### Description Neither option work: `listen=... advertise some.custom.hostname.io` `listen=... advertise some.custom.hostname.io:0` to make Kamailio present only hostname(without port) in Record-Route headers, affects NAPTR/SRV. ### Troubleshooting ============ _Hostname without port - still gives port 5081 in Record-Route_ **kamailio.cfg** ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io name "provider_socket_tls"` ... **sngrep, 200 OK for INVITE** ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=494.6e51>` ... **kamcmd corex.list_sockets** ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ======== _Hostname with port 0 - still gives port 5081 in Record-Route_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:0 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=042.7721>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ============ _Hostname with explicit different port 8888 - gives that port 8888 in Record-Route (to confirm config works)_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:8888 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:8888;transport=tls;r2=on;lr;did=dae.ac31>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:8888 } ``` ... #### Reproduction Please see Troubleshooting section #### Debugging Data Please see Troubleshooting section #### Log Messages N/A #### SIP Traffic Please see Troubleshooting section ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) dbe51d 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: dbe51d compiled on 07:13:22 Jul 17 2024 with gcc 12.2.0) ``` * **Operating System**: ``` [dev]root@[voiceproxy]:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm [dev]root@[voiceproxy]:~# uname -a Linux i-0875d7720d6152612 6.1.0-23-cloud-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.99-1 (2024-07-15) x86_64 GNU/Linux [dev]root@[voiceproxy]:~# cat /etc/*relea* ID=ec2 VERSION="20240702-1796" PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` * **Might be related** : https://github.com/kamailio/kamailio/issues/1884 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3932 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3932(a)github.com>

2 4

[kamailio/kamailio] cdp: fix use after free in transaction call backs (PR #3931)
by Rick Barenthin 25 Jul '24

25 Jul '24

If the traction is set to auto drop, the memory will be freed and with it the next pointer.   #### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The use after free caused on a Load tested system crashes. Now the next pointer is saved before executing the callback and handle the auto drop. Then the stored next pointer is used to continue the iteration over the callbacks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3931 -- Commit Summary -- * cdp: fix use after free in transaction call backs -- File Changes -- M src/modules/cdp/transaction.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3931.patch https://github.com/kamailio/kamailio/pull/3931.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3931 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3931(a)github.com>

3 2

git:master:a71bd9d9: cdp: fix use after free in transaction call backs
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a71bd9d9424456ef1167468c5bbbfd38b1099e89 URL: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T12:20:59+02:00 cdp: fix use after free in transaction call backs If the traction is set to auto drop, the memory will be freed and with it the next pointer. --- Modified: src/modules/cdp/transaction.c --- Diff: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… Patch: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… --- diff --git a/src/modules/cdp/transaction.c b/src/modules/cdp/transaction.c index f1445ff15be..a2b97654dd0 100644 --- a/src/modules/cdp/transaction.c +++ b/src/modules/cdp/transaction.c @@ -256,10 +256,11 @@ int cdp_trans_timer(time_t now, void *ptr) /* do all queued callbacks */ x = cb_queue->head; while(x) { + n = x->next; (x->cb)(1, *(x->ptr), 0, (now - x->expires)); if(x->auto_drop) cdp_free_trans(x); - x = x->next; + x = n; } pkg_free(cb_queue);

1 0

[kamailio/kamailio] ims_qos_npn: fixed issues discovered by coverity (PR #3926)
by Dragos Vingarzan 25 Jul '24

25 Jul '24

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fixing issues discovered by Coverity You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3926 -- Commit Summary -- * ims_qos_npn: fixed issues discovered by coverity -- File Changes -- M src/modules/ims_qos_npn/rx_aar.c (12) M src/modules/ims_qos_npn/rx_avp.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3926.patch https://github.com/kamailio/kamailio/pull/3926.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3926 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3926(a)github.com>

2 2

git:master:79433959: ims_qos_npn: fixed missing breaks in switch and checks for null pointers
by Dragos Vingarzan 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: 7943395957c070a16553b16536e5be59b4719d9b URL: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-25T11:47:24+02:00 ims_qos_npn: fixed missing breaks in switch and checks for null pointers --- Modified: src/modules/ims_qos_npn/rx_aar.c Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… Patch: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… --- diff --git a/src/modules/ims_qos_npn/rx_aar.c b/src/modules/ims_qos_npn/rx_aar.c index fc99344c2c6..4423a0561b2 100644 --- a/src/modules/ims_qos_npn/rx_aar.c +++ b/src/modules/ims_qos_npn/rx_aar.c @@ -615,7 +615,7 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, //check if the src or dst port is 0 and if so then don't add to rx intportA = atoi(req_sdp_stream->port.s); - if(rpl) { + if(rpl_sdp_stream) { intportB = atoi(rpl_sdp_stream->port.s); } if(intportA != 0 && (rpl && intportB != 0)) { @@ -719,18 +719,20 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, auth->u.auth.generic_data, sdp_stream_num + 1, &req_sdp_stream->media, &ipA, &portA, &ipB, &portB, - rpl ? &rpl_sdp_stream->transport : 0, + rpl_sdp_stream ? &rpl_sdp_stream->transport : 0, &req_sdp_stream->raw_stream, - rpl ? &rpl_sdp_stream->raw_stream : 0, + rpl_sdp_stream ? &rpl_sdp_stream->raw_stream + : 0, direction, 0 /*This is a new mcd, we are not setting it as active*/); rx_add_media_component_description_avp(aar, sdp_stream_num + 1, &req_sdp_stream->media, &ipA, &portA, &ipB, &portB, - rpl ? &rpl_sdp_stream->transport : 0, + rpl_sdp_stream ? &rpl_sdp_stream->transport : 0, &req_sdp_stream->raw_stream, - rpl ? &rpl_sdp_stream->raw_stream : 0, + rpl_sdp_stream ? &rpl_sdp_stream->raw_stream + : 0, direction, AVP_EPC_Flow_Usage_No_Information); } add_flow = 1; diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index a0053138b4f..a2fd3188efe 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -1402,7 +1402,7 @@ int rx_mcc_mnc_to_sip_visited(str *dst, str src) } mcc = (100 * (src.s[0] - '0') + (10 * (src.s[1] - '0')) + ((src.s[2] - '0'))); - if(mcc < 0 || mcc >= 999) { + if(mcc >= 999) { LOG(L_ERR, "Invalid MCC value\n"); return 0; } @@ -1699,6 +1699,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 1: // SAI if(length >= 7) { @@ -1707,6 +1708,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 2: // RAI if(length >= 7) { @@ -1715,6 +1717,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 3 ... 127: // spare for future use break;

1 0

git:master:b4efe772: janssonrpcc: free new servers list on error
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: b4efe7725728392d0c8921c006d6fbc6455e9b8f URL: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T10:59:15+02:00 janssonrpcc: free new servers list on error --- Modified: src/modules/janssonrpcc/janssonrpc_srv.c --- Diff: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… Patch: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… --- diff --git a/src/modules/janssonrpcc/janssonrpc_srv.c b/src/modules/janssonrpcc/janssonrpc_srv.c index 73eb25ce62d..9b7ac31c084 100644 --- a/src/modules/janssonrpcc/janssonrpc_srv.c +++ b/src/modules/janssonrpcc/janssonrpc_srv.c @@ -90,6 +90,7 @@ int refresh_srv(jsonrpc_srv_t *srv_obj) srv_record = (struct srv_rdata *)l->rdata; if(srv_record == NULL) { free_rdata_list(head); + free_server_list(new_servers); ERR("BUG: null rdata\n"); return -1; }

1 0

git:master:a8cb2390: pkg: Add systemd template for starting multiple kamailio services
by Xenofon Karamanos 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a8cb23903b271a1b78456fed5da8e10474aee405 URL: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-07-25T11:11:36+03:00 pkg: Add systemd template for starting multiple kamailio services --- Added: pkg/kamailio/deb/debian/kamailio@.service --- Diff: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… Patch: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… --- diff --git a/pkg/kamailio/deb/debian/kamailio@.service b/pkg/kamailio/deb/debian/kamailio@.service new file mode 100644 index 00000000000..81c06394d17 --- /dev/null +++ b/pkg/kamailio/deb/debian/kamailio@.service @@ -0,0 +1,26 @@ +[Unit] +Description=Kamailio - the Open Source SIP Server (instance %i) +Documentation=man:kamailio(8) +Wants=network-online.target +After=network-online.target + +[Service] +Type=forking +User=kamailio +Group=kamailio +Environment='CFGFILE=/etc/kamailio/kamailio-%i.cfg' +Environment='SHM_MEMORY=64' +Environment='PKG_MEMORY=8' +EnvironmentFile=-/etc/default/kamailio-%i +EnvironmentFile=-/etc/default/kamailio-%i.d/* +# PIDFile requires a full absolute path +PIDFile=/run/kamailio-%i/kamailio.pid +# ExecStart requires a full absolute path +ExecStart=/usr/sbin/kamailio -P /run/kamailio-%i/kamailio.pid -Y /run/kamailio-%i -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY +Restart=on-failure +# /run/kamailio in tmpfs +RuntimeDirectory=kamailio-%i +RuntimeDirectoryMode=0770 + +[Install] +WantedBy=multi-user.target

1 0

git:master:a6c41571: core: cfg select - check res before initializing
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a6c415713bb209b03ff110d4ae891173d04ac471 URL: https://github.com/kamailio/kamailio/commit/a6c415713bb209b03ff110d4ae89117… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T08:44:15+02:00 core: cfg select - check res before initializing --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/a6c415713bb209b03ff110d4ae89117… Patch: https://github.com/kamailio/kamailio/commit/a6c415713bb209b03ff110d4ae89117… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index f3b2d681d3e..e6c599a204e 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -147,8 +147,10 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) int i; static char buf[INT2STR_MAX_LEN]; - res->s = 0; - res->len = 0; + if(res != NULL) { + res->s = 0; + res->len = 0; + } if(msg == NULL) { /* fixup call */

1 0

[kamailio/kamailio] t_uac_send parser does not like exclamation or other non alphabetic characters in Contact header (Issue #3682)
by xaled1 24 Jul '24

24 Jul '24

Hi there is an issue with the SIP parser for the t_uac_send function https://www.kamailio.org/docs/modules/devel/modules/tm.html#tm.f.t_uac_send If I call this function for example: t_uac_send("INVITE", "sip:test@123.123.123.123:5060", "", "" ,"Content-Type: text/plain\r\nContact: <sip:85951b3d-096c-95d6-5f05-4f38095aca9f@172.17.64.120:5060;transport=tcp>;+u.sip!devicename.ccm.cisco.com=\"SEP5486BC7F2BBC\"", "Testbody") Then the resulting request is broken - it's probably due to a character (exclamation mark?) in the Contact header.... I tested it with a call from kemi, but it probably also occurs when you run it with a normal kamailio -script tests -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3682 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3682(a)github.com>

3 4

git:master:7ba313f6: jsonrpcc: declare variables are the beginning of function
by Daniel-Constantin Mierla 24 Jul '24

24 Jul '24

Module: kamailio Branch: master Commit: 7ba313f6f96ffa6042c163027c0c7bb65106fef7 URL: https://github.com/kamailio/kamailio/commit/7ba313f6f96ffa6042c163027c0c7bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-24T10:43:18+02:00 jsonrpcc: declare variables are the beginning of function --- Modified: src/modules/jsonrpcc/netstring.c --- Diff: https://github.com/kamailio/kamailio/commit/7ba313f6f96ffa6042c163027c0c7bb… Patch: https://github.com/kamailio/kamailio/commit/7ba313f6f96ffa6042c163027c0c7bb… --- diff --git a/src/modules/jsonrpcc/netstring.c b/src/modules/jsonrpcc/netstring.c index be7a5de8108..9328a46215e 100644 --- a/src/modules/jsonrpcc/netstring.c +++ b/src/modules/jsonrpcc/netstring.c @@ -35,11 +35,13 @@ int netstring_read_fd(int fd, char **netstring) { int i, bytes; size_t len = 0; + size_t read_len = 0; + char buffer[10] = {0}; + char *buffer2 = NULL; + int x; *netstring = NULL; - char buffer[10] = {0}; - /* Peek at first 10 bytes, to get length and colon */ bytes = recv(fd, buffer, 10, MSG_PEEK); @@ -68,8 +70,8 @@ int netstring_read_fd(int fd, char **netstring) return NETSTRING_ERROR_NO_COLON; /* Read the whole string from the buffer */ - size_t read_len = i + len + 1; - char *buffer2 = pkg_malloc(read_len); + read_len = i + len + 1; + buffer2 = pkg_malloc(read_len); if(!buffer2) { LM_ERR("Out of memory!"); return -1; @@ -90,8 +92,6 @@ int netstring_read_fd(int fd, char **netstring) buffer2[read_len - 1] = '\0'; - int x; - for(x = 0; x <= read_len - i - 1; x++) { buffer2[x] = buffer2[x + i]; }

1 0

git:master:796bcc03: jsonrpcc: free allocated pkg buffer on error
by Daniel-Constantin Mierla 24 Jul '24

24 Jul '24

Module: kamailio Branch: master Commit: 796bcc038d7885e01dbad34abc68bf612062c533 URL: https://github.com/kamailio/kamailio/commit/796bcc038d7885e01dbad34abc68bf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-24T10:37:21+02:00 jsonrpcc: free allocated pkg buffer on error --- Modified: src/modules/jsonrpcc/netstring.c --- Diff: https://github.com/kamailio/kamailio/commit/796bcc038d7885e01dbad34abc68bf6… Patch: https://github.com/kamailio/kamailio/commit/796bcc038d7885e01dbad34abc68bf6… --- diff --git a/src/modules/jsonrpcc/netstring.c b/src/modules/jsonrpcc/netstring.c index bf7294ceb41..be7a5de8108 100644 --- a/src/modules/jsonrpcc/netstring.c +++ b/src/modules/jsonrpcc/netstring.c @@ -77,12 +77,16 @@ int netstring_read_fd(int fd, char **netstring) bytes = recv(fd, buffer2, read_len, 0); /* Make sure we got the whole netstring */ - if(read_len > bytes) + if(read_len > bytes) { + pkg_free(buffer2); return NETSTRING_ERROR_TOO_SHORT; + } /* Test for the trailing comma */ - if(buffer2[read_len - 1] != ',') + if(buffer2[read_len - 1] != ',') { + pkg_free(buffer2); return NETSTRING_ERROR_NO_COMMA; + } buffer2[read_len - 1] = '\0';

1 0

git:master:e9684113: Makefile.groups: removed osp module
by Daniel-Constantin Mierla 23 Jul '24

23 Jul '24

Module: kamailio Branch: master Commit: e96841130fd4d3a1e362170beef6b83e7a84f1cc URL: https://github.com/kamailio/kamailio/commit/e96841130fd4d3a1e362170beef6b83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-23T12:56:32+02:00 Makefile.groups: removed osp module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/e96841130fd4d3a1e362170beef6b83… Patch: https://github.com/kamailio/kamailio/commit/e96841130fd4d3a1e362170beef6b83… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index b40781bf5cd..bda4f36a258 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -172,9 +172,6 @@ mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos ims_qos_n ims_usrloc_scscf ims_charging ims_ocs ims_diameter_server \ ims_ipsec_pcscf -# - modules depending on osp toolkit library -mod_list_osp=osp - # - modules depending on java library mod_list_java=app_java @@ -268,7 +265,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_redis) \ $(mod_list_mono) $(mod_list_ims) \ $(mod_list_cassandra) $(mod_list_oracle) \ - $(mod_list_outbound) $(mod_list_osp) \ + $(mod_list_outbound) \ $(mod_list_java) $(mod_list_dnssec) \ $(mod_list_sctp) $(mod_list_autheph) \ $(mod_list_gzcompress) $(mod_list_uuid) \

1 0

git:master:193a8457: osp: module relocated to archive
by Daniel-Constantin Mierla 23 Jul '24

23 Jul '24

Module: kamailio Branch: master Commit: 193a8457af56dea6e7a1320df1d77d52e0951584 URL: https://github.com/kamailio/kamailio/commit/193a8457af56dea6e7a1320df1d77d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-23T12:54:27+02:00 osp: module relocated to archive --- Removed: src/modules/osp/Makefile Removed: src/modules/osp/README Removed: src/modules/osp/RELEASE-NOTES.txt Removed: src/modules/osp/destination.c Removed: src/modules/osp/destination.h Removed: src/modules/osp/doc/Makefile Removed: src/modules/osp/doc/osp.xml Removed: src/modules/osp/doc/osp_admin.xml Removed: src/modules/osp/doc/osp_devel.xml Removed: src/modules/osp/etc/cacert_0.pem Removed: src/modules/osp/etc/localcert.pem Removed: src/modules/osp/etc/pkey.pem Removed: src/modules/osp/etc/sample-osp-kamailio.cfg Removed: src/modules/osp/globals.c Removed: src/modules/osp/orig_transaction.c Removed: src/modules/osp/orig_transaction.h Removed: src/modules/osp/osp_mod.c Removed: src/modules/osp/osp_mod.h Removed: src/modules/osp/osptoolkit.c Removed: src/modules/osp/osptoolkit.h Removed: src/modules/osp/provider.c Removed: src/modules/osp/provider.h Removed: src/modules/osp/sipheader.c Removed: src/modules/osp/sipheader.h Removed: src/modules/osp/term_transaction.c Removed: src/modules/osp/term_transaction.h Removed: src/modules/osp/tm.c Removed: src/modules/osp/tm.h Removed: src/modules/osp/usage.c Removed: src/modules/osp/usage.h --- Diff: https://github.com/kamailio/kamailio/commit/193a8457af56dea6e7a1320df1d77d5… Patch: https://github.com/kamailio/kamailio/commit/193a8457af56dea6e7a1320df1d77d5…

1 0

git:master:29510872: erlang: init xavps for safety destroy on error
by Daniel-Constantin Mierla 23 Jul '24

23 Jul '24

Module: kamailio Branch: master Commit: 29510872607deb3238411b358c422d004fb307b7 URL: https://github.com/kamailio/kamailio/commit/29510872607deb3238411b358c422d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-23T11:57:48+02:00 erlang: init xavps for safety destroy on error --- Modified: src/modules/erlang/pv_tuple.c --- Diff: https://github.com/kamailio/kamailio/commit/29510872607deb3238411b358c422d0… Patch: https://github.com/kamailio/kamailio/commit/29510872607deb3238411b358c422d0… --- diff --git a/src/modules/erlang/pv_tuple.c b/src/modules/erlang/pv_tuple.c index d25b98caea9..22fc7863dfe 100644 --- a/src/modules/erlang/pv_tuple.c +++ b/src/modules/erlang/pv_tuple.c @@ -56,8 +56,8 @@ int pv_tuple_set( sr_xavp_t *tuples_root; sr_xavp_t *tuple; sr_xavp_t *th, *new, *old, *prv = NULL; - sr_xavp_t *tuple_xavp; - sr_xavp_t *elem_xavp; + sr_xavp_t *tuple_xavp = NULL; + sr_xavp_t *elem_xavp = NULL; sr_xval_t tuple_val; pv_param_t p; pv_value_t empty;

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,bullseye #2722
by kamailio＠sipwise.com 23 Jul '24

23 Jul '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 153.38 KiB...] rm -f TAGS tags *.dbg .*.swp rm -f rtpengine.d rtpengine.d rtpengine.d *~ rm -f TAGS tags *.dbg .*.swp rm -f rtpproxy.d rtpproxy.d rtpproxy.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ruxc.d ruxc.d ruxc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sanity.d sanity.d sanity.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sca.d sca.d sca.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sctp.d sctp.d sctp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sdpops.d sdpops.d sdpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f seas.d seas.d seas.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secfilter.d secfilter.d secfilter.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid.d secsipid.d secsipid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid_proc.d secsipid_proc.d secsipid_proc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipcapture.d sipcapture.d sipcapture.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipdump.d sipdump.d sipdump.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipjson.d sipjson.d sipjson.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siprepo.d siprepo.d siprepo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipt.d sipt.d sipt.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siptrace.d siptrace.d siptrace.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siputils.d siputils.d siputils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sl.d sl.d sl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f slack.d slack.d slack.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sms.d sms.d sms.d *~ rm -f TAGS tags *.dbg .*.swp rm -f smsops.d smsops.d smsops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f snmpstats.d snmpstats.d snmpstats.d *~ rm -f TAGS tags *.dbg .*.swp rm -f speeddial.d speeddial.d speeddial.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sqlops.d sqlops.d sqlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ss7ops.d ss7ops.d ss7ops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sst.d sst.d sst.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statistics.d statistics.d statistics.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsc.d statsc.d statsc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsd.d statsd.d statsd.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stirshaken.d stirshaken.d stirshaken.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stun.d stun.d stun.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sworker.d sworker.d sworker.d *~ rm -f TAGS tags *.dbg .*.swp rm -f systemdops.d systemdops.d systemdops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tcpops.d tcpops.d tcpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textops.d textops.d textops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textopsx.d textopsx.d textopsx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f timer.d timer.d timer.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tls.d tls.d tls.d *~ Package wolfssl was not found in the pkg-config search path. Perhaps you should add the directory containing `wolfssl.pc' to the PKG_CONFIG_PATH environment variable No package 'wolfssl' found Makefile:65: sources = tls_cfg.c tls_config.c tls_ct_wrq.c tls_domain.c tls_init.c tls_rpc.c tls_select.c tls_server.c tls_util.c tls_verify.c tls_wolfssl_mod.c , auto_gen = , objs = tls_cfg.o tls_config.o tls_ct_wrq.o tls_domain.o tls_init.o tls_rpc.o tls_select.o tls_server.o tls_util.o tls_verify.o tls_wolfssl_mod.o rm -f TAGS tags *.dbg .*.swp rm -f tls_wolfssl.d tls_wolfssl.d tls_wolfssl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tlsa.d tlsa.d tlsa.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tm.d tm.d tm.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmrec.d tmrec.d tmrec.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmx.d tmx.d tmx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topoh.d topoh.d topoh.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos.d topos.d topos.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos_redis.d topos_redis.d topos_redis.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tsilo.d tsilo.d tsilo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac.d uac.d uac.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac_redirect.d uac_redirect.d uac_redirect.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_auth_db.d uid_auth_db.d uid_auth_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_avp_db.d uid_avp_db.d uid_avp_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_domain.d uid_domain.d uid_domain.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_gflags.d uid_gflags.d uid_gflags.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_uri_db.d uid_uri_db.d uid_uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uri_db.d uri_db.d uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f userblocklist.d userblocklist.d userblocklist.d *~ rm -f TAGS tags *.dbg .*.swp rm -f usrloc.d usrloc.d usrloc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f utils.d utils.d utils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uuid.d uuid.d uuid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f websocket.d websocket.d websocket.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_client.d xcap_client.d xcap_client.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_server.d xcap_server.d xcap_server.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp.d xhttp.d xhttp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_pi.d xhttp_pi.d xhttp_pi.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_prom.d xhttp_prom.d xhttp_prom.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_rpc.d xhttp_rpc.d xhttp_rpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xlog.d xlog.d xlog.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlops.d xmlops.d xmlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlrpc.d xmlrpc.d xmlrpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmpp.d xmpp.d xmpp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xprint.d xprint.d xprint.d *~ make[2]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' make[1]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' dh_clean dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) dpkg-source -b . dpkg-source: info: using source format '3.0 (native)' dpkg-source: info: building kamailio in kamailio_6.0.0~dev2+bpo11.20240720005440.2745.tar.xz dpkg-source: info: building kamailio in kamailio_6.0.0~dev2+bpo11.20240720005440.2745.dsc debian/rules binary dh_testdir # Add here commands to configure the package. /usr/bin/make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/debian/kamailio \ cfg_target=/etc/kamailio/ \ BASEDIR=/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/debian/kamailio \ skip_modules=" bdb dbtext oracle pa iptrtpproxy dnssec java nats tls_wolfssl" \ CC_EXTRA_OPTS="-Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745=. -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE" \ LD_EXTRA_OPTS="-Wl,-z,relro" \ group_include="kstandard" quiet=verbose make[1]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' /usr/bin/make -C src/ cfg make[2]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> rm -f modules.lst making config... /usr/bin/make --no-print-directory modules.lst config.mak loaded Makefile.defs defs skipped /usr/bin/make --no-print-directory -wC . cfg-defs normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> make[4]: Nothing to be done for 'cfg-defs'. config.mak loaded Makefile.defs defs skipped saving modules list... make[2]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' make[1]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' touch configure-stamp dh_testdir /usr/bin/make all quiet=verbose make[1]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' /usr/bin/make -C src/ all make[2]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' config.mak loaded Makefile:116: *** "bad config.mak, try re-running make cfg". Stop. make[2]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' make[1]: *** [Makefile:34: all] Error 2 make[1]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' make: *** [debian/rules:130: test_build_all] Error 2 dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.16366/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.16366/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_kJGwZY filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.16366 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bullseye-amd64.building.16033 + '[' -r /run/lock/bullseye-amd64.update.16033 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.gTX97Iau9L ']' + rm -rf /tmp/tmp.gTX97Iau9L + '[' -n /tmp/apt-jdg_kJGwZY ']' + sudo rm -rf /tmp/apt-jdg_kJGwZY + '[' -n 292 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=102 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sat Jul 20 01:04:44 UTC 2024 [running 102 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sat Jul 20 01:04:44 UTC 2024 [running 102 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

[kamailio/kamailio] nghttp2 module causing Kamailio P-CSCF to crash on connect (Issue #3917)
by NUCLEAR-WAR 22 Jul '24

22 Jul '24

### Description I am doing some experiments with NGHTTP2 Module to make use of it in some scenarios, where Kamailio receives HTTP2 requests and has t react on them, unfortunately the module is causing Kamailio to crash upon receiving a request and need to be restarted. Also the Docs for the module need some correction : https://www.kamailio.org/docs/modules/5.9.x/modules/nghttp2.html Missing required Parameters : modparam("nghttp2", "tls_private_key", "key_in_PEM_Format") modparam("nghttp2", "tls_public_key", "certificate_in_PEM_Format") also $nghttp2(url) is wrong, $nghttp2(path) or $nghttp2(pathfull) is the correct ones. its also annoying to have it only working in TLS, would it possible to make it also works without TLS ? #### Reproduction the fastest way it to connect to NGHTTP2 server with curl : curl --http2-prior-knowledge -v -k https://server_ip:port/ #### Debugging Data ``` 92(132) DEBUG: nghttp2 [nghttp2_server.c:717]: eventcb(): 172.22.0.1 connected 92(132) DEBUG: nghttp2 [nghttp2_server.c:507]: on_request_recv(): 172.22.0.1 GET / 92(132) DEBUG: nghttp2 [nghttp2_mod.c:522]: ksr_event_route(): executing event_route[nghttp2:request] (1) free(): invalid pointer 102(142) CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 7 102(142) DEBUG: <core> [core/tcp_main.c:3984]: handle_ser_child(): dead child 92, pid 132 (shutting down?) 102(142) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x5b85ddc10ae0, 7, -1, 0x0) fd_no=130 called 0(40) ALERT: <core> [main.c:806]: handle_sigs(): child process 132 exited by a signal 6 0(40) ALERT: <core> [main.c:810]: handle_sigs(): core was generated ``` #### Log Messages  ``` https://pastebin.com/MQe4F5sv ``` ### Additional Information * **Kamailio Version** 5.8 * **Operating System**: Ubuntu 24.04 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3917 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3917(a)github.com>

3 14

git:master:7350a80a: nghttp2: duplicate reply status code in nghttp2_send_reply()
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 7350a80a1d4d121a75e12529553191c4a9038f56 URL: https://github.com/kamailio/kamailio/commit/7350a80a1d4d121a75e12529553191c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T14:44:42+02:00 nghttp2: duplicate reply status code in nghttp2_send_reply() - expected to be freed later - GH #3917 --- Modified: src/modules/nghttp2/nghttp2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7350a80a1d4d121a75e12529553191c… Patch: https://github.com/kamailio/kamailio/commit/7350a80a1d4d121a75e12529553191c… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index a6b63b56e84..28b80544107 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -299,8 +299,14 @@ static int ksr_nghttp2_send_reply(sip_msg_t *msg, str *rcode, str *sbody) int rv; ssize_t writelen; int pipefd[2]; + char *p; - _ksr_nghttp2_ctx.rplhdrs_v[0].value = (uint8_t *)rcode->s; + p = strndup(rcode->s, rcode->len); + if(p == NULL) { + SYS_MEM_ERROR; + return -1; + } + _ksr_nghttp2_ctx.rplhdrs_v[0].value = (uint8_t *)p; _ksr_nghttp2_ctx.rplhdrs_v[0].valuelen = rcode->len; if(_ksr_nghttp2_ctx.rplhdrs_n == 0) {

1 0

[kamailio/kamailio] Warnings emitted when calling functions from dialplan module (Issue #3851)
by Ben Kaufman 22 Jul '24

22 Jul '24

### Description Calling functions from the `dialplan` module in 5.8 (`dp_translate()`, `dp_match()`) results in the following line being logged: ``` WARNING: <core> [core/mem/q_malloc.c:520]: qm_free(): WARNING: free(0) called from dialplan: dp_db.c: pcre2_free(206) ``` Is this a functional problem, or just a case of overly aggressive logging? ### Troubleshooting #### Reproduction Reproducible with the following kamailio config: ``` #!KAMAILIO loadmodule "pv" loadmodule "db_sqlite" loadmodule "xlog" loadmodule "dialplan" disable_tcp = true force_rport = true !!define DBFILE /etc/kamailio/kamailio.sqlite modparamx("db_sqlite","db_set_readonly", "$def(DBFILE)") modparamx("dialplan","db_url", "sqlite:///$def(DBFILE)") modparam("dialplan", "attrs_pvar", "$avp(dp_attrs)") request_route { if ( $rm == "ACK" ) { exit; } xinfo("$ci New request\n"); dp_match("1", "$rU"); exit; } ``` The warning log is issued in 5.8 but not 5.7. Reproduced by sending a request with SIPp: ``` sipp -sn uac -m 1 -s 15554445555 localhost ``` ### Possible Solutions Not sure if this is just a case of logging being overly aggressive, or an issue with the module's memory management. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.1 (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, 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: unknown compiled with gcc 12.2.0 ``` Tested using docker `debian:12-slim` using the official packages from `http://deb.kamailio.org/kamailio58` * **Operating System**: Docker debian:12-slim, but also observed in Alpine Linux/ -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3851 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3851(a)github.com>

6 13

git:master:34749ab1: utils: jump to error on pkg allocation failure
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 34749ab13b31504358761c964f794b283931394c URL: https://github.com/kamailio/kamailio/commit/34749ab13b31504358761c964f794b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T11:01:16+02:00 utils: jump to error on pkg allocation failure --- Modified: src/modules/utils/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/34749ab13b31504358761c964f794b2… Patch: https://github.com/kamailio/kamailio/commit/34749ab13b31504358761c964f794b2… --- diff --git a/src/modules/utils/xcap_auth.c b/src/modules/utils/xcap_auth.c index 3824b2d484a..5c986a18cd3 100644 --- a/src/modules/utils/xcap_auth.c +++ b/src/modules/utils/xcap_auth.c @@ -418,11 +418,13 @@ int get_rules_doc(str *user, str *domain, int type, str **rules_doc) doc = (str *)pkg_malloc(sizeof(str)); if(doc == NULL) { PKG_MEM_ERROR; + goto error; } doc->s = (char *)pkg_malloc(body.len * sizeof(char)); if(doc->s == NULL) { pkg_free(doc); PKG_MEM_ERROR; + goto error; } memcpy(doc->s, body.s, body.len); doc->len = body.len; @@ -514,4 +516,4 @@ int w_xcap_auth_status(struct sip_msg *_msg, char *_sp1, char *_sp2) } return ki_xcap_auth_status(_msg, &watcher_uri, &presentity_uri); -} \ No newline at end of file +}

1 0

git:master:79a668b8: tls: check lenght when parsing pv alt name
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4 URL: https://github.com/kamailio/kamailio/commit/79a668b8bdb0e085adb3581d718e5fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T10:41:47+02:00 tls: check lenght when parsing pv alt name --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/79a668b8bdb0e085adb3581d718e5fd… Patch: https://github.com/kamailio/kamailio/commit/79a668b8bdb0e085adb3581d718e5fd… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index c788eabcd63..8b1a0457c0a 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1190,13 +1190,13 @@ int pv_parse_alt_name(pv_spec_p sp, str *in) if(in->s == NULL || in->len <= 0) return -1; - if(strncmp(in->s, "DNS", 3) == 0) { + if(in->len == 3 && strncmp(in->s, "DNS", 3) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_HOST; - } else if(strncmp(in->s, "URI", 3) == 0) { + } else if(in->len == 3 && strncmp(in->s, "URI", 3) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_URI; - } else if(strncmp(in->s, "EMAIL", 5) == 0) { + } else if(in->len == 5 && strncmp(in->s, "EMAIL", 5) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_E; - } else if(strncmp(in->s, "IP", 2) == 0) { + } else if(in->len == 2 && strncmp(in->s, "IP", 2) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_IP; } else { LM_ERR("Unsupported alt name %s\n", in->s);

1 0

git:master:7c06997a: tls: remove uselss pv format parsing in pv_parse_alt_name()
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 7c06997a1b6e77ae0642d369f532219dc35ef8e0 URL: https://github.com/kamailio/kamailio/commit/7c06997a1b6e77ae0642d369f532219… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T10:23:31+02:00 tls: remove uselss pv format parsing in pv_parse_alt_name() --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/7c06997a1b6e77ae0642d369f532219… Patch: https://github.com/kamailio/kamailio/commit/7c06997a1b6e77ae0642d369f532219… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index c7eb96bd9fa..c788eabcd63 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1187,14 +1187,9 @@ static int pv_comp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int pv_parse_alt_name(pv_spec_p sp, str *in) { - pv_elem_t *fmt = NULL; - if(in->s == NULL || in->len <= 0) return -1; - if(pv_parse_format(in, &fmt) < 0 || fmt == NULL) { - LM_ERR("wrong format[%.*s]\n", in->len, in->s); - return -1; - } + if(strncmp(in->s, "DNS", 3) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_HOST; } else if(strncmp(in->s, "URI", 3) == 0) {

1 0

git:master:5a1f80f2: xprint: check to avoid double free
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 5a1f80f266069dbc453b44a856f225c254e7c050 URL: https://github.com/kamailio/kamailio/commit/5a1f80f266069dbc453b44a856f225c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T10:02:09+02:00 xprint: check to avoid double free --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/5a1f80f266069dbc453b44a856f225c… Patch: https://github.com/kamailio/kamailio/commit/5a1f80f266069dbc453b44a856f225c… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index e4442ba87f4..b6fc5066556 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1896,6 +1896,7 @@ int xl_mod_init() str_ipaddr.s[str_ipaddr.len] = '\0'; } else { pkg_free(s); + s = NULL; str_ipaddr.len = 0; PKG_MEM_ERROR_FMT("for str_ipaddr\n"); } @@ -1914,7 +1915,8 @@ int xl_mod_init() } } } - pkg_free(s); + if(s != NULL) + pkg_free(s); DBG("Hostname: %.*s\n", str_hostname.len, ZSW(str_hostname.s)); DBG("Domainname: %.*s\n", str_domainname.len, ZSW(str_domainname.s));

1 0

git:master:dc71c0a5: topoh: 0-init alocated structures
by Daniel-Constantin Mierla 19 Jul '24

19 Jul '24

Module: kamailio Branch: master Commit: dc71c0a5791ebc1306648b5ed338613050e32f5c URL: https://github.com/kamailio/kamailio/commit/dc71c0a5791ebc1306648b5ed338613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-19T20:00:12+02:00 topoh: 0-init alocated structures --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dc71c0a5791ebc1306648b5ed338613… Patch: https://github.com/kamailio/kamailio/commit/dc71c0a5791ebc1306648b5ed338613… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index fe63bf88c7f..7dffa829504 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -321,12 +321,12 @@ int th_build_socket_strings(socket_info_t *socket) != 0) return 0; - socket_strings = pkg_malloc(sizeof(struct th_socket_strings)); + socket_strings = pkg_mallocxz(sizeof(struct th_socket_strings)); if(socket_strings == NULL) { PKG_MEM_ERROR_FMT("socket_strings\n"); goto error; } - table_entry = pkg_malloc(sizeof(struct str_hash_entry)); + table_entry = pkg_mallocxz(sizeof(struct str_hash_entry)); if(table_entry == NULL) { PKG_MEM_ERROR_FMT("table_entry\n"); goto error;

1 0

git:master:20f2096d: core: removed unnecessary destroy
by Daniel-Constantin Mierla 19 Jul '24

19 Jul '24

Module: kamailio Branch: master Commit: 20f2096d314253e7e74688da664de2830289a276 URL: https://github.com/kamailio/kamailio/commit/20f2096d314253e7e74688da664de28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-19T20:00:12+02:00 core: removed unnecessary destroy --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/20f2096d314253e7e74688da664de28… Patch: https://github.com/kamailio/kamailio/commit/20f2096d314253e7e74688da664de28… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 9cc1812c294..4c0137060ad 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -1085,8 +1085,6 @@ long rval_get_long(struct run_act_ctx *h, struct sip_msg *msg, long *i, LM_BUG("invalid cached value:cache type %d, value type %d\n", cache ? cache->cache_type : 0, cache ? cache->val_type : 0); error: - if(destroy_pval) - pv_value_destroy(&pval); *i = 0; return -1; }

1 0

git:5.7:2deec6b4: sipcapture: add missing headers for inet_ntop()
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: 5.7 Commit: 2deec6b43b8149ebb8c027a68709c2a708f01be9 URL: https://github.com/kamailio/kamailio/commit/2deec6b43b8149ebb8c027a68709c2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T17:36:34+02:00 sipcapture: add missing headers for inet_ntop() fixes #3927 (cherry picked from commit fe505c9654541ec60f14e5a50896bb11751e61e4) (cherry picked from commit 164d1ecca7e94beba24013f31276bdc1f2ee04a1) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/2deec6b43b8149ebb8c027a68709c2a… Patch: https://github.com/kamailio/kamailio/commit/2deec6b43b8149ebb8c027a68709c2a… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index db7ea912e11..3485f330a45 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -21,6 +21,8 @@ * */ +#include <arpa/inet.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/events.h"

1 0

git:5.8:164d1ecc: sipcapture: add missing headers for inet_ntop()
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: 5.8 Commit: 164d1ecca7e94beba24013f31276bdc1f2ee04a1 URL: https://github.com/kamailio/kamailio/commit/164d1ecca7e94beba24013f31276bdc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T17:35:29+02:00 sipcapture: add missing headers for inet_ntop() fixes #3927 (cherry picked from commit fe505c9654541ec60f14e5a50896bb11751e61e4) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/164d1ecca7e94beba24013f31276bdc… Patch: https://github.com/kamailio/kamailio/commit/164d1ecca7e94beba24013f31276bdc… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index db7ea912e11..3485f330a45 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -21,6 +21,8 @@ * */ +#include <arpa/inet.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/events.h"

1 0

[kamailio/kamailio] hep.c:985:41: error: implicit declaration of function ‘inet_ntop’ (Issue #3927)
by Victor Seva 18 Jul '24

18 Jul '24

From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075961 ``` kamailio currently FTBFS on s390x, but built there before. The same problem can be observed on ppc64: https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=s390x&ver=5.8.… hep.c: In function ‘hepv3_get_chunk’: hep.c:985:41: error: implicit declaration of function ‘inet_ntop’ [-Werror=implicit-function-declaration] 985 | inet_ntop(AF_INET, &(hg->hep_src_ip4->data), ipstr, | ^~~~~~~~~ gcc -fPIC -DPIC -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.8.2"' -DARCH='"s390x"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 13.3.0"' -D__CPU_s390x -D__OS_linux -DVERSIONVAL=5008002 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DUSE_PTHREAD_MUTEX -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"sipcapture"' -DMOD_NAMEID='sipcapture' -c sipcapture.c -o sipcapture.o -MMD -MP In file included from ../../core/atomic_ops.h:180, from ../../core/locking.h:72, from ../../core/rpc.h:34, from ../../core/sr_module.h:36, from sipcapture.c:54: ... make[4]: *** [../../Makefile.rules:100: hep.o] Error 1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3927 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3927(a)github.com>

1 1

git:master:fe505c96: sipcapture: add missing headers for inet_ntop()
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: fe505c9654541ec60f14e5a50896bb11751e61e4 URL: https://github.com/kamailio/kamailio/commit/fe505c9654541ec60f14e5a50896bb1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T17:30:52+02:00 sipcapture: add missing headers for inet_ntop() fixes #3927 --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/fe505c9654541ec60f14e5a50896bb1… Patch: https://github.com/kamailio/kamailio/commit/fe505c9654541ec60f14e5a50896bb1… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index db7ea912e11..3485f330a45 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -21,6 +21,8 @@ * */ +#include <arpa/inet.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/events.h"

1 0

git:master:b6de4b92: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: b6de4b92fd18d541c745e07cfaefaf7c56c45f18 URL: https://github.com/kamailio/kamailio/commit/b6de4b92fd18d541c745e07cfaefaf7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-18T15:46:10+02:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/b6de4b92fd18d541c745e07cfaefaf7… Patch: https://github.com/kamailio/kamailio/commit/b6de4b92fd18d541c745e07cfaefaf7…

1 0

[kamailio/kamailio] sqlops: Don't truncated sql command when logging. (PR #3903)
by Xenofon Karamanos 18 Jul '24

18 Jul '24

#### 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  This PR Fixes a bug where logging shows a truncated command instead of the original one. Original query in .cfg: `sql_query("ca", "UPDATE dialog SET timeout = timeout + 1 WHERE callid = '$ci' AND timeout > 0;` logged error before fix: sql_do_query(): cannot do the query [UPDATE dialog SET timeout = timeout + 1 WHERE callid = 'al@there] logged error after fix: sql_do_query(): cannot do the query [UPDATE dialog SET timeout = timeout + 1 WHERE callid = 'al(a)there.com AND timeout > 0;] You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3903 -- Commit Summary -- * sqlops: Don't truncated sql command when logging. -- File Changes -- M src/modules/sqlops/sql_api.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3903.patch https://github.com/kamailio/kamailio/pull/3903.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3903 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3903(a)github.com>

2 6

git:master:e5407c05: sqlops: Add log_buf_size param for logging raw queries.
by Xenofon Karamanos 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: e5407c058f88fe06be2ee5da468ce2929748e31f URL: https://github.com/kamailio/kamailio/commit/e5407c058f88fe06be2ee5da468ce29… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-07-18T16:37:15+03:00 sqlops: Add log_buf_size param for logging raw queries. --- Modified: src/modules/sqlops/doc/sqlops_admin.xml Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/e5407c058f88fe06be2ee5da468ce29… Patch: https://github.com/kamailio/kamailio/commit/e5407c058f88fe06be2ee5da468ce29… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index aeaa54ef0ff..c26c63ebcd4 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -191,6 +191,28 @@ modparam("sqlops", "sqlres", "ra") ... modparam("sqlops", "tr_buf_size", 4096) ... +</programlisting> + </example> + </section> + <section id="sqlops.p.log_buf_size"> + <title><varname>log_buf_size</varname> (int)</title> + <para> + The size of the buffer (characters) when logging raw SQL operations. + </para> + <para> + Note: When the buffer is smaller than the SQL operation, the operation is logged truncated up to log_buf_size. + </para> + <para> + <emphasis> + Default value is 128. + </emphasis> + </para> + <example> + <title>Set <varname>log_buf_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sqlops", "log_buf_size", 4096) +... </programlisting> </example> </section> @@ -607,4 +629,3 @@ xlog("Affected rows: $sqlrows(ca)\n"); </section> </section> </chapter> - diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index b76edbd480e..255121dd87d 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -36,6 +36,7 @@ #include "sql_api.h" extern int sqlops_results_maxsize; +extern int sqlops_log_buf_size; sql_con_t *_sql_con_root = NULL; sql_result_t *_sql_result_root = NULL; @@ -276,7 +277,9 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) } if(con->dbf.raw_query(con->dbh, query, &db_res) != 0) { LM_ERR("cannot do the query [%.*s]\n", - (query->len > 64) ? 64 : query->len, query->s); + (query->len > sqlops_log_buf_size) ? sqlops_log_buf_size + : query->len, + query->s); return -1; } diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 1b0859b1ca5..900dcacb371 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -77,6 +77,7 @@ static int sql_res_param(modparam_t type, void *val); extern int sqlops_tr_buf_size; int sqlops_results_maxsize = 32; +int sqlops_log_buf_size = 128; static int sqlops_connect_mode = 0; @@ -106,6 +107,7 @@ static param_export_t params[] = { {"sqlcon", PARAM_STRING | USE_FUNC_PARAM, (void *)sql_con_param}, {"sqlres", PARAM_STRING | USE_FUNC_PARAM, (void *)sql_res_param}, {"tr_buf_size", PARAM_INT, &sqlops_tr_buf_size}, + {"log_buf_size", PARAM_INT, &sqlops_log_buf_size}, {"connect_mode", PARAM_INT, &sqlops_connect_mode}, {"results_maxsize", PARAM_INT, &sqlops_results_maxsize}, {0, 0, 0}};

1 0

git:5.8:685f45c4: dialplan: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: 5.8 Commit: 685f45c4adf911ac41c14b55ad36dd4b8b51897c URL: https://github.com/kamailio/kamailio/commit/685f45c4adf911ac41c14b55ad36dd4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:42:31+02:00 dialplan: remove pcre2_free() warning related to #3851 (cherry picked from commit 70563ca0629a8de5aa5427b003f441e6c3a40c6a) --- Modified: src/modules/dialplan/dp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/685f45c4adf911ac41c14b55ad36dd4… Patch: https://github.com/kamailio/kamailio/commit/685f45c4adf911ac41c14b55ad36dd4… --- diff --git a/src/modules/dialplan/dp_db.c b/src/modules/dialplan/dp_db.c index 857a2e43e75..64d2a4f3b12 100644 --- a/src/modules/dialplan/dp_db.c +++ b/src/modules/dialplan/dp_db.c @@ -203,8 +203,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } int init_data(void)

1 0

git:5.8:64a01ebe: lcr: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: 5.8 Commit: 64a01ebec255ece59be3683bab421b35505d745d URL: https://github.com/kamailio/kamailio/commit/64a01ebec255ece59be3683bab421b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:42:31+02:00 lcr: remove pcre2_free() warning related to #3851 (cherry picked from commit 310b631007082f553117d126b6b9bd915be596ac) --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/64a01ebec255ece59be3683bab421b3… Patch: https://github.com/kamailio/kamailio/commit/64a01ebec255ece59be3683bab421b3… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index dac215a9eb5..bbd397d5186 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -433,8 +433,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } /*

1 0

git:5.8:1946e35c: regex: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: 5.8 Commit: 1946e35c4d144fba3067d3fee5d1bd030dc4a609 URL: https://github.com/kamailio/kamailio/commit/1946e35c4d144fba3067d3fee5d1bd0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:42:31+02:00 regex: remove pcre2_free() warning related to #3851 (cherry picked from commit b86030cfbd66ba95f33f312595edae29e2b5cde0) --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1946e35c4d144fba3067d3fee5d1bd0… Patch: https://github.com/kamailio/kamailio/commit/1946e35c4d144fba3067d3fee5d1bd0… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 52ed60b295c..f4e93e48a3e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -170,8 +170,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } /*! \brief

1 0

git:master:70563ca0: dialplan: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 70563ca0629a8de5aa5427b003f441e6c3a40c6a URL: https://github.com/kamailio/kamailio/commit/70563ca0629a8de5aa5427b003f441e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:41:16+02:00 dialplan: remove pcre2_free() warning related to #3851 --- Modified: src/modules/dialplan/dp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/70563ca0629a8de5aa5427b003f441e… Patch: https://github.com/kamailio/kamailio/commit/70563ca0629a8de5aa5427b003f441e… --- diff --git a/src/modules/dialplan/dp_db.c b/src/modules/dialplan/dp_db.c index 857a2e43e75..64d2a4f3b12 100644 --- a/src/modules/dialplan/dp_db.c +++ b/src/modules/dialplan/dp_db.c @@ -203,8 +203,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } int init_data(void)

1 0

git:master:310b6310: lcr: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 310b631007082f553117d126b6b9bd915be596ac URL: https://github.com/kamailio/kamailio/commit/310b631007082f553117d126b6b9bd9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:41:15+02:00 lcr: remove pcre2_free() warning related to #3851 --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/310b631007082f553117d126b6b9bd9… Patch: https://github.com/kamailio/kamailio/commit/310b631007082f553117d126b6b9bd9… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 6cad2830fb6..f53de3b3668 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -433,8 +433,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } /*

1 0

git:master:b86030cf: regex: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: b86030cfbd66ba95f33f312595edae29e2b5cde0 URL: https://github.com/kamailio/kamailio/commit/b86030cfbd66ba95f33f312595edae2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:41:15+02:00 regex: remove pcre2_free() warning related to #3851 --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b86030cfbd66ba95f33f312595edae2… Patch: https://github.com/kamailio/kamailio/commit/b86030cfbd66ba95f33f312595edae2… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 52ed60b295c..f4e93e48a3e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -170,8 +170,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } /*! \brief

1 0

[kamailio/kamailio] tcpops: fix memory leak in $tcp(conid) (PR #3924)
by Dennis 18 Jul '24

18 Jul '24

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Reference counter to tcp session not decremented after use $tcp(conid), so shm for session never free. Can be releated to: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21294.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3924 -- Commit Summary -- * tcpops: fix memory leak in $tcp(conid) -- File Changes -- M src/modules/tcpops/tcpops_mod.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3924.patch https://github.com/kamailio/kamailio/pull/3924.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3924 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3924(a)github.com>

2 2

git:master:acf50d86: tcpops: fix memory leak in $tcp(conid)
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: acf50d86b502af36e3635d61745feaa5c577231d URL: https://github.com/kamailio/kamailio/commit/acf50d86b502af36e3635d61745feaa… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T13:31:26+02:00 tcpops: fix memory leak in $tcp(conid) - reference counter to tcp session not decremented, so shm for session never free --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/acf50d86b502af36e3635d61745feaa… Patch: https://github.com/kamailio/kamailio/commit/acf50d86b502af36e3635d61745feaa… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 6b648230894..a89a18992aa 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -811,6 +811,9 @@ static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); default: /* conid */ + if(con) { + tcpconn_put(con); + } return pv_get_sintval(msg, param, res, msg->rcv.proto_reserved1); } }

1 0

git:master:84ea36b4: core: remove unnecessary check after using the structure
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 84ea36b4b79c07c4fc0a8c9e119184433353764e URL: https://github.com/kamailio/kamailio/commit/84ea36b4b79c07c4fc0a8c9e1191844… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T12:29:05+02:00 core: remove unnecessary check after using the structure --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/84ea36b4b79c07c4fc0a8c9e1191844… Patch: https://github.com/kamailio/kamailio/commit/84ea36b4b79c07c4fc0a8c9e1191844… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ab02fb7c47c..f26abd2e79d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2384,7 +2384,7 @@ char *generate_res_buf_from_sip_res( } /* test and add xavp via reply params */ - if(msg && msg->via2 && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) + if(msg->via2 && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer(); xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params,

1 0

git:master:15b2a546: core: set digit 0 in the md5 buffer in case of error inside char_msg_val()
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 15b2a5467f11e009ae4efad1ee29af860326095f URL: https://github.com/kamailio/kamailio/commit/15b2a5467f11e009ae4efad1ee29af8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T12:17:10+02:00 core: set digit 0 in the md5 buffer in case of error inside char_msg_val() --- Modified: src/core/char_msg_val.h --- Diff: https://github.com/kamailio/kamailio/commit/15b2a5467f11e009ae4efad1ee29af8… Patch: https://github.com/kamailio/kamailio/commit/15b2a5467f11e009ae4efad1ee29af8… --- diff --git a/src/core/char_msg_val.h b/src/core/char_msg_val.h index b3d7e4a1bea..bcdea56b85e 100644 --- a/src/core/char_msg_val.h +++ b/src/core/char_msg_val.h @@ -41,8 +41,11 @@ inline static int char_msg_val(struct sip_msg *msg, char *cv) str sempty = str_init(""); if(unlikely(!check_transaction_quadruple(msg))) { - LM_ERR("can't calculate char_value due to a parsing error\n"); - memset(cv, '0', MD5_LEN); + int i; + for(i = 0; i < MD5_LEN; i++) { + cv[i] = '0'; + } + LM_ERR("cannot calculate char_value due to a parsing error\n"); return 0; } /* to body is automatically parsed (via check_transactionquadruple /

1 0

git:master:a471d34d: core: init res inside select_cfg_var()
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: a471d34d6162387a1427f5d0c5b3c6079a2b0bdc URL: https://github.com/kamailio/kamailio/commit/a471d34d6162387a1427f5d0c5b3c60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T12:00:47+02:00 core: init res inside select_cfg_var() --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/a471d34d6162387a1427f5d0c5b3c60… Patch: https://github.com/kamailio/kamailio/commit/a471d34d6162387a1427f5d0c5b3c60… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index f948dd4ab4c..f3b2d681d3e 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -147,6 +147,9 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) int i; static char buf[INT2STR_MAX_LEN]; + res->s = 0; + res->len = 0; + if(msg == NULL) { /* fixup call */ @@ -228,12 +231,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) break; case CFG_VAR_STR: - if(p) { - memcpy(res, p, sizeof(str)); - } else { - res->s = 0; - res->len = 0; - } + memcpy(res, p, sizeof(str)); break; default:

1 0

[kamailio/kamailio] ims_qos_npn: forked module from ims_qos, for better rx support (PR #3921)
by Dragos Vingarzan 18 Jul '24

18 Jul '24

#### 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) - [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  The `ims_qos` module had a few limitations. This fork of that module adds: - AAR for the registration (signaling path monitoring) - subsequent AARs in calls - support for STR - extra event_routes on Rx authorization session events - extra AVPs decoding and use The dependency and use of the `ims_dialog` was removed. We think that the respective module has fallen behind `dialog` (although it should've replaced it? don't know...). Cleaning/upgrading that module too might be too much effort. Since these changes might be breaking things for other folks using IMS, we are pushing these as an alternative module. We hope that we'll find though consensus in the future and either remove or merge with the older `ims_qos` module. Same would be valid for `ims_dialog` and `dialog`, yet those also might need some upgrades. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3921 -- Commit Summary -- * ims_qos_npn: imported modified module * src: added ims_qos_npn to Makefile.groups -- File Changes -- M src/Makefile.groups (2) A src/modules/ims_qos_npn/Makefile (19) A src/modules/ims_qos_npn/README (781) A src/modules/ims_qos_npn/cdpeventprocessor.c (382) A src/modules/ims_qos_npn/cdpeventprocessor.h (87) A src/modules/ims_qos_npn/doc/Makefile (4) A src/modules/ims_qos_npn/doc/ims_qos.xml (113) A src/modules/ims_qos_npn/doc/ims_qos_admin.xml (882) A src/modules/ims_qos_npn/ims_qos_mod.c (2173) A src/modules/ims_qos_npn/ims_qos_mod.h (85) A src/modules/ims_qos_npn/ims_qos_stats.c (156) A src/modules/ims_qos_npn/ims_qos_stats.h (38) A src/modules/ims_qos_npn/rx_aar.c (1296) A src/modules/ims_qos_npn/rx_aar.h (131) A src/modules/ims_qos_npn/rx_asr.c (124) A src/modules/ims_qos_npn/rx_asr.h (59) A src/modules/ims_qos_npn/rx_authdata.c (494) A src/modules/ims_qos_npn/rx_authdata.h (125) A src/modules/ims_qos_npn/rx_avp.c (2144) A src/modules/ims_qos_npn/rx_avp.h (118) A src/modules/ims_qos_npn/rx_rar.c (160) A src/modules/ims_qos_npn/rx_rar.h (34) A src/modules/ims_qos_npn/rx_str.c (184) A src/modules/ims_qos_npn/rx_str.h (61) A src/modules/ims_qos_npn/sem.h (90) A src/modules/ims_qos_npn/stats.c (79) A src/modules/ims_qos_npn/stats.h (61) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3921.patch https://github.com/kamailio/kamailio/pull/3921.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3921 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3921(a)github.com>

2 4

[kamailio/kamailio] siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (PR #3919)
by emvondo 18 Jul '24

18 Jul '24

#### 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/3919 -- Commit Summary -- * siprepo: fix int params and wrong copy data in siprepo_msg_async_pull -- File Changes -- M src/modules/siprepo/siprepo_data.c (6) M src/modules/siprepo/siprepo_mod.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3919.patch https://github.com/kamailio/kamailio/pull/3919.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3919 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3919(a)github.com>

2 3

git:master:a3a63655: siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919)
by GitHub 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: a3a63655dbcbf1bc8067f34c36f4a7295b2a1745 URL: https://github.com/kamailio/kamailio/commit/a3a63655dbcbf1bc8067f34c36f4a72… Author: emvondo <106535097+emvondo(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2024-07-18T10:10:33+02:00 siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919) * siprepo: fix int params and wrong copy data in siprepo_msg_async_pull --------- Co-authored-by: emvondo <bycl2332(a)orange.com> --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a3a63655dbcbf1bc8067f34c36f4a72… Patch: https://github.com/kamailio/kamailio/commit/a3a63655dbcbf1bc8067f34c36f4a72… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 397def720fb..2720c50c2c0 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -496,15 +496,15 @@ int siprepo_msg_async_pull(str *callid, str *msgid, str *gname, str *rname, return -1; } stp->callid.s = (char*)stp + ROUND_POINTER(sizeof(siprepo_task_param_t)); - memcpy(callid->s, stp->callid.s, callid->len); + memcpy(stp->callid.s, callid->s, callid->len); stp->callid.len = callid->len; stp->msgid.s = stp->callid.s + ROUND_POINTER(callid->len + 1); - memcpy(msgid->s, stp->msgid.s, msgid->len); + memcpy(stp->msgid.s, msgid->s, msgid->len); stp->msgid.len = msgid->len; stp->rname.s = stp->msgid.s + ROUND_POINTER(msgid->len + 1); - memcpy(rname->s, stp->rname.s, rname->len); + memcpy(stp->rname.s, rname->s, rname->len); stp->rname.len = rname->len; stp->rmode = rmode; diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index d8f8b02c5ad..e6acc23368e 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -58,6 +58,8 @@ static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2); static void siprepo_timer_exec(unsigned int ticks, int worker, void *param); +static int fixup_sr_msg_async_pull(void **param, int param_no); + /* clang-format off */ typedef struct sworker_task_param { char *buf; @@ -69,10 +71,10 @@ typedef struct sworker_task_param { static cmd_export_t cmds[]={ {"sr_msg_push", (cmd_function)w_sr_msg_push, 2, fixup_spve_igp, fixup_free_spve_null, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, - {"sr_msg_pull", (cmd_function)w_sr_msg_pull, 3, fixup_spve_all, - fixup_free_spve_all, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, - {"sr_msg_async_pull", (cmd_function)w_sr_msg_async_pull, 5, fixup_spve_all, - fixup_free_spve_all, ANY_ROUTE}, + {"sr_msg_pull", (cmd_function)w_sr_msg_pull, 4, fixup_sssi, + fixup_free_sssi, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, + {"sr_msg_async_pull", (cmd_function)w_sr_msg_async_pull, 5, fixup_sr_msg_async_pull, + 0, ANY_ROUTE}, {"sr_msg_rm", (cmd_function)w_sr_msg_rm, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, {"sr_msg_check", (cmd_function)w_sr_msg_check, 0, 0, @@ -282,6 +284,15 @@ static int w_sr_msg_async_pull(sip_msg_t *msg, char *pcallid, char *pmsgid, } +static int fixup_sr_msg_async_pull(void **param, int param_no) +{ + if(param_no >= 1 && param_no <= 4) + return fixup_spve_null(param, 1); + if(param_no == 5) + return fixup_igp_null(param, 1); + return 0; +} + /** * */

1 0

git:master:aa79588c: dispatcher: added ocidx to the rpc response
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: aa79588ceacaaae118230bd06b0eb7aadf9b31f3 URL: https://github.com/kamailio/kamailio/commit/aa79588ceacaaae118230bd06b0eb7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T09:09:01+02:00 dispatcher: added ocidx to the rpc response --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/aa79588ceacaaae118230bd06b0eb7a… Patch: https://github.com/kamailio/kamailio/commit/aa79588ceacaaae118230bd06b0eb7a… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 3fd941c21c4..74ee7cc8e8d 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1869,13 +1869,14 @@ int ds_rpc_print_set( ipbuf[0] = '\0'; ip_addr2sbufz( &node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssddjjujj", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjjujjj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, "PROTOID", (int)node->dlist[j].proto, "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, "DNSTIME_USEC", (unsigned long)node->dlist[j].dnstime.tv_usec, "OCRATE", - node->dlist[j].attrs.ocrate, "OCTIME_SEC", + node->dlist[j].attrs.ocrate, "OCIDX", + (unsigned long)node->dlist[j].ocidx, "OCTIME_SEC", (unsigned long)node->dlist[j].octime.tv_sec, "OCTIME_USEC", (unsigned long)node->dlist[j].octime.tv_usec)

1 0

git:master:8c3b5ab3: dispatcher: remove reference to MI in comments
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 8c3b5ab3818c86b90b02e20aa4631654e0b51745 URL: https://github.com/kamailio/kamailio/commit/8c3b5ab3818c86b90b02e20aa463165… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T09:09:01+02:00 dispatcher: remove reference to MI in comments --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/8c3b5ab3818c86b90b02e20aa463165… Patch: https://github.com/kamailio/kamailio/commit/8c3b5ab3818c86b90b02e20aa463165… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 287164f829d..bdb615ad3ea 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3982,14 +3982,14 @@ static void ds_options_callback( } } - /* Check if in the meantime someone disabled probing of the target through RPC, MI or reload */ + /* Check if in the meantime someone disabled probing of the target + * through RPC or reload */ if(ds_probing_mode == DS_PROBE_ONLYFLAGGED && !(ds_get_state(group, &uri) & DS_PROBING_DST)) { return; } /* ps->code contains the result-code of the request. - * * We accept both a "200 OK" or the configured reply as a valid response */ if((ps->code >= 200 && ps->code <= 299) || ds_ping_check_rplcode(ps->code)) { @@ -4000,7 +4000,7 @@ static void ds_options_callback( && (ds_get_state(group, &uri) & DS_PROBING_DST))) state |= DS_PROBING_DST; - /* Check if in the meantime someone disabled the target through RPC or MI */ + /* Check if in the meantime someone disabled the target through RPC */ if(!(ds_get_state(group, &uri) & DS_DISABLED_DST) && ds_update_state(fmsg, group, &uri, state, &rctx) != 0) { LM_ERR("Setting the state failed (%.*s, group %d)\n", uri.len, @@ -4010,7 +4010,7 @@ static void ds_options_callback( state = DS_TRYING_DST; if(ds_probing_mode != DS_PROBE_NONE) state |= DS_PROBING_DST; - /* Check if in the meantime someone disabled the target through RPC or MI */ + /* Check if in the meantime someone disabled the target through RPC */ if(!(ds_get_state(group, &uri) & DS_DISABLED_DST) && ds_update_state(fmsg, group, &uri, state, &rctx) != 0) { LM_ERR("Setting the probing state failed (%.*s, group %d)\n",

1 0

git:master:39be7eb5: src: added ims_qos_npn to Makefile.groups
by Dragos Vingarzan 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 39be7eb53773a1e3776d185f47d13a41e95408c3 URL: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… Author: Dragos Vingarzan <dragos(a)neatpath.net> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-18T09:02:17+02:00 src: added ims_qos_npn to Makefile.groups --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… Patch: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 909abc7541b..b40781bf5cd 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -167,7 +167,7 @@ mod_list_redis=db_redis ndb_redis topos_redis mod_list_mono=app_mono # - modules related to IMS extensions -mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos \ +mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos ims_qos_npn \ ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ ims_usrloc_scscf ims_charging ims_ocs ims_diameter_server \ ims_ipsec_pcscf

1 0

git:master:5ee7d35c: ims_qos_npn: imported modified module
by Dragos Vingarzan 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 5ee7d35cfd9839230efbb163bac81ecbd461d6b5 URL: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec… Author: Dragos Vingarzan <dragos(a)neatpath.net> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-18T09:02:17+02:00 ims_qos_npn: imported modified module --- Added: src/modules/ims_qos_npn/Makefile Added: src/modules/ims_qos_npn/README Added: src/modules/ims_qos_npn/cdpeventprocessor.c Added: src/modules/ims_qos_npn/cdpeventprocessor.h Added: src/modules/ims_qos_npn/doc/Makefile Added: src/modules/ims_qos_npn/doc/ims_qos.xml Added: src/modules/ims_qos_npn/doc/ims_qos_admin.xml Added: src/modules/ims_qos_npn/ims_qos_mod.c Added: src/modules/ims_qos_npn/ims_qos_mod.h Added: src/modules/ims_qos_npn/ims_qos_stats.c Added: src/modules/ims_qos_npn/ims_qos_stats.h Added: src/modules/ims_qos_npn/rx_aar.c Added: src/modules/ims_qos_npn/rx_aar.h Added: src/modules/ims_qos_npn/rx_asr.c Added: src/modules/ims_qos_npn/rx_asr.h Added: src/modules/ims_qos_npn/rx_authdata.c Added: src/modules/ims_qos_npn/rx_authdata.h Added: src/modules/ims_qos_npn/rx_avp.c Added: src/modules/ims_qos_npn/rx_avp.h Added: src/modules/ims_qos_npn/rx_rar.c Added: src/modules/ims_qos_npn/rx_rar.h Added: src/modules/ims_qos_npn/rx_str.c Added: src/modules/ims_qos_npn/rx_str.h Added: src/modules/ims_qos_npn/sem.h Added: src/modules/ims_qos_npn/stats.c Added: src/modules/ims_qos_npn/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec… Patch: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec…

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 17 Jul '24

17 Jul '24

- URL: https://github.com/kamailio/kamailio/commit/fa792054a58126b57797675aadc4f0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:27:27+02:00 core: pvapi - use defined types for pv_get_avp_name() name and flags - URL: https://github.com/kamailio/kamailio/commit/4b35f78c57a679723ec77c10c1a2f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:33:01+02:00 corex: use defined types for avp name and flags - URL: https://github.com/kamailio/kamailio/commit/ac9417cb0db60f9a4a0ff9f532edd07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:36:30+02:00 corex: destroy all msg avps after nio event route - URL: https://github.com/kamailio/kamailio/commit/07e5c94cad90474f8e2f2918ca28741… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:55:52+02:00 core: pvar - use defined types for avp type and name - URL: https://github.com/kamailio/kamailio/commit/dedba13bf159d780c3c0ae4dd524e92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:57:24+02:00 core: avp - coherent use of defined types for name and type - URL: https://github.com/kamailio/kamailio/commit/bdd8619d4389b3a84b3ca601d5fe02a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:44:51+02:00 core: cfg.y - use avp flags type - URL: https://github.com/kamailio/kamailio/commit/f8782d7f7522c83ca5490d133a6f696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:01+02:00 acc: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b7de3f755d7f613cb324768466d3122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:04+02:00 avpops: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/4f61b76640f3bca27642a4e0e973b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:07+02:00 call_control: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/d1bca3506b931164fb7993936107a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:10+02:00 cfgt: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/dcce0b7f9c742ce2fdc512da87f5b12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:13+02:00 cplc: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e1e2ad2fc278a05a1ad82e7cb18511d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:16+02:00 debugger: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/a6a191be5aa389f82f4f6d56b48eb9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:19+02:00 dialplan: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/896fc467901da9e99426866ce6348fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:22+02:00 drouting: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/ee07ab29297a7ac86fe975d692f2bf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:25+02:00 exec: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/308246a76a268980038d2435ad7c259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:28+02:00 h350: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/98504b4f7557299cd5c52e95aeb307e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:31+02:00 ims_registrar_pcscf: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/604f900ca8a0e64757ff123c2f0b6a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:34+02:00 ims_registrar_scscf: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e67ad97d3da4e3b5149ea0de31f0930… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:37+02:00 json: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/2ac3e5daafe8c48835aaf8c488e5aa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:39+02:00 kazoo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b523f5e4f4a4f5b8c2f40717c57d093… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:42+02:00 lcr: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/def2e8fcd09ba4bceb21169410da4bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:44+02:00 ldap: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/3bc58f2a3cdf1db930b3836d2d19614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:48+02:00 matrix: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/be98520dd9366d30be74ec9078212f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:50+02:00 mediaproxy: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b7ae09d3b311a7e5cc6d7ded81fc034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:53+02:00 msilo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/bf996241f712a8645ffb28906aeb849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:55+02:00 mtree: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/cb7ad3e8cfeb2bfc3b8d092d3b03073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:59+02:00 nathelper: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/11ac3d05d5d1f1222bf025d26f92f43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:01+02:00 osp: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/dda660bdb3fc3f9257e9291cf38182d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:04+02:00 pdb: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/594a4b39b15a2d4db361554d091e14e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:06+02:00 permissions: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/456608939cf5970eaa3df0919088308… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:09+02:00 pua_dialoginfo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/53f9a571315c151bdd1bf4a6bd5e21f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:11+02:00 pv: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/59c2ebad7d030fd8b2d2e675e3f481f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:14+02:00 registrar: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/0483f1c74e9f3f48e573b445655a622… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:16+02:00 rtpengine: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e14e80a29a8d6edcef955a66b696c3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:19+02:00 rtpproxy: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/44654f476a7ebc3b8531e3dc0455ccd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:21+02:00 sdpops: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e703f9454f8d2b48562e254d79d6102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:23+02:00 siptrace: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/72e8f2a201c9084c3ac86f7921c7787… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:25+02:00 siputils: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/32963fa84244fb0b6b80a50101866c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:27+02:00 tm: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/61ed552911e5ac633cdfdabd9ed2a26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:28+02:00 uac: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/72b80c120c28fbc910c946c9a075e87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:31+02:00 xprint: coherent use of defined types for avp flags, name and value

1 0

[kamailio/kamailio] Dialog DMQ sync: Timer needs fixing, firing on wrong node! (Issue #3656)
by Benoît Panizzon 17 Jul '24

17 Jul '24

Situation: Two Kamailio nodes syncing dialog profiles via DMQ Observation: When a dialog timeout is encountered, about half of the time, the timeout is triggered on the peer node not handling the dialog preventing the call to be correctly terminated and also leaving entries in the dialog database which never get deleted. https://kamailio.org/docs/modules/5.7.x/modules/dialog.html#dialog.p.enable… Makes clear, that only the node which is handling the dialog in question, can make changes not related to the dialog profiles. So when a dialog times out, it is this node which has to trigger the timeout, not any other one. When looking at the source code, it is clear, that the 'lifetime' is transmitted via DMQ dialog message to the peer nodes, which in turn arm a timer. So it is obvious, this time will trigger, sometimes before the instance handling the dialog itself triggers that timer. With some assistance of @oej I found a way to alter the JSON payload to extend the lifetime on the peer nodes: ``` route[DMQ_CAPTURE] { if(is_method("KDMQ")) { if(has_body("application/json") && $fU == 'dialog') { if (jansson_get("lifetime", $rb, "$var(lifetime)")) { $var(new_lifetime) = $var(lifetime) + 60; # Add 60 seconds on DMQ peer to make sure it expires AFTER main node. $var(newrb) = $rb; jansson_set("integer", "lifetime", $var(new_lifetime), "$var(newrb)"); set_body("$var(newrb)","application/json"); msg_apply_changes(); } } dmq_handle_message(); exit; } } ``` Testing with this config fixed the issue of the timeout firing on a peer node instead of the node handling the dialog. Issue is present in 5.5, 5.6 and after looking at the code, I assume also on 5.7 -Benoît -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3656 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3656(a)github.com>

6 15

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev