kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/ari/config.c: Optimize conf_alloc() object init.

Browse Source 
* Now conf_alloc() has more off nominal error checking.

* Eliminated RAII_VAR() use in conf_alloc().

* Eliminated a dubius shortcut when destroying cfg->general in
conf_destructor() that would cause a crash if cfg->general failed to get
allocated.

* Add some ACO registration section comments.

Change-Id: Ia40c2b1b2d0777d641605118ae019c5a73865e1a
This commit is contained in:
Richard Mudgett
2015-09-25 17:26:08 -05:00
parent aa00df62ee
commit 3f4fa245e5
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/ari/config.c
View File

@@ -155,13 +155,18 @@ static struct aco_type user_option = {
static struct aco_type *user[] = ACO_TYPES(&user_option); static struct aco_type *user[] = ACO_TYPES(&user_option);
static void conf_general_dtor(void *obj)
{
struct ast_ari_conf_general *general = obj;
ast_string_field_free_memory(general);
}
/*! \brief \ref ast_ari_conf destructor. */ /*! \brief \ref ast_ari_conf destructor. */
static void conf_destructor(void *obj) static void conf_destructor(void *obj)
{ {
struct ast_ari_conf *cfg = obj; struct ast_ari_conf *cfg = obj;
ast_string_field_free_memory(cfg->general);
ao2_cleanup(cfg->general); ao2_cleanup(cfg->general);
ao2_cleanup(cfg->users); ao2_cleanup(cfg->users);
} }
@@ -169,7 +174,7 @@ static void conf_destructor(void *obj)
/*! \brief Allocate an \ref ast_ari_conf for config parsing */ /*! \brief Allocate an \ref ast_ari_conf for config parsing */
static void *conf_alloc(void) static void *conf_alloc(void)
{ {
RAII_VAR(struct ast_ari_conf *, cfg, NULL, ao2_cleanup); struct ast_ari_conf *cfg;
cfg = ao2_alloc_options(sizeof(*cfg), conf_destructor, cfg = ao2_alloc_options(sizeof(*cfg), conf_destructor,
AO2_ALLOC_OPT_LOCK_NOLOCK); AO2_ALLOC_OPT_LOCK_NOLOCK);
@@ -177,20 +182,20 @@ static void *conf_alloc(void)
return NULL; return NULL;
} }
cfg->general = ao2_alloc_options(sizeof(*cfg->general), NULL, cfg->general = ao2_alloc_options(sizeof(*cfg->general), conf_general_dtor,
AO2_ALLOC_OPT_LOCK_NOLOCK); AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!cfg->general) {
return NULL;
}
if (ast_string_field_init(cfg->general, 64)) {
return NULL;
}
aco_set_defaults(&general_option, "general", cfg->general);
cfg->users = ao2_container_alloc_rbtree(AO2_ALLOC_OPT_LOCK_NOLOCK, cfg->users = ao2_container_alloc_rbtree(AO2_ALLOC_OPT_LOCK_NOLOCK,
AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE, user_sort_cmp, NULL); AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE, user_sort_cmp, NULL);
ao2_ref(cfg, +1); if (!cfg->users
|| !cfg->general
|| ast_string_field_init(cfg->general, 64)
|| aco_set_defaults(&general_option, "general", cfg->general)) {
ao2_ref(cfg, -1);
return NULL;
}
return cfg; return cfg;
} }
@@ -308,6 +313,7 @@ int ast_ari_config_init(void)
return -1; return -1;
} }
/* ARI general category options */
aco_option_register(&cfg_info, "enabled", ACO_EXACT, general_options, aco_option_register(&cfg_info, "enabled", ACO_EXACT, general_options,
"yes", OPT_BOOL_T, 1, "yes", OPT_BOOL_T, 1,
FLDSET(struct ast_ari_conf_general, enabled)); FLDSET(struct ast_ari_conf_general, enabled));
@@ -324,6 +330,7 @@ int ast_ari_config_init(void)
AST_DEFAULT_WEBSOCKET_WRITE_TIMEOUT_STR, OPT_INT_T, PARSE_IN_RANGE, AST_DEFAULT_WEBSOCKET_WRITE_TIMEOUT_STR, OPT_INT_T, PARSE_IN_RANGE,
FLDSET(struct ast_ari_conf_general, write_timeout), 1, INT_MAX); FLDSET(struct ast_ari_conf_general, write_timeout), 1, INT_MAX);
/* ARI type=user category options */
aco_option_register(&cfg_info, "type", ACO_EXACT, user, NULL, aco_option_register(&cfg_info, "type", ACO_EXACT, user, NULL,
OPT_NOOP_T, 0, 0); OPT_NOOP_T, 0, 0);
aco_option_register(&cfg_info, "read_only", ACO_EXACT, user, aco_option_register(&cfg_info, "read_only", ACO_EXACT, user,