sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

git:master:f84689aa: acc_radius : fixes extra attribues memory leak

by Yasin

Module: kamailio Branch: master Commit: f84689aa9f56693abe95f537f8a0217a068b1f01 URL: https://github.com/kamailio/kamailio/commit/f84689aa9f56693abe95f537f8a0217… Author: Yasin <yasin.caner(a)netgsm.com.tr> Committer: Yasin <yasin.caner(a)netgsm.com.tr> Date: 2015-10-01T10:28:54+03:00 acc_radius : fixes extra attribues memory leak if we dont free getting memory from extrarstr , can give out of memory. this commit fixes this problem. --- Modified: modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f84689aa9f56693abe95f537f8a0217… Patch: https://github.com/kamailio/kamailio/commit/f84689aa9f56693abe95f537f8a0217… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index b1843d6..5975c3e 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -24,6 +24,7 @@ * History: * ------- * 2010-07-28 - moved out radius account out of acc module (daniel) + * 2015-10-01 - accounting memory leak is fixed with free_strar_mem (ycaner) */ /*! \file @@ -49,6 +50,7 @@ #include "../../lib/kcore/radius.h" #include "../../modules/acc/acc_api.h" #include "acc_radius_mod.h" +#include "../../modules/acc/acc_extra.h" MODULE_VERSION @@ -329,6 +331,8 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) uint32_t av_type; int offset; int i; + int m=0; + int o=0; send=NULL; @@ -353,8 +357,11 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) ADD_RAD_AVPAIR( RA_TIME_STAMP, &av_type, -1); /* add extra also */ - attr_cnt += accb.get_extra_attrs(rad_extra, req, inf->varr+attr_cnt, - inf->iarr+attr_cnt, inf->tarr+attr_cnt); + o = accb.get_extra_attrs(rad_extra, req, inf->varr+attr_cnt, + inf->iarr+attr_cnt, inf->tarr+attr_cnt); + attr_cnt += o; + m = attr_cnt; + /* add the values for the vector - start from 1 instead of * 0 to skip the first value which is the METHOD as string */ @@ -388,10 +395,14 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) goto error; } rc_avpair_free(send); + /* free memory allocated by extra2strar */ + free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); return 1; error: rc_avpair_free(send); + /* free memory allocated by extra2strar */ + free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); return -1; }

8 years, 6 months

