sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
197 discussions

[kamailio/kamailio] examples/scscf: minor fixes (logging) (#756)

by Dragos Oancea

The real return code of MAA/SAA is not shown in the logs in case of unknown error. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/756 -- Commit Summary -- * examples/scscf: minor fixes (logging) -- File Changes -- M examples/scscf/kamailio.cfg (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/756.patch https://github.com/kamailio/kamailio/pull/756.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/756

7 years, 9 months

git:master:33fe3025: Merge pull request #756 from athonet-open/fix__example_scscf

by GitHub

Module: kamailio Branch: master Commit: 33fe30255fabc979d1512784aafa96ee28758a09 URL: https://github.com/kamailio/kamailio/commit/33fe30255fabc979d1512784aafa96e… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-23T13:19:41+02:00 Merge pull request #756 from athonet-open/fix__example_scscf examples/scscf: minor fixes (logging) --- Modified: examples/scscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/33fe30255fabc979d1512784aafa96e… Patch: https://github.com/kamailio/kamailio/commit/33fe30255fabc979d1512784aafa96e… --- diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index f66ff54..9d06af4 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -737,7 +737,7 @@ route[REG_MAR_REPLY] send_reply("500", "MAR failed"); break; default: - xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:uaa_return_code)]\n"); + xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:maa_return_code)]\n"); send_reply("500", "Unknown response code from MAR"); break; } @@ -761,7 +761,7 @@ route[PRE_REG_SAR_REPLY] xlog("L_ERR", "SAR error - error response sent from module\n"); break; default: - xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:uaa_return_code)]\n"); + xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:saa_return_code)]\n"); break; } exit; @@ -783,7 +783,7 @@ route[REG_SAR_REPLY] xlog("L_ERR", "SAR error - error response sent from module\n"); break; default: - xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:uaa_return_code)]\n"); + xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:saa_return_code)]\n"); break; } exit; @@ -869,7 +869,7 @@ route[FINAL_ORIG] route[CHARGING_CCR_ORIG_REPLY] { - xlog("L_DBG","saa_return code is $avp(s:cca_return_code)\n"); + xlog("L_DBG","cca_return code is $avp(s:cca_return_code)\n"); switch ($avp(s:cca_return_code)){ case 1: #success @@ -1039,7 +1039,7 @@ route[FINAL_TERM] { route[CHARGING_CCR_TERM_REPLY] { - xlog("L_DBG","saa_return code is $avp(s:cca_return_code)\n"); + xlog("L_DBG","cca_return code is $avp(s:cca_return_code)\n"); switch ($avp(s:cca_return_code)){ case 1: #success

7 years, 9 months

git:master:39ceb976: examples/scscf: minor fixes (logging)

by Dragos Oancea

Module: kamailio Branch: master Commit: 39ceb9763132549f100de638f4c0b8806c0a9232 URL: https://github.com/kamailio/kamailio/commit/39ceb9763132549f100de638f4c0b88… Author: Dragos Oancea <dragos.oancea(a)athonet.com> Committer: Dragos Oancea <dragos.oancea(a)athonet.com> Date: 2016-08-23T10:50:11+02:00 examples/scscf: minor fixes (logging) --- Modified: examples/scscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/39ceb9763132549f100de638f4c0b88… Patch: https://github.com/kamailio/kamailio/commit/39ceb9763132549f100de638f4c0b88… --- diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index f66ff54..9d06af4 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -737,7 +737,7 @@ route[REG_MAR_REPLY] send_reply("500", "MAR failed"); break; default: - xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:uaa_return_code)]\n"); + xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:maa_return_code)]\n"); send_reply("500", "Unknown response code from MAR"); break; } @@ -761,7 +761,7 @@ route[PRE_REG_SAR_REPLY] xlog("L_ERR", "SAR error - error response sent from module\n"); break; default: - xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:uaa_return_code)]\n"); + xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:saa_return_code)]\n"); break; } exit; @@ -783,7 +783,7 @@ route[REG_SAR_REPLY] xlog("L_ERR", "SAR error - error response sent from module\n"); break; default: - xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:uaa_return_code)]\n"); + xlog("L_ERR", "Unknown return code from SAR, value is [$avp(s:saa_return_code)]\n"); break; } exit; @@ -869,7 +869,7 @@ route[FINAL_ORIG] route[CHARGING_CCR_ORIG_REPLY] { - xlog("L_DBG","saa_return code is $avp(s:cca_return_code)\n"); + xlog("L_DBG","cca_return code is $avp(s:cca_return_code)\n"); switch ($avp(s:cca_return_code)){ case 1: #success @@ -1039,7 +1039,7 @@ route[FINAL_TERM] { route[CHARGING_CCR_TERM_REPLY] { - xlog("L_DBG","saa_return code is $avp(s:cca_return_code)\n"); + xlog("L_DBG","cca_return code is $avp(s:cca_return_code)\n"); switch ($avp(s:cca_return_code)){ case 1: #success

7 years, 9 months

git:master:e34ecb39: Merge pull request #753 from athonet-open/fix__dbl_frees

by GitHub

Module: kamailio Branch: master Commit: e34ecb397becd6824331fc15141e320bcc920cca URL: https://github.com/kamailio/kamailio/commit/e34ecb397becd6824331fc15141e320… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-22T13:25:45+02:00 Merge pull request #753 from athonet-open/fix__dbl_frees core: fixed two double free() situations --- Modified: data_lump_rpl.c Modified: parser/hf.c --- Diff: https://github.com/kamailio/kamailio/commit/e34ecb397becd6824331fc15141e320… Patch: https://github.com/kamailio/kamailio/commit/e34ecb397becd6824331fc15141e320… --- diff --git a/data_lump_rpl.c b/data_lump_rpl.c index 6ce77f8..6b8ba8d 100644 --- a/data_lump_rpl.c +++ b/data_lump_rpl.c @@ -102,9 +102,12 @@ void free_lump_rpl(struct lump_rpl* lump) { if (lump) { if (!((lump->flags)&LUMP_RPL_NOFREE) && ((lump->flags)&LUMP_RPL_NODUP) - && lump->text.s) + && lump->text.s) { pkg_free(lump->text.s); + lump->text.s = 0; + } pkg_free(lump); + lump = 0; } } diff --git a/parser/hf.c b/parser/hf.c index 2ff94d0..4b82fbe 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -215,6 +215,7 @@ void free_hdr_field_lst(struct hdr_field* hf) hf=hf->next; clean_hdr_field(foo); pkg_free(foo); + foo = 0; } }

7 years, 9 months

git:master:c1ea48cf: core: fix double free on clearing lump

by Dragos Oancea

Module: kamailio Branch: master Commit: c1ea48cfe38e6c52c50e6f1d698254a789e988f1 URL: https://github.com/kamailio/kamailio/commit/c1ea48cfe38e6c52c50e6f1d698254a… Author: Dragos Oancea <dragos.oancea(a)athonet.com> Committer: Dragos Oancea <dragos.oancea(a)athonet.com> Date: 2016-08-22T09:58:48+02:00 core: fix double free on clearing lump --- Modified: data_lump_rpl.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ea48cfe38e6c52c50e6f1d698254a… Patch: https://github.com/kamailio/kamailio/commit/c1ea48cfe38e6c52c50e6f1d698254a… --- diff --git a/data_lump_rpl.c b/data_lump_rpl.c index 6ce77f8..6b8ba8d 100644 --- a/data_lump_rpl.c +++ b/data_lump_rpl.c @@ -102,9 +102,12 @@ void free_lump_rpl(struct lump_rpl* lump) { if (lump) { if (!((lump->flags)&LUMP_RPL_NOFREE) && ((lump->flags)&LUMP_RPL_NODUP) - && lump->text.s) + && lump->text.s) { pkg_free(lump->text.s); + lump->text.s = 0; + } pkg_free(lump); + lump = 0; } }

7 years, 9 months

[kamailio/kamailio] core: fixed two double free() situations (#753)

by Dragos Oancea

I ran into these while testing with SIPP and having memlog=1 : kamailio[21826]: : <core> [mem/q_malloc.c:453]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7f24869850f8), called from <core>: parser/contact/parse_contact.c: free_contact(109), first free <core>: parser/contact/parse_contact.c: free_contact(109) - aborting kamailio[21540]: : <core> [mem/q_malloc.c:453]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7f4161b971c0), called from <core>: data_lump_rpl.c: free_lump_rpl(107), first free <core>: data_lump_rpl.c: free_lump_rpl(107) - aborting These two patches fix these two separate issues. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/753 -- Commit Summary -- * core: fix double free on clearing hdr * core: fix double free on clearing lump -- File Changes -- M data_lump_rpl.c (5) M parser/hf.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/753.patch https://github.com/kamailio/kamailio/pull/753.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/753

7 years, 9 months

git:master:df83103b: core: fix double free on clearing hdr

by Dragos Oancea

Module: kamailio Branch: master Commit: df83103bb4756b0a3c3e42927396f78aa8210ec4 URL: https://github.com/kamailio/kamailio/commit/df83103bb4756b0a3c3e42927396f78… Author: Dragos Oancea <dragos.oancea(a)athonet.com> Committer: Dragos Oancea <dragos.oancea(a)athonet.com> Date: 2016-08-22T09:58:07+02:00 core: fix double free on clearing hdr --- Modified: parser/hf.c --- Diff: https://github.com/kamailio/kamailio/commit/df83103bb4756b0a3c3e42927396f78… Patch: https://github.com/kamailio/kamailio/commit/df83103bb4756b0a3c3e42927396f78… --- diff --git a/parser/hf.c b/parser/hf.c index 2ff94d0..4b82fbe 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -215,6 +215,7 @@ void free_hdr_field_lst(struct hdr_field* hf) hf=hf->next; clean_hdr_field(foo); pkg_free(foo); + foo = 0; } }

7 years, 9 months

git:master:5ebbe8dc: Merge pull request #726 from phil-lavin/bugfix-presence-race-2

by GitHub

Module: kamailio Branch: master Commit: 5ebbe8dc2bc3fa3f7a32df3f479fe1ed6bc18a8e URL: https://github.com/kamailio/kamailio/commit/5ebbe8dc2bc3fa3f7a32df3f479fe1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-22T09:42:10+02:00 Merge pull request #726 from phil-lavin/bugfix-presence-race-2 Bugfix presence race 2 --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/5ebbe8dc2bc3fa3f7a32df3f479fe1e… Patch: https://github.com/kamailio/kamailio/commit/5ebbe8dc2bc3fa3f7a32df3f479fe1e…

7 years, 9 months

git:master:839cf89b: presentity: don't update terminated presentity entries in the database

by Phil Lavin

Module: kamailio Branch: master Commit: 839cf89b02f8817156487a960ff62013e3cde530 URL: https://github.com/kamailio/kamailio/commit/839cf89b02f8817156487a960ff6201… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2016-07-27T15:04:26+01:00 presentity: don't update terminated presentity entries in the database - Fixes a race condition caused by, for example, the call being answered at almost exactly the same time as the caller cancels. This causes a terminated state to change back to completed. The dialog is then removed from the database and the presentity entry stays in place until it expires. - This fix explicitly prevents terminated entries being updated as the state machine in RFC 4235 prohibits this behaviour. --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/839cf89b02f8817156487a960ff6201… Patch: https://github.com/kamailio/kamailio/commit/839cf89b02f8817156487a960ff6201…

7 years, 9 months

[kamailio/kamailio] Bugfix presence race 2 (#726)

by Phil Lavin

presentity: don't update terminated presentity entries in the database - This fix is pull requested based on the stuff in pull request #724. That is because the stuff done here builds on that earlier work. #724 probably wants to be merged before this one. - Fixes a race condition caused by, for example, the call being answered at almost exactly the same time as the caller cancels. This causes a terminated state to change back to completed. The dialog is then removed from the database and the presentity entry stays in place until it expires. - This fix explicitly prevents terminated entries being updated as the state machine in RFC 4235 prohibits this behaviour. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/726 -- Commit Summary -- * presence: Always check if a record exists for this dialog before inserting * presence: fix memory leak introduced by last commit * presence: log when presentity is deleted due to already existing * presentity: don't update terminated presentity entries in the database -- File Changes -- M modules/presence/presentity.c (297) -- Patch Links -- https://github.com/kamailio/kamailio/pull/726.patch https://github.com/kamailio/kamailio/pull/726.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/726

7 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016