sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

git:5.1:30b71758: ChangeLog: content prepared for v5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 30b71758dbc21dc71f3fc2a501bd7097197da644 URL: https://github.com/kamailio/kamailio/commit/30b71758dbc21dc71f3fc2a501bd709… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T14:51:30+02:00 ChangeLog: content prepared for v5.1.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/30b71758dbc21dc71f3fc2a501bd709… Patch: https://github.com/kamailio/kamailio/commit/30b71758dbc21dc71f3fc2a501bd709… --- diff --git a/ChangeLog b/ChangeLog index 42fc85827b..77268bbe51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,18 @@ ===================== Changes Since Version 5.1.2 =========================== +commit 5f5f7fd506bbde1ac159cbebf133e499dc06427a (HEAD -> 5.1) +Author: lyokha <alexey.radkov(a)gmail.com> +Date: Tue Apr 24 14:46:32 2018 +0200 + + textops: reinitialize new tr_param_t object for tr_txt_parse_re() + + - avoid segfault when running fparam_free_restore() on + such an object immediately after creation, because its field "next" + contains garbage + + (cherry picked from commit 38b8fbdf940b273cf541678fd22af7dd4d63ab3d) + commit f300f27140ba7fc313850fb2d70a9fbfc3064801 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 24 12:41:48 2018 +0200

1 0

git:5.1:5f5f7fd5: textops: reinitialize new tr_param_t object for tr_txt_parse_re()
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 5f5f7fd506bbde1ac159cbebf133e499dc06427a URL: https://github.com/kamailio/kamailio/commit/5f5f7fd506bbde1ac159cbebf133e49… Author: lyokha <alexey.radkov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T14:49:04+02:00 textops: reinitialize new tr_param_t object for tr_txt_parse_re() - avoid segfault when running fparam_free_restore() on such an object immediately after creation, because its field "next" contains garbage (cherry picked from commit 38b8fbdf940b273cf541678fd22af7dd4d63ab3d) --- Modified: src/modules/textops/txt_var.c --- Diff: https://github.com/kamailio/kamailio/commit/5f5f7fd506bbde1ac159cbebf133e49… Patch: https://github.com/kamailio/kamailio/commit/5f5f7fd506bbde1ac159cbebf133e49… --- diff --git a/src/modules/textops/txt_var.c b/src/modules/textops/txt_var.c index 398cd42120..6970b66bc7 100644 --- a/src/modules/textops/txt_var.c +++ b/src/modules/textops/txt_var.c @@ -215,6 +215,7 @@ char* tr_txt_parse_re(str *in, trans_t *t) LM_ERR("no more private memory!\n"); goto error; } + memset(tp, 0, sizeof(tr_param_t)); se=subst_parser(&tok);

1 0

