From 5f29f1dca161eb55d8cd1dd2a3f5e7e34d741da0 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Thu, 15 Oct 2020 16:35:11 +0000 Subject: [PATCH] Make event ordering deterministic NetControl::init and filter_change_tracking could basically be raised in random order. --- scripts/base/frameworks/packet-filter/main.zeek | 2 +- .../scripts.policy.misc.dump-events/all-events-no-args.log | 2 +- .../Baseline/scripts.policy.misc.dump-events/all-events.log | 2 +- .../scripts.policy.misc.dump-events/really-all-events.log | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/base/frameworks/packet-filter/main.zeek b/scripts/base/frameworks/packet-filter/main.zeek index 66ab0e2731..6b97960663 100644 --- a/scripts/base/frameworks/packet-filter/main.zeek +++ b/scripts/base/frameworks/packet-filter/main.zeek @@ -178,7 +178,7 @@ event zeek_init() &priority=5 } } -event zeek_init() &priority=-5 +event zeek_init() &priority=-6 { install(); diff --git a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log index 9b8eadfaac..736708d269 100644 --- a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log +++ b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log @@ -1,6 +1,6 @@ 0.000000 zeek_init - 0.000000 filter_change_tracking 0.000000 NetControl::init + 0.000000 filter_change_tracking 1254722767.492060 Broker::log_flush 1254722767.492060 ChecksumOffloading::check 1254722767.492060 filter_change_tracking diff --git a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log index f3c79c3417..38cce22176 100644 --- a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log +++ b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log @@ -1,6 +1,6 @@ 0.000000 zeek_init - 0.000000 filter_change_tracking 0.000000 NetControl::init + 0.000000 filter_change_tracking 1254722767.492060 Broker::log_flush 1254722767.492060 ChecksumOffloading::check 1254722767.492060 filter_change_tracking diff --git a/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log b/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log index 654b1874ec..5bf6030285 100644 --- a/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log +++ b/testing/btest/Baseline/scripts.policy.misc.dump-events/really-all-events.log @@ -1,6 +1,6 @@ 0.000000 zeek_init - 0.000000 filter_change_tracking 0.000000 NetControl::init + 0.000000 filter_change_tracking 1254722767.492060 NetControl::init_done 1254722767.492060 network_time_init 1254722767.492060 Broker::log_flush