L2NodeConfigurator: conditionally add protocol data based on hasStp/hasMrp parameters

Add hasStp and hasMrp boolean parameters to L2NodeConfigurator.
Only add Ieee8021dInterfaceData when hasStp is true, and only add
MrpInterfaceData when hasMrp is true. Previously, both were added
unconditionally, causing MrpInterfaceData to appear on interfaces
even when MRP was not active.

EthernetSwitch passes its hasStp/hasMrp parameters through to
L2NodeConfigurator. L2NetworkConfigurator::configureInterface()
now gracefully handles the case when Ieee8021dInterfaceData is absent.

Author: avarga

src/inet/linklayer/configurator/common/L2NetworkConfigurator.cc

@@ -256,7 +256,9 @@ void L2NetworkConfigurator::configureInterface(NetworkInterface *networkInterfac
 void L2NetworkConfigurator::configureInterface(InterfaceInfo *interfaceInfo)
 {
     NetworkInterface *networkInterface = interfaceInfo->networkInterface;
-    auto interfaceData = networkInterface->getProtocolDataForUpdate<Ieee8021dInterfaceData>();
+    auto interfaceData = networkInterface->findProtocolDataForUpdate<Ieee8021dInterfaceData>();
+    if (!interfaceData)
+        return;
 
     interfaceData->setLinkCost(interfaceInfo->portData.linkCost);
     interfaceData->setPriority(interfaceInfo->portData.priority);

src/inet/linklayer/configurator/common/L2NodeConfigurator.cc

@@ -60,10 +60,11 @@ void L2NodeConfigurator::prepareNode()
 
 void L2NodeConfigurator::prepareInterface(NetworkInterface *networkInterface)
 {
-//    ASSERT(!networkInterface->getProtocolData<Ieee8021dInterfaceData>());
-    networkInterface->addProtocolData<Ieee8021dInterfaceData>();
+    if (par("hasStp"))
+        networkInterface->addProtocolData<Ieee8021dInterfaceData>();
 #ifdef INET_WITH_MRP
-    networkInterface->addProtocolData<MrpInterfaceData>();
+    if (par("hasMrp"))
+        networkInterface->addProtocolData<MrpInterfaceData>();
 #endif
 }
 

src/inet/linklayer/configurator/common/L2NodeConfigurator.ned

@@ -31,6 +31,8 @@ simple L2NodeConfigurator extends SimpleModule like IL2NodeConfigurator
     parameters:
         @class(L2NodeConfigurator);
         @display("i=block/cogwheel");
+        bool hasStp = default(false);
+        bool hasMrp = default(false);
         string interfaceTableModule;
         string l2ConfiguratorModule = default("l2NetworkConfigurator"); // The absolute path to the ~L2NetworkConfigurator; use "" if there is no configurator
 }

src/inet/node/ethernet/EthernetSwitch.ned

@@ -87,6 +87,8 @@ module EthernetSwitch like IEthernetNetworkNode
         }
         l2NodeConfigurator: <default("L2NodeConfigurator")> like IL2NodeConfigurator if hasStp || hasMrp {
             @display("p=100,300;is=s");
+            hasStp = parent.hasStp;
+            hasMrp = parent.hasMrp;
         }
         status: NodeStatus if hasStatus {
             @display("p=100,400;is=s");