sr-dev May 2014

sr-dev@lists.kamailio.org

34 participants
238 discussions

git:master: kex: remove debug message added in previous commit

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d12ac993176f4282b6a740490fd9c645132c98e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d12ac99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 21:36:28 2014 +0200 kex: remove debug message added in previous commit --- modules/kex/pkg_stats.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/kex/pkg_stats.c b/modules/kex/pkg_stats.c index 937d043..4a0111d 100644 --- a/modules/kex/pkg_stats.c +++ b/modules/kex/pkg_stats.c @@ -89,7 +89,6 @@ int pkg_proc_stats_init(void) int pkg_proc_stats_myinit(int rank) { struct mem_info info; - LM_INFO("+++++++++++++ %d (%d) [%d]\n", rank, (int)my_pid(), process_no); if(_pkg_proc_stats_list==NULL) return -1; if(process_no>=_pkg_proc_stats_no)

10 years

New commits on branch master

by Daniel-Constantin Mierla

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c2888f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 21:06:34 2014 +0200 mem/q_malloc: free old pointer if allocation in realloc fails URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41a37b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 21:03:34 2014 +0200 mem/f_malloc: free old pointer if allocation in realloc fails URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3dda712… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:56:19 2014 +0200 Makefile.defs: version set to 4.2.0-dev6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ace9adb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:52:53 2014 +0200 Makefile.defs: memory manager set to f_malloc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4eae467… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:52:06 2014 +0200 xmlrpc: removed unused variable in rpc_array_add - reported by Juha Heinanen URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aac0c21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:10:00 2014 +0200 core/mem: f_malloc updates for pool type and refactoring of parts - removed define on statistics, it was always on for the past several years - the code is cleaner - total free fragements is kept in root memory block to avoid computing it at runtime by walking hash slots - attempt to join fragments when a malloc fails to reuse existing fragments - should help when mem_join is 0, being very fast up to the moment of an out of memory, when does the attempt of joining - pkg stats updated to use the single event callback at the end of malloc, free or realloc operations URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e670525… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:07:41 2014 +0200 core/mem: q_malloc updates to set pool type and pkg stats refactoring - total free fragments are kept in memory root block to avoid computing them by walking the hash table - use single event callback to update per process pkg stats, executed at the end of malloc, free or realloc opperations URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b1cef2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:05:32 2014 +0200 kex: use the new pkg update stats event callback - print total size and total free fragments for each process - should solve the issue when values of pkg stats were innacurate URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91b3628… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:05:12 2014 +0200 core/mem: ll_malloc initialization updated to be able to set pool type URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5baa85b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:04:34 2014 +0200 core/mem: sf_malloc initialization updated to be able to set pool type URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bccf5cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:02:47 2014 +0200 core: repaced the two pkg update event callbacks with one - simplified usage as can be executed at the end of memory operations (malloc, free, realloc) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c996d5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:02:06 2014 +0200 core/mem: set shm type when initializing shared memory pool URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ef30f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 20:01:23 2014 +0200 pkg/mem: set pkg type when intializing memory pool URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffa1beb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 19:57:19 2014 +0200 core/mem: define internal types for pkg and shm pools - to allow easier identification when doing operations over mem block URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62a9e6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 11:45:34 2014 +0200 Makefile.defs: compile with debugging symbols when using clang - added -g parameter to be on pair with gcc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e7f95b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 09:18:40 2014 +0200 mem/f_malloc: link previous free fragment to speed up join URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=892a24f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 2 23:58:12 2014 +0200 mem/f_malloc: check returned pointer for bitmask index - if null, reset slot and search on bigger chunks slots

10 years

git:master: modules/sdpops: turned two sdp_with_ice() INFO messages to DBG messages

by Juha Heinanen

Module: sip-router Branch: master Commit: d3d2c582cd518ddac61ec005ecfffce12450563e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3d2c58… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat May 3 17:30:26 2014 +0300 modules/sdpops: turned two sdp_with_ice() INFO messages to DBG messages --- modules/sdpops/sdpops_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index a8c472f..4595466 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -1447,10 +1447,10 @@ static int w_sdp_with_ice(sip_msg_t* msg, char* foo, char *bar) } if (ser_memmem(body.s, ice.s, body.len, ice.len) != NULL) { - LM_INFO("found ice attribute\n"); + LM_DBG("found ice attribute\n"); return 1; } else { - LM_INFO("did't find ice attribute\n"); + LM_DBG("did't find ice attribute\n"); return -1; } }

