sr-dev

sr-dev@lists.kamailio.org

11 participants
45233 discussions

git:5.8:02edb040: sca: reserve subscription.rr.s separately since it could be updated
by Victor Seva 27 May '25

27 May '25

Module: kamailio Branch: 5.8 Commit: 02edb0408d907fa2a9031faf40bca899dbfcf050 URL: https://github.com/kamailio/kamailio/commit/02edb0408d907fa2a9031faf40bca89… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-27T11:43:53+02:00 sca: reserve subscription.rr.s separately since it could be updated (cherry picked from commit fd04bcc152dd6ef88fbb819b0b77aee7ca817878) (cherry picked from commit 14de4b1101f62c3463e5f05836e8618a3b0db96b) --- Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/02edb0408d907fa2a9031faf40bca89… Patch: https://github.com/kamailio/kamailio/commit/02edb0408d907fa2a9031faf40bca89… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 9e212f01e2c..c460cccdb36 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -625,9 +625,6 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, len += sizeof(sca_subscription); len += sizeof(char) * (aor->len + subscriber->len); - if(!SCA_STR_EMPTY(rr)) { - len += sizeof(char) * rr->len; - } sub = (sca_subscription *)shm_malloc(len); if(sub == NULL) { @@ -659,18 +656,20 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, SCA_STR_COPY(&sub->target_aor, aor); len += aor->len; + // we shm_malloc this parts separately in case we need to update in-memory + // info for this subscriber. This is likely to happen if the + // subscriber goes off-line for some reason. if(!SCA_STR_EMPTY(rr)) { - sub->rr.s = (char *)sub + len; + sub->rr.s = (char *)shm_malloc(rr->len); + if(sub->rr.s == NULL) { + SHM_MEM_ERROR; + goto error; + } SCA_STR_COPY(&sub->rr, rr); - len += rr->len; } // dialog.id holds call-id + from-tag + to-tag; dialog.call_id, // dialog.from_tag, and dialog.to_tag point to offsets within // dialog.id. - // - // we shm_malloc this separately in case we need to update in-memory - // dialog saved for this subscriber. This is likely to happen if the - // subscriber goes off-line for some reason. len = sizeof(char) * (call_id->len + from_tag->len + to_tag->len); sub->dialog.id.s = (char *)shm_malloc(len); if(sub->dialog.id.s == NULL) { @@ -701,6 +700,9 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, error: if(sub != NULL) { + if(sub->rr.s != NULL) { + shm_free(sub->rr.s); + } if(sub->dialog.id.s != NULL) { shm_free(sub->dialog.id.s); } @@ -733,6 +735,10 @@ void sca_subscription_free(void *value) LM_DBG("Freeing %s subscription from %.*s\n", sca_event_name_from_type(sub->event), STR_FMT(&sub->subscriber)); + if(!SCA_STR_EMPTY(&sub->rr)) { + shm_free(sub->rr.s); + } + if(!SCA_STR_EMPTY(&sub->dialog.id)) { shm_free(sub->dialog.id.s); }

1 0

git:6.0:14de4b11: sca: reserve subscription.rr.s separately since it could be updated
by Victor Seva 27 May '25

27 May '25

