sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

git:tirpi/cfg_framework_multivalue: cfg framework: apply additional var list bugfix

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 90003ec474ff23b385c4760336671ae8758d2523 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90003ec… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 28 17:13:28 2010 +0200 cfg framework: apply additional var list bugfix The variable list needs to be applied for each group --- cfg/cfg_struct.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index a736d67..10d8ef7 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -255,11 +255,12 @@ int cfg_shmize(void) group->name_len, group->name); goto error; } + + /* Create the additional group instances with applying + the temporary list. */ + if (apply_add_var_list(block, group)) + goto error; } - /* Create the additional group instances with applying - the temporary list. */ - if (apply_add_var_list(block, group)) - goto error; /* try to fixup the selects that failed to be fixed-up previously */ if (cfg_fixup_selects()) goto error;

14 years, 1 month

git:master: core: fix end-script commands in expr. leaks

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 28a882873f8a69a189d790e33bcd2017c253a66a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28a8828… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 16:30:40 2010 +0200 core: fix end-script commands in expr. leaks When having commands that end the script immediately in assignments (e.g. $foo = { drop; }) or in expressions (e.g. if ($v + { drop; } > 0)), the script was terminated immediately via longjmp. However this might leave some un-freed variables. This fix introduces a safe version of run_actions() (run_actions_safe()) that will not use longjmp() to immediately end the whole script on drop, returning instead to its caller. --- action.c | 30 +++++++++++++++++++++++++++++- action.h | 8 ++++++++ lvalue.c | 4 ++-- route_struct.h | 1 + rvalue.c | 4 ++-- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/action.c b/action.c index dd0cfef..1716c34 100644 --- a/action.c +++ b/action.c @@ -1564,7 +1564,8 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) h->rec_lev--; end: /* process module onbreak handlers if present */ - if (unlikely(h->rec_lev==0 && ret==0)) + if (unlikely(h->rec_lev==0 && ret==0 && + !(h->run_flags & IGNORE_ON_BREAK_R_F))) for (mod=modules;mod;mod=mod->next) if (unlikely(mod->exports.onbreak_f)) { mod->exports.onbreak_f( msg ); @@ -1578,6 +1579,33 @@ error: } + +#ifdef USE_LONGJMP +/** safe version of run_actions(). + * It always return (it doesn't longjmp on forced script end). + * @returns 0, or 1 on success, <0 on error + * (0 if drop or break encountered, 1 if not ) */ +int run_actions_safe(struct run_act_ctx* h, struct action* a, + struct sip_msg* msg) +{ + struct run_act_ctx ctx; + int ret; + int ign_on_break; + + /* start with a fresh action context */ + init_run_actions_ctx(&ctx); + ctx.last_retcode = h->last_retcode; + ign_on_break = h->run_flags & IGNORE_ON_BREAK_R_F; + ctx.run_flags = h->run_flags | IGNORE_ON_BREAK_R_F; + ret = run_actions(&ctx, a, msg); + h->last_retcode = ctx.last_retcode; + h->run_flags = (ctx.run_flags & ~IGNORE_ON_BREAK_R_F) | ign_on_break; + return ret; +} +#endif /* USE_LONGJMP */ + + + int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx *c) { struct run_act_ctx ctx; diff --git a/action.h b/action.h index c11baa9..a2a5395 100644 --- a/action.h +++ b/action.h @@ -68,4 +68,12 @@ int run_actions(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx* c); + +#ifdef USE_LONGJMP +int run_actions_safe(struct run_act_ctx* c, struct action* a, + struct sip_msg* msg); +#else /*! USE_LONGJMP */ +#define run_actions_safe(c, a, m) run_actions(c, a, m) +#endif /* USE_LONGJMP */ + #endif diff --git a/lvalue.c b/lvalue.c index 4610da4..47a625f 100644 --- a/lvalue.c +++ b/lvalue.c @@ -108,7 +108,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, case RV_ACTION_ST: flags=avp->type & ~AVP_VAL_STR; if (rv->v.action) - value.n=run_actions(h, rv->v.action, msg); + value.n=run_actions_safe(h, rv->v.action, msg); else value.n=-1; ret=value.n; @@ -283,7 +283,7 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, case RV_ACTION_ST: pval.flags=PV_TYPE_INT|PV_VAL_INT; if (rv->v.action) - pval.ri=run_actions(h, rv->v.action, msg); + pval.ri=run_actions_safe(h, rv->v.action, msg); else pval.ri=0; ret=pval.ri; diff --git a/route_struct.h b/route_struct.h index 2d4a643..16733db 100644 --- a/route_struct.h +++ b/route_struct.h @@ -142,6 +142,7 @@ typedef enum _operand_subtype action_param_type; #define RETURN_R_F 2 #define BREAK_R_F 4 #define DROP_R_F 8 +#define IGNORE_ON_BREAK_R_F 256 struct cfg_pos{ diff --git a/rvalue.c b/rvalue.c index eeac3d5..6ef399b 100644 --- a/rvalue.c +++ b/rvalue.c @@ -901,7 +901,7 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - *i=(run_actions(h, rv->v.action, msg)>0); + *i=(run_actions_safe(h, rv->v.action, msg)>0); else *i=0; break; @@ -1100,7 +1100,7 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - i=(run_actions(h, rv->v.action, msg)>0); + i=(run_actions_safe(h, rv->v.action, msg)>0); else i=0; tmpv->s=sint2strbuf(i, tmp_cache->i2s,