10 years

unused variable

by Juha Heinanen

CC (cc) [M xmlrpc.so] xmlrpc.o xmlrpc.c: In function 'rpc_array_add': xmlrpc.c:1789:6: warning: unused variable 'member_name' [-Wunused-variable]

10 years

Possible bug in app_perl

by James Cloos

Given this code in .cfg: if (!perl_exec("verify", "route_LOCATION")) { xlog("L_INFO", "Invite verify failed for ruri: $ru\n"); sl_send_reply("403", "Not Allowed"); exit; } if the perl function returns 1 everything proceeds nicely (skipping the if block as as expected). But should the perl function return 0 (which seemed like the right choice for failure) the call fails to progress; the if block does not run, and nothing else does either. The INVITing sip client retries and times out. I had to return a negative value to get the if block to run. Expected? Or bug? (Running deb's sid build on amd64.) -JimC -- James Cloos <cloos(a)jhcloos.com> OpenPGP: 0x997A9F17ED7DAEA6

10 years

git:4.0: dialog: copy dlg var value locally on get operation

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: f934f4ffed51b143570d76a2786f5e490c5ff265 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f934f4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 2 21:50:14 2014 +0200 dialog: copy dlg var value locally on get operation - reference to shared memory exposes risk on accessing an invalid pointer if anothe process updates it - reported by Dragos Oancea (cherry picked from commit bb3eed8aabea9f63c9922f71714aea242771db02) (cherry picked from commit b76eb77a36a5e751d792cb7e0d60f4750976e322) --- modules/dialog/dlg_var.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index 0d8a1c7..6e29ac0 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -284,6 +284,7 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { dlg_cell_t *dlg; str * value; + str spv; if (param==NULL || param->pvn.type!=PV_NAME_INTSTR || param->pvn.u.isname.type!=AVP_NAME_STR @@ -306,6 +307,19 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) /* dcm: todo - the value should be cloned for safe usage */ value = get_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s); + spv.s = NULL; + if(value) { + spv.len = pv_get_buffer_size(); + if(spv.len<value->len+1) { + LM_ERR("pv buffer too small (%d) - needed %d\n", spv.len, value->len); + } else { + spv.s = pv_get_buffer(); + strncpy(spv.s, value->s, value->len); + spv.len = value->len; + spv.s[spv.len] = '\0'; + } + } + print_lists(dlg); /* unlock dialog */ @@ -314,8 +328,8 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) dlg_release(dlg); } - if (value) - return pv_get_strval(msg, param, res, value); + if (spv.s) + return pv_get_strval(msg, param, res, &spv); return pv_get_null(msg, param, res);

10 years

git:4.0: rtmier: reset avps and xavp lists after route blocks execution

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: be94f3c0dade803ee77aa1b9bf73d3bb95257dc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be94f3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 20:02:19 2014 +0200 rtmier: reset avps and xavp lists after route blocks execution - avoid leaks if someone is using avp/xavp with rtimer - there is a fake message used there, thus not the normal sip message routing that resets avps/xavps (cherry picked from commit 159978cf2a98748f3225155d8946bcbd768b51e3) (cherry picked from commit c5781b28cd92360cf163a84312fa72c08c4737b5) --- modules/rtimer/rtimer_mod.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/rtimer/rtimer_mod.c b/modules/rtimer/rtimer_mod.c index 03a002d..271b888 100644 --- a/modules/rtimer/rtimer_mod.c +++ b/modules/rtimer/rtimer_mod.c @@ -37,6 +37,8 @@ #include "../../socket_info.h" #include "../../dset.h" #include "../../pt.h" +#include "../../usr_avp.h" +#include "../../xavp.h" #include "../../timer_proc.h" #include "../../script_cb.h" #include "../../parser/parse_param.h" @@ -190,6 +192,10 @@ void stm_timer_exec(unsigned int ticks, void *param) set_route_type(REQUEST_ROUTE); run_top_route(main_rt.rlist[rt->route], fmsg, 0); exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif } }

