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

finishing touches, make test more robust, rename function in last again

Browse source
This commit is contained in:
Bernhard Amann 2013-05-15 11:33:25 -07:00
parent 80962ad74b
commit ab6d5b08a8
5 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/base/frameworks/sumstats/plugins/last.bro
View file

@ -21,10 +21,10 @@ export {
}; };
## Get a vector of element values from a ResultVal. ## Get a vector of element values from a ResultVal.
global get_last_elements: function(rv: ResultVal): vector of Observation; global get_last: function(rv: ResultVal): vector of Observation;
} }
function get_last_elements(rv: ResultVal): vector of Observation function get_last(rv: ResultVal): vector of Observation
{ {
local s: vector of Observation = vector(); local s: vector of Observation = vector();
if ( rv?$last_elements ) if ( rv?$last_elements )

1
scripts/base/frameworks/sumstats/plugins/sample.bro
View file

@ -108,6 +108,7 @@ hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal)
} }
local totalcount = rv1$sample_elements + rv2$sample_elements; local totalcount = rv1$sample_elements + rv2$sample_elements;
result$sample_elements = totalcount;
for ( i in other_vector ) for ( i in other_vector )
{ {

12
testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout
View file

@ -1,12 +0,0 @@
6.5.4.3
[[num=2, dbl=<uninitialized>, str=<uninitialized>], [num=5, dbl=<uninitialized>, str=<uninitialized>]]
2
10.10.10.10
[[num=5, dbl=<uninitialized>, str=<uninitialized>]]
1
1.2.3.4
[[num=5, dbl=<uninitialized>, str=<uninitialized>], [num=22, dbl=<uninitialized>, str=<uninitialized>], [num=94, dbl=<uninitialized>, str=<uninitialized>], [num=91, dbl=<uninitialized>, str=<uninitialized>], [num=52, dbl=<uninitialized>, str=<uninitialized>]]
0
7.2.1.5
[[num=1, dbl=<uninitialized>, str=<uninitialized>], [num=91, dbl=<uninitialized>, str=<uninitialized>]]
2

18
testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/out Normal file
View file

@ -0,0 +1,18 @@
1
1.2.3.4
10.10.10.10
2
2
34
6.5.4.3
7.2.1.5
[num=1, dbl=<uninitialized>, str=<uninitialized>]
[num=2, dbl=<uninitialized>, str=<uninitialized>]
[num=22, dbl=<uninitialized>, str=<uninitialized>]
[num=5, dbl=<uninitialized>, str=<uninitialized>]
[num=5, dbl=<uninitialized>, str=<uninitialized>]
[num=5, dbl=<uninitialized>, str=<uninitialized>]
[num=52, dbl=<uninitialized>, str=<uninitialized>]
[num=91, dbl=<uninitialized>, str=<uninitialized>]
[num=91, dbl=<uninitialized>, str=<uninitialized>]
[num=94, dbl=<uninitialized>, str=<uninitialized>]

8
testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro
View file

@ -5,8 +5,8 @@
# @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT # @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT
# @TEST-EXEC: btest-bg-run worker-2 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT # @TEST-EXEC: btest-bg-run worker-2 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT
# @TEST-EXEC: btest-bg-wait 15 # @TEST-EXEC: btest-bg-wait 15
# @TEST-EXEC: cat manager-1/.stdout | sort > out
# @TEST-EXEC: btest-diff manager-1/.stdout # @TEST-EXEC: btest-diff out
@TEST-START-FILE cluster-layout.bro @TEST-START-FILE cluster-layout.bro
redef Cluster::nodes = { redef Cluster::nodes = {
@ -31,7 +31,9 @@ event bro_init() &priority=5
{ {
print key$host; print key$host;
local r = rt[key]["test"]; local r = rt[key]["test"];
print r$samples; for ( sample in r$samples ) {
print r$samples[sample];
}
print r$sample_elements; print r$sample_elements;
} }