From 91c8ca84013860b40583bdcd7f9bfd9e096cd31c Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 23 Jan 2025 09:34:12 +0100 Subject: [PATCH] script_opt: Use emit_builtin_error() for Lookup-Conn Still create a separate baseline file because ZAM doesn't provide detailed location information. Patch for ZBI.op provided by @vpax (cherry picked from commit 3b4b379950e119fd2299f71f199b53da5af13c7d) --- CHANGES | 19 +++++++++++++++++++ VERSION | 2 +- src/script_opt/ZAM/OPs/ZBI.op | 2 +- .../bifs.lookup_connection/.stderr | 7 +++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 testing/btest/Baseline.zam/bifs.lookup_connection/.stderr diff --git a/CHANGES b/CHANGES index 5306f82415..49083f3f6b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,22 @@ +7.1.0-14 | 2025-03-18 16:29:36 -0700 + + * 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 + + (cherry picked from commit 3b4b379950e119fd2299f71f199b53da5af13c7d) + + * Update zeek-testing commit hash (Tim Wojtulewicz, Corelight) + + * CI: Force rebuild of tumbleweed docker image (Tim Wojtulewicz, Corelight) + + * CI: bump FreeBSD 14 to 14.2, which came out in Dec'24 (Christian Kreibich, Corelight) + + (cherry picked from commit b77ef57dffe0740e4a7eeef2f4780b814d1469b0) + 7.1.0-10 | 2025-03-18 13:59:06 -0700 * Fix return types in docs for double_to_count and double_to_int (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 767018f093..5fffe7091b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.0-10 +7.1.0-14 diff --git a/src/script_opt/ZAM/OPs/ZBI.op b/src/script_opt/ZAM/OPs/ZBI.op index ed0e0c58a1..be13f0f082 100644 --- a/src/script_opt/ZAM/OPs/ZBI.op +++ b/src/script_opt/ZAM/OPs/ZBI.op @@ -130,7 +130,7 @@ eval auto cid = $1; res = conn->GetVal(); else { - ERROR2("connection ID not a known connection", cid); + emit_builtin_error("connection ID not a known connection", cid); res = build_dummy_conn_record(); } AssignTarget($$, ZVal(res, res->GetType())); diff --git a/testing/btest/Baseline.zam/bifs.lookup_connection/.stderr b/testing/btest/Baseline.zam/bifs.lookup_connection/.stderr new file mode 100644 index 0000000000..a3d89ea788 --- /dev/null +++ b/testing/btest/Baseline.zam/bifs.lookup_connection/.stderr @@ -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 : 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 : connection ID not a known connection ([orig_h=, orig_p=, resp_h=, resp_p=, proto=65535]) +1362692526.869344 error: invalid connection ID record encountered