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

Merge remote-tracking branch 'origin/master' into dev/2.7

Browse source 
* origin/master:
  Fix SumStats "last" plugin in cluster mode
  Remove unnessary check
  Support appending to vector of any
  Fix coding conventions nits/typos
  Updating submodule(s).
  Revert "Switch frag_timeout from redef to option"
  Improve error handling in x509_ocsp_verify function
  Updating submodule(s).
  Updating submodule(s).
  Update baseline for plugins.hooks for redef -> option changes
  Switch frag_timeout from redef to option
  Switch GridFTP options from redef to option
  Updating submodule(s).
  Fix a unit test relying on a bash-ism
This commit is contained in:
Jon Siwek 2018-11-08 12:43:22 -06:00
commit 635e030be2
17 changed files with 202 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,8 @@ export {
};
redef record ResultVal += {
## This is the queue where elements are maintained. Use the
## This is the queue where elements are maintained.
## Don't access this value directly, instead use the
## :bro:see:`SumStats::get_last` function to get a vector of
## the current element values.
last_elements: Queue::Queue &optional;
@ -29,10 +30,21 @@ export {
function get_last(rv: ResultVal): vector of Observation
{
local s: vector of Observation = vector();
local s: vector of any = vector();
if ( rv?$last_elements )
Queue::get_vector(rv$last_elements, s);
return s;
local rval: vector of Observation = vector();
for ( i in s )
# When using the cluster-ized version of SumStats, Queue's
# internal table storage uses "any" type for values, so we need
# to cast them here or else they may be left as Broker::Data from
# the unserialization process.
rval += s[i] as Observation;
return rval;
}
hook register_observe_plugins()

6
scripts/base/protocols/ftp/gridftp.bro
View file

@ -30,15 +30,15 @@ module GridFTP;
export {
## Number of bytes transferred before guessing a connection is a
## GridFTP data channel.
const size_threshold = 1073741824 &redef;
option size_threshold = 1073741824;
## Time during which we check whether a connection's size exceeds the
## :bro:see:`GridFTP::size_threshold`.
const max_time = 2 min &redef;
option max_time = 2 min;
## Whether to skip further processing of the GridFTP data channel once
## detected, which may help performance.
const skip_data = T &redef;
option skip_data = T;
## Raised when a GridFTP data channel is detected.
##