Module: kamailio Branch: 6.0 Commit: 14de4b1101f62c3463e5f05836e8618a3b0db96b URL: https://github.com/kamailio/kamailio/commit/14de4b1101f62c3463e5f05836e8618… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-27T11:43:14+02:00 sca: reserve subscription.rr.s separately since it could be updated (cherry picked from commit fd04bcc152dd6ef88fbb819b0b77aee7ca817878) --- Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/14de4b1101f62c3463e5f05836e8618… Patch: https://github.com/kamailio/kamailio/commit/14de4b1101f62c3463e5f05836e8618… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index ca42fd138e9..5e34ceac6d2 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -626,9 +626,6 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, len += sizeof(sca_subscription); len += sizeof(char) * (aor->len + subscriber->len); - if(!SCA_STR_EMPTY(rr)) { - len += sizeof(char) * rr->len; - } sub = (sca_subscription *)shm_malloc(len); if(sub == NULL) { @@ -660,18 +657,20 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, SCA_STR_COPY(&sub->target_aor, aor); len += aor->len; + // we shm_malloc this parts separately in case we need to update in-memory + // info for this subscriber. This is likely to happen if the + // subscriber goes off-line for some reason. if(!SCA_STR_EMPTY(rr)) { - sub->rr.s = (char *)sub + len; + sub->rr.s = (char *)shm_malloc(rr->len); + if(sub->rr.s == NULL) { + SHM_MEM_ERROR; + goto error; + } SCA_STR_COPY(&sub->rr, rr); - len += rr->len; } // dialog.id holds call-id + from-tag + to-tag; dialog.call_id, // dialog.from_tag, and dialog.to_tag point to offsets within // dialog.id. - // - // we shm_malloc this separately in case we need to update in-memory - // dialog saved for this subscriber. This is likely to happen if the - // subscriber goes off-line for some reason. len = sizeof(char) * (call_id->len + from_tag->len + to_tag->len); sub->dialog.id.s = (char *)shm_malloc(len); if(sub->dialog.id.s == NULL) { @@ -702,6 +701,9 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, error: if(sub != NULL) { + if(sub->rr.s != NULL) { + shm_free(sub->rr.s); + } if(sub->dialog.id.s != NULL) { shm_free(sub->dialog.id.s); } @@ -734,6 +736,10 @@ void sca_subscription_free(void *value) LM_DBG("Freeing %s subscription from %.*s\n", sca_event_name_from_type(sub->event), STR_FMT(&sub->subscriber)); + if(!SCA_STR_EMPTY(&sub->rr)) { + shm_free(sub->rr.s); + } + if(!SCA_STR_EMPTY(&sub->dialog.id)) { shm_free(sub->dialog.id.s); }

1 0

