From: Jonathan Rose <jrose@digium.com>
Date: Mon, 13 Jan 2014 17:09:11 +0000 (+0000)
Subject: PJSIP: Backport r405270 - Unhold on reinvite without SDP
X-Git-Tag: 12.1.0-rc1~3^2~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=005591423c64b16fc5048da24cad29bd9618169f;p=thirdparty%2Fasterisk.git

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/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@405350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index d548d29b8d..a00299ebb3 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -895,9 +895,16 @@ static pj_bool_t session_reinvite_on_rx_request(pjsip_rx_data *rdata)
 	}
 
 	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;
 	}