[asterisk-commits] jrose: trunk r405270 - /trunk/res/res_pjsip_session.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Jan  9 17:52:09 2014
New Revision: 405270

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405270
Log:
PJSIP: Add unhold on reinvite without SDP behavior

Review: https://reviewboard.asterisk.org/r/3106/

Modified:
    trunk/res/res_pjsip_session.c

Modified: trunk/res/res_pjsip_session.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_session.c?view=diff&rev=405270&r1=405269&r2=405270
==============================================================================
--- trunk/res/res_pjsip_session.c (original)
+++ trunk/res/res_pjsip_session.c Thu Jan  9 17:52:09 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;
 	}