Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/master' into topic/seth/scripts-for-2.1

Browse source 
Conflicts:
	scripts/base/frameworks/packet-filter/main.bro
This commit is contained in:
Seth Hall 2012-04-25 11:56:54 -04:00
commit 7b19dcd0e7
353 changed files with 11398 additions and 6029 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/base/frameworks/packet-filter/main.bro
View file

@ -248,7 +248,7 @@ function install()
#local ts = current_time();
if ( ! precompile_pcap_filter(DefaultPcapFilter, current_filter) )
{
NOTICE([$note=Compile_Failure,
NOTICE([$note=Compile_Failure,
$msg=fmt("Compiling packet filter failed"),
$sub=current_filter]);
Reporter::fatal(fmt("Bad pcap filter '%s'", current_filter));
@ -263,7 +263,7 @@ function install()
local info: Info;
info$ts = network_time();
# If network_time() is 0.0 we're at init time so use the wall clock.
if ( info$ts == 0.0 )
if ( info$ts == 0.0 )
{
info$ts = current_time();
info$init = T;
@ -274,7 +274,7 @@ function install()
{
# Installing the filter failed for some reason.
info$success = F;
NOTICE([$note=Install_Failure,
NOTICE([$note=Install_Failure,
$msg=fmt("Installing packet filter failed"),
$sub=current_filter]);
}