Merge branch 'master' into topic/robin/pp-alarms

This commit is contained in:
Robin Sommer 2011-11-03 15:30:41 -07:00
commit e0692b898e
26 changed files with 365 additions and 165 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