From: Mark Michelson Date: Tue, 17 Sep 2013 16:09:46 +0000 (+0000) Subject: Switch transferdigittimeout to be configured as seconds instead of milliseconds. X-Git-Tag: 12.0.0-alpha2~24^2~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edb351ebf60334daa2656b5aee223b33fbe994e4;p=thirdparty%2Fasterisk.git 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@399237 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/features_config.h b/include/asterisk/features_config.h index 0834969516..593d228ffe 100644 --- 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 aaa77caea5..7cac8d7334 100644 --- 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 68b7dde088..c3f3191a2f 100644 --- a/main/features_config.c +++ b/main/features_config.c @@ -42,8 +42,8 @@ Sound to play when automon or automixmon is attempted but fails to start - - Milliseconds allowed between digit presses when dialing a transfer destination + + Seconds allowed between digit presses when dialing a transfer destination Milliseconds to wait for attended transfer destination to answer