[asterisk-commits] mnicholson: branch 1.6.1 r223277 - in /branches/1.6.1: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Oct  9 13:36:37 2009
New Revision: 223277

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=223277
Log:
Merged revisions 223273 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r223273 | mnicholson | 2009-10-09 13:34:08 -0500 (Fri, 09 Oct 2009) | 14 lines
  
  Merged revisions 223225 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r223225 | mnicholson | 2009-10-09 13:20:11 -0500 (Fri, 09 Oct 2009) | 8 lines
    
    Signal timeouts by returning AST_CONTROL_RINGING when originating calls.
    (closes issue #15104)
    Reported by: nblasgen
    Patches:
          manager-timeout1.diff uploaded by mnicholson (license 96)
    Tested by: nblasgen, mnicholson
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/channel.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=223277&r1=223276&r2=223277
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Fri Oct  9 13:36:37 2009
@@ -3811,7 +3811,11 @@
 		while (timeout && chan->_state != AST_STATE_UP) {
 			struct ast_frame *f;
 			res = ast_waitfor(chan, timeout);
-			if (res <= 0) /* error, timeout, or done */
+			if (res == 0) { /* timeout, treat it like ringing */
+				*outstate = AST_CONTROL_RINGING;
+				break;
+			}
+			if (res < 0) /* error or done */
 				break;
 			if (timeout > -1)
 				timeout = res;