sr-dev October 2024

sr-dev@lists.kamailio.org

14 participants
114 discussions

Start a nNew thread

[kamailio/kamailio] rtpengine: use core STR_EQ macro (PR #4004)
by Victor Seva 22 Oct '24

22 Oct '24

1 2

[kamailio/kamailio] [WIP] ims_registrar_scscf: fixing em_max_expires (PR #3989)
by Dragos Vingarzan 22 Oct '24

22 Oct '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  In case of Emergency-Registrations the S-CSCF was wrongly setting the expires of the `;sos` contacts to `em_min_expires` if they were above `em_max_expires`. Other smaller related fixes: - Fixed also another typo in the config params definition. - Added some code to more easily make sense of which attributes of a struct are set with what. - Added conditions to respect the parameter documentation which indicate that if set to 0, the expires conditions won't be used. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3989 -- Commit Summary -- * ims_registrar_scscf: fixing em_max_expires -- File Changes -- M src/modules/ims_registrar_scscf/config.c (26) M src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c (2) M src/modules/ims_registrar_scscf/save.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3989.patch https://github.com/kamailio/kamailio/pull/3989.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3989 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3989(a)github.com>

1 7

git:master:3f38206d: ims_registrar_scscf: fixing em_max_expires
by Dragos Vingarzan 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: 3f38206d88af0fae4c64ee3072eb78ea68f813cb URL: https://github.com/kamailio/kamailio/commit/3f38206d88af0fae4c64ee3072eb78e… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-10-22T16:21:49+02:00 ims_registrar_scscf: fixing em_max_expires --- Modified: src/modules/ims_registrar_scscf/config.c Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/3f38206d88af0fae4c64ee3072eb78e… Patch: https://github.com/kamailio/kamailio/commit/3f38206d88af0fae4c64ee3072eb78e… --- diff --git a/src/modules/ims_registrar_scscf/config.c b/src/modules/ims_registrar_scscf/config.c index a01b4185f79..e4a2b5b5a14 100644 --- a/src/modules/ims_registrar_scscf/config.c +++ b/src/modules/ims_registrar_scscf/config.c @@ -31,19 +31,19 @@ #include "config.h" struct cfg_group_registrar default_registrar_cfg = { - 3600, /* default_expires */ - 0, /* default_expires_range */ - 60, /* min_expires */ - 0, /* max_expires */ - 3600, /* emergency contact default expires */ - 60, /* emergency contact max expires */ - 0, /* emergency contact min expires */ - 0, /* max_contacts */ - 0, /* retry_after */ - 0, /* case_sensitive */ - Q_UNSPECIFIED, /* default_q */ - 1, /* append_branches */ - "" /* realm_pref */ + .default_expires = 3600, /* default_expires */ + .default_expires_range = 0, /* default_expires_range */ + .min_expires = 60, /* min_expires */ + .max_expires = 600000, /* max_expires */ + .em_default_expires = 1800, /* emergency contact default expires */ + .em_max_expires = 3600, /* emergency contact max expires */ + .em_min_expires = 0, /* emergency contact min expires */ + .max_contacts = 0, /* max_contacts */ + .retry_after = 0, /* retry_after */ + .case_sensitive = 0, /* case_sensitive */ + .default_q = Q_UNSPECIFIED, /* default_q */ + .append_branches = 1, /* append_branches */ + .realm_pref = "" /* realm_pref */ }; void *registrar_cfg = &default_registrar_cfg; diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 08260dcb0a3..9c0b5c534e3 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -284,7 +284,7 @@ static param_export_t params[] = { {"max_expires", INT_PARAM, &default_registrar_cfg.max_expires}, {"em_default_expires", INT_PARAM, &default_registrar_cfg.em_default_expires}, - {"em_min_expires", INT_PARAM, &default_registrar_cfg.em_max_expires}, + {"em_max_expires", INT_PARAM, &default_registrar_cfg.em_max_expires}, {"em_min_expires", INT_PARAM, &default_registrar_cfg.em_min_expires}, {"default_q", INT_PARAM, &default_registrar_cfg.default_q}, diff --git a/src/modules/ims_registrar_scscf/save.c b/src/modules/ims_registrar_scscf/save.c index cf3bea78277..8c67b62c241 100644 --- a/src/modules/ims_registrar_scscf/save.c +++ b/src/modules/ims_registrar_scscf/save.c @@ -125,20 +125,24 @@ static inline int calc_contact_expires( : default_registrar_cfg.default_expires; goto end; } - if(!sos_reg && r < default_registrar_cfg.min_expires) { + if(!sos_reg && r < default_registrar_cfg.min_expires + && default_registrar_cfg.min_expires != 0) { r = default_registrar_cfg.min_expires; goto end; } - if(sos_reg && r < default_registrar_cfg.em_min_expires) { + if(sos_reg && r < default_registrar_cfg.em_min_expires + && default_registrar_cfg.em_min_expires != 0) { r = default_registrar_cfg.em_min_expires; goto end; } - if(!sos_reg && r > default_registrar_cfg.max_expires) { + if(!sos_reg && r > default_registrar_cfg.max_expires + && default_registrar_cfg.max_expires != 0) { r = default_registrar_cfg.max_expires; goto end; } - if(sos_reg && r > default_registrar_cfg.em_max_expires) { - r = default_registrar_cfg.em_min_expires; + if(sos_reg && r > default_registrar_cfg.em_max_expires + && default_registrar_cfg.em_max_expires != 0) { + r = default_registrar_cfg.em_max_expires; goto end; } end:

1 0

[kamailio/kamailio] Add ims_icscf module db tables schema (PR #3991)
by Xenofon Karamanos 22 Oct '24

22 Oct '24

2 3

git:master:a0941254: db_schema: Create new table definitions
by Henning Westerholt 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: a094125433122313c2e02dfc0e9ad5d3a5beaa50 URL: https://github.com/kamailio/kamailio/commit/a094125433122313c2e02dfc0e9ad5d… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-10-22T12:59:03+02:00 db_schema: Create new table definitions --- Added: utils/kamctl/db_berkeley/kamailio/nds_trusted_domains Added: utils/kamctl/db_berkeley/kamailio/s_cscf Added: utils/kamctl/db_berkeley/kamailio/s_cscf_capabilities Added: utils/kamctl/db_redis/kamailio/nds_trusted_domains Added: utils/kamctl/db_redis/kamailio/s_cscf Added: utils/kamctl/db_redis/kamailio/s_cscf_capabilities Added: utils/kamctl/db_sqlite/ims_icscf-create.sql Added: utils/kamctl/dbtext/kamailio/nds_trusted_domains Added: utils/kamctl/dbtext/kamailio/s_cscf Added: utils/kamctl/dbtext/kamailio/s_cscf_capabilities Added: utils/kamctl/mongodb/kamailio/nds_trusted_domains.json Added: utils/kamctl/mongodb/kamailio/s_cscf.json Added: utils/kamctl/mongodb/kamailio/s_cscf_capabilities.json Added: utils/kamctl/mysql/ims_icscf-create.sql Added: utils/kamctl/oracle/ims_icscf-create.sql Added: utils/kamctl/postgres/ims_icscf-create.sql Added: utils/kamctl/xhttp_pi/ims_icscf-mod Added: utils/kamctl/xhttp_pi/ims_icscf-table Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/a094125433122313c2e02dfc0e9ad5d… Patch: https://github.com/kamailio/kamailio/commit/a094125433122313c2e02dfc0e9ad5d…

1 0

git:master:e2ea7279: db_schema: Add ims_icscf db schema
by Henning Westerholt 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: e2ea727988828a9683ef112637e25ee4d58032f7 URL: https://github.com/kamailio/kamailio/commit/e2ea727988828a9683ef112637e25ee… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-10-22T12:59:03+02:00 db_schema: Add ims_icscf db schema --- Added: src/lib/srdb1/schema/kamailio-ims_icscf.xml Added: src/lib/srdb1/schema/nds_trusted_domains.xml Added: src/lib/srdb1/schema/s_cscf.xml Added: src/lib/srdb1/schema/s_cscf_capabilities.xml Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/e2ea727988828a9683ef112637e25ee… Patch: https://github.com/kamailio/kamailio/commit/e2ea727988828a9683ef112637e25ee…

1 0

git:master:c823f413: core: parser sdp - check length for rtpmap extract
by Daniel-Constantin Mierla 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: c823f41350ab9186a323707e9be32e31922bec17 URL: https://github.com/kamailio/kamailio/commit/c823f41350ab9186a323707e9be32e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-22T07:41:08+02:00 core: parser sdp - check length for rtpmap extract --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c823f41350ab9186a323707e9be32e3… Patch: https://github.com/kamailio/kamailio/commit/c823f41350ab9186a323707e9be32e3… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index a74f78abb84..fe5b464e473 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -151,6 +151,9 @@ int extract_rtpmap(str *body, str *rtpmap_payload, str *rtpmap_encoding, char *cp, *cp1; int len; + if(body->len <= 9) { + return -1; + } if(strncasecmp(body->s, "a=rtpmap:", 9) != 0) { /*LM_DBG("We are not pointing to an a=rtpmap: attribute =>`%.*s'\n", * body->len, body->s); */

1 0

git:master:0cbb2eb0: jwt: print decode result in error log message
by Daniel-Constantin Mierla 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: 0cbb2eb035c7d2a29ae707cde94a2c0573e0ffd5 URL: https://github.com/kamailio/kamailio/commit/0cbb2eb035c7d2a29ae707cde94a2c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-22T07:34:29+02:00 jwt: print decode result in error log message --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0cbb2eb035c7d2a29ae707cde94a2c0… Patch: https://github.com/kamailio/kamailio/commit/0cbb2eb035c7d2a29ae707cde94a2c0… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 0efb793c47f..af3d42f79c5 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -498,7 +498,7 @@ static int ki_jwt_verify_key( ret = jwt_decode( &jwt, jwtval->s, (unsigned char *)kdata.s, (size_t)kdata.len); if(ret != 0 || jwt == NULL) { - LM_ERR("failed to decode jwt value\n"); + LM_ERR("failed to decode jwt value (ret: %d jwt: %p)\n", ret, jwt); goto error; } if(jwt_validate(jwt, jwt_valid) != 0) {

1 0

git:master:6b7894d6: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Oct '24

21 Oct '24

Module: kamailio Branch: master Commit: 6b7894d66ca65ca99b5987ddc35a7f28c7a88949 URL: https://github.com/kamailio/kamailio/commit/6b7894d66ca65ca99b5987ddc35a7f2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-10-21T15:01:11+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/6b7894d66ca65ca99b5987ddc35a7f2… Patch: https://github.com/kamailio/kamailio/commit/6b7894d66ca65ca99b5987ddc35a7f2… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 6b1d875d77e..4658b7a3f35 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -674,15 +674,15 @@ modparam("rtpengine", "rtpengine_disable_tout", 20) to all rtpengines, else no rtpengine will be queried until its rtpengine_disable_tout timeout passes. - Default value is ��1�� (enabled). + Default value is ��0�� (disabled). Can be set at runtime, e.g.: $ kamcmd cfg.set_now_int rtpengine aggressive_redetectio -n 0 +n 1 Example 1.3. Set aggressive_redetection parameter ... -modparam("rtpengine", "aggressive_redetection", 0) +modparam("rtpengine", "aggressive_redetection", 1) ... 4.4. rtpengine_tout_ms (integer)

1 0

[kamailio/kamailio] rtpengine: disable aggressive redetection by default (PR #3992)
by Stefan Mititelu 21 Oct '24

21 Oct '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 - [X] Related to issue #3297 #### Description  The setup is a kamailio with no available rtpengine. (e.g. has a list with rtpengine urls but those are not reachable) Recently had a crash similar to #3297, but in an outdated kamailio version (5.5.7). Tried to reproduce this in 5.5.7 and 5.8.3 but could not crash any of them. However I managed to get the logs similar to ones right before the crash happened: ``` 2024-10-04T17:39:58.026206+03:00 kamailio[450237]: ERROR: {1 1 INVITE 203-450290(a)192.168.100.93} <core> [core/action.c:1595]: run_actions(): alert - action [corefunc (16)] cfg [/home/stefan/kamailio.cfg:625] took too long [29310906 us] ``` ...directly related to how much rtpengine_manage() function took to execute. So routing of SIP is delayed by that ammount. Tracked this in code, down to where this lock is get, when "aggressive_redetection" modparam is enabled: https://github.com/kamailio/kamailio/blob/66fe6eb71e58a02222d1a2fb00f9a0cdb… I will double check that part of the code, since I don't think a lock get is necessary. It only updates a value inside a node, inside the list of nodes, but not changes the list links at all. (this in another PR) For now I propose to disable this aggressive_redetection mechanism by default. Since it delays the SIP routing logic when no rtpengines available (and in some cases lead to crashes in transaction module). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3992 -- Commit Summary -- * rtpengine: disable aggressive redetection by default -- File Changes -- M src/modules/rtpengine/config.c (2) M src/modules/rtpengine/doc/rtpengine_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3992.patch https://github.com/kamailio/kamailio/pull/3992.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3992 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3992(a)github.com>

3 4

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2024