Switch transferdigittimeout to be configured as seconds instead of milliseconds.

This was an unintentional consequence of the update of features.conf to use the
config framework in Asterisk 12. Thanks to Marco Signorini on the Asterisk
developers list for pointing out the problem.
........

Merged revisions 399237 from http://svn.asterisk.org/svn/asterisk/branches/12

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

diff --git a/include/asterisk/features_config.h b/include/asterisk/features_config.h
index 0834969..593d228 100644 (file)
--- a/include/asterisk/features_config.h
+++ b/include/asterisk/features_config.h
@@ -69,7 +69,7 @@ struct ast_features_xfer_config {
                /*! DTMF sequence used to swap which party the transferer is talking to */
                AST_STRING_FIELD(atxferswap);
        );
-       /*! Milliseconds allowed between digit presses when dialing transfer destination */
+       /*! Seconds allowed between digit presses when dialing transfer destination */
        unsigned int transferdigittimeout;
        /*! Milliseconds to wait for the transfer target to answer a transferred call */
        unsigned int atxfernoanswertimeout;

diff --git a/main/bridge_basic.c b/main/bridge_basic.c
index aaa77ca..7cac8d7 100644 (file)
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@ -2866,7 +2866,7 @@ static int grab_transfer(struct ast_channel *chan, char *exten, size_t exten_len
                ast_channel_unlock(chan);
                return -1;
        }
-       digit_timeout = xfer_cfg->transferdigittimeout;
+       digit_timeout = xfer_cfg->transferdigittimeout * 1000;
        ast_channel_unlock(chan);
 
        /* Play the simple "transfer" prompt out and wait */

diff --git a/main/features_config.c b/main/features_config.c
index 68b7dde..c3f3191 100644 (file)
--- a/main/features_config.c
+++ b/main/features_config.c
@@ -42,8 +42,8 @@
                                <configOption name="recordingfailsound">
                                        <synopsis>Sound to play when automon or automixmon is attempted but fails to start</synopsis>
                                </configOption>
-                               <configOption name="transferdigittimeout" default="3000">
-                                       <synopsis>Milliseconds allowed between digit presses when dialing a transfer destination</synopsis>
+                               <configOption name="transferdigittimeout" default="3">
+                                       <synopsis>Seconds allowed between digit presses when dialing a transfer destination</synopsis>
                                </configOption>
                                <configOption name="atxfernoanswertimeout" default="15000">
                                        <synopsis>Milliseconds to wait for attended transfer destination to answer</synopsis>