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

Merge branch 'topic/christian/inputframework-warning-fix' of https://github.com/ckreibich/zeek

Browse source 
* 'topic/christian/inputframework-warning-fix' of https://github.com/ckreibich/zeek:
  Tweak to ASCII reader warning suppression
This commit is contained in:
Jon Siwek 2019-05-30 10:57:54 -07:00
commit 6860d5b083
4 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES
View file

@ -1,4 +1,14 @@
2.6-357 | 2019-05-30 10:57:54 -0700
* Tweak to ASCII reader warning suppression (Christian Kreibich, Corelight)
Warnings in the ASCII reader so far remained suppressed even
when an input file changed. It's helpful to learn about problems
in the data when putting in place new data files, so this change
maintains the existing warning suppression while processing a file,
but re-enables warnings after updates to a file.
2.6-354 | 2019-05-29 09:46:19 -0700 2.6-354 | 2019-05-29 09:46:19 -0700
* Add weird: "RDP_channels_requested_exceeds_max" (Vlad Grigorescu) * Add weird: "RDP_channels_requested_exceeds_max" (Vlad Grigorescu)

2
VERSION
View file

@ -1 +1 @@
2.6-354 2.6-357

14
src/input/readers/ascii/Ascii.cc
View file

@ -305,11 +305,15 @@ bool Ascii::DoUpdate()
// no change // no change
return true; return true;
// Warn again in case of trouble if the file changes. The comparison to 0
// is to suppress an extra warning that we'd otherwise get on the initial
// inode assignment.
if ( ino != 0 )
suppress_warnings = false;
mtime = sb.st_mtime; mtime = sb.st_mtime;
ino = sb.st_ino; ino = sb.st_ino;
// file changed. reread. // File changed. Fall through to re-read.
// fallthrough
} }
case MODE_MANUAL: case MODE_MANUAL:
@ -470,8 +474,8 @@ bool Ascii::DoHeartbeat(double network_time, double current_time)
case MODE_REREAD: case MODE_REREAD:
case MODE_STREAM: case MODE_STREAM:
Update(); // call update and not DoUpdate, because update Update(); // Call Update, not DoUpdate, because Update
// checks disabled. // checks the "disabled" flag.
break; break;
default: default:

14
src/input/readers/config/Config.cc
View file

@ -151,11 +151,15 @@ bool Config::DoUpdate()
// no change // no change
return true; return true;
// Warn again in case of trouble if the file changes. The comparison to 0
// is to suppress an extra warning that we'd otherwise get on the initial
// inode assignment.
if ( ino != 0 )
suppress_warnings = false;
mtime = sb.st_mtime; mtime = sb.st_mtime;
ino = sb.st_ino; ino = sb.st_ino;
// file changed. reread. // File changed. Fall through to re-read.
// fallthrough
} }
case MODE_MANUAL: case MODE_MANUAL:
@ -309,8 +313,8 @@ bool Config::DoHeartbeat(double network_time, double current_time)
case MODE_REREAD: case MODE_REREAD:
case MODE_STREAM: case MODE_STREAM:
Update(); // call update and not DoUpdate, because update Update(); // Call Update, not DoUpdate, because Update
// checks disabled. // checks the "disabled" flag.
break; break;
default: default: