diff options
author | Kinsey Moore <kmoore@digium.com> | 2014-10-16 14:35:00 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2014-10-16 14:35:00 +0000 |
commit | 289830cdc60bfe9da197810ef71f5116f56c8020 (patch) | |
tree | 09d52379eb77033bd0924091a6d4a3a46d7cdf71 /res/res_pjsip_exten_state.c | |
parent | 50e802445cfcd17eb58a442524a736db3e7f88ed (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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@425691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_exten_state.c')
-rw-r--r-- | res/res_pjsip_exten_state.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_pjsip_exten_state.c b/res/res_pjsip_exten_state.c index 4cc5a5881..6b8ee6c12 100644 --- a/res/res_pjsip_exten_state.c +++ b/res/res_pjsip_exten_state.c @@ -465,6 +465,8 @@ static void to_ami(struct ast_sip_subscription *sub, static int load_module(void) { + CHECK_PJSIP_MODULE_LOADED(); + if (ast_sip_register_subscription_handler(&presence_handler)) { ast_log(LOG_WARNING, "Unable to register subscription handler %s\n", presence_handler.event_name); |