sr-dev

sr-dev@lists.kamailio.org

17 participants
45424 discussions

git:master:22421845: cnxcc: Makefile - define KAMAILIO_MOD_INTERFACE
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 22421845cfcc0eab194ac510bfc378f72765a059 URL: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:20:33+01:00 cnxcc: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/cnxcc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… Patch: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… --- diff --git a/src/modules/cnxcc/Makefile b/src/modules/cnxcc/Makefile index 73b5408dbd..41803d1383 100644 --- a/src/modules/cnxcc/Makefile +++ b/src/modules/cnxcc/Makefile @@ -47,7 +47,7 @@ endif DEFS+=$(HIREDISDEFS) $(LEVENTDEFS) LIBS=$(HIREDISLIBS) $(LEVENTLIBS) -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

1 0

git:master:43434ee8: modules: readme files regenerated - cfg_rpc ... [skip ci]
by Kamailio Dev 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 43434ee8a1d65276dfbfce2f866f91d4bf0682fc URL: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-23T17:46:38+01:00 modules: readme files regenerated - cfg_rpc ... [skip ci] --- Modified: src/modules/cfg_rpc/README --- Diff: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… Patch: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… --- diff --git a/src/modules/cfg_rpc/README b/src/modules/cfg_rpc/README index 93d31e0a0c..9f3c25820a 100644 --- a/src/modules/cfg_rpc/README +++ b/src/modules/cfg_rpc/README @@ -147,12 +147,15 @@ Chapter 1. Admin Guide 3.2. cfg.get cfg.get - Get the value of a configuration variable. The function - accepts two parameters: group name, variable name. The group name can - optionally contain the group instance id, for example foo[5]. + accepts two parameters: group name, variable name, but if all the + elements belonging to a certain group is wanted to be retrieved then + only the group name would suffice as the function parameter. The group + name can optionally contain the group instance id, for example foo[5]. Example 1.2. Use cfg.get RPC command ... # kamcmd cfg.get core debug +# kamcmd cfg.get tm ... 3.3. cfg.seti

1 0

