sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
347 discussions

[kamailio/kamailio] github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 (PR #4062)
by dependabot[bot] 10 Dec '24

10 Dec '24

Bumps [threeal/cmake-action](https://github.com/threeal/cmake-action) from 2.0.0 to 2.1.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/threeal/cmake-action/releases">threea… releases</a>.</em></p> <blockquote> <h2>Version 2.1.0</h2> <h2>What's Changed</h2> <ul> <li>Added support for specifying quotations for inputs with multiple values.</li> <li>Reduced bundled action script size by removing bloated dependencies.</li> <li>Enhanced development configurations and CI workflows.</li> <li>Updated development dependencies.</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/threeal/cmake-action/compare/v2...v2.1.0&quot… </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/threeal/cmake-action/commit/725d1314ccf9ea922… chore: bump prettier from 3.4.1 to 3.4.2 (<a href="https://redirect.github.com/threeal/cmake-action/issues/543&quot… <li><a href="https://github.com/threeal/cmake-action/commit/6954eda1e8b7fec84… chore: bump typescript-eslint from 8.16.0 to 8.17.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/542&quot… <li><a href="https://github.com/threeal/cmake-action/commit/9b2633db99477647e… chore: bump <code>@eslint/js</code> from 9.15.0 to 9.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/541&quot… <li><a href="https://github.com/threeal/cmake-action/commit/d08d2651e1a4410b6… chore: bump eslint from 9.15.0 to 9.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/540&quot… <li><a href="https://github.com/threeal/cmake-action/commit/3f767d1e2b70aca09… chore: bump rollup from 4.27.4 to 4.28.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/539&quot… <li><a href="https://github.com/threeal/cmake-action/commit/b6fc2b4c091acd09e… chore: bump Yarn to version 4.5.3 (<a href="https://redirect.github.com/threeal/cmake-action/issues/538&quot… <li><a href="https://github.com/threeal/cmake-action/commit/639d8219e822101b6… chore: bump <code>@types/node</code> from 22.10.0 to 22.10.1 (<a href="https://redirect.github.com/threeal/cmake-action/issues/537&quot… <li><a href="https://github.com/threeal/cmake-action/commit/820fc064966f53b9e… chore: bump prettier from 3.3.3 to 3.4.1 (<a href="https://redirect.github.com/threeal/cmake-action/issues/536&quot… <li><a href="https://github.com/threeal/cmake-action/commit/38835ec642f1688f1… chore: bump typescript-eslint from 8.15.0 to 8.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/534&quot… <li><a href="https://github.com/threeal/cmake-action/commit/4a4b9a2bb1f850992… chore: bump <code>@types/node</code> from 22.9.1 to 22.10.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/533&quot… <li>Additional commits viewable in <a href="https://github.com/threeal/cmake-action/compare/v2.0.0...v2.1.0&… 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/4062 -- Commit Summary -- * github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 -- File Changes -- M .github/workflows/cmake_build.yml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4062.patch https://github.com/kamailio/kamailio/pull/4062.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4062 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4062(a)github.com>

2 1

git:master:e71b02a3: github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: e71b02a326e2ce54e4bf6c6c209f79af43c54278 URL: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T07:59:12+01:00 github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 Bumps [threeal/cmake-action](https://github.com/threeal/cmake-action) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/threeal/cmake-action/releases) - [Commits](https://github.com/threeal/cmake-action/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: threeal/cmake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/cmake_build.yml --- Diff: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… Patch: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… --- diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index 8bab75c65bb..73ab19ef5d7 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -49,7 +49,7 @@ jobs: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - name: Build Project natively - uses: threeal/cmake-action(a)v2.0.0 + uses: threeal/cmake-action(a)v2.1.0 # Step runs for all except this combination if: matrix.os != 'ubuntu-latest' || matrix.target_arch != 'aarch64' with: @@ -62,7 +62,7 @@ jobs: - name: Build Project with cross-compiler if: matrix.os == 'ubuntu-latest' && matrix.target_arch == 'aarch64' - uses: threeal/cmake-action(a)v2.0.0 + uses: threeal/cmake-action(a)v2.1.0 with: build-dir: ${{github.workspace}}/build build-args: -j8

1 0

git:master:8e398b86: lib/srdb1: new and free connection callbacks expect one parameter
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 8e398b8675079e1baac7c7575e70283175cdebe2 URL: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T19:04:25+01:00 lib/srdb1: new and free connection callbacks expect one parameter - new connection is executetd with a database id and free connection with a pool con - compiler warnings: src/lib/srdb1/db.c:322:23: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] 322 | con = new_connection(id); src/lib/srdb1/db.c:361:18: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] 361 | free_connection(con); --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db.h --- Diff: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… Patch: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index b13d87c692b..77dea84df52 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -270,7 +270,7 @@ int db_bind_mod(const str *mod, db_func_t *mydbf) * Initialize database module * \note No function should be called before this */ -db1_con_t *db_do_init(const str *url, void *(*new_connection)()) +db1_con_t *db_do_init(const str *url, void *(*new_connection)(struct db_id *)) { return db_do_init2(url, *new_connection, DB_POOLING_PERMITTED); } @@ -280,8 +280,8 @@ db1_con_t *db_do_init(const str *url, void *(*new_connection)()) * Initialize database module * \note No function should be called before this */ -db1_con_t *db_do_init2( - const str *url, void *(*new_connection)(), db_pooling_t pooling) +db1_con_t *db_do_init2(const str *url, void *(*new_connection)(struct db_id *), + db_pooling_t pooling) { struct db_id *id; void *con; @@ -347,7 +347,7 @@ db1_con_t *db_do_init2( * Shut down database module * \note No function should be called after this */ -void db_do_close(db1_con_t *_h, void (*free_connection)()) +void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)) { struct pool_con *con; diff --git a/src/lib/srdb1/db.h b/src/lib/srdb1/db.h index 248647ecd07..a9538f6b9ca 100644 --- a/src/lib/srdb1/db.h +++ b/src/lib/srdb1/db.h @@ -48,6 +48,8 @@ #include "db_cap.h" #include "db_con.h" #include "db_row.h" +#include "db_id.h" +#include "db_pool.h" #include "db_pooling.h" #include "db_locking.h" @@ -464,7 +466,7 @@ int db_bind_mod(const str *mod, db_func_t *dbf); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t *db_do_init(const str *url, void *(*new_connection)()); +db1_con_t *db_do_init(const str *url, void *(*new_connection)(struct db_id *)); /** @@ -478,8 +480,8 @@ db1_con_t *db_do_init(const str *url, void *(*new_connection)()); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t *db_do_init2( - const str *url, void *(*new_connection)(), db_pooling_t pooling); +db1_con_t *db_do_init2(const str *url, void *(*new_connection)(struct db_id *), + db_pooling_t pooling); /** @@ -490,7 +492,7 @@ db1_con_t *db_do_init2( * \param _h database connection handle * \param (*free_connection) Pointer to the db specific free_connection method */ -void db_do_close(db1_con_t *_h, void (*free_connection)()); +void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); /**

1 0

Updated: Online devel meeting on matrix - 15:00 UTC, Dec 9, 2024
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Hello, we should consider an online devel meeting sometime soon to summarize what was done at (and still needs to be done after) devel meeting in Dusseldorf and plan a bit the targets for next major release 6.0. If considered useful, I propose Dec 9, 2024 (Monday) at 15:00UTC (16:00 Berlin/Paris/Madrid/Rome), but we can also look for other dates as well. Topics to be discussed can be added at: - https://github.com/kamailio/kamailio-wiki/blob/main/docs/devel/irc-meetings… Pull requests can be made by users without git access. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:master:83e9cc03: cmake: Link internal libraries to core and remove them from modules
by Xenofon Karamanos 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 83e9cc036147b071281ad5c444a473ece83f618e URL: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-12-09T15:19:57+02:00 cmake: Link internal libraries to core and remove them from modules --- Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt Modified: src/lib/CMakeLists.txt Modified: src/lib/ims/CMakeLists.txt Modified: src/lib/srdb1/CMakeLists.txt Modified: src/lib/srdb2/CMakeLists.txt Modified: src/lib/trie/CMakeLists.txt Modified: src/modules/acc/CMakeLists.txt Modified: src/modules/alias_db/CMakeLists.txt Modified: src/modules/auth_db/CMakeLists.txt Modified: src/modules/avpops/CMakeLists.txt Modified: src/modules/carrierroute/CMakeLists.txt Modified: src/modules/cfg_db/CMakeLists.txt Modified: src/modules/cnxcc/CMakeLists.txt Modified: src/modules/cplc/CMakeLists.txt Modified: src/modules/db2_ldap/CMakeLists.txt Modified: src/modules/db2_ops/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/db_cluster/CMakeLists.txt Modified: src/modules/db_flatstore/CMakeLists.txt Modified: src/modules/db_mongodb/CMakeLists.txt Modified: src/modules/db_oracle/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt Modified: src/modules/db_postgres/CMakeLists.txt Modified: src/modules/db_redis/CMakeLists.txt Modified: src/modules/db_sqlite/CMakeLists.txt Modified: src/modules/db_text/CMakeLists.txt Modified: src/modules/db_unixodbc/CMakeLists.txt Modified: src/modules/dialog/CMakeLists.txt Modified: src/modules/dialplan/CMakeLists.txt Modified: src/modules/dispatcher/CMakeLists.txt Modified: src/modules/dmq/CMakeLists.txt Modified: src/modules/domain/CMakeLists.txt Modified: src/modules/domainpolicy/CMakeLists.txt Modified: src/modules/drouting/CMakeLists.txt Modified: src/modules/group/CMakeLists.txt Modified: src/modules/htable/CMakeLists.txt Modified: src/modules/imc/CMakeLists.txt Modified: src/modules/ims_auth/CMakeLists.txt Modified: src/modules/ims_charging/CMakeLists.txt Modified: src/modules/ims_dialog/CMakeLists.txt Modified: src/modules/ims_diameter_server/CMakeLists.txt Modified: src/modules/ims_icscf/CMakeLists.txt Modified: src/modules/ims_ipsec_pcscf/CMakeLists.txt Modified: src/modules/ims_isc/CMakeLists.txt Modified: src/modules/ims_ocs/CMakeLists.txt Modified: src/modules/ims_qos/CMakeLists.txt Modified: src/modules/ims_qos_npn/CMakeLists.txt Modified: src/modules/ims_usrloc_pcscf/CMakeLists.txt Modified: src/modules/ims_usrloc_scscf/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/keepalive/CMakeLists.txt Modified: src/modules/lcr/CMakeLists.txt Modified: src/modules/matrix/CMakeLists.txt Modified: src/modules/mohqueue/CMakeLists.txt Modified: src/modules/mqueue/CMakeLists.txt Modified: src/modules/msilo/CMakeLists.txt Modified: src/modules/mtree/CMakeLists.txt Modified: src/modules/p_usrloc/CMakeLists.txt Modified: src/modules/pdt/CMakeLists.txt Modified: src/modules/permissions/CMakeLists.txt Modified: src/modules/pipelimit/CMakeLists.txt Modified: src/modules/prefix_route/CMakeLists.txt Modified: src/modules/presence/CMakeLists.txt Modified: src/modules/presence_xml/CMakeLists.txt Modified: src/modules/pua/CMakeLists.txt Modified: src/modules/rls/CMakeLists.txt Modified: src/modules/rtpengine/CMakeLists.txt Modified: src/modules/rtpproxy/CMakeLists.txt Modified: src/modules/sca/CMakeLists.txt Modified: src/modules/secfilter/CMakeLists.txt Modified: src/modules/sipcapture/CMakeLists.txt Modified: src/modules/siptrace/CMakeLists.txt Modified: src/modules/siputils/CMakeLists.txt Modified: src/modules/speeddial/CMakeLists.txt Modified: src/modules/sqlops/CMakeLists.txt Modified: src/modules/topos/CMakeLists.txt Modified: src/modules/uac/CMakeLists.txt Modified: src/modules/uid_auth_db/CMakeLists.txt Modified: src/modules/uid_avp_db/CMakeLists.txt Modified: src/modules/uid_domain/CMakeLists.txt Modified: src/modules/uid_gflags/CMakeLists.txt Modified: src/modules/uid_uri_db/CMakeLists.txt Modified: src/modules/uri_db/CMakeLists.txt Modified: src/modules/userblocklist/CMakeLists.txt Modified: src/modules/usrloc/CMakeLists.txt Modified: src/modules/utils/CMakeLists.txt Modified: src/modules/xcap_client/CMakeLists.txt Modified: src/modules/xcap_server/CMakeLists.txt Modified: src/modules/xhttp/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e… Patch: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e…

1 0

[kamailio/kamailio] Python exception handling fixes (PR #4044)
by Matthias Urlichs 09 Dec '24

09 Dec '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. Doing both will raise a `SystemError` exception which obscures the original problem. It may also cause a memory leak. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4044 -- Commit Summary -- * app_python3: fix exception handling -- File Changes -- M src/modules/app_python3/apy_kemi.c (4) M src/modules/app_python3s/apy3s_kemi.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4044.patch https://github.com/kamailio/kamailio/pull/4044.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4044 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4044(a)github.com>

3 9

git:master:ef73fb87: app_python3s: fix exception handling
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: ef73fb876f527c3bde4b425e3ec70d3f613fcb87 URL: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T12:13:54+01:00 app_python3s: fix exception handling Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. --- Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… Patch: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… --- diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index f28354909b7..dd23bd0f2d7 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -409,7 +409,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(pobj == NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } if(ket->ptypes[i] == SR_KEMIP_STR) { if(!PyUnicode_Check(pobj)) { @@ -421,7 +421,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(vps[i].v.s.s == NULL) { LM_ERR("null-string parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } vps[i].v.s.len = (int)slen; vps[i].vtype = SR_KEMIP_STR;

1 0

git:master:91dc75e6: app_python3: fix exception handling
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 91dc75e65bb2a6643b8b322024416c420caf5d64 URL: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T12:13:54+01:00 app_python3: fix exception handling Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… Patch: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 213a19e4703..ddc987168b6 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -281,7 +281,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(pobj == NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } if(ket->ptypes[i] == SR_KEMIP_STR) { if(!PyUnicode_Check(pobj)) { @@ -293,7 +293,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(vps[i].v.s.s == NULL) { LM_ERR("null-string parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } vps[i].v.s.len = (int)slen; vps[i].vtype = SR_KEMIP_STR;

1 0

t_relay() ignores destination uri ($du) set by dispatcher module
by molodtsov＠ajax.systems 09 Dec '24

09 Dec '24

Help me, kamailio step-bros, i'm stuck! Im trying to build logic, where if target client was not located on this node - message is forwarded to the next node, until sip message make full circle, and it will be handled by its 'X-Visited-Nodes' header and fire 404 if no one consumed it. (I can see that check is buggy, but i will fix this later so don't pay much attention to it) Im blocked by t_relay() behaviour, which is ignore destination selected by ds_select_dst; Instead of forwarding message, it comes on the same node again and again >>>> my dispatcher config 927 route[DISPATCH] { 928 $var(destination_found) = 0; 929 $var(checked_nodes) = ""; # Keep track of locally checked nodes 930 $var(loop_behaviour) = 0; 931 932 # Initialize X-Visited-Nodes if it doesn't exist 933 if ($hdrc(X-Visited-Nodes) == 0) { 934 append_hf_value("X-Visited-Nodes", ""); # Initialize the header in the message 935 } 936 937 xlog("X-Visited-Nodes: $hdr(X-Visited-Nodes)"); 938 append_hf_value("X-Visited-Nodes", "$du"); 939 # Round-robin dispatching on gateways group '1' 940 while (ds_select_dst("1", "4") && $var(loop_behaviour) != 2) { 941 $var(loop_behaviour) = 0; 942 # Get the current proposed destination 943 $var(current_dest) = $du; 944 945 # 1. Skip if the proposed destination is self 946 if ($var(loop_behaviour) == 0 && $var(current_dest) =~ ".*" + $Ri + ".*") { 947 xlog("Skipping self destination <$var(current_dest)>\n"); 948 ds_mark_dst(); # Mark this node globally only because it's "self" 949 $var(loop_behaviour) = 1; #continue 950 } 951 952 # 2. Check if we've made a full circle 953 if ($var(loop_behaviour) == 0 && $var(checked_nodes) =~ "^" + $var(current_dest) + ".*") { 954 xlog("All nodes checked, no valid destination found\n"); 955 send_reply("404", "No user found, no new destination available"); 956 exit; 957 } 958 959 # 3. Check if the node is already in X-Visited-Nodes 960 if ($var(loop_behaviour) == 0 && $hdr(X-Visited-Nodes) =~ ".*" + $var(current_dest) + ".*") { 961 xlog("Node <$var(current_dest)> already in X-Visited-Nodes\n"); 962 $var(checked_nodes) = $var(checked_nodes) + "," + $var(current_dest); 963 $var(loop_behaviour) = 1; #continue 964 } 965 966 if($var(loop_behaviour) == 0){ 974 xlog("DISPATCHER: selected reqURI: <$ru> ; destURI: <$du> via <$var(current_dest)> (attrs: $xavp(_dsdst_=>attrs))\n"); 975 $var(destination_found) = 1; 976 $var(loop_behaviour) = 2; # Exit the loop as a valid destination is found 977 } 978 } 979 980 # If a destination is found, relay the message 981 if ($var(destination_found)) { 987 if (!t_relay()) { 988 sl_reply_error(); 989 } 990 exit; 991 } else { 992 return(-1); 993 } 994 } >>>> INVITE message trace (every line was trimmed to not garbage this message with irrelevant info like process name or timestamp) i have enabled config trace mode, so my invite message inside dispatcher route looks like this. And on my other node, there is not a trace of invite message {1 22 INV CmLZ} <script>: Lookup for 02222 failed - no such client on this node <--- Trying to call user, which is not registered on this node, so location route returns fail and message should go on another node {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=845 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=842 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=843 a=2 n=return {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=653 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=650 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=645 a=5 n=route {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=928 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=929 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=930 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=937 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=934 a=26 n=append_hf_value {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=937 a=25 n=xlog {1 22 INV CmLZ} <script>: X-Visited-Nodes: <null> {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=938 a=26 n=append_hf_value {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=978 a=23 n=while {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=940 a=26 n=ds_select_dst {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=941 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=943 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=953 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=960 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=966 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=978 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=974 a=25 n=xlog {1 22 INV CmLZ} <script>: DISPATCHER: selected reqURI: <sip:02222@kamailio-nlb-test-40f4f509064551a6.elb.eu-west-1.amazonaws.com> ; destURI: <sip:10.197.200.228:5060> via <sip:10.197.200.228:5060> (attrs: <null>) <--- destination uri is correct, message should be sent to next kamailio node isn't it? {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=975 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=976 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=940 a=26 n=ds_select_dst {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=993 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=990 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=987 a=24 n=t_relay <-- should relay to $dU destination {1 22 INV CmLZ} tm [t_lookup.c:1868]: t_newtran(): msg (0x7d0ad3775368) id=28/25950 global id=28/25950 T start=(nil) {1 22 INV CmLZ} tm [t_lookup.c:781]: t_lookup_request(): start searching: hash=9408, isACK=0 {1 22 INV CmLZ} tm [t_lookup.c:499]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK.YP1EiC6qX] {1 22 INV CmLZ} tm [t_lookup.c:981]: t_lookup_request(): no transaction found {1 22 INV CmLZ} tm [h_table.c:532]: tm_xdata_swap(): copy X/AVPs from msg context to txdata {1 22 INV CmLZ} tm [t_hooks.c:301]: run_reqin_callbacks_internal(): trans=0x7d0acdbf1168, callback type 1, id 0 entered {1 22 INV CmLZ} tm [h_table.c:551]: tm_xdata_swap(): restore X/AVPs msg context from txdata {1 22 INV CmLZ} tm [h_table.c:415]: build_cell(): created new cell 0x7d0acdbf1168 {1 22 INV CmLZ} tm [t_funcs.c:339]: t_relay_to(): new INVITE {1 22 INV CmLZ} tm [t_reply.c:634]: _reply_light(): reply sent out - buf=0x7d0ad3755d98: SIP/2.0 100 trying -... shmem=0x7d0acdbf4b10: SIP/2.0 100 trying - {1 22 INV CmLZ} tm [t_reply.c:645]: _reply_light(): finished {1 22 INV CmLZ} tm [t_funcs.c:386]: t_relay_to(): new transaction forwarded {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=990 a=2 n=exit <--- same invite appears on this node instead of being forwarded to next kamailio node {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=585 a=5 n=route {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=699 a=67 n=set_rpl_no_connect {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=702 a=55 n=force_rport {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=727 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=732 a=16 n=if

1 0

git:master:ba0c570c: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: ba0c570ca95bff06c8ce04779371567d88a4e9f8 URL: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-09T09:46:10+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… Patch: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 06ee1beb53b..12a030cc19d 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1294,16 +1294,17 @@ Note See also: t_set_fr(), fr_timer. - In Kamailio compatibility mode (defined by #!KAMAILIO), the value of - the parameter must be the name of an AVP in pseudo-variable format: - $avp(name). In SER compatibility mode it must be just AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP in + pseudo-variable format: $avp(name). In SER compatibility mode (defined + by #!SER) it must be just AVP name. Example 1.28. Set fr_timer_avp parameter ... -# Kamailio mode -modparam("tm", "fr_timer_avp", "$avp(i:708)") -# Old SER mode -modparam("tm", "fr_timer_avp", "i:708") +# default Kamailio compatibility mode +modparam("tm", "fr_timer_avp", "$avp(frtimer)") +# old SER compatibility mode +modparam("tm", "fr_timer_avp", "frtimer") ... 3.28. fr_inv_timer_avp (string) @@ -1328,15 +1329,16 @@ Note See also: t_set_fr(), fr_inv_timer. - In Kamailio compatibility mode (defined by #!KAMAILIO), the value of - the parameter must be the name of an AVP in pseudo-variable format: - $avp(name). In SER compatibility mode it must by just AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP in + pseudo-variable format: $avp(name). In SER compatibility mode (defined + by #!SER) it must by just AVP name. Example 1.29. Set fr_inv_timer_avp parameter ... -# Kamailio mode +# Kamailio compatibility mode modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") -# Old SER mode +# old SER compatibility mode modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ...

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024