sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/counters: sercmd: added command line completion for counters

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 388ac89f2cdc2ed6a411238fb9b8b17531557b33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=388ac89… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:33:32 2010 +0200 sercmd: added command line completion for counters Command line completion for counters groups and names, for all the counters RPCs defined in the counters module. --- utils/sercmd/sercmd.c | 317 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 316 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=388…

14 years, 6 months

git:andrei/counters: counters: added docs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 5c9d70108df0a318ec62c5dcf64f37b3d969a4ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c9d701… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:32:03 2010 +0200 counters: added docs --- modules/counters/README | 148 ++++++++++++++++++++++++++++++++++++ modules/counters/doc/Makefile | 4 + modules/counters/doc/counters.xml | 51 ++++++++++++ modules/counters/doc/functions.xml | 94 +++++++++++++++++++++++ modules/counters/doc/params.xml | 58 ++++++++++++++ modules/counters/doc/rpc.xml | 89 +++++++++++++++++++++ 6 files changed, 444 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5c9…

14 years, 6 months

git:andrei/counters: counters: new modules for counters manipulations

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 90ba454289fb76ba3ba2badd025e6cd41c581740 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90ba454… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:25:07 2010 +0200 counters: new modules for counters manipulations New module for manipulating counters via the script, or RPCs. Script functions: cnt_inc(name) cnt_add(name, val) cnt_reset(name) Before using a counter in the script it must be declared using: modparam("counters", "script_counter", counter_name) RPCs: cnt.get grp name - get counter value cnt.reset grp name - reset counter cnt.grps_list - list all the counter groups cnt.var_list grp - list all the counters names in a group cnt.grp_get_all grp - list all the counters and their value, in a group --- modules/counters/Makefile | 12 ++ modules/counters/counters.c | 368 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 380 insertions(+), 0 deletions(-) diff --git a/modules/counters/Makefile b/modules/counters/Makefile new file mode 100644 index 0000000..2f325fb --- /dev/null +++ b/modules/counters/Makefile @@ -0,0 +1,12 @@ +# $Id$ +# + +include ../../Makefile.defs +auto_gen= +NAME=counters.so +LIBS= + +DEFS+=-DSER_MOD_INTERFACE + +include ../../Makefile.modules + diff --git a/modules/counters/counters.c b/modules/counters/counters.c new file mode 100644 index 0000000..c163730 --- /dev/null +++ b/modules/counters/counters.c @@ -0,0 +1,368 @@ +/*$Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** counters/statistics rpcs and script functions. + * @file counters.c + * @ingroup counters + * Module: counters. + */ +/* + * History: + * ------- + * 2010-08-06 created by andrei + */ + + +#include "../../modparam.h" +#include "../../dprint.h" +#include "../../compiler_opt.h" +#include "../../counters.h" + +MODULE_VERSION + +/* default script counter group name */ +static char* cnt_script_grp = "script"; + +static int add_script_counter(modparam_t type, void* val); +static int cnt_inc_f(struct sip_msg*, char*, char*); +static int cnt_add_f(struct sip_msg*, char*, char*); +static int cnt_reset_f(struct sip_msg*, char*, char*); +static int cnt_fixup1(void** param, int param_no); +static int cnt_int_fixup(void** param, int param_no); + + + +static cmd_export_t cmds[] = { + {"cnt_inc", cnt_inc_f, 1, cnt_fixup1, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, + {"cnt_add", cnt_add_f, 2, cnt_int_fixup, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, + {"cnt_reset", cnt_reset_f, 1, cnt_fixup1, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, + {0,0,0,0,0} +}; + +static param_export_t params[] = { + {"script_cnt_grp_name", PARAM_STRING, &cnt_script_grp}, + {"script_counter", PARAM_STRING|PARAM_USE_FUNC, add_script_counter}, + {0,0,0} +}; + + +static void cnt_get_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_get_doc[] = { + "get counter value (takes group and counter name as parameters)", 0 +}; + +static void cnt_reset_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_reset_doc[] = { + "reset counter (takes group and counter name as parameters)", 0 +}; + +static void cnt_get_raw_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_get_raw_doc[] = { + "get raw counter value (debugging version)", 0 +}; + +static void cnt_grps_list_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_grps_list_doc[] = { + "list all the counter group names", 0 +}; + +static void cnt_var_list_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_var_list_doc[] = { + "list all the counters names in a specified group", 0 +}; + +static void cnt_grp_get_all_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_grp_get_all_doc[] = { + "list all counter names and values in a specified group", 0 +}; + + + + +static rpc_export_t counters_rpc[] = { + {"cnt.get", cnt_get_rpc, cnt_get_doc, 0 }, + {"cnt.reset", cnt_reset_rpc, cnt_reset_doc, 0 }, + {"cnt.get_raw", cnt_get_raw_rpc, cnt_get_raw_doc, 0 }, + {"cnt.grps_list", cnt_grps_list_rpc, cnt_grps_list_doc, RET_ARRAY }, + {"cnt.var_list", cnt_var_list_rpc, cnt_var_list_doc, RET_ARRAY }, + {"cnt.grp_get_all", cnt_grp_get_all_rpc, cnt_grp_get_all_doc, 0 }, + { 0, 0, 0, 0} +}; + + + +struct module_exports exports= { + "counters", + cmds, + counters_rpc, /* RPC methods */ + params, + 0, /* module initialization function */ + 0, /* response function */ + 0, /* destroy function */ + 0, /* on_cancel function */ + 0, /* per-child init function */ +}; + + +static int add_script_counter(modparam_t type, void* val) +{ + char* name; + counter_handle_t h; + int ret; + + if ((type & PARAM_STRING) == 0) { + BUG("bad parameter type %d\n", type); + goto error; + } + name = (char*) val; + ret = counter_register(&h, cnt_script_grp, name, 0, 0, 0, 0); + if (ret < 0) { + if (ret == -2) { + ERR("counter %s.%s already registered\n", cnt_script_grp, name); + return 0; + } + ERR("failed to register counter %s.%s\n", cnt_script_grp, name); + goto error; + } + return 0; +error: + return -1; +} + + + +static int cnt_fixup1(void** param, int param_no) +{ + char* name; + counter_handle_t h; + + name = (char*)*param; + if (counter_lookup(&h, cnt_script_grp, name) < 0) { + ERR("counter %s.%s does not exist (forgot to define it?)\n", + cnt_script_grp, name); + return -1; + } + *param = (void*)(long)h.id; + return 0; +} + + + +static int cnt_int_fixup(void** param, int param_no) +{ + char* name; + counter_handle_t h; + + if (param_no == 1) { + name = (char*)*param; + if (counter_lookup(&h, cnt_script_grp, name) < 0) { + ERR("counter %s.%s does not exist (forgot to define it?)\n", + cnt_script_grp, name); + return -1; + } + *param = (void*)(long)h.id; + } else + return fixup_var_int_2(param, param_no); + return 0; +} + + + +static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) +{ + counter_handle_t h; + + h.id = (long)(void*)handle; + counter_inc(h); + return 1; +} + + + +static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) +{ + counter_handle_t h; + int v; + + h.id = (long)(void*)handle; + if (unlikely(get_int_fparam(&v, msg, (fparam_t*)val) < 0)) { + ERR("non integer parameter\n"); + return -1; + } + counter_add(h, v); + return 1; +} + + + +static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) +{ + counter_handle_t h; + + h.id = (long)(void*)handle; + counter_reset(h); + return 1; +} + + + +static void cnt_get_rpc(rpc_t* rpc, void* c) +{ + char* group; + char* name; + counter_val_t v; + counter_handle_t h; + + if (rpc->scan(c, "ss", &group, &name) < 2) { + /* rpc->fault(c, 400, "group and counter name required"); */ + return; + } + if (counter_lookup(&h, group, name) < 0) { + rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); + return; + } + v = counter_get_val(h); + rpc->add(c, "d", (int)v); + return; +} + + + +static void cnt_get_raw_rpc(rpc_t* rpc, void* c) +{ + char* group; + char* name; + counter_val_t v; + counter_handle_t h; + + if (rpc->scan(c, "ss", &group, &name) < 2) { + /* rpc->fault(c, 400, "group and counter name required"); */ + return; + } + if (counter_lookup(&h, group, name) < 0) { + rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); + return; + } + v = counter_get_raw_val(h); + rpc->add(c, "d", (int)v); + return; +} + + + +static void cnt_reset_rpc(rpc_t* rpc, void* c) +{ + char* group; + char* name; + counter_handle_t h; + + if (rpc->scan(c, "ss", &group, &name) < 2) { + /* rpc->fault(c, 400, "group and counter name required"); */ + return; + } + if (counter_lookup(&h, group, name) < 0) { + rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); + return; + } + counter_reset(h); + return; +} + + + +struct rpc_list_params { + rpc_t* rpc; + void* ctx; +}; + + +/* helper callback for iterating groups or names */ +static void rpc_print_name(void* param, str* n) +{ + struct rpc_list_params* p; + rpc_t* rpc; + void* ctx; + + p = param; + rpc = p->rpc; + ctx = p->ctx; + rpc->add(ctx, "S", n); +} + + +/* helper callback for iterating on variable names & values*/ +static void rpc_print_name_val(void* param, str* g, str* n, + counter_handle_t h) +{ + struct rpc_list_params* p; + rpc_t* rpc; + void* s; + + p = param; + rpc = p->rpc; + s = p->ctx; + rpc->struct_add(s, "d", n->s, (int)counter_get_val(h)); +} + + + +static void cnt_grps_list_rpc(rpc_t* rpc, void* c) +{ + struct rpc_list_params packed_params; + + packed_params.rpc = rpc; + packed_params.ctx = c; + counter_iterate_grp_names(rpc_print_name, &packed_params); +} + + + +static void cnt_var_list_rpc(rpc_t* rpc, void* c) +{ + char* group; + struct rpc_list_params packed_params; + + if (rpc->scan(c, "s", &group) < 1) { + /* rpc->fault(c, 400, "group name required"); */ + return; + } + packed_params.rpc = rpc; + packed_params.ctx = c; + counter_iterate_grp_var_names(group, rpc_print_name, &packed_params); +} + + + +static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +{ + void* s; + char* group; + struct rpc_list_params packed_params; + + if (rpc->scan(c, "s", &group) < 1) { + /* rpc->fault(c, 400, "group name required"); */ + return; + } + if (rpc->add(c, "{", &s) < 0) return; + packed_params.rpc = rpc; + packed_params.ctx = s; + counter_iterate_grp_vars(group, rpc_print_name_val, &packed_params); +} + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

