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

Merged revisions 303548 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r303548 | russell | 2011-01-24 14:49:53 -0600 (Mon, 24 Jan 2011) | 38 lines
  
  Merged revisions 303546 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r303546 | russell | 2011-01-24 14:32:21 -0600 (Mon, 24 Jan 2011) | 31 lines
    
    Fix channel redirect out of MeetMe() and other issues with channel softhangup.
    
    Mantis issue #18585 reports that a channel redirect out of MeetMe() stopped
    working properly.  This issue includes a patch that resolves the issue by
    removing a call to ast_check_hangup() from app_meetme.c.  I left that in my
    patch, as it doesn't need to be there.  However, the rest of the patch fixes
    this problem with or without the change to app_meetme.
    
    The key difference between what happens before and after this patch is the
    effect of the END_OF_Q control frame.  After END_OF_Q is hit in ast_read(),
    ast_read() will return NULL.  With the ast_check_hangup() removed, app_meetme
    sees this which causes it to exit as intended.  Checking ast_check_hangup()
    caused app_meetme to exit earlier in the process, and the target of the
    redirect saw the condition where ast_read() returned NULL.
    
    Removing ast_check_hangup() works around the issue in app_meetme, but doesn't
    solve the issue if another application did the same thing.  There are also
    other edge cases where if an application finishes at the same time that a
    redirect happens, the target of the redirect will think that the channel hung
    up.  So, I made some changes in pbx.c to resolve it at a deeper level.  There
    are already places that unset the SOFTHANGUP_ASYNCGOTO flag in an attempt to
    abort the hangup process.  My patch extends this to remove the END_OF_Q frame
    from the channel's read queue, making the "abort hangup" more complete.  This
    same technique was used in every place where a softhangup flag was cleared.
    
    (closes issue #18585)
    Reported by: oej
    Tested by: oej, wedhorn, russell
    
    Review: https://reviewboard.asterisk.org/r/1082/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@303549 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2011-01-24 20:51:37 +00:00
parent 8bd0213ea3
commit cfc893a5bc
5 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
main/channel.c
View File

@@ -2599,6 +2599,31 @@ void ast_poll_channel_del(struct ast_channel *chan0, struct ast_channel *chan1)
return;
}
void ast_channel_clear_softhangup(struct ast_channel *chan, int flag)
{
ast_channel_lock(chan);
chan->_softhangup &= ~flag;
if (!chan->_softhangup) {
struct ast_frame *fr;
/* If we have completely cleared the softhangup flag,
* then we need to fully abort the hangup process. This requires
* pulling the END_OF_Q frame out of the channel frame queue if it
* still happens to be there. */
fr = AST_LIST_LAST(&chan->readq);
if (fr && fr->frametype == AST_FRAME_CONTROL &&
fr->subclass.integer == AST_CONTROL_END_OF_Q) {
AST_LIST_REMOVE(&chan->readq, fr, frame_list);
ast_frfree(fr);
}
}
ast_channel_unlock(chan);
}
/*! \brief Softly hangup a channel, don't lock */
int ast_softhangup_nolock(struct ast_channel *chan, int cause)
{
@@ -6806,10 +6831,10 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
ast_jb_get_and_deliver(c0, c1);
if ((c0->_softhangup | c1->_softhangup) & AST_SOFTHANGUP_UNBRIDGE) {/* Bit operators are intentional. */
if (c0->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
c0->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
ast_channel_clear_softhangup(c0, AST_SOFTHANGUP_UNBRIDGE);
}
if (c1->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
c1->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
ast_channel_clear_softhangup(c1, AST_SOFTHANGUP_UNBRIDGE);
}
c0->_bridge = c1;
c1->_bridge = c0;
@@ -7150,10 +7175,10 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
if ((c0->_softhangup | c1->_softhangup) & AST_SOFTHANGUP_UNBRIDGE) {/* Bit operators are intentional. */
if (c0->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
c0->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
ast_channel_clear_softhangup(c0, AST_SOFTHANGUP_UNBRIDGE);
}
if (c1->_softhangup & AST_SOFTHANGUP_UNBRIDGE) {
c1->_softhangup &= ~AST_SOFTHANGUP_UNBRIDGE;
ast_channel_clear_softhangup(c1, AST_SOFTHANGUP_UNBRIDGE);
}
c0->_bridge = c1;
c1->_bridge = c0;