stp: stp does not have any DISCARDING states

inet-framework · ManiAm · Sep 8, 2019 · Sep 8, 2019 · Sep 8, 2019 · Sep 8, 2019
commit 4ba018e69da652730262ff2ff6d784fc038ca93e
diff --git a/src/inet/linklayer/configurator/Ieee8021dInterfaceData.cc b/src/inet/linklayer/configurator/Ieee8021dInterfaceData.cc
@@ -64,43 +64,46 @@ std::string Ieee8021dInterfaceData::detailedInfo() const
 const char *Ieee8021dInterfaceData::getRoleName(PortRole role)
 {
     switch (role) {
-        case ALTERNATE:
-            return "ALTERNATE";
+    case NOTASSIGNED:
+        return "NOTASSIGNED";
 
-        case NOTASSIGNED:
-            return "NOTASSIGNED";
+    case ROOT:
+        return "ROOT";
 
-        case DISABLED:
-            return "DISABLED";
+    case DESIGNATED:
+        return "DESIGNATED";
 
-        case DESIGNATED:
-            return "DESIGNATED";
+    case ALTERNATE:
+        return "ALTERNATE";
 
-        case BACKUP:
-            return "BACKUP";
+    case DISABLED:
+        return "DISABLED";
 
-        case ROOT:
-            return "ROOT";
+    case BACKUP:
+        return "BACKUP";
 
-        default:
-            throw cRuntimeError("Unknown port role %d", role);
+    default:
+        throw cRuntimeError("Unknown port role %d", role);
     }
 }
 
 const char *Ieee8021dInterfaceData::getStateName(PortState state)
 {
     switch (state) {
-        case DISCARDING:
-            return "DISCARDING";
+    case BLOCKING:
+        return "BLOCKING";
 
-        case LEARNING:
-            return "LEARNING";
+    case LEARNING:
+        return "LEARNING";
 
-        case FORWARDING:
-            return "FORWARDING";
+    case FORWARDING:
+        return "FORWARDING";
 
-        default:
-            throw cRuntimeError("Unknown port state %d", state);
+    case DISCARDING:
+        return "DISCARDING";
+
+    default:
+        throw cRuntimeError("Unknown port state %d", state);
     }
 }
 

diff --git a/src/inet/linklayer/configurator/Ieee8021dInterfaceData.h b/src/inet/linklayer/configurator/Ieee8021dInterfaceData.h
@@ -36,7 +36,7 @@ class INET_API Ieee8021dInterfaceData : public InterfaceProtocolData
   public:
     enum PortRole { NOTASSIGNED, ROOT, DESIGNATED, ALTERNATE, DISABLED, BACKUP /*rstp only*/ };
 
-    enum PortState { DISCARDING, LEARNING, FORWARDING };
+    enum PortState { BLOCKING /*stp only*/, LEARNING, FORWARDING, DISCARDING /*rstp only*/ };
 
     class PortInfo
     {

diff --git a/src/inet/linklayer/ieee8021d/stp/Stp.cc b/src/inet/linklayer/ieee8021d/stp/Stp.cc
@@ -110,7 +110,7 @@ void Stp::initInterfacedata(unsigned int interfaceId)
 
     // note: port cost and port priority are configured by the L2NetworkConfigurator
 
-    ifd->setState(Ieee8021dInterfaceData::DISCARDING);
+    ifd->setState(Ieee8021dInterfaceData::BLOCKING);
     ifd->setRootPriority(bridgePriority);
     ifd->setRootAddress(bridgeAddress);
     ifd->setRootPathCost(0);
@@ -244,7 +244,7 @@ void Stp::checkTimers()
         if (port->getRole() == Ieee8021dInterfaceData::ROOT || port->getRole() == Ieee8021dInterfaceData::DESIGNATED) {
             if (port->getFdWhile() >= currentFwdDelay) {
                 switch (port->getState()) {
-                    case Ieee8021dInterfaceData::DISCARDING:
+                    case Ieee8021dInterfaceData::BLOCKING:
                         EV_DETAIL << "Port=" << interfaceId << " goes into learning state." << endl;
                         port->setState(Ieee8021dInterfaceData::LEARNING);
                         port->setFdWhile(0);
@@ -263,9 +263,9 @@ void Stp::checkTimers()
             }
         }
         else {
-            EV_DETAIL << "Port=" << interfaceId << " goes into discarding state." << endl;
+            EV_DETAIL << "Port=" << interfaceId << " goes into BLOCKING state." << endl;
             port->setFdWhile(0);
-            port->setState(Ieee8021dInterfaceData::DISCARDING);
+            port->setState(Ieee8021dInterfaceData::BLOCKING);
         }
     }
 }
@@ -536,7 +536,7 @@ bool Stp::isSuperiorBPDU(int interfaceId, const Ptr<const Bpdu>& bpdu)
     // BPDU is superior
     if (result < 0) {
         port->setFdWhile(0);    // renew info
-        port->setState(Ieee8021dInterfaceData::DISCARDING);
+        port->setState(Ieee8021dInterfaceData::BLOCKING);
         setSuperiorBPDU(interfaceId, bpdu);    // renew information
         delete xBpdu;
         return true;