[asterisk-commits] jrose: branch 12 r405350 - /branches/12/res/res_pjsip_session.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Jan 13 11:09:11 2014
New Revision: 405350

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405350
Log:
PJSIP: Backport r405270 - Unhold on reinvite without SDP

Adds behavior to unhold on a reinvite without an SDP section
Review: https://reviewboard.asterisk.org/r/3106/

Modified:
    branches/12/res/res_pjsip_session.c

Modified: branches/12/res/res_pjsip_session.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip_session.c?view=diff&rev=405350&r1=405349&r2=405350
==============================================================================
--- branches/12/res/res_pjsip_session.c (original)
+++ branches/12/res/res_pjsip_session.c Mon Jan 13 11:09:11 2014
@@ -895,9 +895,16 @@
 	}
 
 	if (!(sdp_info = pjsip_rdata_get_sdp_info(rdata)) ||
-		(sdp_info->sdp_err != PJ_SUCCESS) ||
-		!sdp_info->sdp ||
-		!sdp_requires_deferral(session, sdp_info->sdp)) {
+		(sdp_info->sdp_err != PJ_SUCCESS)) {
+		return PJ_FALSE;
+	}
+
+	if (!sdp_info->sdp) {
+		ast_queue_unhold(session->channel);
+		return PJ_FALSE;
+	}
+
+	if (!sdp_requires_deferral(session, sdp_info->sdp)) {
 		return PJ_FALSE;
 	}