[asterisk-commits] mmichelson: trunk r399248 - in /trunk: ./ main/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep 17 12:10:51 2013
New Revision: 399248

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

Modified:
    trunk/   (props changed)
    trunk/main/bridge_basic.c
    trunk/main/features_config.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Sep 17 12:10:51 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160,399197,399207,399225,399237
+/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160,399197,399207,399225,399237,399247

Modified: trunk/main/bridge_basic.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge_basic.c?view=diff&rev=399248&r1=399247&r2=399248
==============================================================================
--- trunk/main/bridge_basic.c (original)
+++ trunk/main/bridge_basic.c Tue Sep 17 12:10:51 2013
@@ -2721,7 +2721,7 @@
 		if (!(state_properties[props->state].flags & TRANSFER_STATE_FLAG_TIMED)) {
 			ast_cond_wait(&props->cond, lock);
 		} else {
-			struct timeval relative_timeout;
+			struct timeval relative_timeout = { 0, };
 			struct timeval absolute_timeout;
 			struct timespec timeout_arg;
 
@@ -2730,10 +2730,10 @@
 			}
 
 			if (state_properties[props->state].flags & TRANSFER_STATE_FLAG_TIMER_LOOP_DELAY) {
-				relative_timeout = ast_samp2tv(props->atxferloopdelay, 1000);
+				relative_timeout.tv_sec = props->atxferloopdelay;
 			} else {
 				/* Implied TRANSFER_STATE_FLAG_TIMER_ATXFER_NO_ANSWER */
-				relative_timeout = ast_samp2tv(props->atxfernoanswertimeout, 1000);
+				relative_timeout.tv_sec = props->atxfernoanswertimeout;
 			}
 
 			absolute_timeout = ast_tvadd(props->start, relative_timeout);

Modified: trunk/main/features_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features_config.c?view=diff&rev=399248&r1=399247&r2=399248
==============================================================================
--- trunk/main/features_config.c (original)
+++ trunk/main/features_config.c Tue Sep 17 12:10:51 2013
@@ -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"