[asterisk-commits] murf: branch 1.4 r139764 - in /branches/1.4: main/pbx.c res/res_features.c

[SVN commits to the Asterisk project]

Author: murf
Date: Mon Aug 25 10:33:14 2008
New Revision: 139764

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139764
Log:
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!



Modified:
    branches/1.4/main/pbx.c
    branches/1.4/res/res_features.c

Modified: branches/1.4/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/pbx.c?view=diff&rev=139764&r1=139763&r2=139764
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Mon Aug 25 10:33:14 2008
@@ -2539,10 +2539,7 @@
 		ast_log(LOG_WARNING, "Don't know what to do with '%s'\n", c->name);
 	if (res != AST_PBX_KEEPALIVE)
 		ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING);
-#ifdef HANGUP_EXTEN_EXECUTION_MOVED_TO_res_features
 	if ((res != AST_PBX_KEEPALIVE) && ast_exists_extension(c, c->context, "h", 1, c->cid.cid_num)) {
-		/* end before h exten was here */
-		
 		set_ext_pri(c, "h", 1);
 		while(ast_exists_extension(c, c->context, c->exten, c->priority, c->cid.cid_num)) {
 			if ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->cid.cid_num))) {
@@ -2556,7 +2553,6 @@
 			c->priority++;
 		}
 	}
-#endif
 	ast_set2_flag(c, autoloopflag, AST_FLAG_IN_AUTOLOOP);
 
 	pbx_destroy(c->pbx);

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=139764&r1=139763&r2=139764
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Mon Aug 25 10:33:14 2008
@@ -1659,50 +1659,6 @@
 
 	}
    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))) {