14 years, 1 month

git:master: core: route(dynamic expression) memleak fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c26801f44c260b3989f525bf2b26670d4cc7f651 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c26801f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 16:27:46 2010 +0200 core: route(dynamic expression) memleak fix When using a dynamic expression as argument to route() (e.g. route($foo) or route($foo + "1")), the evaluated rvalue was not freed. --- action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index 3768dfa..dd0cfef 100644 --- a/action.c +++ b/action.c @@ -680,11 +680,13 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (unlikely(i < 0)) { ERR("route \"%s\" not found at %s:%d\n", s.s, (a->cfile)?a->cfile:"line", a->cline); + rval_destroy(rv); rval_cache_clean(&c1); s.s = 0; ret = E_SCRIPT; goto error; } + rval_destroy(rv); rval_cache_clean(&c1); s.s = 0; } else {

14 years, 1 month

git:master: modules/lcr: removed #!/usr/bin/awk from lcr_weight_test.awk

by Juha Heinanen

Module: sip-router Branch: master Commit: 8bfbe85163e974cc917eb7043d728dd8ef4917d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bfbe85… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Sep 29 13:59:54 2010 +0300 modules/lcr: removed #!/usr/bin/awk from lcr_weight_test.awk --- modules/lcr/utils/lcr_weight_test.awk | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/lcr/utils/lcr_weight_test.awk b/modules/lcr/utils/lcr_weight_test.awk index fdb9a37..66e3e3d 100755 --- a/modules/lcr/utils/lcr_weight_test.awk +++ b/modules/lcr/utils/lcr_weight_test.awk @@ -1,5 +1,3 @@ -#!/usr/bin/awk -f - # This script can be used to find out actual probabilities # that correspond to a list of LCR gateway weights.

14 years, 1 month

git:master: modules/lcr: added awk version of lcr_weight_test script

by Juha Heinanen

Module: sip-router Branch: master Commit: 2800504202dfb773baed7212949918848f0ea716 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2800504… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Sep 29 13:56:05 2010 +0300 modules/lcr: added awk version of lcr_weight_test script --- modules/lcr/utils/lcr_weight_test.awk | 37 +++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/modules/lcr/utils/lcr_weight_test.awk b/modules/lcr/utils/lcr_weight_test.awk new file mode 100755 index 0000000..fdb9a37 --- /dev/null +++ b/modules/lcr/utils/lcr_weight_test.awk @@ -0,0 +1,37 @@ +#!/usr/bin/awk -f + +# This script can be used to find out actual probabilities +# that correspond to a list of LCR gateway weights. + +BEGIN { + + if (ARGC < 2) { + printf("Usage: lcr_weight_test.php <list of weights (integers 1-254)>\n"); + exit; + } + + iters = 100000; + + for (i = 1; i < ARGC; i++) { + counts[i] = 0; + } + + for (i = 1; i <= iters; i++) { + for (j = 1; j < ARGC; j++) { + elem[j] = ARGV[j] * rshift(int(2147483647 * rand()), 8); + }; + at = 1; + max = elem[at]; + for (j = 2; j < ARGC; j++) { + if (elem[j] > max) { + max = elem[j]; + at = j; + } + } + counts[at] = counts[at] + 1; + } + + for (i = 1; i < ARGC; i++) { + printf("weight %d probability %.4f\n", ARGV[i], counts[i]/iters); + } +}

14 years, 1 month

git:master: modules/dialplan: allow larger dpid arg than short

by Juha Heinanen

Module: sip-router Branch: master Commit: 3013f28351cd99014e18767aff84ecf8692a8d75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3013f28… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Sep 28 21:59:22 2010 +0300 modules/dialplan: allow larger dpid arg than short - dp_translate() was only able to accept short int constant dpid arg. now constant dpid arg can be int. credits to anca vamanu. --- modules/dialplan/dialplan.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index d514c4e..eb546be 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -378,7 +378,7 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) */ static int dp_trans_fixup(void ** param, int param_no){ - int dpid, err; + int dpid; dp_param_p dp_par= NULL; char *p, *s=NULL; str lstr; @@ -404,8 +404,8 @@ static int dp_trans_fixup(void ** param, int param_no){ if(param_no == 1) { if(*p != '$') { dp_par->type = DP_VAL_INT; - dpid = str2s(*param, strlen(*param), &err); - if (err != 0) { + lstr.s = *param; lstr.len = strlen(*param); + if(str2sint(&lstr, &dpid) != 0) { LM_ERR("bad number <%s>\n",(char *)(*param)); pkg_free(dp_par); return E_CFG; @@ -496,7 +496,6 @@ static struct mi_root * mi_translate(struct mi_root *cmd, void *param) str dpid_str; str input; int dpid; - int err; str attrs; str output= {0, 0}; @@ -510,8 +509,7 @@ static struct mi_root * mi_translate(struct mi_root *cmd, void *param) LM_ERR( "empty idp parameter\n"); return init_mi_tree(404, "Empty id parameter", 18); } - dpid = str2s(dpid_str.s, dpid_str.len, &err); - if(err != 0) { + if(str2sint(&dpid_str, &dpid) != 0) { LM_ERR("Wrong id parameter - should be an integer\n"); return init_mi_tree(404, "Wrong id parameter", 18); }

14 years, 1 month

git:master: core: switch(string) break/return fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c9586e183f5fbde854ec8f27c38f58a7853e971a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9586e1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 28 18:09:17 2010 +0200 core: switch(string) break/return fix Commit 6ab93de3 (switch(string) memleak fix) broke break & return from switch case statements. Reported-by: Juha Heinanen jh tutpro com --- action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index ec098ff..3768dfa 100644 --- a/action.c +++ b/action.c @@ -1333,7 +1333,7 @@ sw_jt_def: ret=run_actions(h, mct->jump[i], msg); h->run_flags &= ~BREAK_R_F; /* catch breaks, but let returns passthrough */ - break; + goto skip; } goto match_cleanup; }

14 years, 1 month

git:master: sip-router-oob.cfg: user src_ip instead of @src.ip

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d010f59edf3fbb61b4f74b78eb6e0eb27230dbe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d010f59… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 28 14:02:39 2010 +0200 sip-router-oob.cfg: user src_ip instead of @src.ip Using the built-in src_ip is slightly faster then the @src.ip select and also more consistent with the other src_ip checks in the config. --- etc/sip-router-oob.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/sip-router-oob.cfg b/etc/sip-router-oob.cfg index 6aa82f5..cad1071 100644 --- a/etc/sip-router-oob.cfg +++ b/etc/sip-router-oob.cfg @@ -1166,7 +1166,7 @@ route[AUTHENTICATION] # You have to trust them base on some other information such as the # source IP address. # WARNING: If at all this is only safe in a local network! - if (@src.ip == $gw_ip) { + if (src_ip == $gw_ip) { break; } @@ -1298,7 +1298,7 @@ route[INBOUND] # clause in the next line and closing bracket below. # WARNING: If at all you should trust IP addresses only in # your local network! - #if (@src.ip == $gw_ip) { + #if (src_ip == $gw_ip) { route(SESSION_TIMER); #}

14 years, 1 month

return() not terminating switch statement

by Juha Heinanen

i noticed that in sr master version, return is not terminating switch statement. i have route [foo] { switch ($var(test)) { case "e1": xlog("L_INFO", "We are at e1\n"); return(1); case "lo": xlog("L_INFO", "... and at lo\n"); return(2); default: xlog("L_INFO", "... and at default\n"); }; return(-1); } and when the switch statement is executed, i get to syslog Sep 28 18:09:12 sip /usr/sbin/sip-proxy[3802]: INFO: We are at e1 Sep 28 18:09:12 sip /usr/sbin/sip-proxy[3802]: INFO: ... and at default why is that? is it a bug or strange "feature". -- juha

14 years, 1 month

git:carstenbock/dispatcher: - the values for replycodes and probing threshhold may now be set using the ser-cfg Framework .

by Carsten Bock

Module: sip-router Branch: carstenbock/dispatcher Commit: c0050876826898eca24e78db2af094c55a3313b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c005087… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Tue Sep 28 14:09:02 2010 +0200 - the values for replycodes and probing threshhold may now be set using the ser-cfg Framework. --- modules_k/dispatcher/config.c | 46 +++++++++++++++ modules_k/dispatcher/config.h | 40 +++++++++++++ modules_k/dispatcher/dispatch.c | 16 +++-- modules_k/dispatcher/dispatcher.c | 74 +++++++++++++++++++----- modules_k/dispatcher/doc/dispatcher_admin.xml | 4 +- 5 files changed, 156 insertions(+), 24 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c00…

14 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2010