dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

allows for configurable answer timeout on attended transfer 

patch 0006763 with minor changes.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@29766 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mogorman 2006-05-23 18:23:05 +00:00
parent 1df81b557e
commit ec8ef55d83
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CREDITS
View File

@ -79,6 +79,8 @@ Constantine Filin - major contributions to the Asterisk Realtime Architecture
Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
Claude Patry - bug fixes, feature enhancements, and bug marshalling
cpatry@gmail.com
Miroslav Nachev, miro@space-comm.com COSMOS Software Enterprises, Ltd.
- for Variable for No Answer Timeout for Attended Transfer
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt

1
configs/features.conf.sample
View File

@ -26,6 +26,7 @@ context => parkedcalls ; Which context parked calls are in
;pickupexten = *8 ; Configure the pickup extension. (default is *8)
;featuredigittimeout = 500 ; Max time (ms) between digits for
; feature activation (default is 500 ms)
;atxfernoanswertimeout = 15 ; Timeout for answer on attended transfer default is 15 seconds.
[featuremap]
;blindxfer => #1 ; Blind transfer (default is #)

12
res/res_features.c
View File

@ -70,6 +70,7 @@ static void FREE(void *ptr)
#define DEFAULT_PARK_TIME 45000
#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
#define DEFAULT_FEATURE_DIGIT_TIMEOUT 500
#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000
#define AST_MAX_WATCHERS 256
@ -96,6 +97,8 @@ static int adsipark;
static int transferdigittimeout;
static int featuredigittimeout;
static int atxfernoanswertimeout;
static char *registrar = "res_features"; /*!< Registrar for operations */
/* module and CLI command definitions */
@ -722,7 +725,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
l = strlen(xferto);
snprintf(xferto + l, sizeof(xferto) - l, "@%s/n", transferer_real_context); /* append context */
newchan = ast_feature_request_and_dial(transferer, "Local", ast_best_codec(transferer->nativeformats),
xferto, 15000, &outstate, transferer->cid.cid_num, transferer->cid.cid_name);
xferto, atxfernoanswertimeout, &outstate, transferer->cid.cid_num, transferer->cid.cid_name);
ast_indicate(transferer, -1);
if (!newchan) {
finishup(transferee);
@ -1986,6 +1989,7 @@ static int load_config(void)
transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
atxfernoanswertimeout = DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER;
cfg = ast_config_load("features.conf");
if (cfg) {
@ -2022,6 +2026,12 @@ static int load_config(void)
ast_log(LOG_WARNING, "%s is not a valid featuredigittimeout\n", var->value);
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
}
} else if (!strcasecmp(var->name, "atxfernoanswertimeout")) {
if ((sscanf(var->value, "%d", &atxfernoanswertimeout) != 1) || (atxfernoanswertimeout < 1)) {
ast_log(LOG_WARNING, "%s is not a valid atxfernoanswertimeout\n", var->value);
atxfernoanswertimeout = DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER;
} else
atxfernoanswertimeout = atxfernoanswertimeout * 1000;
} else if (!strcasecmp(var->name, "courtesytone")) {
ast_copy_string(courtesytone, var->value, sizeof(courtesytone));
} else if (!strcasecmp(var->name, "parkedplay")) {