kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow the user to specify where to enable the respective features for when a parked call is picked up. (ie: transfers and parking)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-02-16 18:08:34 +00:00
parent 84718d10c4
commit b8ab0abb83
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configs/features.conf.sample
View File

@@ -15,8 +15,10 @@ 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 ;parkedcalltransfers = caller ; Enables or disables DTMF based transfers when picking up a parked call.
;parkedcallreparking = yes ; Enables or disables DTMF based parking when picking up a parked call ; one of: callee, caller, both, no (default is no)
;parkedcallreparking = caller ; Enables or disables DTMF based parking when picking up a parked call.
; one of: callee, caller, both, no (default is no)
;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

22
res/res_features.c
View File

@@ -1830,14 +1830,14 @@ 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));
if (parkedcalltransfers) { if ((parkedcalltransfers == AST_FEATURE_FLAG_BYCALLEE) || (parkedcalltransfers == AST_FEATURE_FLAG_BYBOTH))
ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT); ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
if ((parkedcalltransfers == AST_FEATURE_FLAG_BYCALLER) || (parkedcalltransfers == AST_FEATURE_FLAG_BYBOTH))
ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT); ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
} if ((parkedcallreparking == AST_FEATURE_FLAG_BYCALLEE) || (parkedcallreparking == AST_FEATURE_FLAG_BYBOTH))
if (parkedcallreparking) {
ast_set_flag(&(config.features_callee), AST_FEATURE_PARKCALL); ast_set_flag(&(config.features_callee), AST_FEATURE_PARKCALL);
if ((parkedcallreparking == AST_FEATURE_FLAG_BYCALLER) || (parkedcallreparking == AST_FEATURE_FLAG_BYBOTH))
ast_set_flag(&(config.features_caller), AST_FEATURE_PARKCALL); ast_set_flag(&(config.features_caller), AST_FEATURE_PARKCALL);
}
res = ast_bridge_call(chan, peer, &config); res = ast_bridge_call(chan, peer, &config);
pbx_builtin_setvar_helper(chan, "PARKEDCHANNEL", peer->name); pbx_builtin_setvar_helper(chan, "PARKEDCHANNEL", peer->name);
@@ -2162,9 +2162,19 @@ static int load_config(void)
} 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")) { } else if (!strcasecmp(var->name, "parkedcalltransfers")) {
parkedcalltransfers = ast_true(var->value); if (!strcasecmp(var->value, "both"))
parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
else if (!strcasecmp(var->value, "caller"))
parkedcalltransfers = AST_FEATURE_FLAG_BYCALLER;
else if (!strcasecmp(var->value, "callee"))
parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE;
} else if (!strcasecmp(var->name, "parkedcallreparking")) { } else if (!strcasecmp(var->name, "parkedcallreparking")) {
parkedcallreparking = ast_true(var->value); if (!strcasecmp(var->value, "both"))
parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
else if (!strcasecmp(var->value, "caller"))
parkedcalltransfers = AST_FEATURE_FLAG_BYCALLER;
else if (!strcasecmp(var->value, "callee"))
parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE;
} 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")) {