[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r392308 - /team/rmudgett/bridge_phase/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jun 19 22:01:25 2013
New Revision: 392308

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392308
Log:
The DTMF disconnect feature does not apply while the agent is waiting for a call.

Modified:
    team/rmudgett/bridge_phase/apps/app_agent_pool.c

Modified: team/rmudgett/bridge_phase/apps/app_agent_pool.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/apps/app_agent_pool.c?view=diff&rev=392308&r1=392307&r2=392308
==============================================================================
--- team/rmudgett/bridge_phase/apps/app_agent_pool.c (original)
+++ team/rmudgett/bridge_phase/apps/app_agent_pool.c Wed Jun 19 22:01:25 2013
@@ -892,13 +892,6 @@
 	return 0;
 }
 
-static int bridge_agent_hold_disconnect(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, void *hook_pvt)
-{
-	ast_softhangup(bridge_channel->chan, AST_SOFTHANGUP_EXPLICIT);
-	ast_bridge_change_state(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
-	return 0;
-}
-
 /*!
  * \internal
  * \brief ast_bridge agent_hold push method.
@@ -918,7 +911,6 @@
 	int res = 0;
 	char dtmf[AST_FEATURE_MAX_LEN];
 	struct ast_channel *chan;
-	struct ast_flags *flags;
 	const char *moh_class;
 	RAII_VAR(struct agent_pvt *, agent, NULL, ao2_cleanup);
 
@@ -932,19 +924,6 @@
 
 /*! \todo BUGBUG bridge_agent_hold_push() needs one second heartbeat interval hook added.  */
 /* BUGBUG Agent:agent-id device state to NOT_INUSE if currently INUSE after wrapup_time timeout. */
-
-	/* Add DTMF disconnect hook. */
-	dtmf[0] = '\0';
-	ast_channel_lock(chan);
-	flags = ast_bridge_features_ds_get(chan);
-	if (flags && ast_test_flag(flags, AST_FEATURE_DISCONNECT)) {
-		ast_get_builtin_feature(chan, "disconnect", dtmf, sizeof(dtmf));
-	}
-	ast_channel_unlock(chan);
-	if (!ast_strlen_zero(dtmf)) {
-		res |= ast_bridge_dtmf_hook(bridge_channel->features, dtmf,
-			bridge_agent_hold_disconnect, NULL, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL);
-	}
 
 	agent_lock(agent);
 	moh_class = ast_strdupa(agent->cfg->moh);