[asterisk-commits] mnicholson: branch 1.4 r223225 - /branches/1.4/main/channel.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Oct  9 13:20:11 2009
New Revision: 223225

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=223225
Log:
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.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=223225&r1=223224&r2=223225
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Fri Oct  9 13:20:11 2009
@@ -3286,7 +3286,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;