This patch reverts the changes made via 139347, and 139635, as users

are seeing adverse difference. 

I will un-close 13251.

Back to the drawing board/ concept/ beginning/ whatever!




git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@139764 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 0 insertions, 44 deletions

diff --git a/res/res_features.c b/res/res_features.c
index 1e16e9827..75e1ccbd9 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1659,50 +1659,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 
 	}
    before_you_go:
-	if (ast_exists_extension(chan, chan->context, "h", 1, chan->cid.cid_num)) {
-		struct ast_cdr *swapper;
-		char savelastapp[AST_MAX_EXTENSION];
-		char savelastdata[AST_MAX_EXTENSION];
-		char save_exten[AST_MAX_EXTENSION];
-		int  save_prio;
-		
-		if (chan->cdr && ast_opt_end_cdr_before_h_exten) {
-			ast_cdr_end(bridge_cdr);
-		}
-		/* swap the bridge cdr and the chan cdr for a moment, and let the endbridge
-		   dialplan code operate on it */
-		swapper = chan->cdr;
-		ast_copy_string(savelastapp, bridge_cdr->lastapp, sizeof(bridge_cdr->lastapp));
-		ast_copy_string(savelastdata, bridge_cdr->lastdata, sizeof(bridge_cdr->lastdata));
-		chan->cdr = bridge_cdr;
-		ast_channel_lock(chan);
-		ast_copy_string(save_exten, chan->exten, sizeof(save_exten));
-		save_prio = chan->priority;
-		ast_copy_string(chan->exten, "h", sizeof(chan->exten));
-		chan->priority = 1;
-		ast_channel_unlock(chan);
-		while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
-			if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) {
-				/* Something bad happened, or a hangup has been requested. */
-				if (option_debug)
-					ast_log(LOG_DEBUG, "Spawn h extension (%s,%s,%d) exited non-zero on '%s'\n", chan->context, chan->exten, chan->priority, chan->name);
-				if (option_verbose > 1)
-					ast_verbose( VERBOSE_PREFIX_2 "Spawn h extension (%s, %s, %d) exited non-zero on '%s'\n", chan->context, chan->exten, chan->priority, chan->name);
-				break;
-			}
-			chan->priority++;
-		}
-		/* swap it back */
-		ast_channel_lock(chan);
-		ast_copy_string(chan->exten, save_exten, sizeof(chan->exten));
-		chan->priority = save_prio;
-		chan->cdr = swapper;
-		ast_channel_unlock(chan);
-		/* protect the lastapp/lastdata against the effects of the hangup/dialplan code */
-		ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp));
-		ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata));
-	}
-	
 	/* obey the NoCDR() wishes. */
 	if (!chan->cdr || (chan->cdr && !ast_test_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED))) {