Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 07:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/johanna/bit-1683'

Browse source 
Looks like the right fix. Two tiny tweaks:

     - changed the order of arguments for DeleteVals() for consistency
       with the corresponding Manager function.

     - turned the InternalWarning into a Warning: if I understand
       correctly, this can happen when scripts on nodes diverge; which
       is a user-side problem, not an internal Bro logic issue.

BIT-1683 #merged

* origin/topic/johanna/bit-1683:
  Actually check if the number of fields in a write are equal to the number of fields required.
This commit is contained in:
Robin Sommer 2016-09-27 11:44:33 -07:00
commit 4059d4b4f1
8 changed files with 159 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/logging/WriterFrontend.h
View file

@ -203,7 +203,7 @@ public:
protected:
friend class Manager;
void DeleteVals(threading::Value** vals);
void DeleteVals(int num_fields, threading::Value** vals);
EnumVal* stream;
EnumVal* writer;