Author: kmoore Date: Thu Aug 15 07:17:41 2013 New Revision: 396724 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396724 Log: Fix feature_attended_transfer test
The feature_attended_transfer test is failing due to Asterisk not passing DTMF in the bridges created for internal attended transfers. This sets the features initialization routine to set this flag by default and adjusts the basic bridge and confbridge's use of the bridging system accordingly as per Richard's suggestion instead of adjusting this individual case. This change allows the necessary DTMF to pass through the attended transfer bridge and complete the test successfully. Review: https://reviewboard.asterisk.org/r/2759/ (closes issue ASTERISK-22222) Modified: trunk/apps/app_confbridge.c trunk/main/bridge.c trunk/main/features.c Modified: trunk/apps/app_confbridge.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=396724&r1=396723&r2=396724 ============================================================================== --- trunk/apps/app_confbridge.c (original) +++ trunk/apps/app_confbridge.c Thu Aug 15 07:17:41 2013 @@ -1587,6 +1587,8 @@ /* Set if DTMF should pass through for this user or not */ if (ast_test_flag(&user.u_profile, USER_OPT_DTMF_PASS)) { user.features.dtmf_passthrough = 1; + } else { + user.features.dtmf_passthrough = 0; } /* Set dsp threshold values if present */ Modified: trunk/main/bridge.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge.c?view=diff&rev=396724&r1=396723&r2=396724 ============================================================================== --- trunk/main/bridge.c (original) +++ trunk/main/bridge.c Thu Aug 15 07:17:41 2013 @@ -3203,6 +3203,8 @@ if (!features->interval_hooks) { return -1; } + + features->dtmf_passthrough = 1; return 0; } Modified: trunk/main/features.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=396724&r1=396723&r2=396724 ============================================================================== --- trunk/main/features.c (original) +++ trunk/main/features.c Thu Aug 15 07:17:41 2013 @@ -797,9 +797,6 @@ { int res = 0; - /* Always pass through any DTMF digits. */ - bridge_channel->features->dtmf_passthrough = 1; - res |= setup_bridge_features_builtin(bridge_channel->features, bridge_channel->chan); res |= setup_bridge_features_dynamic(bridge_channel->features, bridge_channel->chan); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
