From f47a089576d63fe799cca34f1d4f3146f5ee3448 Mon Sep 17 00:00:00 2001 From: Benjamin Bannier Date: Wed, 6 Nov 2024 09:26:00 +0100 Subject: [PATCH 1/2] Bump auxil/spicy to latest development snapshot --- auxil/spicy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auxil/spicy b/auxil/spicy index 7347a2be41..135c1c9822 160000 --- a/auxil/spicy +++ b/auxil/spicy @@ -1 +1 @@ -Subproject commit 7347a2be4188a7ec2b3b71cf620fd3e3267c78af +Subproject commit 135c1c98220b514dd3684ec940b8734f78a2fd2e From f57955321e949810000fdbb59017b0cab9e5764a Mon Sep 17 00:00:00 2001 From: Benjamin Bannier Date: Wed, 6 Nov 2024 09:42:33 +0100 Subject: [PATCH 2/2] Make Spicy hook execution order deterministic in test --- testing/btest/spicy/event-args.zeek | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/btest/spicy/event-args.zeek b/testing/btest/spicy/event-args.zeek index 94312aff47..08163ea9ef 100644 --- a/testing/btest/spicy/event-args.zeek +++ b/testing/btest/spicy/event-args.zeek @@ -30,7 +30,7 @@ public type Banner = unit { protocol analyzer spicy::SSH over TCP: parse originator with SSH::Banner; -on SSH::Banner::%error(msg: string) -> event Banner::error(msg); -on SSH::Banner::%error() -> event Banner::error("n/a"); +on SSH::Banner::%error(msg: string) -> event Banner::error(msg) &priority=2; +on SSH::Banner::%error() -> event Banner::error("n/a") &priority=1; # @TEST-END-FILE