14 years, 6 months

git:andrei/counters: core: counters / statistics support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 4208dc00cf245559ed3152beace6084c7c6c4571 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4208dc0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 18:41:30 2010 +0200 core: counters / statistics support Efficient counters support (api). Incrementing or adding a value to a defined counter is extremely fast at the cost of slower reading (each process has its own set of counters => no cacheline ping-pong and no expensive atomic operations). All counters must be defined before forking (in a module this means from mod_init() or init_child(rank==PROC_INIT)). A counter is uniquely identified by its group and its name (and not only by its name like in kamailio stats). Example (error checking skipped): /* before forking, e.g. mod_init() */ counter_handle_t h; /* declare the counter my_grp.foo */ counter_register(&h, "my_grp", "foo", 0, 0, 0, 0); /* after forking */ counter_inc(h); /* getting a counter value, knowing its group and name*/ counter_lookup(&h, "my_grp", "foo"); val = counter_get(h); --- counters.c | 696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ counters.h | 124 +++++++++++ main.c | 10 +- 3 files changed, 828 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=420…

14 years, 6 months

git:andrei/counters: sercmd: fix cfg. var name completion

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 261d8282e6dabf73a65904e7a8413ccec9faf2fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=261d828… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 18:09:17 2010 +0200 sercmd: fix cfg. var name completion In some rare cases cfg. variable name completion did not work properly (e.g. reusing a command from history, editing it, changing the group and attempting command completion again). This was due to an assumption that the state would be re-initialized on new commands (which is mostly not true). --- utils/sercmd/sercmd.c | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 1f1a721..3b4432a 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -1802,36 +1802,31 @@ char** sercmd_completion(const char* text, int start, int end) } } #endif /* USE_MI */ -#ifdef USE_CFG_VARS }else if (crt_param_no==2){ - if (attempted_completion_state!=COMPLETE_CFG_GRP){ - for(i=0; complete_params_cfg_var[i]; i++){ - if ((cmd_len==strlen(complete_params_cfg_var[i])) && - (strncmp(&rl_line_buffer[cmd_start], +#ifdef USE_CFG_VARS + /* see if we complete cfg. var names for this command */ + for(i=0; complete_params_cfg_var[i]; i++){ + if ((cmd_len==strlen(complete_params_cfg_var[i])) && + (strncmp(&rl_line_buffer[cmd_start], complete_params_cfg_var[i], cmd_len)==0)){ - attempted_completion_state=COMPLETE_CFG_GRP; - /* find grp_start */ - for(j=cmd_end; (j<start) && ((rl_line_buffer[j]==' ') - || (rl_line_buffer[j]=='\t')); j++); - grp_start=j; - break; - } - } - } - if (attempted_completion_state==COMPLETE_CFG_GRP){ - /* get the group name from the grp_param */ - /* find first whitespace for the group name*/ - for(j=grp_start; (j<start) && (rl_line_buffer[j]!=' ') && - (rl_line_buffer[j]!='\t'); j++); - grp_len=j-grp_start; - for(grp=cfg_grp_lst; grp; grp=grp->next){ - if (grp_len==grp->grp_name.len && - memcmp(&rl_line_buffer[grp_start], grp->grp_name.s, - grp_len)==0) { - attempted_completion_state=COMPLETE_CFG_VAR; - crt_cfg_grp=grp; - goto end; + /* get the group name: */ + /* find grp_start */ + for(j=cmd_end; (j<start) && ((rl_line_buffer[j]==' ') || + (rl_line_buffer[j]=='\t')); j++); + grp_start=j; + /* find group end / grp_len*/ + for(j=grp_start; (j<start) && (rl_line_buffer[j]!=' ') && + (rl_line_buffer[j]!='\t'); j++); + grp_len=j-grp_start; + for(grp=cfg_grp_lst; grp; grp=grp->next){ + if (grp_len==grp->grp_name.len && + memcmp(&rl_line_buffer[grp_start], + grp->grp_name.s, grp_len)==0) { + attempted_completion_state=COMPLETE_CFG_VAR; + crt_cfg_grp=grp; + goto end; + } } } }