[kamailio] acc_radius : fixes extra attribues memory leak (#349)

by Yasin

if we dont free getting memory from extrarstr , can give out of memory. this commit fixes this problem. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/349 -- Commit Summary -- * acc_radius : fixes extra attribues memory leak -- File Changes -- M modules/acc_radius/acc_radius_mod.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/349.patch https://github.com/kamailio/kamailio/pull/349.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/349

8 years, 6 months

git:4.3:e10fc9b4: core: mem - reworked f_malloc free chunks management

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: e10fc9b41e45abd73e3006b3fe8a4c76f96451f7 URL: https://github.com/kamailio/kamailio/commit/e10fc9b41e45abd73e3006b3fe8a4c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T09:41:17+02:00 core: mem - reworked f_malloc free chunks management - credits to Juha Heinanen for heling with testing (cherry picked from commit 8cced16d7055939a885b6dc6bdb8a346748a0fcd) --- Modified: mem/f_malloc.c Modified: mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/e10fc9b41e45abd73e3006b3fe8a4c7… Patch: https://github.com/kamailio/kamailio/commit/e10fc9b41e45abd73e3006b3fe8a4c7…

8 years, 6 months

git:master:738b113b: tmx: tm reply code pv to use status code directly in onreply routes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 738b113b4be346b7caef600249202d361b556a41 URL: https://github.com/kamailio/kamailio/commit/738b113b4be346b7caef600249202d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T09:26:14+02:00 tmx: tm reply code pv to use status code directly in onreply routes - no need to lookup transaction --- Modified: modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/738b113b4be346b7caef600249202d3… Patch: https://github.com/kamailio/kamailio/commit/738b113b4be346b7caef600249202d3… --- diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index 5b03e9a..7b61a49 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -44,8 +44,6 @@ static struct _pv_tmx_data _pv_treq; static struct _pv_tmx_data _pv_trpl; static struct _pv_tmx_data _pv_tinv; -static str _empty_str = {"", 0}; - void pv_tmx_data_init(void) { memset(&_pv_treq, 0, sizeof(struct _pv_tmx_data)); @@ -494,6 +492,14 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || res==NULL) return -1; + switch (get_route_type()) { + case CORE_ONREPLY_ROUTE: + case TM_ONREPLY_ROUTE: + /* use the status of the current reply */ + code = msg->first_line.u.reply.statuscode; + goto done; + } + /* first get the transaction */ if (_tmx_tmb.t_check( msg , 0 )==-1) return -1; if ( (t=_tmx_tmb.t_gett())==0) { @@ -506,16 +512,6 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, /* use the status of the last sent reply */ code = t->uas.status; break; - case CORE_ONREPLY_ROUTE: - /* t_check() above has the side effect of setting T and - REFerencing T => we must unref and unset it for the - main/core onreply_route. */ - _tmx_tmb.t_unref(msg); - /* no break */ - case TM_ONREPLY_ROUTE: - /* use the status of the current reply */ - code = msg->first_line.u.reply.statuscode; - break; case FAILURE_ROUTE: case BRANCH_FAILURE_ROUTE: /* use the status of the winning reply */ @@ -534,12 +530,10 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, } } - LM_DBG("reply code is <%d>\n",code); - - res->rs.s = int2str( code, &res->rs.len); +done: + LM_DBG("reply code is <%d>\n", code); + return pv_get_sintval(msg, param, res, code); - res->ri = code; - res->flags = PV_VAL_STR|PV_VAL_INT|PV_TYPE_INT; return 0; } @@ -557,7 +551,7 @@ int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, if (_tmx_tmb.t_check( msg , 0 )==-1) return -1; if ( (t=_tmx_tmb.t_gett())==0) { /* no T */ - res->rs = _empty_str; + return pv_get_strempty(msg, param, res); } else { switch (get_route_type()) { case CORE_ONREPLY_ROUTE:

8 years, 6 months

git:master:11791d2b: tmx: proper response of branch ruid pv for tm onreply route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 11791d2b749df9673e9c8fe09ae9e923fb6e735b URL: https://github.com/kamailio/kamailio/commit/11791d2b749df9673e9c8fe09ae9e92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T09:12:16+02:00 tmx: proper response of branch ruid pv for tm onreply route --- Modified: modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/11791d2b749df9673e9c8fe09ae9e92… Patch: https://github.com/kamailio/kamailio/commit/11791d2b749df9673e9c8fe09ae9e92… --- diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index fa1478c..5b03e9a 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -442,6 +442,7 @@ int pv_get_tm_reply_ruid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { struct cell *t; + tm_ctx_t *tcx = 0; int branch; if(msg==NULL || res==NULL) @@ -451,7 +452,7 @@ int pv_get_tm_reply_ruid(struct sip_msg *msg, pv_param_t *param, if (_tmx_tmb.t_check( msg , 0 )==-1) return -1; if ( (t=_tmx_tmb.t_gett())==0) { /* no T */ - res->rs = _empty_str; + return pv_get_strempty(msg, param, res); } else { switch (get_route_type()) { case FAILURE_ROUTE: @@ -460,18 +461,27 @@ int pv_get_tm_reply_ruid(struct sip_msg *msg, pv_param_t *param, if ( (branch=_tmx_tmb.t_get_picked_branch())<0 ) { LM_CRIT("no picked branch (%d) for a final response" " in MODE_ONFAILURE\n", branch); - return -1; + return pv_get_strempty(msg, param, res); } - res->rs = t->uac[branch].ruid; + LM_DBG("reply ruid is [%.*s]\n", t->uac[branch].ruid.len, t->uac[branch].ruid.s); + return pv_get_strval(msg, param, res, &t->uac[branch].ruid); break; + case TM_ONREPLY_ROUTE: + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + return pv_get_strempty(msg, param, res); + } + branch = tcx->branch_index; + if(branch<0 || branch>=t->nr_of_outgoings) { + return pv_get_strempty(msg, param, res); + } + LM_DBG("reply ruid is [%.*s]\n", t->uac[branch].ruid.len, t->uac[branch].ruid.s); + return pv_get_strval(msg, param, res, &t->uac[branch].ruid); default: LM_ERR("unsupported route_type %d\n", get_route_type()); - return -1; + return pv_get_strempty(msg, param, res); } } - LM_DBG("reply ruid is [%.*s]\n", res->rs.len, res->rs.s); - res->flags = PV_VAL_STR; - return 0; } int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param,

8 years, 6 months

git:master:36a704e8: core: pv - helper function to return empty string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36a704e8b54b65e8414fd2a02d973e74a9256e1d URL: https://github.com/kamailio/kamailio/commit/36a704e8b54b65e8414fd2a02d973e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T09:11:11+02:00 core: pv - helper function to return empty string --- Modified: pvapi.c Modified: pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/36a704e8b54b65e8414fd2a02d973e7… Patch: https://github.com/kamailio/kamailio/commit/36a704e8b54b65e8414fd2a02d973e7… --- diff --git a/pvapi.c b/pvapi.c index 3918895..e9b557e 100644 --- a/pvapi.c +++ b/pvapi.c @@ -611,6 +611,21 @@ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) /** * */ +int pv_get_strempty(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + if(res==NULL) + return -1; + + res->rs = pv_str_empty; + res->ri = 0; + res->flags = PV_VAL_STR; + return 0; +} + + +/** + * + */ pv_export_t* pv_lookup_spec_name(str *pvname, pv_spec_p e) { pv_item_t *pvi; diff --git a/pvar.h b/pvar.h index 3bdfe17..8cc8488 100644 --- a/pvar.h +++ b/pvar.h @@ -210,6 +210,7 @@ str* pv_cache_get_name(pv_spec_t *spec); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_strempty(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_uintval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, unsigned int uival);

8 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015