kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename new parkedcallparking option to parkedcallreparking

Browse Source 
Since this option actually already existed in 1.6.0+, use the same name so as
not to confuse people when they upgrade


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2009-01-31 00:15:09 +00:00
parent 4e069885ce
commit 2b340eab54
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/features.conf.sample
View File

@@ -17,7 +17,7 @@ context => parkedcalls ; Which context parked calls are in
; one of: parked, caller, both (default is caller)
;parkedcalltransfers = caller ; Enables or disables DTMF based transfers when picking up a parked call.
; one of: callee, caller, both, no (default is both)
;parkedcallparking = caller ; Enables or disables DTMF based one-touch parking when picking up a parked call.
;parkedcallreparking = caller ; Enables or disables DTMF based one-touch parking when picking up a parked call.
; one of: callee, caller, both, no (default is no)
;parkedcallhangup = caller ; Enables or disables DTMF based hangups when picking up a parked call.
; one of: callee, caller, both, no (default is no)

18
res/res_features.c
View File

@@ -94,7 +94,7 @@ static int parking_start; /*!< First available
static int parking_stop; /*!< Last available extension for parking */
static int parkedcalltransfers; /*!< Who can REDIRECT after picking up a parked a call */
static int parkedcallparking; /*!< Who can PARKCALL after picking up a parked call */
static int parkedcallreparking; /*!< Who can PARKCALL after picking up a parked call */
static int parkedcallhangup; /*!< Who can DISCONNECT after picking up a parked call */
static int parkedcallrecording; /*!< Who can AUTOMON after picking up a parked call */
@@ -2433,10 +2433,10 @@ static int park_exec(struct ast_channel *chan, void *data)
if ((parkedcalltransfers == AST_FEATURE_FLAG_BYCALLER) || (parkedcalltransfers == AST_FEATURE_FLAG_BYBOTH)) {
ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
}
if ((parkedcallparking == AST_FEATURE_FLAG_BYCALLEE) || (parkedcallparking == AST_FEATURE_FLAG_BYBOTH)) {
if ((parkedcallreparking == AST_FEATURE_FLAG_BYCALLEE) || (parkedcallreparking == AST_FEATURE_FLAG_BYBOTH)) {
ast_set_flag(&(config.features_callee), AST_FEATURE_PARKCALL);
}
if ((parkedcallparking == AST_FEATURE_FLAG_BYCALLER) || (parkedcallparking == AST_FEATURE_FLAG_BYBOTH)) {
if ((parkedcallreparking == AST_FEATURE_FLAG_BYCALLER) || (parkedcallreparking == AST_FEATURE_FLAG_BYBOTH)) {
ast_set_flag(&(config.features_caller), AST_FEATURE_PARKCALL);
}
if ((parkedcallhangup == AST_FEATURE_FLAG_BYCALLEE) || (parkedcallhangup == AST_FEATURE_FLAG_BYBOTH)) {
@@ -2742,7 +2742,7 @@ static int load_config(void)
adsipark = 0;
parkaddhints = 0;
parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
parkedcallparking = 0;
parkedcallreparking = 0;
parkedcallhangup = 0;
parkedcallrecording = 0;
@@ -2786,15 +2786,15 @@ static int load_config(void)
parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE;
else if (!strcasecmp(var->value, "both"))
parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(var->name, "parkedcallparking")) {
} else if (!strcasecmp(var->name, "parkedcallreparking")) {
if (!strcasecmp(var->value, "no"))
parkedcallparking = 0;
parkedcallreparking = 0;
else if (!strcasecmp(var->value, "caller"))
parkedcallparking = AST_FEATURE_FLAG_BYCALLER;
parkedcallreparking = AST_FEATURE_FLAG_BYCALLER;
else if (!strcasecmp(var->value, "callee"))
parkedcallparking = AST_FEATURE_FLAG_BYCALLEE;
parkedcallreparking = AST_FEATURE_FLAG_BYCALLEE;
else if (!strcasecmp(var->value, "both"))
parkedcallparking = AST_FEATURE_FLAG_BYBOTH;
parkedcallreparking = AST_FEATURE_FLAG_BYBOTH;
} else if (!strcasecmp(var->name, "parkedcallhangup")) {
if (!strcasecmp(var->value, "no"))
parkedcallhangup = 0;