[asterisk-commits] jbigelow: trunk r401580 - in /trunk: ./ main/bridge_channel.c

[SVN commits to the Asterisk project]

Author: jbigelow
Date: Wed Oct 23 11:48:39 2013
New Revision: 401580

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401580
Log:
Add a test suite event to indicate when the atxfer 3-way feature is detected

This adds a test suite event that indicates to tests when the attended transfer
three-way call feature is detected.

Review: https://reviewboard.asterisk.org/r/2912/
........

Merged revisions 401578 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/bridge_channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge_channel.c?view=diff&rev=401580&r1=401579&r2=401580
==============================================================================
--- trunk/main/bridge_channel.c (original)
+++ trunk/main/bridge_channel.c Wed Oct 23 11:48:39 2013
@@ -1092,6 +1092,7 @@
 #ifdef TEST_FRAMEWORK
 	char *feature = "unknown";
 	struct ast_featuremap_config *featuremap = ast_get_chan_featuremap_config(chan);
+	struct ast_features_xfer_config *xfer = ast_get_chan_features_xfer_config(chan);
 
 	if (featuremap) {
 		if (!strcmp(dtmf, featuremap->blindxfer)) {
@@ -1106,6 +1107,8 @@
 			feature = "automixmon";
 		} else if (!strcmp(dtmf, featuremap->parkcall)) {
 			feature = "parkcall";
+		} else if (!strcmp(dtmf, xfer->atxferthreeway)) {
+			feature = "atxferthreeway";
 		}
 	}