sr-dev

sr-dev@lists.kamailio.org

44307 discussions

by Klaus Darilion

Module: sip-router Branch: master Commit: eb6d6cbdd5ab82401dada03f90899fad7e354d5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb6d6cb… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Fri Sep 17 16:29:36 2010 +0200 enhance docs describe that the ACK tm callback is executed in INVITE context --- modules_k/acc/doc/acc_admin.xml | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules_k/acc/doc/acc_admin.xml b/modules_k/acc/doc/acc_admin.xml index af7ccdd..82184fa 100644 --- a/modules_k/acc/doc/acc_admin.xml +++ b/modules_k/acc/doc/acc_admin.xml @@ -197,6 +197,13 @@ if (uri=~"sip:+40") /* calls to Romania */ { http://kamailio.org/dokuwiki/doku.php/pseudovariables:devel</ulink> </para> <para> + Note: For all the ACK processed by tm, the registered callbacks + (like acc module) will be called with the corresponding INVITE + transaction contexts as long as this is still available. This means + that the ACK callbacks will see the AVPs setup for the INVITE + transaction and not the AVPs setup before t_relay(). + </para> + <para> Via <emphasis>log_name</emphasis> you define how/where the <emphasis>data</emphasis> will be logged. Its meaning depends of the accounting support which is used: @@ -552,6 +559,7 @@ modparam("acc", "log_facility", "LOG_DAEMON") <title><varname>log_extra</varname> (string)</title> <para> Extra values to be logged. + See section <xref linkend="ACC-extra-id"/> for more details. </para> <para> Default value is NULL. @@ -639,6 +647,7 @@ modparam("acc", "service_type", 16) <title><varname>radius_extra</varname> (string)</title> <para> Extra values to be logged via RADIUS - RADIUS specific. + See section <xref linkend="ACC-extra-id"/> for more details. </para> <para> Default value is NULL. @@ -842,6 +851,7 @@ modparam("acc", "acc_time_column", "time") <title><varname>db_extra</varname> (string)</title> <para> Extra values to be logged into database - DB specific. + See section <xref linkend="ACC-extra-id"/> for more details. </para> <para> Default value is NULL. @@ -922,6 +932,7 @@ modparam("acc", "diameter_client_port", 3000) <title><varname>diameter_extra</varname> (string)</title> <para> Extra values to be logged via DIAMETER - DIAMETER specific. + See section <xref linkend="ACC-extra-id"/> for more details. </para> <para> Default value is NULL.

14 years, 4 months

spleete configuration file

by Meftah Tayeb

hi, could we spleete the configuration file in several configuration file based on the default config, but diferent sexions? and we include it in the main conf file? like in routes, we create a folder "route" in /etc/sip-router (kamailio or ser) and we pute routes in separate files or in single file, and include it from sip-router.conf that will facilitate iverything thank you __________ Information from ESET NOD32 Antivirus, version of virus signature database 5283 (20100716) __________ The message was checked by ESET NOD32 Antivirus. http://www.eset.com

14 years, 4 months

git:master: core: print function name in LOG messages

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8af71cf262688bd80294dbd8a725a0e2e447c196 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8af71cf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Sep 11 19:11:23 2010 +0200 core: print function name in LOG messages Compile time define for printing the function name by default in log messages. Can be turned on by compiling with -DLOG_FUNC_NAME (e.g. make cfg extra_defs=-DLOG_FUNC_NAME) and turned off by recompiling with -DNO_LOG_FUNC_NAME. It's also turned off if the compiler does not support it (non C99 and no known workaround). The default it's off. --- dprint.h | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dprint.h b/dprint.h index c3cb5dc..8f50b1f 100644 --- a/dprint.h +++ b/dprint.h @@ -38,12 +38,18 @@ #include "cfg_core.h" +/** if defined the function name will also be logged. */ +#ifdef NO_LOG_FUNC_NAME +# undef LOG_FUNC_NAME +#endif /* NO_LOG_FUNC_NAME */ + /* C >= 99 has __func__, older gcc versions have __FUNCTION__ */ #if __STDC_VERSION__ < 199901L # if __GNUC__ >= 2 # define _FUNC_NAME_ __FUNCTION__ # else # define _FUNC_NAME_ "" +# undef LOG_FUNC_NAME # endif #else # define _FUNC_NAME_ __func__ @@ -199,11 +205,24 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); } \ } while(0) -# define LOG(level, fmt, ...) \ +# ifdef LOG_FUNC_NAME +# define LOG(level, fmt, ...) \ + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt,\ + _FUNC_NAME_, __VA_ARGS__) + +# define LOG_FC(facility, level, fmt, ...) \ + LOG_((facility), (level), LOC_INFO, "%s(): " fmt,\ + _FUNC_NAME_, __VA_ARGS__) +# else /* LOG_FUNC_NAME */ + +# define LOG(level, fmt, ...) \ LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt, __VA_ARGS__) -# define LOG_FC(facility, level, fmt, ...) \ + +# define LOG_FC(facility, level, fmt, ...) \ LOG_((facility), (level), LOC_INFO, fmt, __VA_ARGS__) +# endif /* LOG_FUNC_NAME */ + # else /* ! __SUNPRO_C */ # define LOG_(facility, level, prefix, fmt, args...) \ do { \ @@ -248,11 +267,21 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); } \ } while(0) -# define LOG(level, fmt, args...) \ +# ifdef LOG_FUNC_NAME +# define LOG(level, fmt, args...) \ + LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\ + _FUNC_NAME_, ## args) + +# define LOG_FC(facility, level, fmt, args...) \ + LOG_((facility), (level), LOC_INFO, "%s(): " fmt , _FUNC_NAME_, ## args) + +# else /* LOG_FUNC_NAME */ +# define LOG(level, fmt, args...) \ LOG_(DEFAULT_FACILITY, (level), LOC_INFO, fmt , ## args) -# define LOG_FC(facility, level, fmt, args...) \ +# define LOG_FC(facility, level, fmt, args...) \ LOG_((facility), (level), LOC_INFO, fmt , ## args) - + +# endif /* LOG_FUNC_NAME */ # endif /* __SUNPRO_C */ #endif /* NO_LOG */

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg_db: updated to the cfg framework changes

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: ebd2739e1d45623529f9e4663204d15b8daaa78f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebd2739… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 14 16:23:15 2010 +0200 cfg_db: updated to the cfg framework changes --- modules/tls/tls_init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index ed792aa..a57772e 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -605,7 +605,7 @@ int init_tls_h(void) s.s = "low_mem_threshold1"; s.len = strlen(s.s); if (low_mem_threshold1 != cfg_get(tls, tls_cfg, low_mem_threshold1) && - cfg_set_now_int(cfg_ctx, &tls_grp, &s, low_mem_threshold1)) { + cfg_set_now_int(cfg_ctx, &tls_grp, NULL /* group id */, &s, low_mem_threshold1)) { ERR("failed to set tls.low_mem_threshold1 to %d\n", low_mem_threshold1); return -1; @@ -613,7 +613,7 @@ int init_tls_h(void) s.s = "low_mem_threshold2"; s.len = strlen(s.s); if (low_mem_threshold2 != cfg_get(tls, tls_cfg, low_mem_threshold2) && - cfg_set_now_int(cfg_ctx, &tls_grp, &s, low_mem_threshold2)) { + cfg_set_now_int(cfg_ctx, &tls_grp, NULL /* group id */, &s, low_mem_threshold2)) { ERR("failed to set tls.low_mem_threshold1 to %d\n", low_mem_threshold2); return -1;

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: log message added

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 1e3ac66d09b8cd0759b81187169ac2d3552eb2d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e3ac66… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 8 16:58:18 2010 +0200 cfg framework: log message added cfg_set_now() prints out the id of the group which is modified. --- cfg/cfg_ctx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 1ca2ec9..cbdd5a7 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -584,6 +584,9 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va group_name->len, group_name->s, var_name->len, var_name->s, ((str *)val)->len, ((str *)val)->s); + if (group_id) + LOG(L_INFO, "INFO: cfg_set_now(): group id = %u\n", + *group_id); convert_val_cleanup(); return 0;

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: unlock on error

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: a138e2b1aba2cea03310d1061e641736b452e7b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a138e2b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 8 17:32:48 2010 +0200 cfg framework: unlock on error release the global lock when the group instance is not found --- cfg/cfg_ctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index cbdd5a7..94f2d98 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -433,7 +433,7 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va *group_id); if (!group_inst) { LOG(L_ERR, "ERROR: cfg_set_now(): global group instance is not found\n"); - goto error0; + goto error; } var_block = group_inst->vars; } else {

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: group instance bug fixes

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 54d8259ea0bd7ab6a80a996d9cc1fcfa398fecf5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54d8259… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Sep 9 09:55:04 2010 +0200 cfg framework: group instance bug fixes - Check whether the new config block is really created. - Increase the number if items within the array when a new instance is added --- cfg/cfg_ctx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 94f2d98..480fab5 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -512,7 +512,7 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va it cannot be freed */ if (cfg_shmized) { - if (!group_inst && CFG_GROUP_META(block, group)->array) { + if (!group_inst && block && CFG_GROUP_META(block, group)->array) { if (cfg_update_defaults(CFG_GROUP_META(block, group), group, var, p, ((var->def->type & CFG_ATOMIC) == 0)) /* clone if needed */ @@ -1281,6 +1281,7 @@ int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) sizeof(cfg_group_inst_t) + group->size - 1); CFG_GROUP_META(block, group)->array = new_array; + CFG_GROUP_META(block, group)->num++; if (CFG_GROUP_META(*cfg_global, group)->array) { /* prepare the array of the replaced strings,

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: group instance support in cfg_get_by_name() + bugfix

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 5d4d6ae9ed9848d92e10e746a8d870833b5c683d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d4d6ae… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Sep 9 12:56:58 2010 +0200 cfg framework: group instance support in cfg_get_by_name() + bugfix - cfg_get_by_name() can return the value from both the default or from a specific group instance. - bugfix: cfg_add_group_inst() overwrote a larger memory area then the group size. - More verbose log messages when the group instance is not found. --- cfg/cfg_ctx.c | 36 ++++++++++++++++++++++++++++-------- cfg/cfg_ctx.h | 5 ++++- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 480fab5..b0fa851 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -387,7 +387,8 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va group->size, *group_id); if (!group_inst) { - LOG(L_ERR, "ERROR: cfg_set_now(): local group instance is not found\n"); + LOG(L_ERR, "ERROR: cfg_set_now(): local group instance %.*s[%u] is not found\n", + group_name->len, group_name->s, *group_id); goto error0; } var_block = group_inst->vars; @@ -432,7 +433,8 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va group->size, *group_id); if (!group_inst) { - LOG(L_ERR, "ERROR: cfg_set_now(): global group instance is not found\n"); + LOG(L_ERR, "ERROR: cfg_set_now(): global group instance %.*s[%u] is not found\n", + group_name->len, group_name->s, *group_id); goto error; } var_block = group_inst->vars; @@ -1038,7 +1040,7 @@ int cfg_rollback(cfg_ctx_t *ctx) * -1 - error * 1 - variable exists, but it is not readable */ -int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, +int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, void **val, unsigned int *val_type) { cfg_group_t *group; @@ -1046,6 +1048,7 @@ int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, void *p; static str s; /* we need the value even after the function returns */ + cfg_group_inst_t *group_inst; /* verify the context even if we do not need it now to make sure that a cfg driver has called the function @@ -1066,10 +1069,27 @@ int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, return 1; } - /* use the module's handle to access the variable - It means that the variable is read from the local config - after forking */ - p = *(group->handle) + var->offset; + if (group_id) { + if (!cfg_local) { + LOG(L_ERR, "ERROR: cfg_get_by_name(): Local configuration is missing\n"); + return -1; + } + group_inst = cfg_find_group(CFG_GROUP_META(cfg_local, group), + group->size, + *group_id); + if (!group_inst) { + LOG(L_ERR, "ERROR: cfg_get_by_name(): local group instance %.*s[%u] is not found\n", + group_name->len, group_name->s, *group_id); + return -1; + } + p = group_inst->vars + var->offset; + + } else { + /* use the module's handle to access the variable + It means that the variable is read from the local config + after forking */ + p = *(group->handle) + var->offset; + } switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: @@ -1278,7 +1298,7 @@ int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) /* fill in the new group instance with the default data */ memcpy( new_inst->vars, CFG_GROUP_DATA(*cfg_global, group), - sizeof(cfg_group_inst_t) + group->size - 1); + group->size); CFG_GROUP_META(block, group)->array = new_array; CFG_GROUP_META(block, group)->num++; diff --git a/cfg/cfg_ctx.h b/cfg/cfg_ctx.h index 0e2299f..255911e 100644 --- a/cfg/cfg_ctx.h +++ b/cfg/cfg_ctx.h @@ -110,7 +110,7 @@ int cfg_commit(cfg_ctx_t *ctx); int cfg_rollback(cfg_ctx_t *ctx); /*! \brief returns the value of a variable */ -int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, +int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, void **val, unsigned int *val_type); /*! \brief returns the description of a variable */ @@ -177,4 +177,7 @@ int cfg_diff_next(void **h, /*! \brief destroy the handle of cfg_diff_next() */ void cfg_diff_release(cfg_ctx_t *ctx); +/* Add a new instance to an existing group */ +int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id); + #endif /* _CFG_CTX_H */

14 years, 4 months

git:tirpi/cfg_framework_multivalue: modules_k/kex: updated to the cfg framework changes

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 72c10ee1d2f8debdefea7ea5163c4ab530a45bb7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72c10ee… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 14 16:12:55 2010 +0200 modules_k/kex: updated to the cfg framework changes The debug value is set in the default "core" group. --- modules_k/kex/mi_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 36f5b93..b7c20af 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -328,7 +328,7 @@ static struct mi_root *mi_debug(struct mi_root *cmd, void *param) return init_mi_tree( 400, MI_SSTR(MI_BAD_PARM)); set = 1; } else { - if(cfg_get_by_name(_kex_cfg_ctx, &group_name, &var_name, &vval, + if(cfg_get_by_name(_kex_cfg_ctx, &group_name, NULL /* group id */, &var_name, &vval, &val_type)!=0) return init_mi_tree( 500, MI_SSTR(MI_INTERNAL_ERR)); new_debug = (int)(long)vval; @@ -346,7 +346,7 @@ static struct mi_root *mi_debug(struct mi_root *cmd, void *param) } if(set==1) { - cfg_set_now(_kex_cfg_ctx, &group_name, &var_name, + cfg_set_now(_kex_cfg_ctx, &group_name, NULL /* group id */, &var_name, (void *)(long)new_debug, CFG_VAR_INT); }

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: cfg_add_group_inst() added

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 28d46c65eaecd623a5e472522fc53564730fe2c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28d46c6… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 8 15:26:59 2010 +0200 cfg framework: cfg_add_group_inst() added The function can add a new group instance to an existing group. The values of the new instance are identical to the default values of the group. After the new group instance is added, the values can be changed by cfg_set_now(). --- cfg/cfg_ctx.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg_struct.c | 49 +++++++++++++++++++++++++-- cfg/cfg_struct.h | 6 +++ 3 files changed, 146 insertions(+), 4 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index cc64a0d..1ca2ec9 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -593,6 +593,7 @@ error: if (block) cfg_block_free(block); if (new_array) shm_free(new_array); if (child_cb) cfg_child_cb_free(child_cb); + if (replaced) shm_free(replaced); error0: LOG(L_ERR, "ERROR: cfg_set_now(): failed to set the variable: %.*s.%.*s\n", @@ -1219,3 +1220,97 @@ void cfg_diff_release(cfg_ctx_t *ctx) CFG_CTX_UNLOCK(ctx); } + +/* Add a new instance to an existing group */ +int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) +{ + cfg_group_t *group; + cfg_block_t *block = NULL; + void **replaced = NULL; + cfg_group_inst_t *new_array = NULL, *new_inst; + + /* verify the context even if we do not need it now + to make sure that a cfg driver has called the function + (very very weak security) */ + if (!ctx) { + LOG(L_ERR, "ERROR: cfg_add_group_inst(): context is undefined\n"); + return -1; + } + + if (!cfg_shmized) { + /* TODO: Add a new fake variable belonging to + the additional group instance to the linked list. */ + return -1; + } + + if (!(group = cfg_lookup_group(group_name->s, group_name->len))) { + LOG(L_ERR, "ERROR: cfg_add_group_inst(): group not found\n"); + return -1; + } + + /* make sure that nobody else replaces the global config + while the new one is prepared */ + CFG_WRITER_LOCK(); + if (cfg_find_group(CFG_GROUP_META(*cfg_global, group), + group->size, + group_id) + ) { + LOG(L_DBG, "DEBUG: cfg_add_group_inst(): the group instance already exists\n"); + CFG_WRITER_UNLOCK(); + return 0; /* not an error */ + } + + /* clone the global memory block because the additional array can be + replaced only together with the block. */ + if (!(block = cfg_clone_global())) + goto error; + + /* Extend the array with a new group instance */ + if (!(new_array = cfg_extend_array(CFG_GROUP_META(*cfg_global, group), group, + group_id, + &new_inst)) + ) + goto error; + + /* fill in the new group instance with the default data */ + memcpy( new_inst->vars, + CFG_GROUP_DATA(*cfg_global, group), + sizeof(cfg_group_inst_t) + group->size - 1); + + CFG_GROUP_META(block, group)->array = new_array; + + if (CFG_GROUP_META(*cfg_global, group)->array) { + /* prepare the array of the replaced strings, + and replaced group instances, + they will be freed when the old block is freed */ + replaced = (void **)shm_malloc(sizeof(void *) * 2); + if (!replaced) { + LOG(L_ERR, "ERROR: cfg_add_group_inst(): not enough shm memory\n"); + goto error; + } + replaced[0] = CFG_GROUP_META(*cfg_global, group)->array; + replaced[1] = NULL; + } + /* replace the global config with the new one */ + cfg_install_global(block, replaced, NULL, NULL); + CFG_WRITER_UNLOCK(); + + LOG(L_INFO, "INFO: cfg_add_group_inst(): " + "group instance is added: %.*s[%u]\n", + group_name->len, group_name->s, + group_id); + + return 0; +error: + CFG_WRITER_UNLOCK(); + if (block) cfg_block_free(block); + if (new_array) shm_free(new_array); + if (replaced) shm_free(replaced); + + LOG(L_ERR, "ERROR: cfg_add_group_inst(): " + "Failed to add the group instance: %.*s[%u]\n", + group_name->len, group_name->s, + group_id); + + return -1; +} diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 3e92080..77d7cf5 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -584,9 +584,7 @@ cfg_block_t *cfg_clone_global(void) return block; } -/* Clone an array of configuration group instances. - * WARNING: unsafe, cfg_writer_lock or cfg_global_lock must be held! - */ +/* Clone an array of configuration group instances. */ cfg_group_inst_t *cfg_clone_array(cfg_group_meta_t *meta, cfg_group_t *group) { cfg_group_inst_t *new_array; @@ -606,6 +604,47 @@ cfg_group_inst_t *cfg_clone_array(cfg_group_meta_t *meta, cfg_group_t *group) return new_array; } +/* Extend the array of configuration group instances with one more instance. + * Only the ID of the new group is set, nothing else. */ +cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, + unsigned int group_id, + cfg_group_inst_t **new_group) +{ + int i; + cfg_group_inst_t *new_array, *old_array; + int inst_size; + + inst_size = sizeof(cfg_group_inst_t) + group->size - 1; + new_array = (cfg_group_inst_t *)shm_malloc(inst_size * (meta->num + 1)); + if (!new_array) { + LOG(L_ERR, "ERROR: cfg_extend_array(): not enough shm memory\n"); + return NULL; + } + /* Find the position of the new group in the array. The array is ordered + by the group IDs. */ + old_array = meta->array; + for ( i = 0; + (i < meta->num) + && (((cfg_group_inst_t *)((char *)old_array + inst_size * i))->id < group_id); + i++ + ); + if (i > 0) + memcpy( new_array, + old_array, + inst_size * i); + + memset((char*)new_array + inst_size * i, 0, inst_size); + *new_group = (cfg_group_inst_t *)((char*)new_array + inst_size * i); + (*new_group)->id = group_id; + + if (i < meta->num) + memcpy( (char*)new_array + inst_size * (i + 1), + (char*)old_array + inst_size * i, + inst_size * (meta->num - i)); + + return new_array; +} + /* Find the group instance within the meta-data based on the group_id */ cfg_group_inst_t *cfg_find_group(cfg_group_meta_t *meta, int group_size, unsigned int group_id) { @@ -615,13 +654,15 @@ cfg_group_inst_t *cfg_find_group(cfg_group_meta_t *meta, int group_size, unsigne if (!meta) return NULL; - /* For now, search lineray till the end of the array. + /* For now, search lineray. TODO: improve */ for (i = 0; i < meta->num; i++) { ginst = (cfg_group_inst_t *)((char *)meta->array + (sizeof(cfg_group_meta_t) + group_size - 1) * i); if (ginst->id == group_id) return ginst; + else if (ginst->id > group_id) + break; /* needless to continue, the array is ordered */ } return NULL; } diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 58cd810..65519e2 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -375,6 +375,12 @@ cfg_block_t *cfg_clone_global(void); /* Clone an array of configuration group instances. */ cfg_group_inst_t *cfg_clone_array(cfg_group_meta_t *meta, cfg_group_t *group); +/* Extend the array of configuration group instances with one more instance. + * Only the ID of the new group is set, nothing else. */ +cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, + unsigned int group_id, + cfg_group_inst_t **new_group); + /* clones a string to shared memory */ int cfg_clone_str(str *src, str *dst);

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