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

Merge remote branch 'origin/topic/robin/logging-internals' into topic/policy-scripts-new

Browse source
This commit is contained in:
Seth Hall 2011-04-19 20:35:00 -04:00
commit 7a1fd6498c
9 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
testing/btest/Baseline/language.rec-nested-opt/output Normal file
View file

@ -0,0 +1,3 @@
{
[Wget/1.9+cvs-stable (Red Hat modified)] = [name=Wget, version=[major=1, minor=9, addl=+cvs], host=0.0.0.0, ts=0.0]
}

4
testing/btest/Baseline/logging.rotate-custom/out
View file

@ -68,6 +68,8 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299499205.0 10.0.0.1 20 10.0.0.2 1033
1299502795.0 10.0.0.2 20 10.0.0.3 9
> test.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
> test2-11-03-06_19.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299466805.0 10.0.0.1 20 10.0.0.2 1024
@ -130,5 +132,3 @@
1299502795.0 10.0.0.2 20 10.0.0.3 9
> test2.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
> test.log
# t id.orig_h id.orig_p id.resp_h id.resp_p

25
testing/btest/language/rec-nested-opt.bro Normal file
View file

@ -0,0 +1,25 @@
# @TEST-EXEC: bro %INPUT >output 2>&1
# @TEST-EXEC: btest-diff output
type Version: record {
major: count &optional; ##< Major version number
minor: count &optional; ##< Minor version number
addl: string &optional; ##< Additional version string (e.g. "beta42")
} &log;
type Info: record {
name: string;
version: Version;
host: addr;
ts: time;
};
# Important thing to note here is that $minor2 is not include in the $version field.
global matched_software: table[string] of Info = {
["Wget/1.9+cvs-stable (Red Hat modified)"] =
[$name="Wget", $version=[$major=1,$minor=9,$addl="+cvs"], $host=0.0.0.0, $ts=network_time()],
};
print matched_software;