[kamailio/kamailio] textops: properly initialize new tr_param_t object (#1506)
by Alexey Radkov 24 Apr '18

24 Apr '18

Just `memset()` this to `0`. Without this kamailio segfaults when running `fparam_free_restore()` on a variable that contains transformations immediately after creation, because field `next` of the transformation contains garbage. In my case this was variable which contained `re.subst` transformation. And below is the top of the backtrace. ``` #0 0x00000000005cba17 in tr_param_free (tp=0x292873257325203a) at core/pvapi.c:1804 #1 0x00000000005cb677 in tr_destroy (t=0x7f6387ed0c40) at core/pvapi.c:1742 #2 0x00000000005cb9c1 in tr_free (t=0x0) at core/pvapi.c:1786 #3 0x00000000005ca194 in pv_spec_destroy (spec=0x7f6387ed0b80) at core/pvapi.c:1570 #4 0x00000000005ca1b7 in pv_spec_free (spec=0x7f6387ed0b80) at core/pvapi.c:1578 #5 0x0000000000541820 in fparam_free_contents (fp=0x7f6387ed0ae0) at core/sr_module.c:1334 #6 0x0000000000541898 in fparam_free_restore (param=0x7f6387ed1168) at core/sr_module.c:1364 ```   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1506 -- Commit Summary -- * properly initialize new tr_param_t object -- File Changes -- M src/modules/textops/txt_var.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1506.patch https://github.com/kamailio/kamailio/pull/1506.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/1506

2 2

git:master:38b8fbdf: textops: reinitialize new tr_param_t object for tr_txt_parse_re()
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: master Commit: 38b8fbdf940b273cf541678fd22af7dd4d63ab3d URL: https://github.com/kamailio/kamailio/commit/38b8fbdf940b273cf541678fd22af7d… Author: lyokha <alexey.radkov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T14:46:32+02:00 textops: reinitialize new tr_param_t object for tr_txt_parse_re() - avoid segfault when running fparam_free_restore() on such an object immediately after creation, because its field "next" contains garbage --- Modified: src/modules/textops/txt_var.c --- Diff: https://github.com/kamailio/kamailio/commit/38b8fbdf940b273cf541678fd22af7d… Patch: https://github.com/kamailio/kamailio/commit/38b8fbdf940b273cf541678fd22af7d… --- diff --git a/src/modules/textops/txt_var.c b/src/modules/textops/txt_var.c index 398cd42120..6970b66bc7 100644 --- a/src/modules/textops/txt_var.c +++ b/src/modules/textops/txt_var.c @@ -215,6 +215,7 @@ char* tr_txt_parse_re(str *in, trans_t *t) LM_ERR("no more private memory!\n"); goto error; } + memset(tp, 0, sizeof(tr_param_t)); se=subst_parser(&tok);

1 0

git:5.1:6ffd296d: ChangeLog: content updated for v5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 6ffd296de50a1936bd7b5883ab375e48b7ad086d URL: https://github.com/kamailio/kamailio/commit/6ffd296de50a1936bd7b5883ab375e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:59:47+02:00 ChangeLog: content updated for v5.1.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/6ffd296de50a1936bd7b5883ab375e4… Patch: https://github.com/kamailio/kamailio/commit/6ffd296de50a1936bd7b5883ab375e4…

1 0

git:5.1:f300f271: Makefile.defs: version set to 5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: f300f27140ba7fc313850fb2d70a9fbfc3064801 URL: https://github.com/kamailio/kamailio/commit/f300f27140ba7fc313850fb2d70a9fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:41:48+02:00 Makefile.defs: version set to 5.1.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f300f27140ba7fc313850fb2d70a9fb… Patch: https://github.com/kamailio/kamailio/commit/f300f27140ba7fc313850fb2d70a9fb… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b7346a71fe..86b57216b8 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:e1fd2ed4: ims_charging: fixed check result code at mscc level (#1504)
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: e1fd2ed4bfdc2704f1c89f1b64d852599c0b6726 URL: https://github.com/kamailio/kamailio/commit/e1fd2ed4bfdc2704f1c89f1b64d8525… Author: yuri-r <yuri.rootshtein(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:40:26+02:00 ims_charging: fixed check result code at mscc level (#1504) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) (cherry picked from commit 352440d299f1b9f431cc05397f4ea6a7b5967c8a) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/e1fd2ed4bfdc2704f1c89f1b64d8525… Patch: https://github.com/kamailio/kamailio/commit/e1fd2ed4bfdc2704f1c89f1b64d8525… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 735f5b30be..497f65dd72 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1361,7 +1361,7 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, create_cca_fui_avps(fui_action, redirecturi); /* check result code at mscc level */ - if (ro_cca_data->mscc->resultcode != 2001) { + if (ro_cca_data->mscc->resultcode && ro_cca_data->mscc->resultcode != 2001) { LM_DBG("CCA failure at MSCC level with resultcode [%d]\n", ro_cca_data->mscc->resultcode); error_code = RO_RETURN_FALSE; goto error1;

1 0

git:master:352440d2: ims_charging: fixed check result code at mscc level (#1504)
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: master Commit: 352440d299f1b9f431cc05397f4ea6a7b5967c8a URL: https://github.com/kamailio/kamailio/commit/352440d299f1b9f431cc05397f4ea6a… Author: yuri-r <yuri.rootshtein(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:39:07+02:00 ims_charging: fixed check result code at mscc level (#1504) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/352440d299f1b9f431cc05397f4ea6a… Patch: https://github.com/kamailio/kamailio/commit/352440d299f1b9f431cc05397f4ea6a… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 735f5b30be..497f65dd72 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1361,7 +1361,7 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, create_cca_fui_avps(fui_action, redirecturi); /* check result code at mscc level */ - if (ro_cca_data->mscc->resultcode != 2001) { + if (ro_cca_data->mscc->resultcode && ro_cca_data->mscc->resultcode != 2001) { LM_DBG("CCA failure at MSCC level with resultcode [%d]\n", ro_cca_data->mscc->resultcode); error_code = RO_RETURN_FALSE; goto error1;

1 0

[kamailio/kamailio] ims_charging: fixed check result code at mscc level (#1504)
by yuri-r 24 Apr '18

24 Apr '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1504 -- Commit Summary -- * ims_charging: fixed check result code at mscc level -- File Changes -- M src/modules/ims_charging/ims_ro.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1504.patch https://github.com/kamailio/kamailio/pull/1504.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/1504

2 2

git:5.1:314aa224: pkg/rpm: version set to 5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 314aa22404647dc5619bc66f9f415a0bb405e14e URL: https://github.com/kamailio/kamailio/commit/314aa22404647dc5619bc66f9f415a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:36:20+02:00 pkg/rpm: version set to 5.1.3 --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/314aa22404647dc5619bc66f9f415a0… Patch: https://github.com/kamailio/kamailio/commit/314aa22404647dc5619bc66f9f415a0… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 4a3538f927..1a5f233217 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index c0e030af4c..d857e53cbf 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index c6a8ce986f..b274092cd1 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 3f0ba2a401..333b4cc6ef 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 1f89b9e128..f578cd6723 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 6d9d1bc690..93b0c933b8 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index a6d52e9513..a2ac6bdf06 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index bff991171c..ad2e21fcae 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018