Add support for configuring wireless interfaces

In Base Station module
inet-framework · Feb 22, 2024 · 8dcc7d5 · 8dcc7d5
1 parent 2a7da92
commit 8dcc7d5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/inet/routing/leach/LeachBS.cc b/src/inet/routing/leach/LeachBS.cc
@@ -31,9 +31,9 @@ void LeachBS::initialize(int stage) {
 
     //reads from omnetpp.ini
     if (stage == INITSTAGE_LOCAL) {
-        sequencenumber = 0;
         host = getContainingNode(this);
         interfaceTable.reference(this, "interfaceTableModule", true);
+        interfaces = par("interfaces");
 
         bsPktReceived = 0;
 
@@ -54,20 +54,21 @@ void LeachBS::stop() {
 }
 
 void LeachBS::configureInterfaces() {
+    cPatternMatcher interfaceMatcher(interfaces, false, true, false);
     int numInterfaces = interfaceTable->getNumInterfaces();
     for (int i = 0; i < numInterfaces; i++) {
         NetworkInterface *networkInterface = interfaceTable->getInterface(i);
-        // Only single wireless interface is required
-        if (networkInterface->isWireless()) {
-            interface80211ptr = networkInterface;
-            break;
+        if (networkInterface->isMulticast()
+                && interfaceMatcher.matches(
+                        networkInterface->getInterfaceName())) {
+            wirelessInterface = networkInterface;
         }
     }
 }
 
 void LeachBS::handleMessageWhenUp(cMessage *msg) {
     Ipv4Address nodeAddr =
-            (interface80211ptr->getProtocolData<Ipv4InterfaceData>()->getIPAddress());
+            (wirelessInterface->getProtocolData<Ipv4InterfaceData>()->getIPAddress());
     // if node is sending message
     if (msg->isSelfMessage()) {
         delete msg;

diff --git a/src/inet/routing/leach/LeachBS.h b/src/inet/routing/leach/LeachBS.h
@@ -30,11 +30,10 @@ class INET_API LeachBS: public RoutingProtocolBase {
     virtual ~LeachBS();
 
     int interfaceId = -1;
-    NetworkInterface *interface80211ptr = nullptr;
-    IInterfaceTable *ift = nullptr;
-    unsigned int sequencenumber = 0;
+    NetworkInterface *wirelessInterface = nullptr;
     cModule *host = nullptr;
     ModuleRefByPar<IInterfaceTable> interfaceTable;
+    const char *interfaces  = nullptr;
 
 protected:
     virtual int numInitStages() const override {

diff --git a/src/inet/routing/leach/LeachBS.ned b/src/inet/routing/leach/LeachBS.ned
@@ -22,9 +22,12 @@ simple LeachBS like IManetRouting
         // properties
         @class("leach::LeachBS");
         @display("i=block/routing");
-        
+
         // context parameters
-        string interfaceTableModule;   
+        string interfaceTableModule;
+
+        // Leach base station parameter group
+        string interfaces = default("*"); // Only single wireless interface is required        
     gates:
         input ipIn;
         output ipOut;