sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

git:master: modules_s/acc_radius: fix compilation warning
by Ovidiu Sas 29 Sep '10

29 Sep '10

Module: sip-router Branch: master Commit: 3cf12697b6edf404569f2f2a7e0e91f2984c296f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cf1269… Author: root <root(a)centos.(none)> Committer: root <root(a)centos.(none)> Date: Wed Sep 29 10:13:52 2010 -0400 modules_s/acc_radius: fix compilation warning --- modules_s/acc_radius/acc_radius.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/acc_radius/acc_radius.c b/modules_s/acc_radius/acc_radius.c index 4275268..559702e 100644 --- a/modules_s/acc_radius/acc_radius.c +++ b/modules_s/acc_radius/acc_radius.c @@ -269,7 +269,7 @@ static int get_direction(struct sip_msg* msg) return -1; } ret = check_ftag(msg, &((rr_t*)msg->route->parsed)->nameaddr.uri); - if (msg->route->parsed) free_rr((rr_t**)&msg->route->parsed); + if (msg->route->parsed) free_rr((rr_t**)(void*)&msg->route->parsed); return ret; } else { DBG("No Route headers found\n");

1 0

git:master: parser/sdp: fix some compile warnings
by Ovidiu Sas 29 Sep '10

29 Sep '10

Module: sip-router Branch: master Commit: cd999eae2089ad2373bf320442151e68f88f9723 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd999ea… Author: root <root(a)centos.(none)> Committer: root <root(a)centos.(none)> Date: Wed Sep 29 07:38:05 2010 -0400 parser/sdp: fix some compile warnings --- parser/sdp/sdp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 55b3b79..b35447e 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -694,7 +694,7 @@ int parse_sdp(struct sip_msg* _m) res = parse_sdp_session(&body, 0, NULL, (sdp_info_t*)_m->body); if (res != 0) { LM_DBG("free_sdp\n"); - free_sdp((sdp_info_t**)&_m->body); + free_sdp((sdp_info_t**)(void*)&_m->body); } return res; break; @@ -716,7 +716,7 @@ int parse_sdp(struct sip_msg* _m) } res = parse_mixed_content(&body, mp_delimiter, (sdp_info_t*)_m->body); if (res != 0) { - free_sdp((sdp_info_t**)&_m->body); + free_sdp((sdp_info_t**)(void*)&_m->body); } return res; } else {

1 0

warning on compiling kamailio
by Ovidiu Sas 29 Sep '10

29 Sep '10

While compiling kamailio on CentOS I got the following warning: route.c: In function 'comp_ip': route.c:1596: warning: 'he' may be used uninitialized in this function Regards, Ovidiu Sas

1 0

git:master: - be less verbose
by Carsten Bock 29 Sep '10

29 Sep '10

Module: sip-router Branch: master Commit: 3f367560725eaf00f3bc8d8f0d3d047db3c6997a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f36756… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Sep 29 18:12:22 2010 +0200 - be less verbose --- modules_k/dispatcher/dispatcher.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index ef4bb9a..39258d7 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -782,7 +782,7 @@ static int ds_parse_reply_codes() { list_size += 100; } } - LM_INFO("Should be %d Destinations.\n", list_size); + LM_DBG("Should be %d Destinations.\n", list_size); if (list_size > 0) { /* Allocate Memory for the new list: */ @@ -841,7 +841,7 @@ static int ds_parse_reply_codes() { /* Print the list as INFO: */ for (i =0; i< *ds_ping_reply_codes_cnt; i++) { - LM_INFO("Dispatcher: Now accepting Reply-Code %d (%d/%d) as valid\n", + LM_DBG("Dispatcher: Now accepting Reply-Code %d (%d/%d) as valid\n", (*ds_ping_reply_codes)[i], (i+1), *ds_ping_reply_codes_cnt); } return 0;

1 0

git:master: - allow the configuration of valid response-codes to the pinger ; they can be set through config framework.
by Carsten Bock 29 Sep '10

29 Sep '10

Module: sip-router Branch: master Commit: ec903da3a0b0a91dfc4b4236d84e7e145706c994 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec903da… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Sep 29 18:08:41 2010 +0200 - allow the configuration of valid response-codes to the pinger; they can be set through config framework. --- modules_k/dispatcher/config.c | 46 ++++++++ modules_k/dispatcher/config.h | 40 +++++++ modules_k/dispatcher/dispatch.c | 11 +-- modules_k/dispatcher/dispatch.h | 5 + modules_k/dispatcher/dispatcher.c | 154 +++++++++++++++++++++++++ modules_k/dispatcher/doc/dispatcher_admin.xml | 23 ++++- 6 files changed, 270 insertions(+), 9 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ec9…

1 0

git:master: core: return & break are absorbed in expressions
by Andrei Pelinescu-Onciul 29 Sep '10

29 Sep '10

Module: sip-router Branch: master Commit: 65b64bca77b18f7ee964119e1b3b363d66189c3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65b64bc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 17:35:25 2010 +0200 core: return & break are absorbed in expressions return & break inside an expression do not cause the current route block or while/switch statement to end. E.g.: $v = { return 1; } will not end the current route, will only set $v to 1. --- lvalue.c | 12 ++++++++---- rvalue.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lvalue.c b/lvalue.c index 47a625f..a8dcbd9 100644 --- a/lvalue.c +++ b/lvalue.c @@ -107,9 +107,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: flags=avp->type & ~AVP_VAL_STR; - if (rv->v.action) + if (rv->v.action) { value.n=run_actions_safe(h, rv->v.action, msg); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else value.n=-1; ret=value.n; break; @@ -282,9 +284,11 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: pval.flags=PV_TYPE_INT|PV_VAL_INT; - if (rv->v.action) + if (rv->v.action) { pval.ri=run_actions_safe(h, rv->v.action, msg); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else pval.ri=0; ret=pval.ri; break; diff --git a/rvalue.c b/rvalue.c index 6ef399b..9195972 100644 --- a/rvalue.c +++ b/rvalue.c @@ -900,9 +900,11 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, } break; case RV_ACTION_ST: - if (rv->v.action) + if (rv->v.action) { *i=(run_actions_safe(h, rv->v.action, msg)>0); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else *i=0; break; case RV_SEL: @@ -1099,9 +1101,11 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, *tmpv=rv->v.s; break; case RV_ACTION_ST: - if (rv->v.action) + if (rv->v.action) { i=(run_actions_safe(h, rv->v.action, msg)>0); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else i=0; tmpv->s=sint2strbuf(i, tmp_cache->i2s, sizeof(tmp_cache->i2s), &tmpv->len);

1 0

git:master: utils/kamctl: new lcr function: eval_weights
by Ovidiu Sas 29 Sep '10

29 Sep '10

Module: sip-router Branch: master Commit: f6673e2930b6c4e28af60f8ed4c2ea233c944ab4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6673e2… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Sep 29 11:11:36 2010 -0400 utils/kamctl: new lcr function: eval_weights - evaluates the probability of a GW being selected based on given weigths --- utils/kamctl/kamctl | 32 ++++++++++++++++++++++++++++++-- utils/kamctl/kamctl.base | 1 + 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index be65363..48db7dd 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1114,15 +1114,15 @@ trusted() { ### LCR management # lcr() { - require_dbengine - require_ctlengine case $1 in show_gws) + require_dbengine mecho "lcr gateways" QUERY="select * FROM $GW_TABLE ORDER BY $LCR_ID_COLUMN, $LCR_GW_GRPID_COLUMN; " $DBROCMD "$QUERY" ;; show_routes) + require_dbengine mecho "lcr routes" QUERY="select * FROM $LCR_TABLE ORDER BY $LCR_ID_COLUMN, $LCR_PREFIX_COLUMN; " $DBROCMD "$QUERY" @@ -1136,6 +1136,34 @@ lcr() { dump_routes) $RPCCMD lcr.dump_lcrs ;; + eval_weights) + shift + $AWK 'BEGIN { + if (ARGC < 2) { + printf("Usage: lcr eval_weights <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); + } + }' $@ + ;; *) usage_lcr exit 1 diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 1949711..11c398d 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -354,6 +354,7 @@ cat <<EOF lcr dump_gws....... show in memory gateways lcr dump_routes.... show in memory routes lcr reload ........ reload lcr gateways and routes + lcr eval_weights .. evaluates probability for given GW's weights EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_lcr"

1 0

git:tirpi/cfg_framework_multivalue: cfg framework: translate_pointer bugfix
by Miklos Tirpak 29 Sep '10

29 Sep '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: b4e2f2aa59257ef26aeec1558ebd9aa76c61d60d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4e2f2a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 28 17:14:37 2010 +0200 cfg framework: translate_pointer bugfix The parameters of translate_pointer() need to be casted to char*. It would be much more convenient, and also safer, to do this casting within the macro. --- cfg/cfg_ctx.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 8b79197..606ab6b 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -286,7 +286,9 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, /* The array needs to be cloned before the modification */ if (!(array = cfg_clone_array(meta, group))) return -1; - ginst = translate_pointer(array, meta->array, ginst); + ginst = (cfg_group_inst_t *)translate_pointer((char *)array, + (char *)meta->array, + (char *)ginst); /* re-link the array to the meta-data */ meta->array = array; clone_done = 1; @@ -459,9 +461,9 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va * the complete config block and this array is replaced. */ if (!(new_array = cfg_clone_array(CFG_GROUP_META(*cfg_global, group), group))) goto error; - group_inst = translate_pointer(new_array, - CFG_GROUP_META(*cfg_global, group)->array, - group_inst); + group_inst = (cfg_group_inst_t *)translate_pointer((char *)new_array, + (char *)CFG_GROUP_META(*cfg_global, group)->array, + (char *)group_inst); var_block = group_inst->vars; CFG_GROUP_META(block, group)->array = new_array; } else {

1 0

git:tirpi/cfg_framework_multivalue: cfg framework: apply the values in the order they are set
by Miklos Tirpak 29 Sep '10

29 Sep '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 675f88e144fdcbe2f776b58e1f890f470e3d4bdb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=675f88e… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 29 13:58:07 2010 +0200 cfg framework: apply the values in the order they are set Add the value change to the end of the list (within the same group_id) to make sure that the values are changed in the order they are set in the script. This is important when the same variable is changed multiple times, the latest value must be kept in this case. --- cfg/cfg_struct.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 10d8ef7..358e4eb 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -948,7 +948,7 @@ int new_add_var(str *group_name, unsigned int group_id, str *var_name, /* order the list by group_id, it will be easier to count the group instances */ for( add_var_p = &group->add_var; - *add_var_p && ((*add_var_p)->group_id < group_id); + *add_var_p && ((*add_var_p)->group_id <= group_id); add_var_p = &((*add_var_p)->next)); add_var->next = *add_var_p;

1 0

git:tirpi/cfg_framework_multivalue: cfg framework: group instance support in the script
by Miklos Tirpak 29 Sep '10

29 Sep '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 9235f7d58df3ec883d4749de3b37bd493bc9bde2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9235f7d… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 29 16:40:30 2010 +0200 cfg framework: group instance support in the script Variables within group instances can be set from the script, for example: tm[2].reparse_invite = 0; tm[2].default_reason = "New reason"; Any assignmnet within a group instance creates the entire instance if it does not exist yet. Note: does not work with core variables yet. --- cfg.y | 10 ++++++++++ cfg/cfg.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg.h | 19 +++++++++++++++++++ 3 files changed, 79 insertions(+), 0 deletions(-) diff --git a/cfg.y b/cfg.y index d98372d..c43792b 100644 --- a/cfg.y +++ b/cfg.y @@ -1632,6 +1632,16 @@ cfg_var: | cfg_var_id DOT cfg_var_id EQUAL error { yyerror("number or string expected"); } + | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_id EQUAL NUMBER { + if (cfg_ginst_var_int($1, $3, $6, $8)) { + yyerror("variable cannot be added to the group instance"); + } + } + | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_id EQUAL STRING { + if (cfg_ginst_var_string($1, $3, $6, $8)) { + yyerror("variable cannot be added to the group instance"); + } + } ; module_stm: diff --git a/cfg/cfg.c b/cfg/cfg.c index 88a34b2..2d0f640 100644 --- a/cfg/cfg.c +++ b/cfg/cfg.c @@ -227,6 +227,56 @@ int cfg_declare_str(char *group_name, char *var_name, char *val, char *descr) return 0; } +/* Add a varibale to a group instance with integer type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_int(char *group_name, unsigned int group_id, char *var_name, + int val) +{ + str gname, vname; + + gname.s = group_name; + gname.len = strlen(group_name); + vname.s = var_name; + vname.len = strlen(var_name); + + return new_add_var(&gname, group_id, &vname, + (void *)(long)val, CFG_VAR_INT); +} + +/* Add a varibale to a group instance with string type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_string(char *group_name, unsigned int group_id, char *var_name, + char *val) +{ + str gname, vname; + + gname.s = group_name; + gname.len = strlen(group_name); + vname.s = var_name; + vname.len = strlen(var_name); + + return new_add_var(&gname, group_id, &vname, + (void *)val, CFG_VAR_STRING); +} + +/* Create a new group instance. + * wrapper function for new_add_var() + */ +int cfg_new_ginst(char *group_name, unsigned int group_id) +{ + str gname; + + gname.s = group_name; + gname.len = strlen(group_name); + + return new_add_var(&gname, group_id, NULL /* var */, + NULL /* val */, 0 /* type */); +} + /* returns the handle of a cfg group */ void **cfg_get_handle(char *gname) { diff --git a/cfg/cfg.h b/cfg/cfg.h index 8691805..b196d26 100644 --- a/cfg/cfg.h +++ b/cfg/cfg.h @@ -87,6 +87,25 @@ int cfg_declare_int(char *group_name, char *var_name, /* declares a single variable with str type */ int cfg_declare_str(char *group_name, char *var_name, char *val, char *descr); +/* Add a varibale to a group instance with integer type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_int(char *group_name, unsigned int group_id, char *var_name, + int val); + +/* Add a varibale to a group instance with string type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_string(char *group_name, unsigned int group_id, char *var_name, + char *val); + +/* Create a new group instance. + * wrapper function for new_add_var() + */ +int cfg_new_ginst(char *group_name, unsigned int group_id); + /* returns the handle of a cfg group */ void **cfg_get_handle(char *gname);

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2010