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

Merge remote-tracking branch 'origin/topic/jazoff/fix-gridftp'

Browse source 
* origin/topic/jazoff/fix-gridftp:
  problem: gridftp threshold is being applied to all connections
This commit is contained in:
Johanna Amann 2017-09-21 09:10:21 -07:00
commit 39a026c88d
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.5-310 | 2017-09-21 09:10:21 -0700
* fix interaction of gridftp scripts with other thresholds. (Justin Azoff)
2.5-307 | 2017-09-20 10:51:09 -0500 2.5-307 | 2017-09-20 10:51:09 -0500
* BIT-1846: Updating broctl submodule to include fix for symlinking * BIT-1846: Updating broctl submodule to include fix for symlinking

2
VERSION
View file

@ -1 +1 @@
2.5-307 2.5-310

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

@ -75,6 +75,9 @@ event ConnThreshold::bytes_threshold_crossed(c: connection, threshold: count, is
if ( threshold < size_threshold || "gridftp-data" in c$service || c$duration > max_time ) if ( threshold < size_threshold || "gridftp-data" in c$service || c$duration > max_time )
return; return;
if ( ! data_channel_initial_criteria(c) )
return;
add c$service["gridftp-data"]; add c$service["gridftp-data"];
event GridFTP::data_channel_detected(c); event GridFTP::data_channel_detected(c);