sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
284 discussions

git:master:5555e893: mqueue: use local variable to lock early only when needed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5555e893ea0997a7c71a3e424ef09c4570f122f6 URL: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-04T08:02:44+02:00 mqueue: use local variable to lock early only when needed --- Modified: src/modules/mqueue/mqueue_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Patch: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… --- diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 59421f6e2f..b38f0a1069 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -293,6 +293,7 @@ int mq_item_add(str *qname, str *key, str *val) mq_item_t *mi = NULL; mq_item_t *miter = NULL; mq_item_t *miter_prev = NULL; + int oplock = 0; int len; mh = mq_head_get(qname); @@ -301,9 +302,10 @@ int mq_item_add(str *qname, str *key, str *val) LM_ERR("mqueue not found: %.*s\n", qname->len, qname->s); return -1; } - - lock_get(&mh->lock); + if (mh->addmode == 1 || mh->addmode == 2) { + lock_get(&mh->lock); + oplock = 1; miter = mh->ifirst; miter_prev = mh->ifirst; while (miter) { @@ -344,7 +346,9 @@ int mq_item_add(str *qname, str *key, str *val) if(mi==NULL) { LM_ERR("no more shm to add to: %.*s\n", qname->len, qname->s); - lock_release(&mh->lock); + if(oplock) { + lock_release(&mh->lock); + } return -1; } memset(mi, 0, len); @@ -352,12 +356,15 @@ int mq_item_add(str *qname, str *key, str *val) memcpy(mi->key.s, key->s, key->len); mi->key.len = key->len; mi->key.s[key->len] = '\0'; - + mi->val.s = mi->key.s + mi->key.len + 1; memcpy(mi->val.s, val->s, val->len); mi->val.len = val->len; mi->val.s[val->len] = '\0'; + if(oplock==0) { + lock_get(&mh->lock); + } if(mh->ifirst==NULL) { mh->ifirst = mi;

2 years, 7 months

git:master:c09daf26: modules: readme files regenerated - ims_qos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c09daf26a58f23483c2b8cf1f40c990f20e4d215 URL: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T14:16:20+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/mqueue/README Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Patch: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990…

2 years, 7 months

git:master:6da1a08b: stirshaken: docs - add missing end of section tag

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6da1a08b12e162a5dd4cde90033f51e7b9d48656 URL: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:08:22+02:00 stirshaken: docs - add missing end of section tag --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… Patch: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index f54747d0cf..25434ff0b4 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -57,6 +57,7 @@ </itemizedlist> </para> </section> + </section> <section> <title>Parameters</title> <section>

2 years, 7 months

git:master:20559f64: ims_qos: removed angle brakets in the text

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 20559f647fee0dc46fef83f8f7782ec24a1f0b94 URL: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:04:27+02:00 ims_qos: removed angle brakets in the text --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Patch: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 3a72257f7d..0ff629e17e 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -388,7 +388,7 @@ modparam("ims_qos", "include_rtcp_fd", 1) <section> <title><varname>af_signaling_ip</varname> (String)</title> - <para>Set P-CSCF IPv4 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv4 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is 127.0.0.1</emphasis></para> @@ -407,7 +407,7 @@ modparam("ims_qos", "af_signaling_ip", "127.0.0.1") <section> <title><varname>af_signaling_ip6</varname> (String)</title> - <para>Set P-CSCF IPv6 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv6 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is ""</emphasis></para>

2 years, 7 months

git:master:2799782c: mqueue: add mqueue_mode modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2799782c530927de5db3c69df18b8248b8055ee2 URL: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:01:41+02:00 mqueue: add mqueue_mode modparam --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824… Patch: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824…

2 years, 7 months

git:master:e2383b74: modules: readme files regenerated - ims_qos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e2383b74f79107aed232ffb8e6a311c56f64ff46 URL: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T14:01:12+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c… Patch: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c…

2 years, 7 months

[kamailio/kamailio] uac: fix shm leak (PR #3065)

by Stefan Mititelu

#### 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  Setup: uac_req_send() with evroute=2 and tm module enable_uac_fr=1 Noticed following shm errors while intensively testing uac_req_send(), happening quite soon after a fresh restart (e.g. 10 min): ``` kamailio[5384]: ERROR: <core> [core/mem/q_malloc.c:297]: qm_find_free(): qm_find_free(0x7fe8943bc000, 40632); Free fragment not found! kamailio[5384]: ERROR: <core> [core/mem/q_malloc.c:430]: qm_malloc(): qm_malloc(0x7fe8943bc000, 40632) called from uac: uac_send.c: uac_send_info_clone(105), module: uac; Free fragment not found! kamailio[5384]: ERROR: uac [uac_send.c:108]: uac_send_info_clone(): no more shm memory kamailio[5384]: ERROR: uac [uac_send.c:837]: uac_req_send(): cannot clone the uac structure ``` I tried monitoring system memory using `free` tool and noticed that the "used" memory didn't grow alot. However, I noticed the "buff/cached" memory had a steep growth when 200OK(s) started to come, for my setup. Noticed that, for my setup, when 200OK come, event_route[uac:reply] is not called, so the tm callback set by UAC module is not called. => the "tp" callback parameter shm allocated by UAC module is not freed. By analogy, when using uac_req_send() with evroute=1 and timeout happens (e.g. no reply comes), event_route[uac:reply] won't be called and same leak should happen => *i didn;t tested that*, was just an analogy. I updated the code to call the callback on TMCB_DESTROY, and make sure tp parameter is freed, *one time*. Let me know what you think of this... in my setup/tests I got no kamailio shm logs anymore. Also "buff/cached" memory didn't have that steep growth anymore. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3065 -- Commit Summary -- * uac: fix shm leak -- File Changes -- M src/modules/uac/uac_send.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3065.patch https://github.com/kamailio/kamailio/pull/3065.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3065 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3065(a)github.com>

2 years, 7 months

git:master:1ff0a9c4: uac: fix shm leak

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1ff0a9c4cee17a68a54c7002a528710ce85b96da URL: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:55:44+02:00 uac: fix shm leak --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… Patch: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 887dc1b4a4..be04464cae 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -717,14 +717,16 @@ void uac_resend_tm_callback(struct cell *t, int type, struct tmcb_params *ps) } tp = (uac_send_info_t*)(*ps->param); - if(tp->evroute!=0) { + if(tp->evroute!=0 && ps->code > 0) { uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, tp, ps->code); } done: - if(tp!=NULL) + if(tp!=NULL){ shm_free(tp); + *ps->param = NULL; + } return; } @@ -755,7 +757,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) } tp = (uac_send_info_t*)(*ps->param); - if(tp->evroute!=0) { + if(tp->evroute!=0 && ps->code > 0) { uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, tp, ps->code); } @@ -829,7 +831,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) uac_r.body = (tp->s_body.len <= 0) ? NULL : &tp->s_body; uac_r.ssock = (tp->s_sock.len <= 0) ? NULL : &tp->s_sock; uac_r.dialog = &tmdlg; - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED|TMCB_DESTROY; if(tp->evroute!=0) { /* Callback function */ uac_r.cb = uac_resend_tm_callback; @@ -849,8 +851,10 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) done: error: - if(tp!=NULL) + if(tp!=NULL){ shm_free(tp); + *ps->param = NULL; + } return; } @@ -890,13 +894,13 @@ int uac_req_send(void) { case 2: - uac_r.cb_flags = TMCB_ON_FAILURE; + uac_r.cb_flags = TMCB_ON_FAILURE|TMCB_DESTROY; /* Callback function */ uac_r.cb = uac_resend_tm_callback; break; case 1: default: - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED|TMCB_DESTROY; /* Callback function */ uac_r.cb = uac_send_tm_callback; break;

2 years, 7 months

[kamailio/kamailio] ims_qos: Added new parameters for AAR, AVP517 (PR #3066)

by alexyosifov

- Added new parameters: af_signaling_ip6, component_media_type, flow_protocol, omit_flow_ports, rs_default_bandwidth, rr_default_bandwidth. Check doc for details.   #### 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 - [ ] 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/3066 -- Commit Summary -- * ims_qos: Added new parameters for AAR,AVP517 -- File Changes -- M src/modules/ims_qos/doc/ims_qos_admin.xml (134) M src/modules/ims_qos/ims_qos_mod.c (13) M src/modules/ims_qos/rx_aar.c (29) M src/modules/ims_qos/rx_avp.c (67) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3066.patch https://github.com/kamailio/kamailio/pull/3066.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3066 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3066(a)github.com>

2 years, 7 months

git:master:5a85767e: ims_qos: Added new parameters for AAR, AVP517

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a85767ef3371dd6443e9cc0caebf3b68980dc07 URL: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b… Author: Aleksandar Yosifov <alexander.yosifov(a)circles.bz> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:54:38+02:00 ims_qos: Added new parameters for AAR,AVP517 - Added new parameters: af_signaling_ip6, component_media_type, flow_protocol, omit_flow_ports, rs_default_bandwidth, rr_default_bandwidth. Check doc for details. --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b… Patch: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b…

2 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022