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

Merge remote-tracking branch 'origin/topic/johanna/gh-3700'

Browse source 
* origin/topic/johanna/gh-3700:
  Fix cid propagation into files.log
This commit is contained in:
Tim Wojtulewicz 2024-04-29 09:09:28 -07:00
commit d7e30d9ee2
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -1,3 +1,12 @@
7.0.0-dev.196 | 2024-04-29 09:09:28 -0700
* Fix cid propagation into files.log (Johanna Amann, Corelight)
Changes to the connection id were not propagated to files.log in all
cases.
Fixes GH-3700
7.0.0-dev.194 | 2024-04-29 09:08:20 -0700 7.0.0-dev.194 | 2024-04-29 09:08:20 -0700
* factored BTest constants into globals to prevent premature ZAM optimization when testing (Vern Paxson, Corelight) * factored BTest constants into globals to prevent premature ZAM optimization when testing (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.194 7.0.0-dev.196

2
scripts/base/frameworks/files/main.zeek
View file

@ -603,7 +603,7 @@ event file_state_remove(f: fa_file) &priority=-10
# by reference in Log::write() rather than by copy. # by reference in Log::write() rather than by copy.
local info = |f$conns| > 1 ? copy(f$info) : f$info; local info = |f$conns| > 1 ? copy(f$info) : f$info;
info$uid = c$uid; info$uid = c$uid;
info$id = cid; info$id = c$id;
Log::write(Files::LOG, info); Log::write(Files::LOG, info);
} }
} }