[asterisk-commits] mmichelson: branch mmichelson/features_config r390017 - in /team/mmichelson/f...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed May 29 09:03:32 2013
New Revision: 390017

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390017
Log:
Use featuredigittimeout setting for bridge builtin features.


Modified:
    team/mmichelson/features_config/bridges/bridge_builtin_features.c
    team/mmichelson/features_config/main/bridging.c

Modified: team/mmichelson/features_config/bridges/bridge_builtin_features.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/bridges/bridge_builtin_features.c?view=diff&rev=390017&r1=390016&r2=390017
==============================================================================
--- team/mmichelson/features_config/bridges/bridge_builtin_features.c (original)
+++ team/mmichelson/features_config/bridges/bridge_builtin_features.c Wed May 29 09:03:32 2013
@@ -305,7 +305,6 @@
 		return 0;
 	}
 
-/* BUGBUG bridging API features does not support features.conf featuremap */
 /* BUGBUG bridging API features does not support the features.conf atxfer bounce between C & B channels */
 	/* Setup a DTMF menu to control the transfer. */
 	if (ast_bridge_features_init(&caller_features)

Modified: team/mmichelson/features_config/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/main/bridging.c?view=diff&rev=390017&r1=390016&r2=390017
==============================================================================
--- team/mmichelson/features_config/main/bridging.c (original)
+++ team/mmichelson/features_config/main/bridging.c Wed May 29 09:03:32 2013
@@ -60,6 +60,7 @@
 #include "asterisk/cli.h"
 #include "asterisk/parking.h"
 #include "asterisk/core_local.h"
+#include "asterisk/features_config.h"
 
 /*! All bridges container. */
 static struct ao2_container *bridges;
@@ -1901,6 +1902,13 @@
 	struct ast_bridge_hook *hook = NULL;
 	char dtmf[MAXIMUM_DTMF_FEATURE_STRING] = "";
 	size_t dtmf_len = 0;
+	unsigned int digit_timeout;
+	RAII_VAR(struct ast_features_general_config *, gen_cfg, NULL, ao2_cleanup);
+
+	ast_channel_lock(bridge_channel->chan);
+	gen_cfg = ast_get_chan_features_general_config(bridge_channel->chan);
+	digit_timeout = gen_cfg->featuredigittimeout;
+	ast_channel_unlock(bridge_channel->chan);
 
 	/* The channel is now under our control and we don't really want any begin frames to do our DTMF matching so disable 'em at the core level */
 	ast_set_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_END_DTMF_ONLY);
@@ -1910,7 +1918,7 @@
 		int res;
 
 		/* If the above timed out simply exit */
-		res = ast_waitfordigit(bridge_channel->chan, 3000);
+		res = ast_waitfordigit(bridge_channel->chan, digit_timeout);
 		if (!res) {
 			ast_debug(1, "DTMF feature string collection on %p(%s) timed out\n",
 				bridge_channel, ast_channel_name(bridge_channel->chan));