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_refer.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_refer.c')
| -rw-r--r-- | res/res_pjsip_refer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_pjsip_refer.c b/res/res_pjsip_refer.c index ff8ceac9e..f64f77dfa 100644 --- a/res/res_pjsip_refer.c +++ b/res/res_pjsip_refer.c @@ -20,7 +20,6 @@ <depend>pjproject</depend> <depend>res_pjsip</depend> <depend>res_pjsip_session</depend> - <depend>res_pjsip_pubsub</depend> <support_level>core</support_level> ***/ @@ -985,6 +984,8 @@ static int load_module(void) { const pj_str_t str_norefersub = { "norefersub", 10 }; + CHECK_PJSIP_SESSION_MODULE_LOADED(); + pjsip_replaces_init_module(ast_sip_get_pjsip_endpoint()); pjsip_xfer_init_module(ast_sip_get_pjsip_endpoint()); pjsip_endpt_add_capability(ast_sip_get_pjsip_endpoint(), NULL, PJSIP_H_SUPPORTED, NULL, 1, &str_norefersub); |