From 86a4ce495783434f6d4fef5484b44147e4b3a7b7 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 16 Oct 2014 16:32:25 +0000 Subject: PJSIP: Enforce module load dependencies This enforces that res_pjsip, res_pjsip_session, and res_pjsip_pubsub have loaded properly before attempting to load any modules that depend on them since the module loader system is not currently capable of resolving module dependencies on its own. ASTERISK-24312 #close Reported by: Dafi Ni Review: https://reviewboard.asterisk.org/r/4062/ ........ Merged revisions 425690 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 425691 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@425700 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip_phoneprov_provider.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'res/res_pjsip_phoneprov_provider.c') diff --git a/res/res_pjsip_phoneprov_provider.c b/res/res_pjsip_phoneprov_provider.c index 6c2c77793..0480f0bbd 100644 --- a/res/res_pjsip_phoneprov_provider.c +++ b/res/res_pjsip_phoneprov_provider.c @@ -370,6 +370,8 @@ static int users_apply_handler(const struct ast_sorcery *sorcery, void *obj) static int load_module(void) { + CHECK_PJSIP_MODULE_LOADED(); + if (!(sorcery = ast_sorcery_open())) { ast_log(LOG_ERROR, "Unable to open a sorcery instance.\n"); return AST_MODULE_LOAD_DECLINE; -- cgit v1.2.3