sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:38f17e62: rtp_media_server: removed lib bcunit linking
by Daniel-Constantin Mierla 20 Oct '22

20 Oct '22

Module: kamailio Branch: master Commit: 38f17e622e8539883a7213acce3aed0635b11aff URL: https://github.com/kamailio/kamailio/commit/38f17e622e8539883a7213acce3aed0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-20T20:24:17+02:00 rtp_media_server: removed lib bcunit linking - not required for the code - tested on debian 11 --- Modified: src/modules/rtp_media_server/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/38f17e622e8539883a7213acce3aed0… Patch: https://github.com/kamailio/kamailio/commit/38f17e622e8539883a7213acce3aed0… --- diff --git a/src/modules/rtp_media_server/Makefile b/src/modules/rtp_media_server/Makefile index 18645c209a5..085fd1a381a 100644 --- a/src/modules/rtp_media_server/Makefile +++ b/src/modules/rtp_media_server/Makefile @@ -5,8 +5,7 @@ NAME=rtp_media_server.so DEFS+=-I$(LOCALBASE)/include ORTPLIBS=-lortp -BCUNITLIBS=-lbcunit MS2LIBS=-lmediastreamer -LIBS+=-L$(LOCALBASE)/lib $(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS) +LIBS+=-L$(LOCALBASE)/lib $(ORTPLIBS) $(MS2LIBS) include ../../Makefile.modules

1 0

git:master:b4113035: pv: check for contact address in pv_get_hfl()
by Daniel-Constantin Mierla 19 Oct '22

19 Oct '22

Module: kamailio Branch: master Commit: b411303502282b2f4d32ad299ed5bcfd0852e902 URL: https://github.com/kamailio/kamailio/commit/b411303502282b2f4d32ad299ed5bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-19T18:31:18+02:00 pv: check for contact address in pv_get_hfl() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b411303502282b2f4d32ad299ed5bcf… Patch: https://github.com/kamailio/kamailio/commit/b411303502282b2f4d32ad299ed5bcf… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 27966dbdcd1..903389bf593 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2449,11 +2449,16 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } if(idx==0) { cb = ((contact_body_t*)msg->contact->parsed)->contacts; - sval.s = cb->name.s; - sval.len = cb->len; - trim(&sval); - res->rs = sval; - return 0; + if(cb!=NULL) { + sval.s = cb->name.s; + sval.len = cb->len; + trim(&sval); + res->rs = sval; + return 0; + } else { + LM_DBG("no contact addresses\n"); + return pv_get_null(msg, param, res); + } } n=0; for(hf=msg->contact; hf!=NULL; hf=hf->next) {

1 0

