expose eventScanOnEventsAvailableClassMask opendnp3 option

neilstephens · Dec 3, 2024 · 14953db · 14953db
1 parent 7475928
commit 14953db
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/Code/Ports/DNP3Port/DNP3MasterPort.cpp b/Code/Ports/DNP3Port/DNP3MasterPort.cpp
@@ -416,6 +416,8 @@ void DNP3MasterPort::Build()
 	StackConfig.master.maxTxFragSize = pConf->pPointConf->MaxTxFragSize;
 	StackConfig.master.maxRxFragSize = pConf->pPointConf->MaxTxFragSize;
 
+	StackConfig.master.eventScanOnEventsAvailableClassMask = pConf->pPointConf->GetEventScanOnEventsAvailableClassMask();
+
 	if(pConf->pPointConf->LinkUpIntegrityTrigger == DNP3PointConf::LinkUpIntegrityTrigger_t::NEVER)
 		StackConfig.master.startupIntegrityClassMask = opendnp3::ClassField::None();
 	else

diff --git a/Code/Ports/DNP3Port/DNP3PointConf.cpp b/Code/Ports/DNP3Port/DNP3PointConf.cpp
@@ -57,6 +57,10 @@ DNP3PointConf::DNP3PointConf(const std::string& FileName, const Json::Value& Con
 	FlagsToClearOnLinkStatus(odc::QualityFlags::ONLINE),
 	CommsPointRideThroughTimems(0),
 	CommsPointHeartBeatTimems(0),
+	/// Which classes should be scanned if IIN 1.1/2/3 flags are set
+	EventScanOnEventsAvailableClass1(false),
+	EventScanOnEventsAvailableClass2(false),
+	EventScanOnEventsAvailableClass3(false),
 	/// Which classes should be requested in a startup integrity scans
 	StartupIntegrityClass0(true),
 	StartupIntegrityClass1(true),
@@ -124,6 +128,12 @@ opendnp3::ClassField DNP3PointConf::GetUnsolClassMask()
 	return opendnp3::ClassField(true,UnsolClass1,UnsolClass2,UnsolClass3);
 }
 
+opendnp3::ClassField DNP3PointConf::GetEventScanOnEventsAvailableClassMask()
+{
+	return opendnp3::ClassField(false,EventScanOnEventsAvailableClass1,
+		EventScanOnEventsAvailableClass2,EventScanOnEventsAvailableClass3);
+}
+
 opendnp3::ClassField DNP3PointConf::GetStartupIntegrityClassMask()
 {
 	return opendnp3::ClassField(StartupIntegrityClass0,StartupIntegrityClass1,
@@ -243,6 +253,14 @@ void DNP3PointConf::ProcessElements(const Json::Value& JSONRoot)
 	if (JSONRoot.isMember("FlagsToClearOnLinkStatus"))
 		FlagsToClearOnLinkStatus = odc::QualityFlagsFromString(JSONRoot["FlagsToClearOnLinkStatus"].asString());
 
+	/// Which classes should be scanned if IIN 1.1/2/3 flags are set
+	if (JSONRoot.isMember("EventScanOnEventsAvailableClass1"))
+		EventScanOnEventsAvailableClass1 = JSONRoot["EventScanOnEventsAvailableClass1"].asBool();
+	if (JSONRoot.isMember("EventScanOnEventsAvailableClass2"))
+		EventScanOnEventsAvailableClass2 = JSONRoot["EventScanOnEventsAvailableClass2"].asBool();
+	if (JSONRoot.isMember("EventScanOnEventsAvailableClass3"))
+		EventScanOnEventsAvailableClass3 = JSONRoot["EventScanOnEventsAvailableClass3"].asBool();
+
 	/// Which classes should be requested in a startup integrity scan
 	if (JSONRoot.isMember("StartupIntegrityClass0"))
 		StartupIntegrityClass0 = JSONRoot["StartupIntegrityClass0"].asBool();

diff --git a/Code/Ports/DNP3Port/DNP3PointConf.h b/Code/Ports/DNP3Port/DNP3PointConf.h
@@ -75,6 +75,11 @@ class DNP3PointConf: public ConfigParser
 	odc::QualityFlags FlagsToClearOnLinkStatus; /// The flags to Clear when SetQualityOnLinkStatus is true
 	uint32_t CommsPointRideThroughTimems;       /// How long to wait before admitting the link is down
 	uint32_t CommsPointHeartBeatTimems;         /// Send a periodic comms event with this period if non zero
+	/// Which classes should be scanned if IIN 1.1/2/3 flags are set
+	opendnp3::ClassField GetEventScanOnEventsAvailableClassMask();
+	bool EventScanOnEventsAvailableClass1;
+	bool EventScanOnEventsAvailableClass2;
+	bool EventScanOnEventsAvailableClass3;
 	/// Which classes should be requested in a startup integrity scan
 	opendnp3::ClassField GetStartupIntegrityClassMask();
 	bool StartupIntegrityClass0;