kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure overlapping hold flags do not conflict

Browse Source 
When changing between different modes of hold, the flags were not being
cleared out properly causing a failure to change hold states.

(closes issue ASTERISK-19919)
Patch-by: Morten Tryfoss
Reported-by: Morten Tryfoss


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@368586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2012-06-06 16:07:02 +00:00
parent eae448bc55
commit b563128877
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
channels/chan_sip.c
View File

@@ -8675,6 +8675,9 @@ static void change_hold_state(struct sip_pvt *dialog, struct sip_request *req, i
} }
/* No address for RTP, we're on hold */ /* No address for RTP, we're on hold */
/* Ensure hold flags are cleared so that overlapping flags do not conflict */
ast_clear_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD);
if (sendonly == 1) /* One directional hold (sendonly/recvonly) */ if (sendonly == 1) /* One directional hold (sendonly/recvonly) */
ast_set_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD_ONEDIR); ast_set_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD_ONEDIR);
else if (sendonly == 2) /* Inactive stream */ else if (sendonly == 2) /* Inactive stream */