sr-dev May 2024

sr-dev@lists.kamailio.org

15 participants
166 discussions

git:master:ebd1c6c7: tm: cb_flags made unsigned for uac_req

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ebd1c6c75a1b832ce85d576aad134b99d47b5738 URL: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:07:26+02:00 tm: cb_flags made unsigned for uac_req --- Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Patch: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… --- diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 59fa7f4e9ea..6fad3380cd8 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -47,7 +47,7 @@ typedef struct uac_req str *ssock; str *ssockname; dlg_t *dialog; - int cb_flags; + unsigned int cb_flags; transaction_cb *cb; void *cbp; str *callid;

6 months, 3 weeks

git:master:f5da773c: tm: cb flag to mark local uac on request drop

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5da773c5fa29edbf9d0e65a83a62f495928ddec URL: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T05:57:46+02:00 tm: cb flag to mark local uac on request drop --- Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… Patch: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… --- diff --git a/src/modules/tm/t_hooks.h b/src/modules/tm/t_hooks.h index aa566cb35d1..cdb657bad64 100644 --- a/src/modules/tm/t_hooks.h +++ b/src/modules/tm/t_hooks.h @@ -59,7 +59,8 @@ struct cell; #define TMCB_RESPONSE_SENT_N 23 #define TMCB_ON_BRANCH_FAILURE_RO_N 24 #define TMCB_ON_BRANCH_FAILURE_N 25 -#define TMCB_MAX_N 25 +#define TMCB_LOCAL_REQUEST_DROP_N 26 +#define TMCB_MAX_N 26 #define TMCB_REQUEST_IN (1 << TMCB_REQUEST_IN_N) @@ -88,6 +89,7 @@ struct cell; #define TMCB_RESPONSE_SENT (1 << TMCB_RESPONSE_SENT_N) #define TMCB_ON_BRANCH_FAILURE (1 << TMCB_ON_BRANCH_FAILURE_N) #define TMCB_ON_BRANCH_FAILURE_RO (1 << TMCB_ON_BRANCH_FAILURE_RO_N) +#define TMCB_LOCAL_REQUEST_DROP (1 << TMCB_LOCAL_REQUEST_DROP_N) #define TMCB_MAX ((1 << (TMCB_MAX_N + 1)) - 1) diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 5559533e5fb..5384d826dd8 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -680,6 +680,7 @@ int prepare_req_within(uac_req_t *uac_r, struct retr_buf **dst_req) ret = t_uac_prepare(uac_r, dst_req, 0); if(unlikely(ret < 0 && ret == E_DROP)) { + uac_r->cb_flags |= TMCB_LOCAL_REQUEST_DROP; ret = 0; } @@ -775,6 +776,7 @@ int t_uac_with_ids( if(ret < 0) { if(unlikely(ret == E_DROP)) { + uac_r->cb_flags |= TMCB_LOCAL_REQUEST_DROP; ret = 0; } return ret;

6 months, 3 weeks

git:master:ee06666c: tm: free new buffer on drop for local requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee06666c43d96029315dae7618e10d381265a85a URL: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T05:28:18+02:00 tm: free new buffer on drop for local requests - GH #3403 --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… Patch: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 206f69ef59d..5559533e5fb 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -559,6 +559,7 @@ static inline int t_uac_prepare( refresh_shortcuts = t_run_local_req(&buf, &buf_len, uac_r, new_cell, request); if(unlikely(refresh_shortcuts == E_DROP)) { + shm_free(buf); ret = E_DROP; goto error1; }

6 months, 3 weeks

Enquiry about N5 interface implementation

by Viabhav Bansal

Hey there! I hope the Kamailio team is physically as well as mentally healthy and thriving towards progressive development. I am a part of a team which deals in development of converged 4G and 5G networks. We have been diving deep into Open5GS 5G core and use Kamailio as our SIP server. However, we are trying to successfully implement VoNR UE registration as well as calling, and facing challenges in that area. I recently saw the VoNR as well as SMSoNR demonstration which the Kamailio team performed and was massively impressed by it! I would like to know when will the N5 SBI update will be rolling out to the public so that we can conduct our testing as well. Hoping for a timely response and update, Thanks and regards, Vaibhav.

6 months, 3 weeks

