Merge remote-tracking branch 'origin/master' into input

This commit is contained in:
Bernhard Amann 2011-11-04 14:12:59 -07:00
commit 72736510de
26 changed files with 110 additions and 93 deletions

View file

@ -144,7 +144,8 @@ function install()
$sub=default_filter]);
}
Log::write(PacketFilter::LOG, info);
if ( reading_live_traffic() || reading_traces() )
Log::write(PacketFilter::LOG, info);
}
event bro_init() &priority=10