3 commits

Author	SHA1	Message	Date
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
Robin Sommer	a3a075174b	Merging in 'topic/robin/cleanup-rewriter'. ... Removing everything related to trace rewriting. (I wasn't too careful in ensuring that I catch everything in the scripts; Seth is working on those anyway.) (Merging by cherry-picking the corresponding commit, as the branch was accidentally made off of the logging stuff).	2011-04-01 15:23:50 -07:00
Robin Sommer	61757ac78b	Initial import of svn+ssh:://svn.icir.org/bro/trunk/bro as of r7088	2010-09-27 20:42:30 -07:00