diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-10-16 16:32:25 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-10-16 16:32:25 +0000 |
| commit | 86a4ce495783434f6d4fef5484b44147e4b3a7b7 (patch) | |
| tree | d2841fad45e99da1ede5aaad23646a3462c62692 /res/res_pjsip_pubsub.c | |
| parent | a770ca168df5052c873a2ca298aafe8bb88277a2 (diff) | |
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
Diffstat (limited to 'res/res_pjsip_pubsub.c')
| -rw-r--r-- | res/res_pjsip_pubsub.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 0d9e25a9d..4a1076d18 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -4168,7 +4168,11 @@ static int resource_event_handler(const struct aco_option *opt, struct ast_varia static int load_module(void) { static const pj_str_t str_PUBLISH = { "PUBLISH", 7 }; - struct ast_sorcery *sorcery = ast_sip_get_sorcery(); + struct ast_sorcery *sorcery; + + CHECK_PJSIP_MODULE_LOADED(); + + sorcery = ast_sip_get_sorcery(); pjsip_evsub_init_module(ast_sip_get_pjsip_endpoint()); |