[kamailio/kamailio] User-params parsing fails in multiple ways (Issue #3762)

by Alex Hermann

### Description The uri parser seems to fail in multiple ways on username-parameters. The ways it fails depends on the presence of user-params in the incoming request and on adjustments to $ru, $rd and $rU in the script. My expectation is that the whole username, including user-params is *always* visible in $rU. In reality, the user-params are absent or present depending on manipulations to the uri in the script. When setting $rU to a value with a user-param, that user-param is represented when reading $ru, but not in $rU.  ### Troubleshooting #### Reproduction I used below config script to test various scenario's. ``` debug=2 memlog=4 #fork=no # This option should not be present to enable forking but disable daemonize, also -D commandline parameter is needed log_stderror=yes log_name="kamailio-test" log_facility=LOG_LOCAL5 sip_warning=no children=2 shm_mem_size=128 check_via=no # (cmd. line: -v) dns=no # (cmd. line: -r) rev_dns=no # (cmd. line: -R) dns_use_search_list=no use_dns_failover=yes dns_srv_lb=yes disable_tcp=yes auto_aliases=no listen=172.16.1.19:7060 loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" modparam("xlog", "prefix", "") route { xnotice("Incoming $rm to $rU\n"); xinfo("$$ru = $ru\n"); switch ($rU) { case "100": xnotice("Set $$rU = \"1234;first=yes\"\n"); $rU = "1234;first=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; case "200": xnotice("Set $$rd = \"example.com;transport=udp\"\n"); $rd = "example.com;transport=udp"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); xnotice("Set $$rU = \"1234;first=yes\"\n"); $rU = "1234;first=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; case "300": xnotice("Set $$ru = \"sip:1234@example.com;transport=udp\"\n"); $ru = "sip:1234@example.com;transport=udp"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); xnotice("Set $$rU = \"1234;first=yes\"\n"); $rU = "1234;first=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; case "400": xnotice("Set $$ru = \"sip:1234;first=yes@example.com;transport=udp\"\n"); $ru = "sip:1234;first=yes@example.com;transport=udp"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } xnotice("Set $$rU = \"1234;second=yes\"\n"); $rU = "1234;second=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;second=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; } sl_send_reply(500, "Done"); exit; } ``` Outputs: --- ``` 1(2206122) NOTICE: Incoming INVITE to 100 1(2206122) INFO: $ru = sip:100@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes@172.16.1.19:7060;user=phone 1(2206122) INFO: $rU: 1234 1(2206122) ERROR: Fail! ``` Setting $rU with a user-param sets it correctly in $ru, but reading $rU back fails. --- ``` 1(2206122) NOTICE: Incoming INVITE to 200 1(2206122) INFO: $ru = sip:200@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $rd = "example.com;transport=udp" 1(2206122) INFO: $ru: sip:200@example.com;transport=udp:7060;user=phone 1(2206122) INFO: $rU: 200 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp:7060;user=phone 1(2206122) INFO: $rU: 1234 1(2206122) ERROR: Fail! ``` Same when setting $rd in advance. --- ``` 1(2206122) NOTICE: Incoming INVITE to 300 1(2206122) INFO: $ru = sip:300@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $ru = "sip:1234@example.com;transport=udp" 1(2206122) INFO: $ru: sip:1234@example.com;transport=udp 1(2206122) INFO: $rU: 1234 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;first=yes 1(2206122) INFO: Success! ``` When setting $ru first with no user-param lets a later asssignment to $rU with user-param succeed. --- ``` 1(2206122) NOTICE: Incoming INVITE to 400 1(2206122) INFO: $ru = sip:400@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $ru = "sip:1234;first=yes@example.com;transport=udp" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;first=yes 1(2206122) INFO: Success! 1(2206122) NOTICE: Set $rU = "1234;second=yes" 1(2206122) INFO: $ru: sip:1234;second=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;second=yes 1(2206122) INFO: Success! ``` Setting $ru with a user-params succeeds. Subsequently overwriting the user part with $rU with a user-param also succeeds. --- ``` 1(2206122) NOTICE: Incoming INVITE to 400 1(2206122) INFO: $ru = sip:400;existing=yes@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $ru = "sip:1234;first=yes@example.com;transport=udp" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;first=yes 1(2206122) INFO: Success! 1(2206122) NOTICE: Set $rU = "1234;second=yes" 1(2206122) INFO: $ru: sip:1234;second=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;second=yes 1(2206122) INFO: Success! ``` Same as previous, but with incoming user-param. --- ``` 1(2206122) NOTICE: Incoming INVITE to 100 1(2206122) INFO: $ru = sip:100;existing=yes@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes;existing=yes@172.16.1.19:7060;user=phone 1(2206122) INFO: $rU: 1234 1(2206122) ERROR: Fail! ``` This one fails in an interesting way. The incoming uri has a user-param. When overwriting $rU with a user-param, the user-param from the incoming request is kept in addition to the new one instead of being overwritten. $rU still misses (both) user-params. #### Debugging Data I have no build (yet) with EXTRA_DEBUG enabled. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3762 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3762(a)github.com>

6 months, 3 weeks

[kamailio/kamailio] tm: memory leak in case dropping messages in local-request event route (PR #3403)

by Simon Darienko

#### 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 I faced an issue with memory leak in case drop NOTIFY messages in the "local-request" event route in `mem_copy_subs` and `build_uac_req` analysis of mem leak: kamcmd corex.shm_summary <code>... Mar 23 12:00:28 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 11 size= 7520 bytes from presence: hash.c: mem_copy_subs(141)<br> Mar 23 12:00:28 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 23 size= 22536 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> a lot of dropped messages in local-request event route <code>... Mar 23 12:01:09 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 83 size= 51256 bytes from presence: hash.c: mem_copy_subs(141) Mar 23 12:01:09 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 98 size= 116864 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> no messages, no activities <code>... Mar 23 12:02:34 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 83 size= 51256 bytes from presence: hash.c: mem_copy_subs(141) Mar 23 12:02:34 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 96 size= 115432 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> In the code, we have a comment like "never free cbp here because if t_uac_prepare fails, cbp is not freed and thus caller has no chance to discover if it is freed or not", but we'll free the cbp in two cases: 1. in case of error, but we have if (ret == E_DROP) then ret = 0; (so, no error result) 2. in case call insert_tmcb for cbp, but we don't do it for E_DROP You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3403 -- Commit Summary -- * tm: memory leak in case dropping messages in local-request event route -- File Changes -- M src/modules/tm/uac.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3403.patch https://github.com/kamailio/kamailio/pull/3403.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3403 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3403(a)github.com>

6 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2024