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

Merge remote-tracking branch 'origin/master' into topic/bernhard/topk

Browse source
This commit is contained in:
Bernhard Amann 2013-05-13 21:03:23 -07:00
commit 56ab9285a4
19 changed files with 265 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/base/frameworks/sumstats/plugins/unique.bro
View file

@ -39,14 +39,14 @@ hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal)
if ( rv1?$unique_vals || rv2?$unique_vals )
{
if ( rv1?$unique_vals )
result$unique_vals = rv1$unique_vals;
result$unique_vals = copy(rv1$unique_vals);
if ( rv2?$unique_vals )
if ( ! result?$unique_vals )
result$unique_vals = rv2$unique_vals;
result$unique_vals = copy(rv2$unique_vals);
else
for ( val2 in rv2$unique_vals )
add result$unique_vals[val2];
add result$unique_vals[copy(val2)];
result$unique = |result$unique_vals|;
}