sr-dev May 2024

sr-dev@lists.kamailio.org

15 participants
166 discussions

git:master:6b8f6d3b: usrloc: delete location_attrs in db_only mode on delete_urecord

by Henning Westerholt

Module: kamailio Branch: master Commit: 6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313 URL: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-16T15:18:54+02:00 usrloc: delete location_attrs in db_only mode on delete_urecord When calling delete_urecord in DB_ONLY mode the location_attrs are not deleted. This fix makes sure to delete location_attrs when calling db_delete_urecord is called. --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… Patch: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index f95fe987d75..8a8c1ea7895 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -1784,9 +1784,11 @@ int uldb_delete_attrs(str *_dname, str *_user, str *_domain, str *_ruid) str tname; db_key_t keys[3]; db_val_t vals[3]; + int n = 0; - if(ul_db_ops_ruid == 1) + if(ul_db_ops_ruid == 1 && _ruid) { return uldb_delete_attrs_ruid(_dname, _ruid); + } LM_DBG("trying to delete location attributes\n"); @@ -1805,22 +1807,26 @@ int uldb_delete_attrs(str *_dname, str *_user, str *_domain, str *_ruid) tname.s = tname_buf; tname.len = _dname->len + 6; - keys[0] = &ulattrs_user_col; - keys[1] = &ulattrs_ruid_col; - keys[2] = &ulattrs_domain_col; - - vals[0].type = DB1_STR; - vals[0].nul = 0; - vals[0].val.str_val = *_user; + keys[n] = &ulattrs_user_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_user; + n++; - vals[1].type = DB1_STR; - vals[1].nul = 0; - vals[1].val.str_val = *_ruid; + if(_ruid) { + keys[n] = &ulattrs_ruid_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_ruid; + n++; + } if(ul_use_domain) { - vals[2].type = DB1_STR; - vals[2].nul = 0; - vals[2].val.str_val = *_domain; + keys[n] = &ulattrs_domain_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_domain; + n++; } if(ul_dbf.use_table(ul_dbh, &tname) < 0) { @@ -1828,7 +1834,7 @@ int uldb_delete_attrs(str *_dname, str *_user, str *_domain, str *_ruid) return -1; } - if(ul_dbf.delete(ul_dbh, keys, 0, vals, (ul_use_domain) ? (3) : (2)) < 0) { + if(ul_dbf.delete(ul_dbh, keys, 0, vals, n) < 0) { LM_ERR("deleting from database failed\n"); return -1; } diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 3c394a24a10..d47167c0f4b 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -502,6 +502,10 @@ int db_delete_urecord(urecord_t *_r) vals[1].val.str_val.s = dom + 1; vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; } + uldb_delete_attrs( + _r->domain, &vals[0].val.str_val, &vals[1].val.str_val, NULL); + } else { + uldb_delete_attrs(_r->domain, &vals[0].val.str_val, NULL, NULL); } if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {

7 months, 1 week

[kamailio/kamailio] [FEATURE] mid-call self-redirect call to new nexthop (Issue #3773)

by Jakihiko

These below is sample diagram, where kamailio/rtpengine act as an SBC <img width="1604" alt="image" src="https://github.com/kamailio/kamailio/assets/143789335/b9540fb3-c1bf-4a78-b1…"> * There is an active call carrier, kamailio/rtpngine and Asterisk1 * Asterisk1 went down (power shortage, or network ..) * What I want is kamailio self-redirect the call to Asterisk2 **Describe the solution you'd like** Ideally, kamailio provide the command line to tell which call will be self-redirect to the new destination, eg: `kamcmd -x sefl_redirect_callid <call-id> <destionation-ip>` Noted: I read the https://blog.opensips.org/2021/06/09/media-re-anchoring-using-opensips-3-2/ but re-INVITE to carrier seem not appropriate in my case due to call rate limit. I'm looking for a new solution where I don't need to use re-INVITE when Asterisk down. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3773 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3773(a)github.com>

7 months, 1 week

git:master:25e409cf: pkg/kamailio/deb: version set to 6.0.0~dev2 [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 25e409cf60a80e4e0af09bb84234af51c33755c4 URL: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-16T09:46:51+02:00 pkg/kamailio/deb: version set to 6.0.0~dev2 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af5… Patch: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af5…

7 months, 1 week

git:master:2e2b22a0: Makefile.defs: version set to 6.0.0-dev2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2e2b22a097139239b8493bfdd777530a9795ad66 URL: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-16T09:25:33+02:00 Makefile.defs: version set to 6.0.0-dev2 - next major release series is going to be 6.0.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530… Patch: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9feece65535..99157d2c017 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -104,10 +104,10 @@ endif INSTALL_FLAVOUR=$(FLAVOUR) # version number -VERSION = 5 -PATCHLEVEL = 9 +VERSION = 6 +PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

7 months, 1 week

[kamailio/kamailio] p_usrloc: use a global all_columns variable in db_load* functions (PR #3845)

by Lucian Balaceanu

#### 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/3845 -- Commit Summary -- * p_usrloc: use a global all_columns variable in db_load* functions -- File Changes -- M src/modules/p_usrloc/udomain.c (157) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3845.patch https://github.com/kamailio/kamailio/pull/3845.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3845(a)github.com>

7 months, 1 week

git:master:ccfb5a0f: auth: point auth_algorithm to a static list values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ccfb5a0f852bf101c1e2ef46f08192921a4d963f URL: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f081929… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-15T22:03:43+02:00 auth: point auth_algorithm to a static list values - function parameters can be overwritten by subsequent functions --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f081929… Patch: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f081929… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 2fcb9169f26..6517dce566a 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -135,6 +135,17 @@ static struct qp auth_qauthint = {STR_STATIC_INIT("auth-int"), QOP_AUTHINT}; /* Hash algorithm used for digest authentication, MD5 if empty */ str auth_algorithm = {"", 0}; + +#define AUTH_ALG_MD5_IDX 0 +#define AUTH_ALG_SHA256_IDX 1 +/* clang-format off */ +static str auth_algorithm_list[] = { + {"MD5", 3}, + {"SHA-256", 7}, + {NULL, 0} +}; +/* clang-format on */ + int hash_hex_len; int add_authinfo_hdr = 0; /* should an Authentication-Info header be added on 200 OK responses? */ @@ -373,10 +384,12 @@ static int mod_init(void) } if(auth_algorithm.len == 0 || strcmp(auth_algorithm.s, "MD5") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_MD5_IDX]; hash_hex_len = HASHHEXLEN; calc_HA1 = calc_HA1_md5; calc_response = calc_response_md5; } else if(strcmp(auth_algorithm.s, "SHA-256") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_SHA256_IDX]; hash_hex_len = HASHHEXLEN_SHA256; calc_HA1 = calc_HA1_sha256; calc_response = calc_response_sha256; @@ -493,10 +506,12 @@ static int ki_auth_algorithm(sip_msg_t *msg, str *alg) auth_algorithm = *alg; if(strcmp(auth_algorithm.s, "MD5") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_MD5_IDX]; hash_hex_len = HASHHEXLEN; calc_HA1 = calc_HA1_md5; calc_response = calc_response_md5; } else if(strcmp(auth_algorithm.s, "SHA-256") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_SHA256_IDX]; hash_hex_len = HASHHEXLEN_SHA256; calc_HA1 = calc_HA1_sha256; calc_response = calc_response_sha256;

7 months, 1 week

TLS.reload and memory usage of SSL_CTX structs

by Xenofon Karamanos

Hello all, I am currently looking into issue https://github.com/kamailio/kamailio/issues/3823 regarding the tls.reload and the constant increase in memory usage when it's called. I tried to look something up related to CRL and related functions for what causing it but nothing to obvious. The only culprit i could find was this function call in SSL_verify_load_locations in load_crl()<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…>. But the same exact function is also called in load_ca_list() with no such behaviour. Next thing i notice, is that on the first rpc call of tls.reload, there is a "significant" memory allocation. What i mean by this is that when a fresh kamailio (5.8) is started up (with -m 7, for low shared memory availability to try and replicate the issue and children=2) and then check free shared memory usage using `kamcmd core.shmmem` is around 2196096 (bytes i am assuming) for my system. On the first call of tls.reload, it drops to 539248. That's a heavy drop so i started digging why on so much allocation is caused. When loading a tls configuration, ksr_fix_domain<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> allocates a new SSL_CTX per process. From what i am seeing this SSL_CTX, is basically the same for each one, with same configuration without any difference on settings. So, what i tried is to allocated it once (see tls_reload branch in my repo<https://github.com/kamailio/kamailio/compare/master...xkaraman:kamailio:tls…>), and just share this context to all of the process and the memory used is way less and also the unbounding memory seems to fixed or at least it's slowed that's barely visible. What are your thoughts on these? Is this something we can done? Is the assumption that tls config will and be the same for every process or can one somehow differentiate from another? Thanks, Xenofon Some numbers for anyone interested: Before the patch 5.8 branch and with settings such as -m 7 (shared memory) and children=2 (with children=8 it doesn't even start, failed to load cyphers in SSL_CTX): Fresh kamailio start shared memory: total: 7340032 free: 2196096 After one tls.reload: free: 539248 After 100 tls.reload: free: 483776 After patch on master (kamailio -m 7 and children=2) (with children=8 it starts normally): Fresh kamailio start shared memory: total: 7340032 free: 3772000 After one tls.reload: free: 3690192 After 100 tls.reload: free: 3681056 [https://repository-images.githubusercontent.com/15101579/2d895000-e695-11e9…]<https://github.com/kamailio/kamailio/compare/master...xkaraman:kamailio:tls…> Comparing kamailio:master...xkaraman:tls_reload · kamailio/kamailio<https://github.com/kamailio/kamailio/compare/master...xkaraman:kamailio:tls…> Kamailio - The Open Source SIP Server for large VoIP and real-time communication platforms - - Comparing kamailio:master...xkaraman:tls_reload · kamailio/kamailio github.com [https://opengraph.githubassets.com/a209e4474f30e5fb4ce474f928991f0fba268f02…]<https://github.com/xkaraman/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> kamailio/src/modules/tls/tls_domain.c at 9c2705b566103f4fad0cad63bc1e36ba3cca621f · xkaraman/kamailio<https://github.com/xkaraman/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> Kamailio - The Open Source SIP Server for large VoIP and real-time communication platforms - - xkaraman/kamailio github.com [https://repository-images.githubusercontent.com/15101579/2d895000-e695-11e9…]<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> kamailio/src/modules/tls/tls_domain.c at 9c2705b566103f4fad0cad63bc1e36ba3cca621f · kamailio/kamailio<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> Kamailio - The Open Source SIP Server for large VoIP and real-time communication platforms - - kamailio/kamailio github.com [https://opengraph.githubassets.com/f4de5f69f56ea5c12c56343428618441242c2518…]<https://github.com/kamailio/kamailio/issues/3823> Memory usage increases everytime tls.reload is executed · Issue #3823 · kamailio/kamailio<https://github.com/kamailio/kamailio/issues/3823> Description We are using Kamailio 5.7.4 on Debian 12 (from http://deb.kamailio.org/kamailio57) with rtpengine as an Edgeproxy for our clients. The instance terminates SIP/TLS (with Cliencertificate... github.com

7 months, 1 week

git:master:922d7dfd: p_usrloc: use a global p_usrloc_columns variable in db_load* functions

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 922d7dfd9ae7d13436c23d60f22d47c9c2fa127a URL: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2024-05-15T14:09:02+03:00 p_usrloc: use a global p_usrloc_columns variable in db_load* functions --- Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c… Patch: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c…

7 months, 1 week

[kamailio/kamailio] db_cluster: Update log levels and failed connection id (PR #3834)

by Xenofon Karamanos

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR aims to update some warning levels used in `db_cluster` module to prevent silent failures. When `db_cluster` tries to do some action in a `db_connector`, it should log some kind of warning (with `conid` that failed) or error instead of debug. When iterating on db_connectors and one fails, it will log a warning with `conid` and if all of the available db are not available it will log an error indicating failure. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3834 -- Commit Summary -- * db_cluster: Update log levels -- File Changes -- M src/modules/db_cluster/dbcl_api.c (83) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3834.patch https://github.com/kamailio/kamailio/pull/3834.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3834 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3834(a)github.com>

7 months, 1 week

git:master:467dbf3e: db_cluster: Update log levels

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 467dbf3e1be16d5a760178d0801834ac67bad888 URL: https://github.com/kamailio/kamailio/commit/467dbf3e1be16d5a760178d0801834a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-05-15T10:39:49+03:00 db_cluster: Update log levels --- Modified: src/modules/db_cluster/dbcl_api.c --- Diff: https://github.com/kamailio/kamailio/commit/467dbf3e1be16d5a760178d0801834a… Patch: https://github.com/kamailio/kamailio/commit/467dbf3e1be16d5a760178d0801834a…

7 months, 1 week

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2024