14 years, 6 months

Re: [sr-dev] pua_dialoginfo deletes AVPs?

by Jasmin Schnatterbeck

Hi Henning, because of the fact, that the problem only appears, if the pua_dialoginfo module is enabled, I think the problem is located somewhere in the code tm hooks, dialog hooks or pua/pua_dialoginfo itself... I have attached the debug output of pua_dialoginfo which shows only, if the module is enabled... may it is useful in any way... Regards Jasmin > On Friday 04 June 2010, Jasmin Schnatterbeck wrote: > > onreply_avp_mode does not seem to be available in kamailio 3.0.2 (at > > least not in the module doc) > > I think this parameter is for avps in reply_route? or does it work for > > branch_route also? > > Hi Jasmin, > > ah, sorry. Its not available or necessary anymore in 3.0. In 1.5 it also > affected the branch_route, i think, but for the newer version this behaviour > is now the default. Then in your case its probably another problem.. > > Cheers, > > Henning

14 years, 6 months

duplicate db_res_t

by Chandrakant Solanki

Hello I am using kamailio 1.5.0.2. I have developed one custom function in module, and also create one custom structure to store database recordset. What I would like to do is... 1] I have structure say struct record and it has variable struct record { int id; char name; db_res_t *res; }; 2] Execute one query and store result into "db_res" variable of db_res_t datatype; 3] Now I would like to preserve 'n in future i will use this recordset.. so how can i store this "db_res" variable into structure variable. I have tried using below syntax... struct record rec[2]; db_res = get_record( "pass_any_query" ); rec[0].res = db_res; But when I used this rec[0].res in future it gives garbage value. Any Idea...??? -- Regards, Chandrakant Solanki

