Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed &default values ignored by input framework.

Browse source 
Reading into a record, the input framework will no longer reset a
&default value in case there is no value to read.
This commit is contained in:
Jan Grashoefer 2016-06-16 01:02:51 +02:00
parent 41eb50f9db
commit 8d853872a4
3 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/input/Manager.cc
View file

@ -1917,6 +1917,7 @@ RecordVal* Manager::ValueToRecordVal(const Stream* stream, const Value* const *v
(*position)++;
}
if ( fieldVal )
rec->Assign(i, fieldVal);
}

8
testing/btest/Baseline/scripts.base.frameworks.input.default/out Normal file
View file

@ -0,0 +1,8 @@
[i=1, b=T, s=leer]
[i=2, b=T, s=leer]
[i=3, b=F, s=leer]
[i=4, b=F, s=leer]
[i=5, b=F, s=leer]
[i=6, b=F, s=leer]
[i=7, b=T, s=leer]
End-of-data

48
testing/btest/scripts/base/frameworks/input/default.bro Normal file
View file

@ -0,0 +1,48 @@
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait 10
# @TEST-EXEC: btest-diff out
@TEST-START-FILE input.log
#separator \x09
#path ssh
#fields i b
#types int bool
1 T
2 T
3 F
4 F
5 F
6 F
7 T
@TEST-END-FILE
redef exit_only_after_terminate = T;
global outfile: file;
module A;
type Val: record {
i: int;
b: bool;
s: string &default="leer";
};
event line(description: Input::EventDescription, tpe: Input::Event, val: Val)
{
print outfile, val;
}
event bro_init()
{
outfile = open("../out");
Input::add_event([$source="../input.log", $name="input", $fields=Val, $ev=line, $want_record=T]);
}
event Input::end_of_data(name: string, source:string)
{
print outfile, "End-of-data";
Input::remove("input");
close(outfile);
terminate();
}