Move API for disabling packet analyzers into component.

Before, that API was part of the analyzers themselves, which meant we
couldn't disable a packet analyzer before it had been instantiated.
That's different from protocol/file analyzers, where we disable them
through the corresponding component. The lack of the component-side
API prevented Spicy from replacing packet analyzers at startup.

The reason we had put this into analyzer originally was performance so
that we don't need a component lookup for every packet. This change
keeps that optimization by caching the on/off state in the analyzer
itself as well, but now with the component being the one controlling
it.

src/packet_analysis/Analyzer.h

@@ -71,13 +71,6 @@ public:
 	 */
 	bool IsAnalyzer(const char* name);
 
-	/**
-	 * Enable or disable this analyzer.
-	 *
-	 * @param value The new enabled value.
-	 */
-	void SetEnabled(bool value) { enabled = value; }
-
 	/**
 	 * Return whether this analyzer is enabled or not.
 	 *
@@ -201,6 +194,7 @@ public:
 	void Weird(const char* name, Packet* packet = nullptr, const char* addl = "") const;
 
 protected:
+	friend class Component;
 	friend class Manager;
 
 	/**
@@ -221,6 +215,14 @@ protected:
 	 */
 	AnalyzerPtr LoadAnalyzer(const std::string& name);
 
+	/**
+	 * Enable or disable this analyzer. This is meant for internal use by
+	 * manager and component.
+	 *
+	 * @param value The new enabled value.
+	 */
+	void SetEnabled(bool value) { enabled = value; }
+
 	/**
 	 * Returns the module name corresponding to the analyzer, i.e. its script-land
 	 * namespace. Configuration values for the analyzer are expected in this module.

src/packet_analysis/Component.cc

@@ -3,6 +3,7 @@
 #include "zeek/packet_analysis/Component.h"
 
 #include "zeek/Desc.h"
+#include "zeek/packet_analysis/Analyzer.h"
 #include "zeek/packet_analysis/Manager.h"
 
 using namespace zeek::packet_analysis;
@@ -21,11 +22,23 @@ void Component::Initialize()
 	packet_mgr->RegisterComponent(this, "ANALYZER_");
 	}
 
+void Component::SetEnabled(bool arg_enabled)
+	{
+	enabled = arg_enabled;
+
+	// If we already have instantiated an analyzer, update its state.
+	if ( auto analyzer = packet_mgr->GetAnalyzer(Tag().AsVal().get()) )
+		analyzer->SetEnabled(enabled);
+	}
+
 void Component::DoDescribe(ODesc* d) const
 	{
 	if ( factory )
 		{
 		d->Add("ANALYZER_");
 		d->Add(CanonicalName());
+		d->Add(", ");
 		}
+
+	d->Add(enabled ? "enabled" : "disabled");
 	}

src/packet_analysis/Component.h

@@ -36,6 +36,20 @@ public:
 	 */
 	factory_callback Factory() const { return factory; }
 
+	/**
+	 * Returns true if the analyzer is currently enabled and hence
+	 * available for use.
+	 */
+	bool Enabled() const { return enabled; }
+
+	/**
+	 * Enables or disables this analyzer.
+	 *
+	 * @param arg_enabled True to enabled, false to disable.
+	 *
+	 */
+	void SetEnabled(bool arg_enabled);
+
 protected:
 	/**
 	 * Overriden from plugin::Component.
@@ -44,6 +58,7 @@ protected:
 
 private:
 	factory_callback factory; // The analyzer's factory callback.
+	bool enabled = true; // True if the analyzer is enabled.
 	};
 
 	}

src/packet_analysis/Manager.cc

@@ -30,7 +30,10 @@ void Manager::InitPostScript(const std::string& unprocessed_output_file)
 	for ( const auto& analyzerComponent : GetComponents() )
 		{
 		if ( AnalyzerPtr newAnalyzer = InstantiateAnalyzer(analyzerComponent->Tag()) )
+			{
+			newAnalyzer->SetEnabled(analyzerComponent->Enabled());
 			analyzers.emplace(analyzerComponent->Name(), newAnalyzer);
+			}
 		}
 
 	// Initialize all analyzers
@@ -91,11 +94,7 @@ AnalyzerPtr Manager::GetAnalyzer(const std::string& name)
 bool Manager::EnableAnalyzer(EnumVal* tag)
 	{
 	Component* c = Lookup(tag);
-	AnalyzerPtr a = GetAnalyzer(c->Name());
+	c->SetEnabled(true);
-	if ( ! a )
-		return false;
-
-	a->SetEnabled(true);
 
 	return true;
 	}
@@ -103,11 +102,7 @@ bool Manager::EnableAnalyzer(EnumVal* tag)
 bool Manager::DisableAnalyzer(EnumVal* tag)
 	{
 	Component* c = Lookup(tag);
-	AnalyzerPtr a = GetAnalyzer(c->Name());
+	c->SetEnabled(false);
-	if ( ! a )
-		return false;
-
-	a->SetEnabled(false);
 
 	return true;
 	}

testing/btest/Baseline/plugins.packet-protocol/output_build

@@ -1,7 +1,7 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 PacketDemo::Bar - Demo packet analyzers (RawLayer, LLC). (dynamic, version 1.0.0)
-    [Packet Analyzer] LLC_Demo (ANALYZER_LLC_DEMO)
+    [Packet Analyzer] LLC_Demo (ANALYZER_LLC_DEMO, enabled)
-    [Packet Analyzer] Raw_Layer (ANALYZER_RAW_LAYER)
+    [Packet Analyzer] Raw_Layer (ANALYZER_RAW_LAYER, enabled)
     [Event] raw_layer_message
     [Event] llc_demo_message