[asterisk-commits] mjordan: trunk r399147 - in /trunk: ./ main/cdr.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Sep 15 21:37:56 2013
New Revision: 399147

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399147
Log:
Filter internal channels out of bridge enter/leave message handling

Some channels exist merely as an implementation detail in Asterisk, such as
ConfBridge's announcer/recorder channels. These channels should never be
exposed to the outside world, or to interfaces that report on Asterisk. We
already filter out such channels in snapshot processing; however, we failed to
filter out bridge related messages that involved these channels.

This patch filters out bridge related messages that are for such channels. This
prevents a spurious WARNING message from being displayed when those channels
move in and out of bridges.
........

Merged revisions 399146 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/cdr.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Sun Sep 15 21:37:56 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399100,399136
+/branches/12:1-398558,398560-398577,398579-399100,399136,399146

Modified: trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cdr.c?view=diff&rev=399147&r1=399146&r2=399147
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Sun Sep 15 21:37:56 2013
@@ -2578,6 +2578,10 @@
 		return;
 	}
 
+	if (filter_channel_snapshot(channel)) {
+		return;
+	}
+
 	CDR_DEBUG(mod_cfg, "Bridge Enter message for channel %s: %u.%08u\n",
 			channel->name,
 			(unsigned int)stasis_message_timestamp(message)->tv_sec,