4 commits

Author	SHA1	Message	Date
Robin Sommer	9709b1d522	Merge remote branch 'origin/topic/robin/reporting' ... * origin/topic/robin/reporting: Syslog BiF now goes through the reporter as well. Avoiding infinite loops when an error message handlers triggers errors itself. Renaming the Logger to Reporter. Overhauling the internal reporting of messages to the user. Updating a bunch of tests/baselines as well. Conflicts: aux/broccoli policy.old/alarm.bro policy/all.bro policy/bro.init policy/frameworks/notice/weird.bro policy/notice.bro src/SSL-binpac.cc src/bro.bif src/main.cc	2011-07-01 13:59:21 -07:00
Jon Siwek	f307a3f408	Update core.vlan-mpls baseline. ... conn UIDs changed because they're now also generated for notices.	2011-06-29 12:57:45 -05:00
Jon Siwek	ea1f819b3e	Update core.vlan-mpls test to use new policy scripts.	2011-06-20 16:06:44 -05:00
Robin Sommer	9ddc26328d	Support for (mixed) MPLS and VLAN traffic, and a new default BPF ... filter. (Seth Hall and Robin Sommer) - Merging in the patch from #264, which provides support for mixed VLAN and MPLS traffic. - Changing Bro's default filter from being built dynamically to being a static "ip or not ip". To get the old behaviour back (i.e., the dynamically built filter), redef "all_packets" to false. - print-filter.bro now always prints the filter that Bro is actually using, even if overriden from the command line.	2011-04-29 09:10:43 -07:00