mirror of
https://github.com/zeek/zeek.git
synced 2025-10-03 15:18:20 +00:00
Bugfix: the header line was ending with a separator.
Test baselines needed adaption as well.
This commit is contained in:
Robin Sommer
parent
b69ecff3ee
commit
52c54859b6
18 changed files with 107 additions and 107 deletions
|
|
@ -60,11 +60,11 @@ bool LogWriterAscii::DoInit(string path, int num_fields, const LogField* const *
|
|||
|
||||
for ( int i = 0; i < num_fields; i++ )
|
||||
{
|
||||
const LogField* field = fields[i];
|
||||
if ( fputs(field->name.c_str(), file) == EOF )
|
||||
if ( i > 0 && fwrite(separator, separator_len, 1, file) != 1 )
|
||||
goto write_error;
|
||||
|
||||
if ( fwrite(separator, separator_len, 1, file) != 1 )
|
||||
const LogField* field = fields[i];
|
||||
if ( fputs(field->name.c_str(), file) == EOF )
|
||||
goto write_error;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299633982.99326 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299633982.99326 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718503.40319 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299718503.40319 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
PREFIX<>t|id.orig_h|id.orig_p|id.resp_h|id.resp_p|status|country|b|
|
||||
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|success|unknown|NOT-SET
|
||||
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|NOT-SET|US|NOT-SET
|
||||
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|failure|UK|NOT-SET
|
||||
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|NOT-SET|BR|NOT-SET
|
||||
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|failure|EMPTY|T
|
||||
PREFIX<>t|id.orig_h|id.orig_p|id.resp_h|id.resp_p|status|country|b
|
||||
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|success|unknown|NOT-SET
|
||||
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|NOT-SET|US|NOT-SET
|
||||
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|failure|UK|NOT-SET
|
||||
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|NOT-SET|BR|NOT-SET
|
||||
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|failure|EMPTY|T
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|success|unknown
|
||||
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|US
|
||||
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|UK
|
||||
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|success|BR
|
||||
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|MX
|
||||
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|success|unknown
|
||||
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|US
|
||||
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|UK
|
||||
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|success|BR
|
||||
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|MX
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
[t=1298326194.80574, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=success, country=<uninitialized>]
|
||||
[t=1298326194.80574, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=failure, country=US]
|
||||
[t=1299718502.96511, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=success, country=<uninitialized>]
|
||||
[t=1299718502.96511, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=failure, country=US]
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@ static-prefix-0.log
|
|||
static-prefix-1.log
|
||||
static-prefix-2.log
|
||||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX3
|
||||
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX3
|
||||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX2
|
||||
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX2
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.46042 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718503.16177 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.46042 1.2.3.4 1234 2.3.4.5 80 success -
|
||||
1299718503.16177 1.2.3.4 1234 2.3.4.5 80 success -
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success -
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success -
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success -
|
||||
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success -
|
||||
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure BR
|
||||
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure BR
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
|
||||
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 success unknown
|
||||
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure US
|
||||
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure UK
|
||||
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 success BR
|
||||
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure MX
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue