diff options
author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-03 23:02:13 +0000 |
---|---|---|
committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-03 23:02:13 +0000 |
commit | ef87b06b4d3315fb8fd3a7f35a88aabca2d61ef1 (patch) | |
tree | d91ca7c6a2742bc6e56cbbbb9f3a397b4373b74f | |
parent | 97e30d337740b4e1d9bd957170368f95d6296ca6 (diff) |
Use correct variable for atxfercallbackretries config option.
* Misc formatting changes.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@300165 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/features.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/main/features.c b/main/features.c index 6ac5147f8..fc9ef5593 100644 --- a/main/features.c +++ b/main/features.c @@ -160,14 +160,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </application> ***/ -#define DEFAULT_PARK_TIME 45000 -#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000 -#define DEFAULT_FEATURE_DIGIT_TIMEOUT 1000 -#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000 -#define DEFAULT_PARKINGLOT "default" /*!< Default parking lot */ -#define DEFAULT_ATXFER_DROP_CALL 0 -#define DEFAULT_ATXFER_LOOP_DELAY 10000 -#define DEFAULT_ATXFER_CALLBACK_RETRIES 2 +#define DEFAULT_PARK_TIME 45000 /*!< ms */ +#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000 /*!< ms */ +#define DEFAULT_FEATURE_DIGIT_TIMEOUT 1000 /*!< ms */ +#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000 /*!< ms */ +#define DEFAULT_PARKINGLOT "default" +#define DEFAULT_ATXFER_DROP_CALL 0 /*!< Do not drop call. */ +#define DEFAULT_ATXFER_LOOP_DELAY 10000 /*!< ms */ +#define DEFAULT_ATXFER_CALLBACK_RETRIES 2 #define AST_MAX_WATCHERS 256 #define MAX_DIAL_FEATURE_OPTIONS 30 @@ -2818,7 +2818,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast } config->start_time = ast_tvnow(); config->feature_timer = featuredigittimeout; - ast_debug(1, "Set time limit to %ld\n", config->feature_timer); + ast_debug(1, "Set time limit to %ld ms\n", config->feature_timer); } } if (f) @@ -3920,7 +3920,7 @@ static int load_config(void) } else if (!strcasecmp(var->name, "atxferdropcall")) { atxferdropcall = ast_true(var->value); } else if (!strcasecmp(var->name, "atxfercallbackretries")) { - if ((sscanf(var->value, "%30u", &atxferloopdelay) != 1)) { + if ((sscanf(var->value, "%30u", &atxfercallbackretries) != 1)) { ast_log(LOG_WARNING, "%s is not a valid atxfercallbackretries\n", var->value); atxfercallbackretries = DEFAULT_ATXFER_CALLBACK_RETRIES; } |