[svn-commits] mnicholson: trunk r204807 - in /trunk/main: channel.c features.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Thu Jul  2 15:37:16 2009
New Revision: 204807

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=204807
Log:
Moved trigger for BRIDGE_END CEL event so that it is more accurate.

Modified:
    trunk/main/channel.c
    trunk/main/features.c

Modified: trunk/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=204807&r1=204806&r2=204807
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Jul  2 15:37:16 2009
@@ -5837,7 +5837,6 @@
 					      "CallerID1: %s\r\n"
 					      "CallerID2: %s\r\n",
 					      c0->name, c1->name, c0->uniqueid, c1->uniqueid, S_OR(c0->cid.cid_num, "<unknown>"), S_OR(c1->cid.cid_num, "<unknown>"));
-				ast_cel_report_event(c0, AST_CEL_BRIDGE_END, NULL, NULL, NULL);
 
 				ast_debug(1, "Returning from native bridge, channels: %s, %s\n", c0->name, c1->name);
 
@@ -5875,7 +5874,6 @@
 			if (ast_channel_make_compatible(c0, c1)) {
 				ast_log(LOG_WARNING, "Can't make %s and %s compatible\n", c0->name, c1->name);
 				manager_bridge_event(0, 1, c0, c1);
-				/* ast_cel_report_event(c0, AST_CEL_BRIDGE_END, NULL, NULL, NULL); */
 				return AST_BRIDGE_FAILED;
 			}
 			o0nativeformats = c0->nativeformats;
@@ -5903,7 +5901,6 @@
 	c0->_bridge = NULL;
 	c1->_bridge = NULL;
 
-	ast_cel_report_event(c0, AST_CEL_BRIDGE_END, NULL, NULL, NULL);
 	manager_event(EVENT_FLAG_CALL, "Unlink",
 		      "Channel1: %s\r\n"
 		      "Channel2: %s\r\n"

Modified: trunk/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/features.c?view=diff&rev=204807&r1=204806&r2=204807
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Thu Jul  2 15:37:16 2009
@@ -2945,6 +2945,7 @@
 			ast_frfree(f);
 
 	}
+	ast_cel_report_event(chan, AST_CEL_BRIDGE_END, NULL, NULL, NULL);
    before_you_go:
 
 	if (ast_test_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT)) {