kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add parkedcalltransfers option for res_features. This basically enables/disables DTMF based transfers. If you want to get former behavior you will have to make sure it is enabled.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-16 17:50:25 +00:00
parent 7dd96f284b
commit 10e3cba61e
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -62,6 +62,7 @@ Changes since Asterisk 1.4-beta was branched:
* Added the URI redirect option for the built-in HTTP server * Added the URI redirect option for the built-in HTTP server
* Added the trunkmaxsize configuration option to chan_iax2. * Added the trunkmaxsize configuration option to chan_iax2.
* Added G729 passthrough support to chan_phone for Sigma Designs boards. * Added G729 passthrough support to chan_phone for Sigma Designs boards.
* Added the parkedcalltransfers option to features.conf
SIP changes SIP changes
----------- -----------

1
configs/features.conf.sample
View File

@@ -15,6 +15,7 @@ context => parkedcalls ; Which context parked calls are in
; or the Touch Monitor is activated/deactivated. ; or the Touch Monitor is activated/deactivated.
;parkedplay = caller ; Who to play the courtesy tone to when picking up a parked call ;parkedplay = caller ; Who to play the courtesy tone to when picking up a parked call
; one of: parked, caller, both (default is caller) ; one of: parked, caller, both (default is caller)
;parkedcalltransfers = yes ; Enables or disables DTMF based transfers when picking up a parked call
;adsipark = yes ; if you want ADSI parking announcements ;adsipark = yes ; if you want ADSI parking announcements
;findslot => next ; Continue to the 'next' free parking space. ;findslot => next ; Continue to the 'next' free parking space.
; Defaults to 'first' available ; Defaults to 'first' available

10
res/res_features.c
View File

@@ -78,6 +78,7 @@ enum {
static char *parkedcall = "ParkedCall"; static char *parkedcall = "ParkedCall";
static int parkaddhints = 0; /*!< Add parking hints automatically */ static int parkaddhints = 0; /*!< Add parking hints automatically */
static int parkedcalltransfers = 0; /*!< Enable DTMF based transfers on bridge when picking up parked calls */
static int parkingtime = DEFAULT_PARK_TIME; /*!< No more than 45 seconds parked before you do something with them */ static int parkingtime = DEFAULT_PARK_TIME; /*!< No more than 45 seconds parked before you do something with them */
static char parking_con[AST_MAX_EXTENSION]; /*!< Context for which parking is made accessible */ static char parking_con[AST_MAX_EXTENSION]; /*!< Context for which parking is made accessible */
static char parking_con_dial[AST_MAX_EXTENSION]; /*!< Context for dialback for parking (KLUDGE) */ static char parking_con_dial[AST_MAX_EXTENSION]; /*!< Context for dialback for parking (KLUDGE) */
@@ -1828,8 +1829,10 @@ static int park_exec(struct ast_channel *chan, void *data)
ast_verbose(VERBOSE_PREFIX_3 "Channel %s connected to parked call %d\n", chan->name, park); ast_verbose(VERBOSE_PREFIX_3 "Channel %s connected to parked call %d\n", chan->name, park);
memset(&config, 0, sizeof(struct ast_bridge_config)); memset(&config, 0, sizeof(struct ast_bridge_config));
ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT); if (parkedcalltransfers) {
ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT); ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
}
res = ast_bridge_call(chan, peer, &config); res = ast_bridge_call(chan, peer, &config);
/* Simulate the PBX hanging up */ /* Simulate the PBX hanging up */
@@ -2116,6 +2119,7 @@ static int load_config(void)
adsipark = 0; adsipark = 0;
comebacktoorigin = 1; comebacktoorigin = 1;
parkaddhints = 0; parkaddhints = 0;
parkedcalltransfers = 0;
transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT; transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT; featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
@@ -2148,6 +2152,8 @@ static int load_config(void)
parkfindnext = (!strcasecmp(var->value, "next")); parkfindnext = (!strcasecmp(var->value, "next"));
} else if (!strcasecmp(var->name, "parkinghints")) { } else if (!strcasecmp(var->name, "parkinghints")) {
parkaddhints = ast_true(var->value); parkaddhints = ast_true(var->value);
} else if (!strcasecmp(var->name, "parkedcalltransfers")) {
parkedcalltransfers = ast_true(var->value);
} else if (!strcasecmp(var->name, "adsipark")) { } else if (!strcasecmp(var->name, "adsipark")) {
adsipark = ast_true(var->value); adsipark = ast_true(var->value);
} else if (!strcasecmp(var->name, "transferdigittimeout")) { } else if (!strcasecmp(var->name, "transferdigittimeout")) {