From 5b74b3d0ac47b961d2baed241f2a7537411cdd01 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Sat, 16 Aug 2025 14:10:17 -0700 Subject: [PATCH] maintenance updates for ZAM BiF-tracking --- src/script_opt/FuncInfo.cc | 5 +++-- testing/btest/Baseline/opt.ZAM-bif-tracking/output | 2 +- testing/btest/opt/ZAM-bif-tracking.zeek | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/script_opt/FuncInfo.cc b/src/script_opt/FuncInfo.cc index 874772d828..d33439b658 100644 --- a/src/script_opt/FuncInfo.cc +++ b/src/script_opt/FuncInfo.cc @@ -117,7 +117,7 @@ static std::unordered_map func_attrs = { {"Option::set_change_handler", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"PacketAnalyzer::GTPV1::remove_gtpv1_connection", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"PacketAnalyzer::Geneve::get_options", ATTR_NO_SCRIPT_SIDE_EFFECTS}, - {"PacketAnalyzer::PPPoE::session_id", ATTR_NO_SCRIPT_SIDE_EFFECTS}, + {"PacketAnalyzer::PPPoE::session_id", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"PacketAnalyzer::TEREDO::remove_teredo_connection", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"PacketAnalyzer::__disable_analyzer", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"PacketAnalyzer::__enable_analyzer", ATTR_NO_SCRIPT_SIDE_EFFECTS}, @@ -162,6 +162,7 @@ static std::unordered_map func_attrs = { {"Storage::Sync::__get", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"Storage::Sync::__open_backend", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"Storage::Sync::__put", ATTR_NO_SCRIPT_SIDE_EFFECTS}, + {"Storage::is_forced_sync", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"Supervisor::__create", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"Supervisor::__destroy", ATTR_NO_SCRIPT_SIDE_EFFECTS}, {"Supervisor::__is_supervised", ATTR_IDEMPOTENT}, @@ -301,6 +302,7 @@ static std::unordered_map func_attrs = { {"get_net_stats", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"get_orig_seq", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"get_package_readme", ATTR_FOLDABLE}, + {"get_plugin_components", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"get_port_transport_proto", ATTR_FOLDABLE}, {"get_proc_stats", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"get_reassembler_stats", ATTR_NO_ZEEK_SIDE_EFFECTS}, @@ -318,7 +320,6 @@ static std::unordered_map func_attrs = { {"global_ids", ATTR_IDEMPOTENT}, {"global_options", ATTR_IDEMPOTENT}, {"gsub", ATTR_FOLDABLE}, - {"get_plugin_components", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"has_event_group", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"has_module_events", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"have_spicy", ATTR_IDEMPOTENT}, diff --git a/testing/btest/Baseline/opt.ZAM-bif-tracking/output b/testing/btest/Baseline/opt.ZAM-bif-tracking/output index 5926891fca..33665f2cc6 100644 --- a/testing/btest/Baseline/opt.ZAM-bif-tracking/output +++ b/testing/btest/Baseline/opt.ZAM-bif-tracking/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -564 seen BiFs, 0 unseen BiFs (), 0 new BiFs () +566 seen BiFs, 0 unseen BiFs (), 0 new BiFs () diff --git a/testing/btest/opt/ZAM-bif-tracking.zeek b/testing/btest/opt/ZAM-bif-tracking.zeek index 687871038c..f1badd7312 100644 --- a/testing/btest/opt/ZAM-bif-tracking.zeek +++ b/testing/btest/opt/ZAM-bif-tracking.zeek @@ -150,6 +150,7 @@ global known_BiFs = set( "Option::set_change_handler", "PacketAnalyzer::GTPV1::remove_gtpv1_connection", "PacketAnalyzer::Geneve::get_options", + "PacketAnalyzer::PPPoE::session_id", "PacketAnalyzer::TEREDO::remove_teredo_connection", "PacketAnalyzer::__disable_analyzer", "PacketAnalyzer::__enable_analyzer", @@ -184,7 +185,6 @@ global known_BiFs = set( "Reporter::warning", "Spicy::__resource_usage", "Spicy::__toggle_analyzer", - "Storage::is_open", "Storage::Async::__close_backend", "Storage::Async::__erase", "Storage::Async::__get", @@ -195,6 +195,8 @@ global known_BiFs = set( "Storage::Sync::__get", "Storage::Sync::__open_backend", "Storage::Sync::__put", + "Storage::is_forced_sync", + "Storage::is_open", "Supervisor::__create", "Supervisor::__destroy", "Supervisor::__is_supervised", @@ -337,6 +339,7 @@ global known_BiFs = set( "get_net_stats", "get_orig_seq", "get_package_readme", + "get_plugin_components", "get_port_transport_proto", "get_proc_stats", "get_reassembler_stats", @@ -345,7 +348,6 @@ global known_BiFs = set( "get_reporter_stats", "get_resp_seq", "get_script_comments", - "get_plugin_components", "get_thread_stats", "get_timer_stats", "getenv",