[asterisk-commits] mmichelson: branch 12 r399237 - in /branches/12: include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep 17 11:09:46 2013
New Revision: 399237

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


Modified:
    branches/12/include/asterisk/features_config.h
    branches/12/main/bridge_basic.c
    branches/12/main/features_config.c

Modified: branches/12/include/asterisk/features_config.h
URL: http://svnview.digium.com/svn/asterisk/branches/12/include/asterisk/features_config.h?view=diff&rev=399237&r1=399236&r2=399237
==============================================================================
--- branches/12/include/asterisk/features_config.h (original)
+++ branches/12/include/asterisk/features_config.h Tue Sep 17 11:09:46 2013
@@ -69,7 +69,7 @@
 		/*! 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;

Modified: branches/12/main/bridge_basic.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/bridge_basic.c?view=diff&rev=399237&r1=399236&r2=399237
==============================================================================
--- branches/12/main/bridge_basic.c (original)
+++ branches/12/main/bridge_basic.c Tue Sep 17 11:09:46 2013
@@ -2866,7 +2866,7 @@
 		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 */

Modified: branches/12/main/features_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/features_config.c?view=diff&rev=399237&r1=399236&r2=399237
==============================================================================
--- branches/12/main/features_config.c (original)
+++ branches/12/main/features_config.c Tue Sep 17 11:09:46 2013
@@ -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>