sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
312 discussions

[kamailio/kamailio] tm: prevent t_suspend memory leak (#2763)

by Julien Chavanton

When suspending while already in t_continue when processing a reply / suspending twice in a reply. Thanks to @giavac https://github.com/kamailio/kamailio/pull/2721 we can now suspend more then once in a reply route. This is working well, however a memory leak was detected. This modification is proposing a solution that will prevent calling `sip_msg_cloner` over an already twice over the same pointer, creating the memory leak.   #### 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) I assume this is a non "breaking change" since it can only trigger in a very the specific case that was not supported anyway. Conditions when this alternate behavior can trigger: 1- must be in t_suspend 2- must be in a reply `if (msg->first_line.type == SIP_REPLY) {` 3- must have an already cloned `if (t->uac[branch].reply) {` An alternate solution would be to free everything in the cloned message and recreate it. #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) load test done that included connections, failures and timeouts while suspending multiple times. ``` 6(31) INFO: tm [t_suspend.c:126]: t_suspend(): [>>>SUSPEND<<<] cloning message ! 53(78) INFO: tm [t_suspend.c:136]: t_suspend(): [>>>SUSPEND<<<] message already cloned, re-using ! ``` ``` Total 100000 INVITE calls sent in 1710825 ms at rate of 58/sec Total 100000 connection responses received in 1714999 ms at rate of 58/sec: >> Detailed connection responses received: - 200 connection responses: 24924 (OK) - 404 connection responses: 25145 (Not Found) - 408 connection responses: 24912 (Request Timeout) - 500 connection responses: 25019 (Internal Server Error) >> Detailed disconnection responses received: - 200 disconnection responses: 24924 (OK) ------ TOTAL responses: 24924 (rate=14/sec) ``` #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2763 -- Commit Summary -- * tm: prevent t_suspend memory leak -- File Changes -- M src/modules/tm/t_suspend.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2763.patch https://github.com/kamailio/kamailio/pull/2763.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2763

3 years, 5 months

git:master:09218156: tm: prevent t_suspend memory leak (#2763)

by GitHub

Module: kamailio Branch: master Commit: 09218156f3831ec9642d9ebf20d8668229ab16d6 URL: https://github.com/kamailio/kamailio/commit/09218156f3831ec9642d9ebf20d8668… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-07T08:13:36-07:00 tm: prevent t_suspend memory leak (#2763) When suspending while already in t_continue when processing a reply / suspending twice in a reply. Co-authored-by: Julien Chavanton <jchavanton(a)subspace.com> --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/09218156f3831ec9642d9ebf20d8668… Patch: https://github.com/kamailio/kamailio/commit/09218156f3831ec9642d9ebf20d8668… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 04f906f53c..826307d20a 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -118,18 +118,23 @@ int t_suspend(struct sip_msg *msg, LM_ERR("failed find UAC branch\n"); return -1; } - LM_DBG("found a a match with branch id [%d] - " - "cloning reply message to t->uac[branch].reply\n", branch); - sip_msg_len = 0; - t->uac[branch].reply = sip_msg_cloner( msg, &sip_msg_len ); + if (!t->uac[branch].reply) { + sip_msg_len = 0; + LM_DBG("found a match with branch id [%d] - " + "cloning reply message to t->uac[branch].reply\n", branch); + t->uac[branch].reply = sip_msg_cloner( msg, &sip_msg_len ); - if (! t->uac[branch].reply ) { - LM_ERR("can't alloc' clone memory\n"); - return -1; + if (! t->uac[branch].reply ) { + LM_ERR("can't alloc' clone memory\n"); + return -1; + } + t->uac[branch].end_reply = ((char*)t->uac[branch].reply) + sip_msg_len; + } else { + LM_DBG("found a match with branch id [%d] - " + "message already cloned to t->uac[branch].reply\n", branch); + // This can happen when suspending more than once in a reply. } - t->uac[branch].end_reply = ((char*)t->uac[branch].reply) + sip_msg_len; - LM_DBG("saving transaction data\n"); t->uac[branch].reply->flags = msg->flags; t->flags |= T_ASYNC_SUSPENDED;

3 years, 5 months

git:master:7747872f: mtree: docs - section id for mt_match() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7747872f066ead3488cbfc854873506bda4f7390 URL: https://github.com/kamailio/kamailio/commit/7747872f066ead3488cbfc854873506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:23:50+02:00 mtree: docs - section id for mt_match() function --- Modified: src/modules/mtree/doc/mtree_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7747872f066ead3488cbfc854873506… Patch: https://github.com/kamailio/kamailio/commit/7747872f066ead3488cbfc854873506… --- diff --git a/src/modules/mtree/doc/mtree_admin.xml b/src/modules/mtree/doc/mtree_admin.xml index 09eb86092c..2416d8fb8d 100644 --- a/src/modules/mtree/doc/mtree_admin.xml +++ b/src/modules/mtree/doc/mtree_admin.xml @@ -454,7 +454,7 @@ modparam("mtree", "mt_allow_duplicates", 1) <section> <title>Functions</title> <section> - <title> + <title id="mtree.f.mt_match"> <function moreinfo="none">mt_match(mtree, pv, mode)</function> </title> <para>

3 years, 5 months

[kamailio/kamailio] Sl (#2767)

by sergey-safarov

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description HTTP request do not trigger `SREV_NET_DATA_RECV` (please check [`receive_msg`](https://github.com/kamailio/kamailio/blob/0e806316b84be8388dad670e964e54011000b4a4/src/core/receive.c#L321)) This PR adds the same behavior for HTTP responces. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2767 -- Commit Summary -- * core: published sip_check_fline function in .h file * sl: disabled SREV_NET_DATA_SENT for HTTP respones -- File Changes -- M src/core/receive.h (1) M src/modules/sl/sl_funcs.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2767.patch https://github.com/kamailio/kamailio/pull/2767.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2767

3 years, 5 months

git:master:4168d7c5: sl: disabled SREV_NET_DATA_SENT for HTTP respones

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4168d7c55955a01c3a30c67d5e8a510be52120ff URL: https://github.com/kamailio/kamailio/commit/4168d7c55955a01c3a30c67d5e8a510… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:17:32+02:00 sl: disabled SREV_NET_DATA_SENT for HTTP respones more details at GH #2767 --- Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/4168d7c55955a01c3a30c67d5e8a510… Patch: https://github.com/kamailio/kamailio/commit/4168d7c55955a01c3a30c67d5e8a510… --- diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 86ad65c5e8..e80259d61d 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -210,7 +210,11 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) dst.comp=msg->via1->comp_no; #endif dst.send_flags=msg->rpl_send_flags; - ret = msg_send(&dst, buf.s, buf.len); + if(sip_check_fline(buf.s, buf.len) == 0) + ret = msg_send_buffer(&dst, buf.s, buf.len, 0); + else + ret = msg_send_buffer(&dst, buf.s, buf.len, 1); + mhomed=backup_mhomed; keng = sr_kemi_eng_get();

3 years, 5 months

git:master:c336eed3: core: published sip_check_fline function in .h file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c336eed393f2fedae16dbcf004e143fdd38c46e2 URL: https://github.com/kamailio/kamailio/commit/c336eed393f2fedae16dbcf004e143f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:17:32+02:00 core: published sip_check_fline function in .h file --- Modified: src/core/receive.h --- Diff: https://github.com/kamailio/kamailio/commit/c336eed393f2fedae16dbcf004e143f… Patch: https://github.com/kamailio/kamailio/commit/c336eed393f2fedae16dbcf004e143f… --- diff --git a/src/core/receive.h b/src/core/receive.h index d4ce7895a8..433bf6a72e 100644 --- a/src/core/receive.h +++ b/src/core/receive.h @@ -32,6 +32,7 @@ #include "ip_addr.h" int receive_msg(char* buf, unsigned int len, struct receive_info *ri); +int sip_check_fline(char *buf, unsigned int len); unsigned int inc_msg_no(void); void ksr_msg_env_reset(void);

3 years, 5 months

[kamailio/kamailio] Smsops 7bit support special chars (#2756)

by alexyosifov

#### 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/2756 -- Commit Summary -- * Add README.md * Merge branch 'master' of github.com:alexyosifov/kamailio * Merge remote-tracking branch 'remote_yosifov/master' * Merge branch 'master' of github.com:alexyosifov/kamailio * smsops: support for 7bit special chars -- File Changes -- M src/modules/smsops/smsops_impl.c (256) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2756.patch https://github.com/kamailio/kamailio/pull/2756.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2756

3 years, 5 months

git:master:f82c4775: smsops: support for 7bit special chars

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f82c4775efca0580401f4b1a48dcb4d2cf26814f URL: https://github.com/kamailio/kamailio/commit/f82c4775efca0580401f4b1a48dcb4d… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:13:17+02:00 smsops: support for 7bit special chars - Added support for 7bit special chars for MO/MT SMSs. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/f82c4775efca0580401f4b1a48dcb4d… Patch: https://github.com/kamailio/kamailio/commit/f82c4775efca0580401f4b1a48dcb4d…

3 years, 5 months

[kamailio/kamailio] app_perl change to ignore "die" signals from eval blocks (#2754)

by rodolfojcj

Proposed fix for issue #2745. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2754 -- Commit Summary -- * app_perl change to ignore "die" signals from eval blocks -- File Changes -- M src/modules/app_perl/lib/perl/Kamailio.pm (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2754.patch https://github.com/kamailio/kamailio/pull/2754.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2754

3 years, 5 months

git:master:50557b84: app_perl change to ignore "die" signals from eval blocks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 50557b8433e137a9095b4d48df8ac9b8c3fd8807 URL: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:11:27+02:00 app_perl change to ignore "die" signals from eval blocks --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… Patch: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… --- diff --git a/src/modules/app_perl/lib/perl/Kamailio.pm b/src/modules/app_perl/lib/perl/Kamailio.pm index eda5ede8b7..aa587424e1 100644 --- a/src/modules/app_perl/lib/perl/Kamailio.pm +++ b/src/modules/app_perl/lib/perl/Kamailio.pm @@ -40,6 +40,7 @@ bootstrap Kamailio; BEGIN { $SIG{'__DIE__'} = sub { + die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; $SIG{'__WARN__'} = sub {

3 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021