[kamailio/kamailio] secfilter: added locks while check list values (PR #3267)
by Jose Luis Verdeguer 18 Oct '22

18 Oct '22

#### 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 - [x ] Related to issue #3263 (replace XXXX with an open issue number) #### Description  Locks have been added to several functions to prevent data from changing while they are being queried. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3267 -- Commit Summary -- * secfilter: added locks while check list values -- File Changes -- M src/modules/secfilter/secfilter.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3267.patch https://github.com/kamailio/kamailio/pull/3267.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3267 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3267(a)github.com>

1 2

git:master:c6aec8b4: secfilter: lock position changed
by Jose Luis Verdeguer 18 Oct '22

18 Oct '22

Module: kamailio Branch: master Commit: c6aec8b4e8e4840ae9b0359fbbb60188786647b8 URL: https://github.com/kamailio/kamailio/commit/c6aec8b4e8e4840ae9b0359fbbb6018… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-10-18T16:21:43+02:00 secfilter: lock position changed --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/c6aec8b4e8e4840ae9b0359fbbb6018… Patch: https://github.com/kamailio/kamailio/commit/c6aec8b4e8e4840ae9b0359fbbb6018… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index f1e5f1e854..c876d39421 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -358,6 +358,7 @@ static int w_check_ua(struct sip_msg *msg) len = ua.len; /* User-agent whitelisted */ + lock_get(&secf_data->lock); list = secf_data->wl.ua; while(list) { if(ua.len > list->s.len) @@ -375,7 +376,6 @@ static int w_check_ua(struct sip_msg *msg) } /* User-agent blacklisted */ - lock_get(&secf_data->lock); list = secf_data->bl.ua; while(list) { if(ua.len > list->s.len)

1 0

git:master:bd78421d: secfilter: added locks while check list values
by Jose Luis Verdeguer 18 Oct '22

18 Oct '22

Module: kamailio Branch: master Commit: bd78421dc16d1f2aa647976da5948ee0e750d918 URL: https://github.com/kamailio/kamailio/commit/bd78421dc16d1f2aa647976da5948ee… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-10-18T16:21:43+02:00 secfilter: added locks while check list values --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/bd78421dc16d1f2aa647976da5948ee… Patch: https://github.com/kamailio/kamailio/commit/bd78421dc16d1f2aa647976da5948ee…

1 0

Testing dialog module (and acc with dialog cdrs)
by Daniel-Constantin Mierla 18 Oct '22

18 Oct '22

Hello, as I am not a user of dialog variables, I am turning to community to ask for help testing the current master branch with configurations that make use of dialog variables and acc dialog-based cdr generation. With a few reports of issues related to dialog modules and unexpected crashes, I looked over the code and noticed that the access of the value for dialog variables was not protected, making them vulnerable of invalid memory access in case of the variable was updated by another process or dialog was terminated. I introduced a couple of new functions to try to cover different use cases of getting the dlg variable values, dialog management code was not affected, but given that these commits need to be backported to stable branch (5.6), I want to get proper feedback from community that things work fine. A previous attempt of a simpler fix was not enough, having side effects to acc module for dialog-based cdr generation, because it was keeping referenced to many dlg variables at the same time. In short, it would be appreciated any feedback on testing dialog and acc with dialog-based cdr generation using git master branch. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Nov 7-10, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

3 13

[kamailio/kamailio] Update mod_stats.c Random crash in CTL handler (PR #3250)
by bensly-shanmugam 17 Oct '22

17 Oct '22

#### Pre-Submission Checklist    - [ ] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  We have found a random crash in the CTL module handler and we are using kamailio 5.4.7. Based on the core log analysis, we have identified that, due to some of the RPC events this crash happens. This crash happen when "rpc_mod_is_printed_one" funtion recevies the parameter ( mem_counter *stats ) as NULL. To avoid the crash, we have added the below code. if ( stats == NULL || current == NULL ) { LM_ERR("rpc_mod_is_printed_one -> funtion parameter contains null value \n"); return 1; } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3250 -- Commit Summary -- * Update mod_stats.c Random crash in CTL handler -- File Changes -- M src/modules/kex/mod_stats.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3250.patch https://github.com/kamailio/kamailio/pull/3250.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3250 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3250(a)github.com>

2 8

git:5.5:c4e70496: kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam
by Henning Westerholt 17 Oct '22

17 Oct '22

Module: kamailio Branch: 5.5 Commit: c4e70496f521a265240736c389716a7dac14893f URL: https://github.com/kamailio/kamailio/commit/c4e70496f521a265240736c389716a7… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-17T10:57:01Z kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam (cherry picked from commit e241f7b8a07b24fba6d6ecf2c344a39d2b2b5859) --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/c4e70496f521a265240736c389716a7… Patch: https://github.com/kamailio/kamailio/commit/c4e70496f521a265240736c389716a7… --- diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index 25e3285c780..dd73bec522a 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -86,7 +86,14 @@ static const char* rpc_mod_mem_statsx_doc[2] = { /* test if the current mod info was already printed */ static int rpc_mod_is_printed_one(mem_counter *stats, mem_counter *current) { - mem_counter *iter = stats; + mem_counter *iter; + + if ( stats == NULL || current == NULL ) + { + LM_ERR("invalid parameter\n"); + return 1; + } + iter = stats; while (iter && iter != current) { if (strcmp(iter->mname, current->mname) == 0) {

1 0

[kamailio/kamailio] siputils: fix time_t warning and a typo (PR #3266)
by micmac1 17 Oct '22

17 Oct '22

Fix the below warning one gets when compiling siputils for a 32 bit target against a time64 libc (musl). Also fix a spelling mistake on the same line ("autdated" -> "outdated"). ``` siputils.c: In function 'ki_hdr_date_check': ../../core/parser/../dprint.h:321:73: warning: format '%ld' expects argument of type 'long int', but argument 11 has type 'time_t' {aka 'long long int'} [-Wformat=] 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/parser/../dprint.h:345:25: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:392:37: note: in expansion of macro 'LOG' 392 | # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) | ^~~ ../../core/parser/../dprint.h:418:16: note: in expansion of macro 'ERR' 418 | #define LM_ERR ERR | ^~~ siputils.c:562:17: note: in expansion of macro 'LM_ERR' 562 | LM_ERR("autdated date header value (%ld sec)\n", tnow - tmsg + tdiff); | ^~~~~~ ``` Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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  Hi all, I ticked "Tested changes locally" because I ran kamailio with siputils module loaded, but I wouldn't know how to trigger the exact code path to end up with the error message I updated. But the compile warning goes away with this change and the same mechanism for time_t format handling is used elsewhere in kamailio already. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3266 -- Commit Summary -- * siputils: fix time_t warning and a typo -- File Changes -- M src/modules/siputils/siputils.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3266.patch https://github.com/kamailio/kamailio/pull/3266.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3266 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3266(a)github.com>

2 2

git:master:413efdd8: siputils: fix time_t warning and a typo
by Henning Westerholt 17 Oct '22

17 Oct '22

Module: kamailio Branch: master Commit: 413efdd80bcffd11a17692d61f32efacf5d34c3d URL: https://github.com/kamailio/kamailio/commit/413efdd80bcffd11a17692d61f32efa… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-17T09:58:36+02:00 siputils: fix time_t warning and a typo Fix the below warning one gets when compiling siputils for a 32 bit target against a time64 libc (musl). Also fix a spelling mistake on the same line ("autdated" -> "outdated"). siputils.c: In function 'ki_hdr_date_check': ../../core/parser/../dprint.h:321:73: warning: format '%ld' expects argument of type 'long int', but argument 11 has type 'time_t' {aka 'long long int'} [-Wformat=] 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/parser/../dprint.h:345:25: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:392:37: note: in expansion of macro 'LOG' 392 | # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) | ^~~ ../../core/parser/../dprint.h:418:16: note: in expansion of macro 'ERR' 418 | #define LM_ERR ERR | ^~~ siputils.c:562:17: note: in expansion of macro 'LM_ERR' 562 | LM_ERR("autdated date header value (%ld sec)\n", tnow - tmsg + tdiff); | ^~~~~~ Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/413efdd80bcffd11a17692d61f32efa… Patch: https://github.com/kamailio/kamailio/commit/413efdd80bcffd11a17692d61f32efa… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 88ed33050b6..91b2d370d07 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -563,7 +563,7 @@ static int ki_hdr_date_check(sip_msg_t* msg, int tdiff) } if (tnow > tmsg + tdiff) { - LM_ERR("autdated date header value (%ld sec)\n", tnow - tmsg + tdiff); + LM_ERR("outdated date header value (%" TIME_T_FMT " sec)\n", TIME_T_CAST(tnow - tmsg + tdiff)); return -4; } else { LM_ERR("Date header value OK\n");

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