Author: gtjoseph Date: Sun Dec 21 18:17:49 2014 New Revision: 429915 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429915 Log: res_pjsip_phoneprovi_provider: Fix reload
Reloading wasn't working correctly because on a reload, the sorcery apply handler was never being called for unchanged users. So, instead of using an apply handler, I'm now iterating over all users. Works much more reliably. Tested-by: George Joseph Review: https://reviewboard.asterisk.org/r/4288/ ........ Merged revisions 429914 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/res/res_pjsip_phoneprov_provider.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/res/res_pjsip_phoneprov_provider.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_phoneprov_provider.c?view=diff&rev=429915&r1=429914&r2=429915 ============================================================================== --- trunk/res/res_pjsip_phoneprov_provider.c (original) +++ trunk/res/res_pjsip_phoneprov_provider.c Sun Dec 21 18:17:49 2014 @@ -285,15 +285,8 @@ return 0; } -/*! \brief Callback that loads the users from phoneprov sections */ -static int load_users(void) -{ - ast_sorcery_reload_object(sorcery, "phoneprov"); - return 0; -} - /*! \brief Callback that validates the phoneprov object */ -static int users_apply_handler(const struct ast_sorcery *sorcery, void *obj) +static int users_apply_handler(void *obj, void *arg, int flags) { struct phoneprov *pp = obj; const char *id = ast_sorcery_object_get_id(pp); @@ -303,19 +296,19 @@ if (!ast_var_find(pp->vars, ast_phoneprov_std_variable_lookup(AST_PHONEPROV_STD_MAC))) { ast_log(LOG_ERROR, "phoneprov %s must contain a MAC entry.\n", id); - return -1; + return 0; } if (!ast_var_find(pp->vars, ast_phoneprov_std_variable_lookup(AST_PHONEPROV_STD_PROFILE))) { ast_log(LOG_ERROR, "phoneprov %s must contain a PROFILE entry.\n", id); - return -1; + return 0; } endpoint_name = ast_var_find(pp->vars, "endpoint"); if (endpoint_name) { if (load_endpoint(id, endpoint_name, pp->vars, port_string)) { - return -1; + return 0; } } @@ -342,12 +335,30 @@ ast_log(LOG_ERROR, "phoneprov %s didn't contain a PROFILE entry.\n", id); } - if (!ast_phoneprov_add_extension(AST_MODULE, pp->vars)) { + ast_phoneprov_add_extension(AST_MODULE, pp->vars); + + return CMP_MATCH; +} + +/*! \brief Callback that loads the users from phoneprov sections */ +static int load_users(void) +{ + struct ao2_container *users; + + ast_sorcery_reload_object(sorcery, "phoneprov"); + + users = ast_sorcery_retrieve_by_fields(sorcery, "phoneprov", + AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL); + if (!users) { return 0; } - return -1; -} + ao2_callback(users, OBJ_MULTIPLE, users_apply_handler, sorcery); + ao2_ref(users, -1); + + return 0; +} + static int load_module(void) { @@ -360,12 +371,14 @@ "pjsip.conf,criteria=type=phoneprov"); ast_sorcery_object_register(sorcery, "phoneprov", phoneprov_alloc, NULL, - users_apply_handler); + NULL); ast_sorcery_object_field_register(sorcery, "phoneprov", "type", "", OPT_NOOP_T, 0, 0); ast_sorcery_object_fields_register(sorcery, "phoneprov", "^", aco_handler, fields_handler); + + ast_sorcery_load_object(sorcery, "phoneprov"); if (ast_phoneprov_provider_register(AST_MODULE, load_users)) { ast_log(LOG_ERROR, "Unable to register pjsip phoneprov provider.\n"); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
