From 289830cdc60bfe9da197810ef71f5116f56c8020 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 16 Oct 2014 14:35:00 +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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@425691 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip_transport_websocket.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'res/res_pjsip_transport_websocket.c') diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c index 7de65dd85..1db36bb5a 100644 --- a/res/res_pjsip_transport_websocket.c +++ b/res/res_pjsip_transport_websocket.c @@ -361,6 +361,8 @@ static struct ast_sip_session_supplement websocket_supplement = { static int load_module(void) { + CHECK_PJSIP_MODULE_LOADED(); + pjsip_transport_register_type(PJSIP_TRANSPORT_RELIABLE, "WS", 5060, &transport_type_ws); pjsip_transport_register_type(PJSIP_TRANSPORT_RELIABLE, "WSS", 5060, &transport_type_wss); -- cgit v1.2.3