[asterisk-commits] file: branch file/pimp_sip_media r380918 - /team/file/pimp_sip_media/res/

[SVN commits to the Asterisk project]

Author: file
Date: Tue Feb  5 16:17:00 2013
New Revision: 380918

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380918
Log:
Tweak logic so channel is hung up when retrieving the remote SDP fails and also remove a callback that will not be implemented.

Modified:
    team/file/pimp_sip_media/res/res_sip_session.c

Modified: team/file/pimp_sip_media/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pimp_sip_media/res/res_sip_session.c?view=diff&rev=380918&r1=380917&r2=380918
==============================================================================
--- team/file/pimp_sip_media/res/res_sip_session.c (original)
+++ team/file/pimp_sip_media/res/res_sip_session.c Tue Feb  5 16:17:00 2013
@@ -1128,19 +1128,12 @@
 	}
 }
 
-#if 0
-static void session_inv_on_create_offer(pjsip_inv_session *inv, pjmedia_sdp_session **p_offer)
-{
-	/* XXX STUB */
-}
-#endif
-
 static void session_inv_on_media_update(pjsip_inv_session *inv, pj_status_t status)
 {
 	struct ast_sip_session *session = inv->mod_data[session_module.id];
 	const pjmedia_sdp_session *remote;
 
-	if (status != PJ_SUCCESS) {
+	if ((status != PJ_SUCCESS) || (pjmedia_sdp_neg_get_active_remote(inv->neg, &remote) != PJ_SUCCESS)) {
 		if (session->channel) {
 			ast_channel_hangupcause_set(session->channel, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
 			ast_queue_hangup(session->channel);
@@ -1148,9 +1141,7 @@
 		return;
 	}
 
-	if (pjmedia_sdp_neg_get_active_remote(inv->neg, &remote) == PJ_SUCCESS) {
-		handle_negotiated_sdp(session, remote);
-	}
+	handle_negotiated_sdp(session, remote);
 }
 
 static pjsip_redirect_op session_inv_on_redirected(pjsip_inv_session *inv, const pjsip_uri *target, const pjsip_event *e)
@@ -1164,7 +1155,6 @@
 	.on_new_session = session_inv_on_new_session,
 	.on_tsx_state_changed = session_inv_on_tsx_state_changed,
 	.on_rx_offer = session_inv_on_rx_offer,
-//	.on_create_offer = session_inv_on_create_offer,
 	.on_media_update = session_inv_on_media_update,
 	.on_redirected = session_inv_on_redirected,
 };