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

Merge branch 'topic/bbannier/spicyz-export-with-debug-output'

Browse source
This commit is contained in:
Benjamin Bannier 2023-09-20 13:04:21 +02:00
commit 0b940d8b3c
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CHANGES
View file

@ -1,3 +1,18 @@
6.1.0-dev.416 | 2023-09-20 13:04:21 +0200
* Correctly compute name for spicyz export with debug log. (Benjamin Bannier, Corelight)
In 36a6770e9891114b4f42dac3728040c67cc9411e we changed the way Spicy
fields exported as
record fields are represented. This broke the `zeek` debug log which
hardcoded a different representation.
This patch brings the generation of the debug log in line with the
actual AST structure. We also enable debug logging in one test to
validate that it works, at least for the case we hit here.
* Updating submodule(s) [nomail] (Benjamin Bannier, Corelight)
6.1.0-dev.413 | 2023-09-19 19:56:44 +0200 6.1.0-dev.413 | 2023-09-19 19:56:44 +0200
* ci/benchmark: Send more Cirrus, GitHub and Zeek version information (Arne Welzel, Corelight) * ci/benchmark: Send more Cirrus, GitHub and Zeek version information (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.1.0-dev.413 6.1.0-dev.416

9
src/spicy/spicyz/glue-compiler.cc
View file

@ -1318,14 +1318,7 @@ struct VisitorZeekType : hilti::visitor::PreOrder<hilti::Result<hilti::Expressio
SPICY_DEBUG(hilti::util::fmt("Creating Zeek record type %s::%s with fields:", ns, local)); SPICY_DEBUG(hilti::util::fmt("Creating Zeek record type %s::%s with fields:", ns, local));
for ( const auto& f : fields ) for ( const auto& f : fields )
SPICY_DEBUG(hilti::util::fmt(" %s", f.as<hilti::expression::Ctor>() SPICY_DEBUG(hilti::util::fmt(" %s", f));
.ctor()
.as<hilti::ctor::Tuple>()
.value()[0]
.as<hilti::expression::Ctor>()
.ctor()
.as<hilti::ctor::String>()
.value()));
} }
else else
SPICY_DEBUG(hilti::util::fmt("Creating (empty) Zeek record type %s::%s", ns, local)); SPICY_DEBUG(hilti::util::fmt("Creating (empty) Zeek record type %s::%s", ns, local));

3
testing/btest/spicy/export-type-with-fields.zeek
View file

@ -1,6 +1,7 @@
# @TEST-REQUIRES: have-spicy # @TEST-REQUIRES: have-spicy
# #
# @TEST-EXEC: spicyz -do export.hlto export.spicy export.evt # Running with `-D zeek` to excercise debug streams.
# @TEST-EXEC: spicyz -D zeek -do export.hlto export.spicy export.evt
# @TEST-EXEC: zeek export.hlto %INPUT >>output # @TEST-EXEC: zeek export.hlto %INPUT >>output
# @TEST-EXEC: btest-diff output # @TEST-EXEC: btest-diff output
# #