When specifying an invalid timeout to Dial, take it

to mean that no timeout is desired.

(closes issue #13625)
Reported by: atis

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

diff --git a/CHANGES b/CHANGES
index ee8c65a935dad7dcc1b3d82f1ba679101a044816..be399c6cd7765ff5b66d3862b631fa50eac99d2b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -145,6 +145,8 @@ Application Changes
    'UNSUPPORTED'.  This change makes SendImage() more consistent with other
    applications.
  * Park has a new option, 's', which silences the announcement of the parking space number.
+ * A non-numeric, zero, or negative timeout specified to Dial() will now be interpreted as
+   invalid input and will be assumed to mean that no timeout is desired.
 
 SIP Changes
 -----------

diff --git a/apps/app_dial.c b/apps/app_dial.c
index b26f9ddd2622c4037c8088471b1c9fe58e7466c2..bf995d8982e4686390988517efe3056f7be433f2 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1589,8 +1589,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                to = atoi(args.timeout);
                if (to > 0)
                        to *= 1000;
-               else
-                       ast_log(LOG_WARNING, "Invalid timeout specified: '%s'\n", args.timeout);
+               else {
+                       ast_log(LOG_WARNING, "Invalid timeout specified: '%s'. Setting timeout to infinite\n", args.timeout);
+                       to = -1;
+               }
        }
 
        if (!outgoing) {