From cc595f7353c4b2c5fc71223a8b1ded601e068e04 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Thu, 9 Oct 2014 17:46:23 +0000 Subject: res_phoneprov: Refactor phoneprov to allow pluggable config providers This patch makes res_phoneprov more modular so other modules (like pjsip) can provide configuration information instead of res_phoneprov relying solely on users.conf and sip.conf. To accomplish this a new ast_phoneprov public API is now exposed which allows config providers to register themselves, set defaults (server profile, etc) and add user extensions. * ast_phoneprov_provider_register registers the provider and provides callbacks for loading default settings and loading users. * ast_phoneprov_provider_unregister clears the defaults and users. * ast_phoneprov_add_extension should be called once for each user/extension by the provider's load_users callback to add them. * ast_phoneprov_delete_extension deletes one extension. * ast_phoneprov_delete_extensions deletes all extensions for the provider. Tested-by: George Joseph Review: https://reviewboard.asterisk.org/r/3970/ ........ Merged revisions 424963 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 424964 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424965 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/chanvars.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'main') diff --git a/main/chanvars.c b/main/chanvars.c index da7449dc6..37714e9a2 100644 --- a/main/chanvars.c +++ b/main/chanvars.c @@ -90,4 +90,67 @@ const char *ast_var_value(const struct ast_var_t *var) return (var ? var->value : NULL); } +char *ast_var_find(const struct varshead *head, const char *name) +{ + struct ast_var_t *var; + + AST_LIST_TRAVERSE(head, var, entries) { + if (!strcmp(name, var->name)) { + return var->value; + } + } + return NULL; +} + +struct varshead *ast_var_list_create(void) +{ + struct varshead *head; + + head = ast_calloc(1, sizeof(*head)); + if (!head) { + return NULL; + } + AST_LIST_HEAD_INIT_NOLOCK(head); + return head; +} + +void ast_var_list_destroy(struct varshead *head) +{ + struct ast_var_t *var; + + if (!head) { + return; + } + while ((var = AST_LIST_REMOVE_HEAD(head, entries))) { + ast_var_delete(var); + } + + ast_free(head); +} + +struct varshead *ast_var_list_clone(struct varshead *head) +{ + struct varshead *clone; + struct ast_var_t *var, *newvar; + + if (!head) { + return NULL; + } + + clone = ast_var_list_create(); + if (!clone) { + return NULL; + } + + AST_VAR_LIST_TRAVERSE(head, var) { + newvar = ast_var_assign(var->name, var->value); + if (!newvar) { + ast_var_list_destroy(clone); + return NULL; + } + AST_VAR_LIST_INSERT_TAIL(clone, newvar); + } + + return clone; +} -- cgit v1.2.3