[kamailio/kamailio] sca: reserve subscription.rr.s separately since it could be updated (PR #4251)
by Victor Seva 27 May '25

27 May '25

#### 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 #### Description sca was generating a crash since it is trying to shm_free a part of a bigger block at: https://github.com/kamailio/kamailio/blob/master/src/modules/sca/sca_subscr… So, let's reserve memory that field separately. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4251 -- Commit Summary -- * sca: reserve subscription.rr.s separately since it could be updated -- File Changes -- M src/modules/sca/sca_subscribe.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4251.patch https://github.com/kamailio/kamailio/pull/4251.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4251 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4251(a)github.com>

1 1

git:master:fd04bcc1: sca: reserve subscription.rr.s separately since it could be updated
by Victor Seva 27 May '25

27 May '25

Module: kamailio Branch: master Commit: fd04bcc152dd6ef88fbb819b0b77aee7ca817878 URL: https://github.com/kamailio/kamailio/commit/fd04bcc152dd6ef88fbb819b0b77aee… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-27T11:41:23+02:00 sca: reserve subscription.rr.s separately since it could be updated --- Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/fd04bcc152dd6ef88fbb819b0b77aee… Patch: https://github.com/kamailio/kamailio/commit/fd04bcc152dd6ef88fbb819b0b77aee… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index ca42fd138e9..5e34ceac6d2 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -626,9 +626,6 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, len += sizeof(sca_subscription); len += sizeof(char) * (aor->len + subscriber->len); - if(!SCA_STR_EMPTY(rr)) { - len += sizeof(char) * rr->len; - } sub = (sca_subscription *)shm_malloc(len); if(sub == NULL) { @@ -660,18 +657,20 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, SCA_STR_COPY(&sub->target_aor, aor); len += aor->len; + // we shm_malloc this parts separately in case we need to update in-memory + // info for this subscriber. This is likely to happen if the + // subscriber goes off-line for some reason. if(!SCA_STR_EMPTY(rr)) { - sub->rr.s = (char *)sub + len; + sub->rr.s = (char *)shm_malloc(rr->len); + if(sub->rr.s == NULL) { + SHM_MEM_ERROR; + goto error; + } SCA_STR_COPY(&sub->rr, rr); - len += rr->len; } // dialog.id holds call-id + from-tag + to-tag; dialog.call_id, // dialog.from_tag, and dialog.to_tag point to offsets within // dialog.id. - // - // we shm_malloc this separately in case we need to update in-memory - // dialog saved for this subscriber. This is likely to happen if the - // subscriber goes off-line for some reason. len = sizeof(char) * (call_id->len + from_tag->len + to_tag->len); sub->dialog.id.s = (char *)shm_malloc(len); if(sub->dialog.id.s == NULL) { @@ -702,6 +701,9 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber, error: if(sub != NULL) { + if(sub->rr.s != NULL) { + shm_free(sub->rr.s); + } if(sub->dialog.id.s != NULL) { shm_free(sub->dialog.id.s); } @@ -734,6 +736,10 @@ void sca_subscription_free(void *value) LM_DBG("Freeing %s subscription from %.*s\n", sca_event_name_from_type(sub->event), STR_FMT(&sub->subscriber)); + if(!SCA_STR_EMPTY(&sub->rr)) { + shm_free(sub->rr.s); + } + if(!SCA_STR_EMPTY(&sub->dialog.id)) { shm_free(sub->dialog.id.s); }

1 0

[kamailio/kamailio] PDB: new RPC command to view/change PDB query timeout value (PR #4260)
by Muhammad Shahzad Shafi 27 May '25

27 May '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This adds RPC command to view and/or change the timeout value for PDB queries. The documentation is also updated accordingly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4260 -- Commit Summary -- * pdb: add new RPC command to view/change PDB query timeout * pdb: add documentation for new RPC command to view/change PDB query timeout * pdb: add new code contributor credits -- File Changes -- M src/modules/pdb/doc/pdb.xml (6) M src/modules/pdb/doc/pdb_admin.xml (18) M src/modules/pdb/pdb.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4260.patch https://github.com/kamailio/kamailio/pull/4260.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4260 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4260(a)github.com>

1 3

[kamailio/kamailio] PDB: add RPC command to get and set PDB query timeout (PR #4254)
by Muhammad Shahzad Shafi 27 May '25

27 May '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This adds RPC command to view and/or change the timeout value for PDB queries. The documentation is also updated accordingly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4254 -- Commit Summary -- * pdb: added rpc command to view/update the pdb query timeout * pdb: add documentation for rpc command to view/update the pdb query timeout -- File Changes -- M src/modules/pdb/doc/pdb.xml (55) M src/modules/pdb/doc/pdb_admin.xml (334) M src/modules/pdb/pdb.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4254.patch https://github.com/kamailio/kamailio/pull/4254.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4254 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4254(a)github.com>

3 8

[kamailio/kamailio] Adding kemi exports for play_dtmf event_callback and dlg_req_within functions (PR #4245)
by ggontariu 27 May '25

27 May '25

- [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) - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Added missing kemi exports for RTP Engine module play_dtmf event_callback functions and Dialog module dlg_req_within function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4245 -- Commit Summary -- * Add support for playing DTMF tones in RTP engine module using Kemi * Add support for KEMI callbacks in RTP engine events * Add `ki_dlg_req_within4` handling for dialog requests -- File Changes -- M src/modules/dialog/dialog.c (24) M src/modules/rtpengine/rtpengine.c (215) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4245.patch https://github.com/kamailio/kamailio/pull/4245.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4245 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4245(a)github.com>

2 17

git:master:472dbb59: dialog: Kemi export dlg_req_within
by Daniel-Constantin Mierla 27 May '25

27 May '25

Module: kamailio Branch: master Commit: 472dbb59006207629e9724b7d7155719cb653969 URL: https://github.com/kamailio/kamailio/commit/472dbb59006207629e9724b7d715571… Author: gabrielgontariu <114484712+gabrielgontariu(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-27T09:31:56+02:00 dialog: Kemi export dlg_req_within --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/472dbb59006207629e9724b7d715571… Patch: https://github.com/kamailio/kamailio/commit/472dbb59006207629e9724b7d715571… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 4539d1657e2..36af6f54404 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2615,6 +2615,27 @@ static int ki_dlg_var_is_null(sip_msg_t *msg, str *name) return -1; } +/** + * + */ +static int ki_dlg_req_within4(struct sip_msg *msg, str *side, str *method, + str *content_type, str *content) +{ + int n = 0; + if(side && side->len > 0) { + if(side->len == 6 && strncasecmp(side->s, "caller", 6) == 0) { + n = 1; + } else if(side->len == 6 && strncasecmp(side->s, "callee", 6) == 0) { + n = 2; + } else { + return -1; + } + } + + return ki_dlg_req_with_headers_and_content( + msg, n, method, NULL, content_type, content); +} + /** * */ @@ -2780,6 +2801,11 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialog"), str_init("dlg_req_within4"), + SR_KEMIP_INT, ki_dlg_req_within4, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:c52bf0aa: rtpengine: Kemi export play_dtmf and event_callback. Enhance support for dtmf event by adding support for source_label, tags, source_ip, type, volume and duration
by Daniel-Constantin Mierla 27 May '25

27 May '25

Module: kamailio Branch: master Commit: c52bf0aaa4ad2bc53ede2eeb5df0d8a9bff0e140 URL: https://github.com/kamailio/kamailio/commit/c52bf0aaa4ad2bc53ede2eeb5df0d8a… Author: gabrielgontariu <114484712+gabrielgontariu(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-27T09:31:56+02:00 rtpengine: Kemi export play_dtmf and event_callback. Enhance support for dtmf event by adding support for source_label, tags, source_ip, type, volume and duration --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/c52bf0aaa4ad2bc53ede2eeb5df0d8a… Patch: https://github.com/kamailio/kamailio/commit/c52bf0aaa4ad2bc53ede2eeb5df0d8a…

1 0

git:master:25daa044: pv_headers: set value after checking if src is set
by Daniel-Constantin Mierla 27 May '25

27 May '25

Module: kamailio Branch: master Commit: 25daa0445ebc611cda3e47fd34aefc74494550d7 URL: https://github.com/kamailio/kamailio/commit/25daa0445ebc611cda3e47fd34aefc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-27T08:59:16+02:00 pv_headers: set value after checking if src is set --- Modified: src/modules/pv_headers/pvh_str.c --- Diff: https://github.com/kamailio/kamailio/commit/25daa0445ebc611cda3e47fd34aefc7… Patch: https://github.com/kamailio/kamailio/commit/25daa0445ebc611cda3e47fd34aefc7… --- diff --git a/src/modules/pv_headers/pvh_str.c b/src/modules/pv_headers/pvh_str.c index 28908a37069..1916f93e002 100644 --- a/src/modules/pv_headers/pvh_str.c +++ b/src/modules/pv_headers/pvh_str.c @@ -50,11 +50,12 @@ int pvh_str_free(str *s) int pvh_str_copy(str *dst, str *src, unsigned int max_size) { - unsigned int src_len = src->len + 1 >= max_size ? max_size - 1 : src->len; + unsigned int src_len = 0; if(src == NULL || dst == NULL || src->len <= 0) return -1; + src_len = src->len + 1 >= max_size ? max_size - 1 : src->len; memset(dst->s, 0, dst->len); memcpy(dst->s, src->s, src_len); dst->s[src_len] = '\0';

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev