[sr-dev] git:master: modules/websocket: Added check to stop Kamailio starting if WebSocket is loaded without xhttp

[Peter Dunkley]

Module: sip-router
Branch: master
Commit: 116ba23c60be15f5fdc1e0cf0f9a9a7affdd32b3
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=116ba23c60be15f5fdc1e0cf0f9a9a7affdd32b3

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Sun May 12 14:09:28 2013 +0100

modules/websocket: Added check to stop Kamailio starting if WebSocket is loaded without xhttp

---

 modules/websocket/ws_mod.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c
index c6331f7..ea1e23a 100644
--- a/modules/websocket/ws_mod.c
+++ b/modules/websocket/ws_mod.c
@@ -272,6 +272,12 @@ static int mod_init(void)
 	}
 	cfg_get(websocket, ws_cfg, keepalive_timeout) = ws_keepalive_timeout;
 
+	if (!module_loaded("xhttp"))
+	{
+		LM_ERR("\"xhttp\" must be loaded to use WebSocket.\n");
+		return -1;
+	}
+
 	if (!module_loaded("nathelper") && !module_loaded("outbound"))
 	{
 		LM_WARN("neither \"nathelper\" nor \"outbound\" modules are"