summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--configs/features.conf.sample1
-rw-r--r--res/res_features.c10
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 3d6b4fbc6..e033c5997 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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 trunkmaxsize configuration option to chan_iax2.
* Added G729 passthrough support to chan_phone for Sigma Designs boards.
+ * Added the parkedcalltransfers option to features.conf
SIP changes
-----------
diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index 43e4cf1a2..d3e54f67c 100644
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -15,6 +15,7 @@ context => parkedcalls ; Which context parked calls are in
; or the Touch Monitor is activated/deactivated.
;parkedplay = caller ; Who to play the courtesy tone to when picking up a parked call
; 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
;findslot => next ; Continue to the 'next' free parking space.
; Defaults to 'first' available
diff --git a/res/res_features.c b/res/res_features.c
index e44090a33..aa110fd0e 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -78,6 +78,7 @@ enum {
static char *parkedcall = "ParkedCall";
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 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) */
@@ -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);
memset(&config, 0, sizeof(struct ast_bridge_config));
- ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
- ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
+ if (parkedcalltransfers) {
+ 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);
/* Simulate the PBX hanging up */
@@ -2116,6 +2119,7 @@ static int load_config(void)
adsipark = 0;
comebacktoorigin = 1;
parkaddhints = 0;
+ parkedcalltransfers = 0;
transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
@@ -2148,6 +2152,8 @@ static int load_config(void)
parkfindnext = (!strcasecmp(var->value, "next"));
} else if (!strcasecmp(var->name, "parkinghints")) {
parkaddhints = ast_true(var->value);
+ } else if (!strcasecmp(var->name, "parkedcalltransfers")) {
+ parkedcalltransfers = ast_true(var->value);
} else if (!strcasecmp(var->name, "adsipark")) {
adsipark = ast_true(var->value);
} else if (!strcasecmp(var->name, "transferdigittimeout")) {