14 years, 6 months

[tracker] Comment added: SDP parsing when dealing with multi-part bodies

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#73 - SDP parsing when dealing with multi-part bodies User who did this - Ovidiu Sas (osas) ---------- The nathelper module is using now the core SDP parser. Please test this on the trunk and report any issues. Regards, Ovidiu Sas ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=73#comment106 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 6 months

git:master: nathelper(k): Core SDP parser integrated into nathelper

by Ovidiu Sas

Module: sip-router Branch: master Commit: 377e5afba8907b0ea84147459c881f6e5af11b0c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=377e5af… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Aug 5 18:40:53 2010 -0400 nathelper(k): Core SDP parser integrated into nathelper The nathelper (k version) is using the core SDP parser to extract the IP and port from the received message. --- modules_k/nathelper/nathelper.c | 372 ++++++++++----------------------------- 1 files changed, 96 insertions(+), 276 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=377…

14 years, 6 months

git:andrei/rve_f_params: core: enable RVE fixup support when fixup_free is present

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: d002aae942d64ebff7621140f2b148401595978b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d002aae… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 6 00:22:05 2010 +0200 core: enable RVE fixup support when fixup_free is present RVEs can now be used transparently in all module functions that have registered free_fixup function or that have standard fixup functions with known corresponding free_fixups. This means all the module functions that use ser-like fparam style fixups (sr_module.h) or kamailio style fixups (mod_fix.h). E.g.: texops(k): $del="From"; remove_hf_re("^"+$del); set_body($body, $content_type); --- action.c | 56 +++++++++++++++++++++++++++++++++++++++++++------------- cfg.y | 7 ++++--- route.c | 3 ++- route_struct.h | 1 + 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/action.c b/action.c index 9c643fb..08bc712 100644 --- a/action.c +++ b/action.c @@ -133,14 +133,18 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ * Assumes src is unchanged. * Side-effects: clobbers i (int). */ -#define MODF_RVE_PARAM_FREE(src, dst) \ +#define MODF_RVE_PARAM_FREE(cmd, src, dst) \ for (i=0; i < (dst)[1].u.number; i++) { \ if ((src)[i+2].type == RVE_ST && (dst)[i+2].u.data) { \ - if ((dst)[i+2].type == FPARAM_DYN_ST) {\ - /* frees also orig. dst.u.data */ \ - fparam_free_contents((dst)[i+2].u.data); \ - /* the fparam struct. (dst.u.data) is freed below */ \ + if ((dst)[i+2].type == RVE_FREE_FIXUP_ST) {\ + /* call free_fixup (which should restore the original + string) */ \ + call_fixup((cmd)->free_fixup, &(dst)[i+2].u.data, i+1); \ + } else if ((dst)[i+2].type == FPARAM_DYN_ST) {\ + /* completely frees fparam and restore original string */\ + fparam_free_restore(&(dst)[i+2].u.data); \ } \ + /* free allocated string */ \ pkg_free((dst)[i+2].u.data); \ (dst)[i+2].u.data = 0; \ } \ @@ -165,18 +169,44 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ rval_destroy(rv); \ ERR("failed to convert RVE to string\n"); \ (dst)[1].u.number = i; \ - MODF_RVE_PARAM_FREE(src, dst); \ + MODF_RVE_PARAM_FREE(cmd, src, dst); \ goto error; \ } \ (dst)[i+2].type = STRING_RVE_ST; \ (dst)[i+2].u.string = s.s; \ (dst)[i+2].u.str.len = s.len; \ rval_destroy(rv); \ - if ((cmd)->fixup && \ - (cmd)->fixup_flags & FIXUP_F_FPARAM_RVE) { \ - call_fixup((cmd)->fixup, &(dst)[i+2].u.data, i+1); \ - if ((dst)[i+2].u.data != s.s) \ - (dst)[i+2].type = FPARAM_DYN_ST; \ + if ((cmd)->fixup) {\ + if ((cmd)->free_fixup) {\ + if (likely( call_fixup((cmd)->fixup, \ + &(dst)[i+2].u.data, i+1) >= 0) ) { \ + /* success => mark it for calling free fixup */ \ + if (likely((dst)[i+2].u.data != s.s)) \ + (dst)[i+2].type = RVE_FREE_FIXUP_ST; \ + } else { \ + /* error calling fixup => mark conv. parameter \ + and return error */ \ + (dst)[1].u.number = i; \ + ERR("runtime fixup failed for %s param %d\n", \ + (cmd)->name, i+1); \ + MODF_RVE_PARAM_FREE(cmd, src, dst); \ + goto error; \ + } \ + } else if ((cmd)->fixup_flags & FIXUP_F_FPARAM_RVE) { \ + if (likely( call_fixup((cmd)->fixup, \ + &(dst)[i+2].u.data, i+1) >= 0)) { \ + if ((dst)[i+2].u.data != s.s) \ + (dst)[i+2].type = FPARAM_DYN_ST; \ + } else { \ + /* error calling fixup => mark conv. parameter \ + and return error */ \ + (dst)[1].u.number = i; \ + ERR("runtime fixup failed for %s param %d\n", \ + (cmd)->name, i+1); \ + MODF_RVE_PARAM_FREE(cmd, src, dst); \ + goto error; \ + }\ + } \ } \ } else \ (dst)[i+2]=(src)[i+2]; \ @@ -238,7 +268,7 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ ret=((f_type)cmd->function)((msg), __VAR_ARGS__); \ MODF_HANDLE_RETCODE(h, ret); \ /* free strings allocated by us or fixups */ \ - MODF_RVE_PARAM_FREE(src, dst); \ + MODF_RVE_PARAM_FREE(cmd, src, dst); \ } while (0) #else /* ! __SUNPRO_C (gcc, icc a.s.o) */ #define MODF_RVE_CALL(f_type, h, msg, src, dst, params...) \ @@ -248,7 +278,7 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ ret=((f_type)cmd->function)((msg), ## params ); \ MODF_HANDLE_RETCODE(h, ret); \ /* free strings allocated by us or fixups */ \ - MODF_RVE_PARAM_FREE(src, dst); \ + MODF_RVE_PARAM_FREE(cmd, src, dst); \ } while (0) #endif /* __SUNPRO_C */ diff --git a/cfg.y b/cfg.y index f97c408..7627619 100644 --- a/cfg.y +++ b/cfg.y @@ -3751,9 +3751,10 @@ static int mod_f_params_pre_fixup(struct action* a) if (is_fparam_rve_fixup(cmd_exp->fixup)) /* mark known fparam rve safe fixups */ cmd_exp->fixup_flags |= FIXUP_F_FPARAM_RVE; - else if (!(cmd_exp->fixup_flags & FIXUP_F_FPARAM_RVE)) { - /* v0 or v1 functions that have fixups need constant, - string params.*/ + else if (!(cmd_exp->fixup_flags & FIXUP_F_FPARAM_RVE) && + cmd_exp->free_fixup == 0) { + /* v0 or v1 functions that have fixups and no coresp. fixup_free + functions, need constant, string params.*/ for (r=0; r < param_no; r++) { rve=params[r].u.data; if (!rve_is_constant(rve)) { diff --git a/route.c b/route.c index e603030..c05a781 100644 --- a/route.c +++ b/route.c @@ -985,7 +985,8 @@ int fix_actions(struct action* a) or RVE_ST (non-ct RVEs) */ if (rve_param_no) { /* we have to fix the type */ if (cmd->fixup && - !(cmd->fixup_flags & FIXUP_F_FPARAM_RVE)) { + !(cmd->fixup_flags & FIXUP_F_FPARAM_RVE) && + cmd->free_fixup == 0) { BUG("non-ct RVEs (%d) in module function call" "that does not support them (%s)\n", rve_param_no, cmd->name); diff --git a/route_struct.h b/route_struct.h index 178ac77..5c1d37f 100644 --- a/route_struct.h +++ b/route_struct.h @@ -128,6 +128,7 @@ enum _operand_subtype{ RETCODE_ST, CASE_ST, BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST, STRING_RVE_ST /* RVE converted to a string (fparam hack) */, + RVE_FREE_FIXUP_ST /* (str)RVE fixed up by a reversable fixup */, FPARAM_DYN_ST /* temporary only (fparam hack) */ };

14 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev