Revert "Add support for configuring wireless interfaces"

This reverts commit ad80f49.
inet-framework · Apr 20, 2024 · a63106a · a63106a
1 parent 8bfecec
commit a63106a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/inet/routing/leach/Leach.cc b/src/inet/routing/leach/Leach.cc
@@ -41,7 +41,6 @@ void Leach::initialize(int stage) {
 
         clusterHeadRatio = par("clusterHeadRatio");
         roundDurationVariance = par("roundDurationVariance");
-        interfaces = par("interfaces");
 
         roundDuration = dblrand(0) * roundDurationVariance;
         TDMADelayCounter = 1;
@@ -72,14 +71,13 @@ void Leach::stop() {
 }
 
 void Leach::configureInterfaces() {
-    cPatternMatcher interfaceMatcher(interfaces, false, true, false);
     int numInterfaces = interfaceTable->getNumInterfaces();
     for (int i = 0; i < numInterfaces; i++) {
         NetworkInterface *networkInterface = interfaceTable->getInterface(i);
-        if (networkInterface->isMulticast()
-                && interfaceMatcher.matches(
-                        networkInterface->getInterfaceName())) {
+        // Only single wireless interface is required
+        if (networkInterface->isWireless()) {
             wirelessInterface = networkInterface;
+            break;
         }
     }
 }

diff --git a/src/inet/routing/leach/Leach.h b/src/inet/routing/leach/Leach.h
@@ -39,7 +39,6 @@ class INET_API Leach: public RoutingProtocolBase {
     cMessage *event = nullptr;
     int round = 0;
     ModuleRefByPar<IInterfaceTable> interfaceTable;
-    const char *interfaces  = nullptr;
 
 protected:
     simtime_t dataPktSendDelay;

diff --git a/src/inet/routing/leach/Leach.ned b/src/inet/routing/leach/Leach.ned
@@ -29,7 +29,6 @@ simple Leach like IManetRouting
         string interfaceTableModule;
 
         // LEACH parameter group
-        string interfaces = default("*"); // Only single wireless interface is required
         volatile double startupDelay @unit(s) = default(uniform(0s, 1s));
         double clusterHeadRatio @unit(ratio) = default(0.05ratio); 	// Determines ratio of cluster heads in network, which is used for threshold function
         int roundDurationVariance = default(10);