mirror of
https://github.com/zeek/zeek.git
synced 2025-10-15 13:08:20 +00:00
64aa5e3025
* 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)
6 lines
464 B
Text
6 lines
464 B
Text
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
<<<<<<< HEAD:testing/btest/Baseline.usage/language.common-mistakes2/out
|
|
in foo
|
|
=======
|
|
starttls, [orig_h=127.0.0.1, orig_p=40284/tcp, resp_h=127.0.0.1, resp_p=21/tcp, proto=6, ctx=[]]
|
|
>>>>>>> 388cbcee48 (Merge remote-tracking branch 'origin/topic/awelzel/4605-conn-id-context'):testing/btest/Baseline/scripts.base.protocols.ftp.ftp-auth-tls/.stdout
|