[svn-commits] twilson: branch 1.8 r306674 - in /branches/1.8: ./ main/features.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon Feb  7 16:43:22 2011
New Revision: 306674

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306674
Log:
Merged revisions 306673 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r306673 | twilson | 2011-02-07 14:40:20 -0800 (Mon, 07 Feb 2011) | 17 lines
  
  Merged revisions 306672 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r306672 | twilson | 2011-02-07 14:35:20 -0800 (Mon, 07 Feb 2011) | 10 lines
    
    Don't try to pickup a call in the middle of a masquerade
    
    If A calls B which doesn't answer and C & D both try to do a call pickup, it is
    possible for ast_pickup_call to answer the call, then fail to masquerade one of
    the calls because the other one is already in the process of masquerading. This
    patch checks to see if the channel is in the process of masquerading before
    call before selecting it for a pickup.
    
    Review: https://reviewboard.asterisk.org/r/1094/
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/features.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/features.c?view=diff&rev=306674&r1=306673&r2=306674
==============================================================================
--- branches/1.8/main/features.c (original)
+++ branches/1.8/main/features.c Mon Feb  7 16:43:22 2011
@@ -5570,7 +5570,8 @@
 		   change while we're here, but that isn't a problem. */
 		(c != chan) &&
 		(chan->pickupgroup & c->callgroup) &&
-		((chan->_state == AST_STATE_RINGING) || (chan->_state == AST_STATE_RING));
+		((chan->_state == AST_STATE_RINGING) || (chan->_state == AST_STATE_RING)) &&
+		!c->masq;
 
 	return i ? CMP_MATCH | CMP_STOP : 0;
 }