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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@223225 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 48ec63bf67d01f6648264c7d80f7caf69c14af5d..17f99ed38302a1be65ae9aada4d3ed2799fd1182 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3286,7 +3286,11 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d
                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;