[svn-commits] file: trunk r54889 - in /trunk: ./ configs/ res/

[svn-commits at lists.digium.com]

Author: file
Date: Fri Feb 16 11:41:27 2007
New Revision: 54889

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54889
Log:
Add option to features.conf that enables parking via DTMF on picked up parked calls. (issue #9082 reported by francesco_r)

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=54889&r1=54888&r2=54889
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri Feb 16 11:41:27 2007
@@ -59,6 +59,7 @@
   * Added 'E' and 'V' commands to ExternalIVR.
   * Added 'DBDel' and 'DBDelTree' manager commands.
   * Added 'o' and 'X' options to Chanspy.
+  * Added the parkedcallreparking option to features.conf
 
 AMI - The manager (TCP/TLS/HTTP)
 --------------------------------

Modified: trunk/configs/features.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/features.conf.sample?view=diff&rev=54889&r1=54888&r2=54889
==============================================================================
--- trunk/configs/features.conf.sample (original)
+++ trunk/configs/features.conf.sample Fri Feb 16 11:41:27 2007
@@ -16,6 +16,7 @@
 ;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
+;parkedcallreparking = yes      ; Enables or disables DTMF based parking 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=54889&r1=54888&r2=54889
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Fri Feb 16 11:41:27 2007
@@ -79,6 +79,7 @@
 
 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 parkedcallreparking = 0;                        /*!< Enable DTMF based parking 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) */
@@ -1833,6 +1834,10 @@
 			ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
 			ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
 		}
+		if (parkedcallreparking) {
+			ast_set_flag(&(config.features_callee), AST_FEATURE_PARKCALL);
+			ast_set_flag(&(config.features_caller), AST_FEATURE_PARKCALL);
+		}
 		res = ast_bridge_call(chan, peer, &config);
 
 		pbx_builtin_setvar_helper(chan, "PARKEDCHANNEL", peer->name);
@@ -2123,6 +2128,7 @@
 	comebacktoorigin = 1;
 	parkaddhints = 0;
 	parkedcalltransfers = 0;
+	parkedcallreparking = 0;
 
 	transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
 	featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
@@ -2157,6 +2163,8 @@
 			parkaddhints = ast_true(var->value);
 		} else if (!strcasecmp(var->name, "parkedcalltransfers")) {
 			parkedcalltransfers = ast_true(var->value);
+		} else if (!strcasecmp(var->name, "parkedcallreparking")) {
+			parkedcallreparking = ast_true(var->value);
 		} else if (!strcasecmp(var->name, "adsipark")) {
 			adsipark = ast_true(var->value);
 		} else if (!strcasecmp(var->name, "transferdigittimeout")) {