[asterisk-commits] file: trunk r51152 - in /trunk: ./ configs/ res/

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Jan 16 11:50:25 2007
New Revision: 51152

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51152
Log:
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.

Modified:
    trunk/CHANGES
    trunk/configs/features.conf.sample
    trunk/res/res_features.c

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?view=diff&rev=51152&r1=51151&r2=51152
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Tue Jan 16 11:50:25 2007
@@ -62,6 +62,7 @@
   * 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
 -----------

Modified: trunk/configs/features.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/features.conf.sample?view=diff&rev=51152&r1=51151&r2=51152
==============================================================================
--- trunk/configs/features.conf.sample (original)
+++ trunk/configs/features.conf.sample Tue Jan 16 11:50:25 2007
@@ -15,6 +15,7 @@
 				; 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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=51152&r1=51151&r2=51152
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Jan 16 11:50:25 2007
@@ -78,6 +78,7 @@
 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 @@
 			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 @@
 	adsipark = 0;
 	comebacktoorigin = 1;
 	parkaddhints = 0;
+	parkedcalltransfers = 0;
 
 	transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
 	featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
@@ -2148,6 +2152,8 @@
 			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")) {