[asterisk-commits] dlee: branch dlee/stasis-res r384969 - in /team/dlee/stasis-res: ./ res/

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Apr  8 11:28:19 2013
New Revision: 384969

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384969
Log:
Merged revisions 384942-384966 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/dlee/stasis-res/   (props changed)
    team/dlee/stasis-res/res/res_http_websocket.c
    team/dlee/stasis-res/res/res_stasis_websocket.c

Propchange: team/dlee/stasis-res/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr  8 11:28:19 2013
@@ -1,1 +1,1 @@
-/trunk:1-384911
+/trunk:1-384966

Modified: team/dlee/stasis-res/res/res_http_websocket.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/res/res_http_websocket.c?view=diff&rev=384969&r1=384968&r2=384969
==============================================================================
--- team/dlee/stasis-res/res/res_http_websocket.c (original)
+++ team/dlee/stasis-res/res/res_http_websocket.c Mon Apr  8 11:28:19 2013
@@ -122,6 +122,10 @@
 {
 	struct websocket_protocol *protocol;
 
+	if (!protocols) {
+		return -1;
+	}
+
 	ao2_lock(protocols);
 
 	/* Ensure a second protocol handler is not registered for the same protocol */
@@ -156,6 +160,10 @@
 int AST_OPTIONAL_API_NAME(ast_websocket_remove_protocol)(const char *name, ast_websocket_callback callback)
 {
 	struct websocket_protocol *protocol;
+
+	if (!protocols) {
+		return -1;
+	}
 
 	if (!(protocol = ao2_find(protocols, name, OBJ_KEY))) {
 		return -1;
@@ -670,6 +678,7 @@
 	ast_websocket_remove_protocol("echo", websocket_echo_callback);
 	ast_http_uri_unlink(&websocketuri);
 	ao2_ref(protocols, -1);
+	protocols = NULL;
 
 	return 0;
 }

Modified: team/dlee/stasis-res/res/res_stasis_websocket.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/res/res_stasis_websocket.c?view=diff&rev=384969&r1=384968&r2=384969
==============================================================================
--- team/dlee/stasis-res/res/res_stasis_websocket.c (original)
+++ team/dlee/stasis-res/res/res_stasis_websocket.c Mon Apr  8 11:28:19 2013
@@ -305,7 +305,7 @@
 		/* ironic */
 		return AST_MODULE_LOAD_FAILURE;
 	}
-        r |= ast_websocket_add_protocol(ws_protocol, websocket_callback);
+	r |= ast_websocket_add_protocol(ws_protocol, websocket_callback);
 	return r;
 }
 
@@ -315,7 +315,7 @@
 
 	ast_json_unref(oom_json);
 	oom_json = NULL;
-        r |= ast_websocket_remove_protocol(ws_protocol, websocket_callback);
+	r |= ast_websocket_remove_protocol(ws_protocol, websocket_callback);
 	return r;
 }
 
@@ -323,4 +323,5 @@
                 .load = load_module,
                 .unload = unload_module,
                 .nonoptreq = "res_stasis,res_http_websocket"
+                .load_pri = AST_MODPRI_APP_DEPEND,
         );