10 years

git:4.0: acc: no request is needed for setting end time on dialog termination

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 63b3c13b3cc884d7f813bb99ccc0563d1a4594f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63b3c13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 28 13:51:56 2014 +0200 acc: no request is needed for setting end time on dialog termination - callback function cdr_on_end() doesn't use it at all - reported by Eduardo Lejarreta, FS#256 (cherry picked from commit 8fcdd23aaa49cb6c1ecb34c4c6b4a88078a860f7) (cherry picked from commit 4455a13e8d31416dc44af455710fd7a7ff37ec11) --- modules/acc/acc_cdr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index 996ebf4..45f7a06 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -476,7 +476,7 @@ static void cdr_on_end( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { - if( !dialog || !params || !params->req) + if( !dialog || !params) { LM_ERR("invalid values\n!"); return;

10 years

git:4.1: dialog: copy dlg var value locally on get operation

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: b76eb77a36a5e751d792cb7e0d60f4750976e322 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b76eb77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 2 21:50:14 2014 +0200 dialog: copy dlg var value locally on get operation - reference to shared memory exposes risk on accessing an invalid pointer if anothe process updates it - reported by Dragos Oancea (cherry picked from commit bb3eed8aabea9f63c9922f71714aea242771db02) --- modules/dialog/dlg_var.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index 111dcd8..4b2ca89 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -284,6 +284,7 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { dlg_cell_t *dlg; str * value; + str spv; if (param==NULL || param->pvn.type!=PV_NAME_INTSTR || param->pvn.u.isname.type!=AVP_NAME_STR @@ -306,6 +307,19 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) /* dcm: todo - the value should be cloned for safe usage */ value = get_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s); + spv.s = NULL; + if(value) { + spv.len = pv_get_buffer_size(); + if(spv.len<value->len+1) { + LM_ERR("pv buffer too small (%d) - needed %d\n", spv.len, value->len); + } else { + spv.s = pv_get_buffer(); + strncpy(spv.s, value->s, value->len); + spv.len = value->len; + spv.s[spv.len] = '\0'; + } + } + print_lists(dlg); /* unlock dialog */ @@ -314,8 +328,8 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) dlg_release(dlg); } - if (value) - return pv_get_strval(msg, param, res, value); + if (spv.s) + return pv_get_strval(msg, param, res, &spv); return pv_get_null(msg, param, res);

10 years

git:4.1: rtmier: reset avps and xavp lists after route blocks execution

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: c5781b28cd92360cf163a84312fa72c08c4737b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5781b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 20:02:19 2014 +0200 rtmier: reset avps and xavp lists after route blocks execution - avoid leaks if someone is using avp/xavp with rtimer - there is a fake message used there, thus not the normal sip message routing that resets avps/xavps (cherry picked from commit 159978cf2a98748f3225155d8946bcbd768b51e3) --- modules/rtimer/rtimer_mod.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/rtimer/rtimer_mod.c b/modules/rtimer/rtimer_mod.c index 03a002d..271b888 100644 --- a/modules/rtimer/rtimer_mod.c +++ b/modules/rtimer/rtimer_mod.c @@ -37,6 +37,8 @@ #include "../../socket_info.h" #include "../../dset.h" #include "../../pt.h" +#include "../../usr_avp.h" +#include "../../xavp.h" #include "../../timer_proc.h" #include "../../script_cb.h" #include "../../parser/parse_param.h" @@ -190,6 +192,10 @@ void stm_timer_exec(unsigned int ticks, void *param) set_route_type(REQUEST_ROUTE); run_top_route(main_rt.rlist[rt->route], fmsg, 0); exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif } }

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2014