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/awelzel/lookup-connection-zam-follow-up'

Browse source 
* origin/topic/awelzel/lookup-connection-zam-follow-up:
  script_opt: Use emit_builtin_error() for Lookup-Conn
This commit is contained in:
Arne Welzel 2025-01-23 16:46:33 +01:00
commit cb44a6ca53
4 changed files with 18 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.2.0-dev.106 | 2025-01-23 16:46:33 +0100
* script_opt: Use emit_builtin_error() for Lookup-Conn (Arne Welzel, Corelight)
Still create a separate baseline file because ZAM doesn't provide
detailed location information.
Patch for ZBI.op provided by @vpax
7.2.0-dev.104 | 2025-01-21 16:48:56 -0700 7.2.0-dev.104 | 2025-01-21 16:48:56 -0700
* session/Manager: Emit explicit errors for FindConnection() with proto=65535 (Arne Welzel, Corelight) * session/Manager: Emit explicit errors for FindConnection() with proto=65535 (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.2.0-dev.104 7.2.0-dev.106

2
src/script_opt/ZAM/OPs/ZBI.op
View file

@ -130,7 +130,7 @@ eval auto cid = $1;
res = conn->GetVal(); res = conn->GetVal();
else else
{ {
ERROR2("connection ID not a known connection", cid); emit_builtin_error("connection ID not a known connection", cid);
res = build_dummy_conn_record(); res = build_dummy_conn_record();
} }
AssignTarget($$, ZVal(res, res->GetType())); AssignTarget($$, ZVal(res, res->GetType()));

7
testing/btest/Baseline.zam/bifs.lookup_connection/.stderr Normal file
View file

@ -0,0 +1,7 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
1362692526.869344 error: invalid connection ID record encountered: the proto field has the "unknown" 65535 value. Did you forget to set it?
1362692526.869344 error in <no location>: connection ID not a known connection ([orig_h=141.142.228.5, orig_p=59856/tcp, resp_h=192.150.187.43, resp_p=80/tcp, proto=65535])
1362692526.869344 error: invalid connection ID record encountered: the proto field has the "unknown" 65535 value. Did you forget to set it?
1362692526.869344 error: invalid connection ID record encountered
1362692526.869344 error in <no location>: connection ID not a known connection ([orig_h=<uninitialized>, orig_p=<uninitialized>, resp_h=<uninitialized>, resp_p=<uninitialized>, proto=65535])
1362692526.869344 error: invalid connection ID record encountered