summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2014-01-09 23:52:09 +0000
committerJonathan Rose <jrose@digium.com>2014-01-09 23:52:09 +0000
commit42b087c2dfe8f50746a44a91e5cb382ccf4342a6 (patch)
tree98402f5173d4837135d3b4e1cb0a2b4bf9dcf8ce /res
parentde6563c618e2b50631619d79adcc8ab1ee262e64 (diff)
PJSIP: Add unhold on reinvite without SDP behavior
Review: https://reviewboard.asterisk.org/r/3106/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_pjsip_session.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index d548d29b8..a00299ebb 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;
}