[asterisk-commits] qwell: branch qwell/fun_with_transports r387511 - /team/qwell/fun_with_transp...

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu May  2 14:55:09 2013
New Revision: 387511

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387511
Log:
Remove dead code.  Fix module deps.

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

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=387511&r1=387510&r2=387511
==============================================================================
--- team/qwell/fun_with_transports/res/res_sip_transport_websocket.c (original)
+++ team/qwell/fun_with_transports/res/res_sip_transport_websocket.c Thu May  2 14:55:09 2013
@@ -18,7 +18,8 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
-	<use type="module">res_http_websocket</use>
+	<depend>res_sip</depend>
+	<depend>res_http_websocket</depend>
 	<support_level>core</support_level>
  ***/
 
@@ -231,27 +232,6 @@
 	ast_websocket_unref(session);
 }
 
-#if 0
-/* XXX Probably not needed. */
-static int websocket_incoming_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
-{
-	int type = rdata->tp_info.transport->key.type;
-
-	if (type != transport_type_ws && type != transport_type_wss) {
-		return 0;
-	}
-
-	/* This is one of our transports.  We need to force it to use us on the dialog. */
-	pjsip_tpselector selector = { .type = PJSIP_TPSELECTOR_TRANSPORT, };
-
-	selector.u.transport = rdata->tp_info.transport;
-
-	pjsip_dlg_set_transport(session->inv_session->dlg, &selector);
-
-	return 0;
-}
-#endif
-
 static void websocket_outgoing_request(struct ast_sip_session *session, struct pjsip_tx_data *tdata)
 {
 	char contact_uri[PJSIP_MAX_URL_SIZE] = { 0, };
@@ -286,7 +266,7 @@
 	if (type != transport_type_ws && type != transport_type_wss) {
 		return 0;
 	}
-	
+
 	if ((contact_hdr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, NULL))) {
 		RAII_VAR(struct ast_sip_contact_transport *, ct, NULL, ao2_cleanup);
 		char contact_uri[PJSIP_MAX_URL_SIZE];