- sr-dev - kamailio.org

git:5.8:661b2670: usrloc: mark contacts with keepalive sent
by Daniel-Constantin Mierla 02 Sep '24

02 Sep '24

Module: kamailio Branch: 5.8 Commit: 661b2670168530c21ee4dd23fcb29abf8b5bc3ba URL: https://github.com/kamailio/kamailio/commit/661b2670168530c21ee4dd23fcb29ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-02T09:37:04+02:00 usrloc: mark contacts with keepalive sent - properly detect if the contact record has to be expired or not (cherry picked from commit 6502872d35d9bd7043bf54cd1d640dd64ae87115) --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/661b2670168530c21ee4dd23fcb29ab… Patch: https://github.com/kamailio/kamailio/commit/661b2670168530c21ee4dd23fcb29ab… --- 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

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev