From 375c2f5a5c688bdd9e38626fc2f3cd9906339db9 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 17 Sep 2013 17:10:51 +0000
Subject: Fix other timeouts (atxferloopdelay and atxfernoanswertimeout) to use
 seconds instead of milliseconds.

Thanks to Richard Mudgett for pointing this out.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/features_config.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'main/features_config.c')

diff --git a/main/features_config.c b/main/features_config.c
index c3f3191a2..d9a304302 100644
--- a/main/features_config.c
+++ b/main/features_config.c
@@ -45,8 +45,8 @@
 				<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>
+				<configOption name="atxfernoanswertimeout" default="15">
+					<synopsis>Seconds to wait for attended transfer destination to answer</synopsis>
 				</configOption>
 				<configOption name="atxferdropcall" default="no">
 					<synopsis>Hang up the call entirely if the attended transfer fails</synopsis>
@@ -62,8 +62,8 @@
 						hang up all channels involved in the transfer.</para>
 					</description>
 				</configOption>
-				<configOption name="atxferloopdelay" default="10000">
-					<synopsis>Milliseconds to wait between attempts to re-dial transfer destination</synopsis>
+				<configOption name="atxferloopdelay" default="10">
+					<synopsis>Seconds to wait between attempts to re-dial transfer destination</synopsis>
 					<see-also><ref type="configOption">atxferdropcall</ref></see-also>
 				</configOption>
 				<configOption name="atxfercallbackretries" default="2">
@@ -355,10 +355,10 @@
 #define DEFAULT_RECORDING_FAIL_SOUND                ""
 
 /*! Default xfer options */
-#define DEFAULT_TRANSFER_DIGIT_TIMEOUT              3000
-#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER  15000
+#define DEFAULT_TRANSFER_DIGIT_TIMEOUT              3
+#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER  15
 #define DEFAULT_ATXFER_DROP_CALL                    0
-#define DEFAULT_ATXFER_LOOP_DELAY                   10000
+#define DEFAULT_ATXFER_LOOP_DELAY                   10
 #define DEFAULT_ATXFER_CALLBACK_RETRIES             2
 #define DEFAULT_XFERSOUND                           "beep"
 #define DEFAULT_XFERFAILSOUND                       "beeperr"
-- 
cgit v1.2.3