[kamailio/kamailio] cfg_rpc: extending the functionality of cfg.get command (#1321)
by hdikme 23 Jan '18

23 Jan '18

- rpc_get function can be also called with only entering the group name information. Before it used to work only with group name and variable name and returning the value for a variable. With the enhancement, it is also possible to retrieve all variable values belonging to a specific group. e.g.: kamcmd cfg.get core. Above given example will print the values of all variables of the configuration group "core".   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  rpc_get function can be also called with only entering the group name information. Before it used to work only with group name and variable name and returning the value for a variable. With the enhancement, it is also possible to retrieve all variable values belonging to a specific group. e.g.: kamcmd cfg.get core. Above given example will print the values of all variables of the configuration group "core". You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1321 -- Commit Summary -- * cfg_rpc: extending the functionality of cfg.get command -- File Changes -- M src/modules/cfg_rpc/cfg_rpc.c (112) M src/modules/cfg_rpc/doc/rpc.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1321.patch https://github.com/kamailio/kamailio/pull/1321.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1321

2 11

git:master:95e82d91: cfg_rcp: allow getting 0 values in rpc cfg.get
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 95e82d9135180be519192029d3f6edcf56eddb59 URL: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T17:32:23+01:00 cfg_rcp: allow getting 0 values in rpc cfg.get - issue introduced in previous commit - log message for dynamic values to be skipped --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… Patch: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index a2d44e3acc..d865eae561 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -381,18 +381,20 @@ static void rpc_get(rpc_t* rpc, void* c) for (i=0; def[i].name; i++) { var.s = def[i].name; var.len = (int)strlen(def[i].name); - LM_DBG("getting value for variable: %.*s.%.*s\n", group.len, group.s, - var.len, var.s); + LM_DBG("getting value for variable: %.*s.%.*s\n", + group.len, group.s, var.len, var.s); val = NULL; ret = cfg_get_by_name(ctx, &group, group_id, &var, &val, &val_type); if (ret < 0) { rpc->fault(c, 400, "Failed to get the variable"); return; - } else if (ret > 0 || val==NULL) { + } else if (ret > 0) { + LM_DBG("skipping dynamic (callback) value for variable:" + " %.*s.%.*s (%p/%d)\n", + group.len, group.s, var.len, var.s, val, ret); continue; } - LM_DBG("type: %d value: %p\n", val_type, val); switch (val_type) { case CFG_VAR_INT: rpc->struct_add(rh, "d", var.s, (int)(long)val);

1 0

git:master:a9972863: ctl: proper handling of optional param specifier (*) in rpc scan
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: a9972863681059c647af4bafd0d9a20f7648c801 URL: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T17:33:39+01:00 ctl: proper handling of optional param specifier (*) in rpc scan --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… Patch: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 74d71dc8f9..efff292081 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -841,11 +841,11 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) /* clear the previously saved error code */ rpc_fault_reset(ctx); - va_start(ap, fmt); orig_fmt=fmt; nofault = 0; modifiers=0; autoconv=autoconvert; + va_start(ap, fmt); for (;*fmt; fmt++){ switch(*fmt){ case '*': /* start of optional parameters */ @@ -918,7 +918,7 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) error_read: /* Do not immediately send out the error message, the user might retry the scan with different parameters */ - if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) + if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) { rpc_fault_prepare(ctx, 400, "error at parameter %d: expected %s type but" " %s", ctx->in.record_no, rpc_type_name(v.type), binrpc_error(err)); @@ -927,6 +927,11 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) ": %s", ctx->in.record_no, ctx->in.ctx.offset, v.type, binrpc_error(err)); */ + } + if(nofault==1 && (err==E_BINRPC_MORE_DATA || err==E_BINRPC_EOP)) { + va_end(ap); + return (int)(fmt-orig_fmt)-modifiers; + } goto error_ret; error_not_supported: rpc_fault(ctx, 500, "internal server error, type %d not supported",

1 0

git:master:e98bd848: cfg_rpc: documentation about group vars listing with rpc cfg.get
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: e98bd84810b8faa7faf7af3384fc2c979725fe86 URL: https://github.com/kamailio/kamailio/commit/e98bd84810b8faa7faf7af3384fc2c9… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T16:59:25+01:00 cfg_rpc: documentation about group vars listing with rpc cfg.get - part of PR #1321 --- Modified: src/modules/cfg_rpc/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/e98bd84810b8faa7faf7af3384fc2c9… Patch: https://github.com/kamailio/kamailio/commit/e98bd84810b8faa7faf7af3384fc2c9… --- diff --git a/src/modules/cfg_rpc/doc/rpc.xml b/src/modules/cfg_rpc/doc/rpc.xml index 9298247d83..9e4f2003eb 100644 --- a/src/modules/cfg_rpc/doc/rpc.xml +++ b/src/modules/cfg_rpc/doc/rpc.xml @@ -35,7 +35,8 @@ <para> <emphasis>cfg.get</emphasis> - Get the value of a configuration variable. The function accepts two parameters: - group name, variable name. The group name can optionally contain the + group name, variable name, but if all the elements belonging to a certain group is wanted to be retrieved + then only the group name would suffice as the function parameter. The group name can optionally contain the group instance id, for example foo[5]. </para> <example> @@ -43,6 +44,7 @@ <programlisting format="linespecific"> ... # &sercmd; cfg.get core debug +# &sercmd; cfg.get tm ... </programlisting> </example>

1 0

git:master:4920d1c5: cfg_rpc: rpc command cfg.get accepts group name to list its vars
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 4920d1c5df277526dcb27d34bfedab4cc2815bde URL: https://github.com/kamailio/kamailio/commit/4920d1c5df277526dcb27d34bfedab4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T16:56:51+01:00 cfg_rpc: rpc command cfg.get accepts group name to list its vars - if only one parameter is given (group name), cfg.get returns a structure with all variables and their values in the group - patched enhaced from the PR #1321 by Huseyin Dikme <hueseyin.dikme(a)1und1.de> --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4920d1c5df277526dcb27d34bfedab4… Patch: https://github.com/kamailio/kamailio/commit/4920d1c5df277526dcb27d34bfedab4… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index f62855b092..a2d44e3acc 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -310,48 +310,113 @@ static const char* rpc_get_doc[2] = { static void rpc_get(rpc_t* rpc, void* c) { - str group, var; - void *val; - unsigned int val_type; - int ret; - unsigned int *group_id; + str group, var; + void *val; + unsigned int val_type; + int ret, n; + unsigned int *group_id; + void *rh = NULL; - if (rpc->scan(c, "SS", &group, &var) < 2) + n = rpc->scan(c, "S*S", &group, &var); + /* 2: both group and variable name are present + * -1: only group is present, print all variables in the group */ + if(n<1) { + rpc->fault(c, 500, "Failed to get the parameters"); return; - + } + if (n == 1) { + var.s = NULL; + var.len = 0; + } if (get_group_id(&group, &group_id)) { rpc->fault(c, 400, "Wrong group syntax. Use either \"group\", or \"group[id]\""); return; } + if(var.len != 0) { + LM_DBG("getting value for variable: %.*s.%.*s\n", group.len, group.s, + var.len, var.s); + /* print value for one variable */ + val = NULL; + ret = cfg_get_by_name(ctx, &group, group_id, &var, + &val, &val_type); + if (ret < 0) { + rpc->fault(c, 400, "Failed to get the variable"); + return; + } else if (ret > 0) { + rpc->fault(c, 400, "Variable exists, but it is not readable via RPC interface"); + return; + } + switch (val_type) { + case CFG_VAR_INT: + rpc->add(c, "d", (int)(long)val); + break; + case CFG_VAR_STRING: + rpc->add(c, "s", (char *)val); + break; + case CFG_VAR_STR: + rpc->add(c, "S", (str *)val); + break; + case CFG_VAR_POINTER: + rpc->rpl_printf(c, "%p", val); + break; + } + } else { + /* print values for all variables in the group */ + void *h; + str gname; + cfg_def_t *def; + int i; + char pbuf[32]; + int plen; + LM_DBG("getting values for group: %.*s\n", group.len, group.s); + rpc->add(c, "{", &rh); + if(rh==NULL) { + LM_ERR("failed to add root structure\n"); + rpc->fault(c, 500, "Failed to add root structure"); + return; + } + cfg_get_group_init(&h); + while(cfg_get_group_next(&h, &gname, &def)) { + if (((gname.len == group.len) && (memcmp(gname.s, group.s, group.len) == 0))) { + for (i=0; def[i].name; i++) { + var.s = def[i].name; + var.len = (int)strlen(def[i].name); + LM_DBG("getting value for variable: %.*s.%.*s\n", group.len, group.s, + var.len, var.s); + val = NULL; + ret = cfg_get_by_name(ctx, &group, group_id, &var, + &val, &val_type); + if (ret < 0) { + rpc->fault(c, 400, "Failed to get the variable"); + return; + } else if (ret > 0 || val==NULL) { + continue; + } + LM_DBG("type: %d value: %p\n", val_type, val); + switch (val_type) { + case CFG_VAR_INT: + rpc->struct_add(rh, "d", var.s, (int)(long)val); + break; + case CFG_VAR_STRING: + rpc->struct_add(rh, "s", var.s, (char *)val); + break; + case CFG_VAR_STR: + rpc->struct_add(rh, "S", var.s, (str *)val); + break; + case CFG_VAR_POINTER: + plen = snprintf(pbuf, 32, "%p", val); + if(plen>0 && plen<32) { + rpc->struct_add(rh, "s", var.s, pbuf); + } else { + LM_ERR("error adding: %.*s.%s\n", + group.len, group.s, var.s); + } + break; + } - ret = cfg_get_by_name(ctx, &group, group_id, &var, - &val, &val_type); - if (ret < 0) { - rpc->fault(c, 400, "Failed to get the variable"); - return; - - } else if (ret > 0) { - rpc->fault(c, 400, "Variable exists, but it is not readable via RPC interface"); - return; - } - - switch (val_type) { - case CFG_VAR_INT: - rpc->add(c, "d", (int)(long)val); - break; - - case CFG_VAR_STRING: - rpc->add(c, "s", (char *)val); - break; - - case CFG_VAR_STR: - rpc->add(c, "S", (str *)val); - break; - - case CFG_VAR_POINTER: - rpc->rpl_printf(c, "%p", val); - break; - + } + } + } } }

1 0

git:5.1:47821c58: kazoo: change string parameters to PARAM_STR
by Luis Azedo 23 Jan '18

23 Jan '18

Module: kamailio Branch: 5.1 Commit: 47821c5871d188ac04b6e366717a314a8d710699 URL: https://github.com/kamailio/kamailio/commit/47821c5871d188ac04b6e366717a314… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-01-23T10:24:53Z kazoo: change string parameters to PARAM_STR (cherry picked from commit 3018595d13dde08d15e8063cecb42a01ea271b66) --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/47821c5871d188ac04b6e366717a314… Patch: https://github.com/kamailio/kamailio/commit/47821c5871d188ac04b6e366717a314… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 40535aa82b..ca7bdfe000 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -159,8 +159,8 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { - {"node_hostname", STR_PARAM, &dbk_node_hostname.s}, - {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, + {"node_hostname", PARAM_STR, &dbk_node_hostname}, + {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, @@ -171,31 +171,31 @@ static param_export_t params[] = { {"amqp_waitframe_timeout_sec", INT_PARAM, &kz_amqp_tv.tv_sec}, {"amqp_consumer_processes", INT_PARAM, &dbk_consumer_processes}, {"amqp_consumer_workers", INT_PARAM, &dbk_consumer_workers}, - {"amqp_consumer_event_key", STR_PARAM, &dbk_consumer_event_key.s}, - {"amqp_consumer_event_subkey", STR_PARAM, &dbk_consumer_event_subkey.s}, + {"amqp_consumer_event_key", PARAM_STR, &dbk_consumer_event_key}, + {"amqp_consumer_event_subkey", PARAM_STR, &dbk_consumer_event_subkey}, {"amqp_query_timeout_micro", INT_PARAM, &kz_qtimeout_tv.tv_usec}, {"amqp_query_timeout_sec", INT_PARAM, &kz_qtimeout_tv.tv_sec}, {"amqp_internal_loop_count", INT_PARAM, &dbk_internal_loop_count}, {"amqp_consumer_loop_count", INT_PARAM, &dbk_consumer_loop_count}, {"amqp_consumer_ack_loop_count", INT_PARAM, &dbk_consumer_ack_loop_count}, {"pua_include_entity", INT_PARAM, &dbk_include_entity}, - {"presentity_table", STR_PARAM, &kz_presentity_table.s}, - {"db_url", STR_PARAM, &kz_db_url.s}, + {"presentity_table", PARAM_STR, &kz_presentity_table}, + {"db_url", PARAM_STR, &kz_db_url}, {"pua_mode", INT_PARAM, &dbk_pua_mode}, {"single_consumer_on_reconnect", INT_PARAM, &dbk_single_consumer_on_reconnect}, {"consume_messages_on_reconnect", INT_PARAM, &dbk_consume_messages_on_reconnect}, - {"amqp_query_timeout_avp", STR_PARAM, &kz_query_timeout_avp.s}, - {"json_escape_char", STR_PARAM, &kz_json_escape_str.s}, - {"app_name", STR_PARAM, &kz_app_name.s}, + {"amqp_query_timeout_avp", PARAM_STR, &kz_query_timeout_avp}, + {"json_escape_char", PARAM_STR, &kz_json_escape_str}, + {"app_name", PARAM_STR, &kz_app_name}, {"use_federated_exchange", INT_PARAM, &dbk_use_federated_exchange}, - {"federated_exchange", STR_PARAM, &dbk_federated_exchange.s}, + {"federated_exchange", PARAM_STR, &dbk_federated_exchange}, {"amqp_heartbeats", INT_PARAM, &dbk_use_hearbeats}, - {"amqp_primary_zone", STR_PARAM, &dbk_primary_zone_name.s}, + {"amqp_primary_zone", PARAM_STR, &dbk_primary_zone_name}, {"amqp_command_hashtable_size", INT_PARAM, &dbk_command_table_size}, - {"amqp_result_avp", STR_PARAM, &kz_query_result_avp.s}, - {"amqps_ca_cert", STR_PARAM, &kz_amqps_ca_cert.s}, - {"amqps_cert", STR_PARAM, &kz_amqps_cert.s}, - {"amqps_key", STR_PARAM, &kz_amqps_key.s}, + {"amqp_result_avp", PARAM_STR, &kz_query_result_avp}, + {"amqps_ca_cert", PARAM_STR, &kz_amqps_ca_cert}, + {"amqps_cert", PARAM_STR, &kz_amqps_cert}, + {"amqps_key", PARAM_STR, &kz_amqps_key}, {"amqps_verify_peer", INT_PARAM, &kz_amqps_verify_peer}, {"amqps_verify_hostname", INT_PARAM, &kz_amqps_verify_hostname}, {"pua_lock_type", INT_PARAM, &kz_pua_lock_type}, @@ -255,11 +255,6 @@ static int mod_init(void) { LM_ERR("You must set the node_hostname parameter\n"); return -1; } - dbk_node_hostname.len = strlen(dbk_node_hostname.s); - - dbk_consumer_event_key.len = strlen(dbk_consumer_event_key.s); - dbk_consumer_event_subkey.len = strlen(dbk_consumer_event_subkey.s); - if(kz_init_avp()) { LM_ERR("Error in avp params\n");

1 0

git:5.0:d99e2f81: kazoo: change string parameters to PARAM_STR
by Luis Azedo 23 Jan '18

23 Jan '18

Module: kamailio Branch: 5.0 Commit: d99e2f8118dca4cd55a3e4138809cebeb8cdb139 URL: https://github.com/kamailio/kamailio/commit/d99e2f8118dca4cd55a3e4138809ceb… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-01-23T10:24:17Z kazoo: change string parameters to PARAM_STR (cherry picked from commit 3018595d13dde08d15e8063cecb42a01ea271b66) --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/d99e2f8118dca4cd55a3e4138809ceb… Patch: https://github.com/kamailio/kamailio/commit/d99e2f8118dca4cd55a3e4138809ceb… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 40535aa82b..ca7bdfe000 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -159,8 +159,8 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { - {"node_hostname", STR_PARAM, &dbk_node_hostname.s}, - {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, + {"node_hostname", PARAM_STR, &dbk_node_hostname}, + {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, @@ -171,31 +171,31 @@ static param_export_t params[] = { {"amqp_waitframe_timeout_sec", INT_PARAM, &kz_amqp_tv.tv_sec}, {"amqp_consumer_processes", INT_PARAM, &dbk_consumer_processes}, {"amqp_consumer_workers", INT_PARAM, &dbk_consumer_workers}, - {"amqp_consumer_event_key", STR_PARAM, &dbk_consumer_event_key.s}, - {"amqp_consumer_event_subkey", STR_PARAM, &dbk_consumer_event_subkey.s}, + {"amqp_consumer_event_key", PARAM_STR, &dbk_consumer_event_key}, + {"amqp_consumer_event_subkey", PARAM_STR, &dbk_consumer_event_subkey}, {"amqp_query_timeout_micro", INT_PARAM, &kz_qtimeout_tv.tv_usec}, {"amqp_query_timeout_sec", INT_PARAM, &kz_qtimeout_tv.tv_sec}, {"amqp_internal_loop_count", INT_PARAM, &dbk_internal_loop_count}, {"amqp_consumer_loop_count", INT_PARAM, &dbk_consumer_loop_count}, {"amqp_consumer_ack_loop_count", INT_PARAM, &dbk_consumer_ack_loop_count}, {"pua_include_entity", INT_PARAM, &dbk_include_entity}, - {"presentity_table", STR_PARAM, &kz_presentity_table.s}, - {"db_url", STR_PARAM, &kz_db_url.s}, + {"presentity_table", PARAM_STR, &kz_presentity_table}, + {"db_url", PARAM_STR, &kz_db_url}, {"pua_mode", INT_PARAM, &dbk_pua_mode}, {"single_consumer_on_reconnect", INT_PARAM, &dbk_single_consumer_on_reconnect}, {"consume_messages_on_reconnect", INT_PARAM, &dbk_consume_messages_on_reconnect}, - {"amqp_query_timeout_avp", STR_PARAM, &kz_query_timeout_avp.s}, - {"json_escape_char", STR_PARAM, &kz_json_escape_str.s}, - {"app_name", STR_PARAM, &kz_app_name.s}, + {"amqp_query_timeout_avp", PARAM_STR, &kz_query_timeout_avp}, + {"json_escape_char", PARAM_STR, &kz_json_escape_str}, + {"app_name", PARAM_STR, &kz_app_name}, {"use_federated_exchange", INT_PARAM, &dbk_use_federated_exchange}, - {"federated_exchange", STR_PARAM, &dbk_federated_exchange.s}, + {"federated_exchange", PARAM_STR, &dbk_federated_exchange}, {"amqp_heartbeats", INT_PARAM, &dbk_use_hearbeats}, - {"amqp_primary_zone", STR_PARAM, &dbk_primary_zone_name.s}, + {"amqp_primary_zone", PARAM_STR, &dbk_primary_zone_name}, {"amqp_command_hashtable_size", INT_PARAM, &dbk_command_table_size}, - {"amqp_result_avp", STR_PARAM, &kz_query_result_avp.s}, - {"amqps_ca_cert", STR_PARAM, &kz_amqps_ca_cert.s}, - {"amqps_cert", STR_PARAM, &kz_amqps_cert.s}, - {"amqps_key", STR_PARAM, &kz_amqps_key.s}, + {"amqp_result_avp", PARAM_STR, &kz_query_result_avp}, + {"amqps_ca_cert", PARAM_STR, &kz_amqps_ca_cert}, + {"amqps_cert", PARAM_STR, &kz_amqps_cert}, + {"amqps_key", PARAM_STR, &kz_amqps_key}, {"amqps_verify_peer", INT_PARAM, &kz_amqps_verify_peer}, {"amqps_verify_hostname", INT_PARAM, &kz_amqps_verify_hostname}, {"pua_lock_type", INT_PARAM, &kz_pua_lock_type}, @@ -255,11 +255,6 @@ static int mod_init(void) { LM_ERR("You must set the node_hostname parameter\n"); return -1; } - dbk_node_hostname.len = strlen(dbk_node_hostname.s); - - dbk_consumer_event_key.len = strlen(dbk_consumer_event_key.s); - dbk_consumer_event_subkey.len = strlen(dbk_consumer_event_subkey.s); - if(kz_init_avp()) { LM_ERR("Error in avp params\n");

1 0

git:master:3018595d: kazoo: change string parameters to PARAM_STR
by lazedo 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 3018595d13dde08d15e8063cecb42a01ea271b66 URL: https://github.com/kamailio/kamailio/commit/3018595d13dde08d15e8063cecb42a0… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-01-23T10:20:52Z kazoo: change string parameters to PARAM_STR --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/3018595d13dde08d15e8063cecb42a0… Patch: https://github.com/kamailio/kamailio/commit/3018595d13dde08d15e8063cecb42a0… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 40535aa82b..ca7bdfe000 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -159,8 +159,8 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { - {"node_hostname", STR_PARAM, &dbk_node_hostname.s}, - {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, + {"node_hostname", PARAM_STR, &dbk_node_hostname}, + {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, @@ -171,31 +171,31 @@ static param_export_t params[] = { {"amqp_waitframe_timeout_sec", INT_PARAM, &kz_amqp_tv.tv_sec}, {"amqp_consumer_processes", INT_PARAM, &dbk_consumer_processes}, {"amqp_consumer_workers", INT_PARAM, &dbk_consumer_workers}, - {"amqp_consumer_event_key", STR_PARAM, &dbk_consumer_event_key.s}, - {"amqp_consumer_event_subkey", STR_PARAM, &dbk_consumer_event_subkey.s}, + {"amqp_consumer_event_key", PARAM_STR, &dbk_consumer_event_key}, + {"amqp_consumer_event_subkey", PARAM_STR, &dbk_consumer_event_subkey}, {"amqp_query_timeout_micro", INT_PARAM, &kz_qtimeout_tv.tv_usec}, {"amqp_query_timeout_sec", INT_PARAM, &kz_qtimeout_tv.tv_sec}, {"amqp_internal_loop_count", INT_PARAM, &dbk_internal_loop_count}, {"amqp_consumer_loop_count", INT_PARAM, &dbk_consumer_loop_count}, {"amqp_consumer_ack_loop_count", INT_PARAM, &dbk_consumer_ack_loop_count}, {"pua_include_entity", INT_PARAM, &dbk_include_entity}, - {"presentity_table", STR_PARAM, &kz_presentity_table.s}, - {"db_url", STR_PARAM, &kz_db_url.s}, + {"presentity_table", PARAM_STR, &kz_presentity_table}, + {"db_url", PARAM_STR, &kz_db_url}, {"pua_mode", INT_PARAM, &dbk_pua_mode}, {"single_consumer_on_reconnect", INT_PARAM, &dbk_single_consumer_on_reconnect}, {"consume_messages_on_reconnect", INT_PARAM, &dbk_consume_messages_on_reconnect}, - {"amqp_query_timeout_avp", STR_PARAM, &kz_query_timeout_avp.s}, - {"json_escape_char", STR_PARAM, &kz_json_escape_str.s}, - {"app_name", STR_PARAM, &kz_app_name.s}, + {"amqp_query_timeout_avp", PARAM_STR, &kz_query_timeout_avp}, + {"json_escape_char", PARAM_STR, &kz_json_escape_str}, + {"app_name", PARAM_STR, &kz_app_name}, {"use_federated_exchange", INT_PARAM, &dbk_use_federated_exchange}, - {"federated_exchange", STR_PARAM, &dbk_federated_exchange.s}, + {"federated_exchange", PARAM_STR, &dbk_federated_exchange}, {"amqp_heartbeats", INT_PARAM, &dbk_use_hearbeats}, - {"amqp_primary_zone", STR_PARAM, &dbk_primary_zone_name.s}, + {"amqp_primary_zone", PARAM_STR, &dbk_primary_zone_name}, {"amqp_command_hashtable_size", INT_PARAM, &dbk_command_table_size}, - {"amqp_result_avp", STR_PARAM, &kz_query_result_avp.s}, - {"amqps_ca_cert", STR_PARAM, &kz_amqps_ca_cert.s}, - {"amqps_cert", STR_PARAM, &kz_amqps_cert.s}, - {"amqps_key", STR_PARAM, &kz_amqps_key.s}, + {"amqp_result_avp", PARAM_STR, &kz_query_result_avp}, + {"amqps_ca_cert", PARAM_STR, &kz_amqps_ca_cert}, + {"amqps_cert", PARAM_STR, &kz_amqps_cert}, + {"amqps_key", PARAM_STR, &kz_amqps_key}, {"amqps_verify_peer", INT_PARAM, &kz_amqps_verify_peer}, {"amqps_verify_hostname", INT_PARAM, &kz_amqps_verify_hostname}, {"pua_lock_type", INT_PARAM, &kz_pua_lock_type}, @@ -255,11 +255,6 @@ static int mod_init(void) { LM_ERR("You must set the node_hostname parameter\n"); return -1; } - dbk_node_hostname.len = strlen(dbk_node_hostname.s); - - dbk_consumer_event_key.len = strlen(dbk_consumer_event_key.s); - dbk_consumer_event_subkey.len = strlen(dbk_consumer_event_subkey.s); - if(kz_init_avp()) { LM_ERR("Error in avp params\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev