sr-dev

sr-dev@lists.kamailio.org

44307 discussions

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, 4 months

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, 4 months

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, 4 months

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, 4 months

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, 4 months

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, 4 months

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, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: cfg_commit() log message fixes

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 59d6804bf0aad9344dd10c75b905e55e793da19b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59d6804… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 15 13:50:56 2010 +0200 cfg framework: cfg_commit() log message fixes --- cfg/cfg_ctx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 534cf49..94f5878 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -1028,7 +1028,7 @@ int cfg_commit(cfg_ctx_t *ctx) if (!(CFG_GROUP_META(block, group)->array = cfg_clone_array(CFG_GROUP_META(*cfg_global, group), group)) ) { - LOG(L_ERR, "ERROR: cfg_set_now(): group array cannot be cloned for %.*s[%u]\n", + LOG(L_ERR, "ERROR: cfg_commit(): group array cannot be cloned for %.*s[%u]\n", group->name_len, group->name, changed->group_id); goto error; } @@ -1044,7 +1044,7 @@ int cfg_commit(cfg_ctx_t *ctx) changed->group_id); } if (!group_inst) { - LOG(L_ERR, "ERROR: cfg_set_now(): global group instance %.*s[%u] is not found\n", + LOG(L_ERR, "ERROR: cfg_commit(): global group instance %.*s[%u] is not found\n", group->name_len, group->name, changed->group_id); goto error; }

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: CFG_GROUP_UNKNOWN group type

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: fd958ea045b82ba1a29e917e47fb9eed146bf5f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd958ea… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 21 14:42:55 2010 +0200 cfg framework: CFG_GROUP_UNKNOWN group type group->dynamic can take 3 values from now: - CFG_GROUP_STATIC: static group declared by a module or the core - CFG_GROUP_DYNAMIC: dynamic group declared from the script - CFG_GROUP_UNKNOWN: not yet known group type. Such group can exist if additional group instances are set in the group, but the group itself has not been declared yet. This is the case for instance if the group instance is set from the script but the group is declared from a mod_init function. Variable name is added to struct _cfg_add_var. The variables may not be known when additional group instances need to be added, hence, they can be referred only by name. --- cfg/cfg.c | 31 +++++++++++++++++++------------ cfg/cfg_ctx.c | 2 +- cfg/cfg_script.c | 8 +++++--- cfg/cfg_struct.c | 25 +++++++++++++++++++++---- cfg/cfg_struct.h | 20 +++++++++++++++++--- 5 files changed, 63 insertions(+), 23 deletions(-) diff --git a/cfg/cfg.c b/cfg/cfg.c index c718f5a..88a34b2 100644 --- a/cfg/cfg.c +++ b/cfg/cfg.c @@ -43,6 +43,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, { int i, num, size, group_name_len; cfg_mapping_t *mapping = NULL; + cfg_group_t *group; int types; /* check the number of the variables */ @@ -142,18 +143,24 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, group_name_len = strlen(group_name); /* check for duplicates */ - if (cfg_lookup_group(group_name, group_name_len)) { - LOG(L_ERR, "ERROR: register_cfg_def(): " - "configuration group has been already declared: %s\n", - group_name); - goto error; + if ((group = cfg_lookup_group(group_name, group_name_len))) { + if (group->dynamic != CFG_GROUP_UNKNOWN) { + /* conflict with another module/core group, or with a dynamic group */ + LOG(L_ERR, "ERROR: register_cfg_def(): " + "configuration group has been already declared: %s\n", + group_name); + goto error; + } + /* An empty group is found which does not have any variable yet */ + cfg_set_group(group, num, mapping, values, size, handle); + } else { + /* create a new group + I will allocate memory in shm mem for the variables later in a single block, + when we know the size of all the registered groups. */ + if (!(group = cfg_new_group(group_name, group_name_len, num, mapping, values, size, handle))) + goto error; } - - /* create a new group - I will allocate memory in shm mem for the variables later in a single block, - when we know the size of all the registered groups. */ - if (!cfg_new_group(group_name, group_name_len, num, mapping, values, size, handle)) - goto error; + group->dynamic = CFG_GROUP_STATIC; /* The cfg variables are ready to use, let us set the handle before passing the new definitions to the drivers. @@ -226,7 +233,7 @@ void **cfg_get_handle(char *gname) cfg_group_t *group; group = cfg_lookup_group(gname, strlen(gname)); - if (!group || group->dynamic) return NULL; + if (!group || (group->dynamic != CFG_GROUP_STATIC)) return NULL; return group->handle; } diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 94f5878..5fa961d 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -77,7 +77,7 @@ int cfg_register_ctx(cfg_ctx_t **handle, cfg_on_declare on_declare_cb) ) { /* dynamic groups are not ready, the callback will be called later when the group is fixed-up */ - if (group->dynamic) continue; + if (group->dynamic != CFG_GROUP_STATIC) continue; gname.s = group->name; gname.len = group->name_len; diff --git a/cfg/cfg_script.c b/cfg/cfg_script.c index 8340206..58b6cd9 100644 --- a/cfg/cfg_script.c +++ b/cfg/cfg_script.c @@ -56,14 +56,14 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type /* the group may have been already declared */ group = cfg_lookup_group(gname, gname_len); if (group) { - if (group->dynamic == 0) { + if (group->dynamic == CFG_GROUP_STATIC) { /* the group has been already declared by a module or by the core */ LOG(L_ERR, "ERROR: new_cfg_script_var(): " "configuration group has been already declared: %s\n", gname); return NULL; } - /* the dynamic group is found */ + /* the dynamic or empty group is found */ /* verify that the variable does not exist */ for ( var = (cfg_script_var_t *)group->vars; var; @@ -76,6 +76,8 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type return NULL; } } + if (group->dynamic == CFG_GROUP_UNKNOWN) + group->dynamic = CFG_GROUP_DYNAMIC; } else { /* create a new group with NULL values, we will fix it later, @@ -85,7 +87,7 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type NULL /* vars */, 0 /* size */, NULL /* handle */); if (!group) goto error; - group->dynamic = 1; + group->dynamic = CFG_GROUP_DYNAMIC; } switch (type) { diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 9d5f008..d34ed06 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -98,6 +98,18 @@ cfg_group_t *cfg_new_group(char *name, int name_len, return group; } +/* Set the values of an existing cfg group. */ +void cfg_set_group(cfg_group_t *group, + int num, cfg_mapping_t *mapping, + char *vars, int size, void **handle) +{ + group->num = num; + group->mapping = mapping; + group->vars = vars; + group->size = size; + group->handle = handle; +} + /* clones a string to shared memory * (src and dst can be the same) */ @@ -200,7 +212,7 @@ int cfg_shmize(void) block = (cfg_block_t*)shm_malloc(sizeof(cfg_block_t)+size-1); if (!block) { - LOG(L_ERR, "ERROR: cfg_clone_str(): not enough shm memory\n"); + LOG(L_ERR, "ERROR: cfg_shmize(): not enough shm memory\n"); goto error; } memset(block, 0, sizeof(cfg_block_t)+size-1); @@ -211,13 +223,13 @@ int cfg_shmize(void) group; group=group->next ) { - if (group->dynamic == 0) { + if (group->dynamic == CFG_GROUP_STATIC) { /* clone the strings to shm mem */ if (cfg_shmize_strings(group)) goto error; /* copy the values to the new block */ memcpy(CFG_GROUP_DATA(block, group), group->vars, group->size); - } else { + } else if (group->dynamic == CFG_GROUP_DYNAMIC) { /* The group was declared with NULL values, * we have to fix it up. * The fixup function takes care about the values, @@ -232,6 +244,11 @@ int cfg_shmize(void) cfg_notify_drivers(group->name, group->name_len, group->mapping->def); *(group->handle) = NULL; + } else { + LOG(L_ERR, "ERROR: cfg_shmize(): Configuration group is declared " + "without any variable: %.*s\n", + group->name_len, group->name); + goto error; } } /* try to fixup the selects that failed to be fixed-up previously */ @@ -273,7 +290,7 @@ static void cfg_destory_groups(unsigned char *block) if (old_string) shm_free(old_string); } - if (group->dynamic) { + if (group->dynamic == CFG_GROUP_DYNAMIC) { /* the group was dynamically allocated */ cfg_script_destroy(group); } else { diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 5f1fa0a..37d56ca 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -48,13 +48,19 @@ * an array. */ typedef struct _cfg_add_var { - unsigned int type; + struct _cfg_add_var *next; + unsigned int type; /*!< type == 0 is also valid, it indicates that the group + must be created with the default values */ union { str s; int i; } val; unsigned int group_id; /*!< Id of the group instance */ - struct _cfg_add_var *next; + int name_len; /*!< Name of the variable. The variable may not be known, + for example the additional group value is set in the script + before the cfg group is declared. Hence, the pointer cannot + be stored here. */ + char name[1]; } cfg_add_var_t; /*! \brief structure used for variable - pointer mapping */ @@ -68,6 +74,9 @@ typedef struct _cfg_mapping { unsigned int flag; /*!< flag indicating the state of the variable */ } cfg_mapping_t; +/*! \brief type of the group */ +enum { CFG_GROUP_UNKNOWN = 0, CFG_GROUP_DYNAMIC, CFG_GROUP_STATIC }; + /*! \brief linked list of registered groups */ typedef struct _cfg_group { int num; /*!< number of variables within the group */ @@ -93,7 +102,7 @@ typedef struct _cfg_group { unsigned char dynamic; /*!< indicates whether the variables within the group are dynamically allocated or not */ struct _cfg_group *next; - int name_len; + int name_len; char name[1]; } cfg_group_t; @@ -236,6 +245,11 @@ cfg_group_t *cfg_new_group(char *name, int name_len, int num, cfg_mapping_t *mapping, char *vars, int size, void **handle); +/* Set the values of an existing cfg group. */ +void cfg_set_group(cfg_group_t *group, + int num, cfg_mapping_t *mapping, + char *vars, int size, void **handle); + /* copy the variables to shm mem */ int cfg_shmize(void);

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: group instance support before forking

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: eddc94d703afb2685ffd6162ddd29a4fef464c2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eddc94d… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Sep 27 16:03:13 2010 +0200 cfg framework: group instance support before forking The new group instances, and their variables are stored in a list which is linked to the group before the config is shmized. After all the variables are known, this list can be changed to memory blocks. --- cfg/cfg_ctx.c | 14 +++--- cfg/cfg_struct.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg_struct.h | 10 ++++ 3 files changed, 150 insertions(+), 6 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 5fa961d..e94d678 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -332,8 +332,8 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va but an additional instance of a variable needs to be added to the group. Add this instance to the linked list of variables, they will be fixed later. */ - /* TODO */ - return -1; + return new_add_var(group_name, *group_id, var_name, + val, val_type); } /* look-up the group and the variable */ @@ -686,7 +686,7 @@ int cfg_set_delayed(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str && var->def->on_set_child_cb && var->def->type & CFG_CB_ONLY_ONCE ) { - LOG(L_ERR, "ERROR: cfg_set_now(): This variable does not support muliple values.\n"); + LOG(L_ERR, "ERROR: cfg_set_delayed(): This variable does not support muliple values.\n"); goto error0; } @@ -1427,9 +1427,11 @@ int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) } if (!cfg_shmized) { - /* TODO: Add a new fake variable belonging to - the additional group instance to the linked list. */ - return -1; + /* Add a new variable without any value to + the linked list of additional values. This variable + will force a new group instance to be created. */ + return new_add_var(group_name, group_id, NULL /* var_name */, + NULL /* val */, 0 /* type */); } if (!(group = cfg_lookup_group(group_name->s, group_name->len))) { diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index d34ed06..aa4c005 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -56,6 +56,10 @@ cfg_child_cb_t **cfg_child_cb_first = NULL; /* first item of the per-child proce cfg_child_cb_t **cfg_child_cb_last = NULL; /* last item of the above list */ cfg_child_cb_t *cfg_child_cb = NULL; /* pointer to the previously executed cb */ + +/* forward declarations */ +static void del_add_var_list(cfg_group_t *group); + /* creates a new cfg group, and adds it to the linked list */ cfg_group_t *cfg_new_group(char *name, int name_len, int num, cfg_mapping_t *mapping, @@ -298,6 +302,8 @@ static void cfg_destory_groups(unsigned char *block) pointers are just set to static variables */ if (mapping) pkg_free(mapping); } + /* Delete the additional variable list */ + del_add_var_list(group); group2 = group->next; pkg_free(group); @@ -824,3 +830,129 @@ void cfg_child_cb_free(cfg_child_cb_t *child_cb_first) shm_free(cb); } } + +/* Allocate memory for a new additional variable + * and link it to a configuration group. + * type==0 results in creating a new group instance with the default values. + * The group is created with CFG_GROUP_UNKNOWN type if it does not exist. + * Note: this function is usable only before the configuration is shmized. + */ +int new_add_var(str *group_name, unsigned int group_id, str *var_name, + void *val, unsigned int type) +{ + cfg_group_t *group; + cfg_add_var_t *add_var = NULL, **add_var_p; + int len; + + LOG(L_DBG, "DEBUG: new_add_var(): declaring a new variable instance %.*s[%u].%.*s\n", + group_name->len, group_name->s, + group_id, + var_name->len, var_name->s); + + if (cfg_shmized) { + LOG(L_ERR, "ERROR: new_add_var(): too late, the configuration has already been shmized\n"); + goto error; + } + + group = cfg_lookup_group(group_name->s, group_name->len); + if (!group) { + /* create a new group with NULL values, it will be filled in later */ + group = cfg_new_group(group_name->s, group_name->len, + 0 /* num */, NULL /* mapping */, + NULL /* vars */, 0 /* size */, NULL /* handle */); + + if (!group) + goto error; + /* It is not yet known whether the group will be static or dynamic */ + group->dynamic = CFG_GROUP_UNKNOWN; + } + + add_var = (cfg_add_var_t *)pkg_malloc(sizeof(cfg_add_var_t) + + (type ? (var_name->len - 1) : 0)); + if (!add_var) { + LOG(L_ERR, "ERROR: new_add_var(): Not enough memory\n"); + goto error; + } + memset(add_var, 0, sizeof(cfg_add_var_t) + + (type ? (var_name->len - 1) : 0)); + + add_var->group_id = group_id; + if (type) { + add_var->name_len = var_name->len; + memcpy(add_var->name, var_name->s, var_name->len); + + switch (type) { + case CFG_VAR_INT: + add_var->val.i = (int)(long)val; + break; + + case CFG_VAR_STR: + len = ((str *)val)->len; + add_var->val.s.s = (char *)pkg_malloc(sizeof(char) * len); + if (!add_var->val.s.s) { + LOG(L_ERR, "ERROR: new_add_var(): Not enough memory\n"); + goto error; + } + add_var->val.s.len = len; + memcpy(add_var->val.s.s, ((str *)val)->s, len); + break; + + case CFG_VAR_STRING: + len = strlen((char *)val); + add_var->val.ch = (char *)pkg_malloc(sizeof(char) * (len + 1)); + if (!add_var->val.ch) { + LOG(L_ERR, "ERROR: new_add_var(): Not enough memory\n"); + goto error; + } + memcpy(add_var->val.ch, (char *)val, len); + add_var->val.ch[len] = '\0'; + break; + + default: + LOG(L_ERR, "ERROR: new_add_var(): unsupported value type: %u\n", + type); + goto error; + } + add_var->type = type; + } + + /* 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)->next)); + + add_var->next = *add_var_p; + *add_var_p = add_var; + + return 0; + +error: + if (!type) + LOG(L_ERR, "ERROR: new_add_var(): failed to add the additional group instance: %.*s[%u]\n", + group_name->len, group_name->s, group_id); + else + LOG(L_ERR, "ERROR: new_add_var(): failed to add the additional variable instance: %.*s[%u].%.*s\n", + group_name->len, group_name->s, group_id, + var_name->len, var_name->s); + + if (add_var) + pkg_free(add_var); + return -1; +} + +/* delete the additional variable list */ +static void del_add_var_list(cfg_group_t *group) { + cfg_add_var_t *add_var, *add_var2; + + add_var = group->add_var; + while (add_var) { + add_var2 = add_var->next; + if ((add_var->type == CFG_VAR_STR) && add_var->val.s.s) + pkg_free(add_var->val.s.s); + else if ((add_var->type == CFG_VAR_STRING) && add_var->val.ch) + pkg_free(add_var->val.ch); + pkg_free(add_var); + add_var = add_var2; + } + group->add_var = NULL; +} diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 37d56ca..9f7b9fc 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -52,6 +52,7 @@ typedef struct _cfg_add_var { unsigned int type; /*!< type == 0 is also valid, it indicates that the group must be created with the default values */ union { + char *ch; str s; int i; } val; @@ -433,4 +434,13 @@ cfg_child_cb_t *cfg_child_cb_new(str *gname, str *name, /* free the memory allocated for a child cb list */ void cfg_child_cb_free(cfg_child_cb_t *child_cb_first); +/* Allocate memory for a new additional variable + * and link it to a configuration group. + * type==0 results in creating a new group instance with the default values. + * The group is created with CFG_GROUP_UNKNOWN type if it does not exist. + * Note: this function is usable only before the configuration is shmized. + */ +int new_add_var(str *group_name, unsigned int group_id, str *var_name, + void *val, unsigned int type); + #endif /* _CFG_STRUCT_H */

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev