mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
make set_separators different from , work for input framework.
1-line-patch + test.
This commit is contained in:
parent
124c985d7a
commit
977c1d7c5a
2 changed files with 56 additions and 0 deletions
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
[1] = [s={
|
||||||
|
b,
|
||||||
|
e,
|
||||||
|
d,
|
||||||
|
c,
|
||||||
|
f,
|
||||||
|
a
|
||||||
|
}, ss=[1, 2, 3, 4, 5, 6]]
|
||||||
|
}
|
46
testing/btest/scripts/base/frameworks/input/setseparator.bro
Normal file
46
testing/btest/scripts/base/frameworks/input/setseparator.bro
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
# (uses listen.bro just to ensure input sources are more reliably fully-read).
|
||||||
|
# @TEST-SERIALIZE: comm
|
||||||
|
#
|
||||||
|
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
|
||||||
|
# @TEST-EXEC: btest-bg-wait -k 5
|
||||||
|
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
|
||||||
|
|
||||||
|
@TEST-START-FILE input.log
|
||||||
|
#separator \x09
|
||||||
|
#fields i s ss
|
||||||
|
1 a|b|c|d|e|f 1|2|3|4|5|6
|
||||||
|
@TEST-END-FILE
|
||||||
|
|
||||||
|
redef InputAscii::set_separator = "|";
|
||||||
|
|
||||||
|
@load frameworks/communication/listen
|
||||||
|
|
||||||
|
global outfile: file;
|
||||||
|
|
||||||
|
module A;
|
||||||
|
|
||||||
|
type Idx: record {
|
||||||
|
i: int;
|
||||||
|
};
|
||||||
|
|
||||||
|
type Val: record {
|
||||||
|
s: set[string];
|
||||||
|
ss:vector of count;
|
||||||
|
};
|
||||||
|
|
||||||
|
global servers: table[int] of Val = table();
|
||||||
|
|
||||||
|
event bro_init()
|
||||||
|
{
|
||||||
|
outfile = open("../out");
|
||||||
|
# first read in the old stuff into the table...
|
||||||
|
Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]);
|
||||||
|
Input::remove("ssh");
|
||||||
|
}
|
||||||
|
|
||||||
|
event Input::update_finished(name: string, source:string)
|
||||||
|
{
|
||||||
|
print outfile, servers;
|
||||||
|
close(outfile);
|
||||||
|
terminate();
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue