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 /channels/chan_pjsip.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 'channels/chan_pjsip.c')
| -rw-r--r-- | channels/chan_pjsip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index ea55df799..f200a05d3 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -2214,6 +2214,8 @@ static int load_module(void) { struct ao2_container *endpoints; + CHECK_PJSIP_SESSION_MODULE_LOADED(); + if (!(chan_pjsip_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { return AST_MODULE_LOAD_DECLINE; } |