[asterisk-commits] qwell: branch qwell/fun_with_transports r388692 - in /team/qwell/fun_with_tra...

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue May 14 11:47:03 2013
New Revision: 388692

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388692
Log:
final comments.

Modified:
    team/qwell/fun_with_transports/res/res_sip/location.c
    team/qwell/fun_with_transports/res/res_sip_transport_websocket.c

Modified: team/qwell/fun_with_transports/res/res_sip/location.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/fun_with_transports/res/res_sip/location.c?view=diff&rev=388692&r1=388691&r2=388692
==============================================================================
--- team/qwell/fun_with_transports/res/res_sip/location.c (original)
+++ team/qwell/fun_with_transports/res/res_sip/location.c Tue May 14 11:47:03 2013
@@ -310,7 +310,7 @@
 int ast_res_sip_init_contact_transports(void)
 {
 	if (contact_transports) {
-		ao2_t_ref(contact_transports, -1, "Remove old scheduled qualifies");
+		ao2_t_ref(contact_transports, -1, "Remove old contact transports");
 	}
 
 	contact_transports = ao2_t_container_alloc_options(AO2_ALLOC_OPT_LOCK_RWLOCK, CONTACT_TRANSPORTS_BUCKETS, NULL, NULL, "Create container for contact transports");

Modified: team/qwell/fun_with_transports/res/res_sip_transport_websocket.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/fun_with_transports/res/res_sip_transport_websocket.c?view=diff&rev=388692&r1=388691&r2=388692
==============================================================================
--- team/qwell/fun_with_transports/res/res_sip_transport_websocket.c (original)
+++ team/qwell/fun_with_transports/res/res_sip_transport_websocket.c Tue May 14 11:47:03 2013
@@ -372,8 +372,11 @@
 	pjsip_transport_register_type(PJSIP_TRANSPORT_RELIABLE, "WS", 5060, &transport_type_ws);
 	pjsip_transport_register_type(PJSIP_TRANSPORT_RELIABLE, "WSS", 5060, &transport_type_wss);
 
+	if (ast_sip_register_service(&websocket_module) != PJ_SUCCESS) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
 	ast_sip_session_register_supplement(&websocket_supplement);
-	ast_sip_register_service(&websocket_module);
 
 	ast_websocket_add_protocol("sip", websocket_cb);