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

Merge remote-tracking branch 'origin/topic/awelzel/4605-conn-id-context'

Browse source 
* origin/topic/awelzel/4605-conn-id-context:
  NEWS: Adapt for conn_id$ctx introduction
  conn_key/fivetuple: Drop support for non conn_id records
  Conn: Move conn_id init and flip to IPBasedConnKey
  IPBasedConnKey: Add GetTransportProto() helper
  input/Manager: Ignore empty record types
  external: Bump commit hashes for external suites
  ip/vlan_fivetuple: Populate nested conn_id_context, not conn_id
  ConnKey: Extend DoPopulateConnIdVal() with ctx
  btest: Update tests and baselines after adding ctx to conn_id
  init-bare: Add conn_id_ctx to conn_id

(cherry picked from commit 388cbcee48)
This commit is contained in:
Arne Welzel 2025-07-03 18:41:29 +02:00
parent 13b79ecb74
commit 64aa5e3025
274 changed files with 97157 additions and 96446 deletions
Download patch file Download diff file Expand all files Collapse all files

2
testing/btest/Baseline/scripts.base.files.extract.limit/files.log
View file

@ -7,5 +7,5 @@
#open XXXX-XX-XX-XX-XX-XX
#fields ts fuid uid id.orig_h id.orig_p id.resp_h id.resp_p source depth analyzers mime_type filename duration local_orig is_orig seen_bytes total_bytes missing_bytes overflow_bytes timedout parent_fuid extracted extracted_cutoff extracted_size md5 sha1 sha256
#types time string string addr port addr port string count set[string] string string interval bool bool count count count count bool string string bool count string string string
XXXXXXXXXX.XXXXXX FCceqBvpMfirSN0Ri ClEkJM2Vm5giqnMf4h 141.142.228.5 50737 141.142.192.162 38141 FTP_DATA 0 EXTRACT text/plain - 0.001059 F F 16557 - 0 0 F - 2 T 6000 - - -
XXXXXXXXXX.XXXXXX F9CPjA4amC2fuFoZ4k ClEkJM2Vm5giqnMf4h 141.142.228.5 50737 141.142.192.162 38141 FTP_DATA 0 EXTRACT text/plain - 0.001059 F F 16557 - 0 0 F - 2 T 6000 - - -
#close XXXX-XX-XX-XX-XX-XX