Use static Mac48Address broadcast address

nsnam · Feb 13, 2024 · e1d5557 · e1d5557
1 parent cf08a97
commit e1d5557
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/src/bridge/model/bridge-net-device.cc b/src/bridge/model/bridge-net-device.cc
@@ -355,7 +355,7 @@ Address
 BridgeNetDevice::GetBroadcast() const
 {
     NS_LOG_FUNCTION_NOARGS();
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/csma/model/csma-net-device.cc b/src/csma/model/csma-net-device.cc
@@ -912,7 +912,7 @@ Address
 CsmaNetDevice::GetBroadcast() const
 {
     NS_LOG_FUNCTION_NOARGS();
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/fd-net-device/model/fd-net-device.cc b/src/fd-net-device/model/fd-net-device.cc
@@ -752,7 +752,7 @@ FdNetDevice::SetIsBroadcast(bool broadcast)
 Address
 FdNetDevice::GetBroadcast() const
 {
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/mesh/model/mesh-point-device.cc b/src/mesh/model/mesh-point-device.cc
@@ -273,7 +273,7 @@ Address
 MeshPointDevice::GetBroadcast() const
 {
     NS_LOG_FUNCTION(this);
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/network/utils/simple-net-device.cc b/src/network/utils/simple-net-device.cc
@@ -380,7 +380,7 @@ Address
 SimpleNetDevice::GetBroadcast() const
 {
     NS_LOG_FUNCTION(this);
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/openflow/model/openflow-switch-net-device.cc b/src/openflow/model/openflow-switch-net-device.cc
@@ -283,7 +283,7 @@ Address
 OpenFlowSwitchNetDevice::GetBroadcast() const
 {
     NS_LOG_FUNCTION_NOARGS();
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/point-to-point/model/point-to-point-net-device.cc b/src/point-to-point/model/point-to-point-net-device.cc
@@ -471,7 +471,7 @@ Address
 PointToPointNetDevice::GetBroadcast() const
 {
     NS_LOG_FUNCTION(this);
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/spectrum/model/aloha-noack-net-device.cc b/src/spectrum/model/aloha-noack-net-device.cc
@@ -206,7 +206,7 @@ Address
 AlohaNoackNetDevice::GetBroadcast() const
 {
     NS_LOG_FUNCTION(this);
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/tap-bridge/model/tap-bridge.cc b/src/tap-bridge/model/tap-bridge.cc
@@ -799,7 +799,7 @@ TapBridge::ForwardToBridgedDevice(uint8_t* buf, ssize_t len)
         //
         // Packets we are going to forward should not be from a broadcast src
         //
-        NS_ASSERT_MSG(Mac48Address::ConvertFrom(src) != Mac48Address("ff:ff:ff:ff:ff:ff"),
+        NS_ASSERT_MSG(Mac48Address::ConvertFrom(src) != Mac48Address::GetBroadcast(),
                       "TapBridge::ForwardToBridgedDevice:  Source addr is broadcast");
         if (!m_ns3AddressRewritten)
         {
@@ -1156,7 +1156,7 @@ Address
 TapBridge::GetBroadcast() const
 {
     NS_LOG_FUNCTION(this);
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/virtual-net-device/model/virtual-net-device.cc b/src/virtual-net-device/model/virtual-net-device.cc
@@ -224,7 +224,7 @@ VirtualNetDevice::IsBroadcast() const
 Address
 VirtualNetDevice::GetBroadcast() const
 {
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool
@@ -236,13 +236,13 @@ VirtualNetDevice::IsMulticast() const
 Address
 VirtualNetDevice::GetMulticast(Ipv4Address multicastGroup) const
 {
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 Address
 VirtualNetDevice::GetMulticast(Ipv6Address addr) const
 {
-    return Mac48Address("ff:ff:ff:ff:ff:ff");
+    return Mac48Address::GetBroadcast();
 }
 
 bool

diff --git a/src/wimax/model/bs-net-device.cc b/src/wimax/model/bs-net-device.cc
@@ -831,7 +831,7 @@ BaseStationNetDevice::DoReceive(Ptr<Packet> packet)
                 C_Packet->RemoveHeader(llc);
                 source = m_ssManager->GetMacAddress(cid);
                 m_bsRxTrace(packet);
-                ForwardUp(packet->Copy(), source, Mac48Address("ff:ff:ff:ff:ff:ff"));
+                ForwardUp(packet->Copy(), source, Mac48Address::GetBroadcast());
             }
             else
             {
@@ -861,7 +861,7 @@ BaseStationNetDevice::DoReceive(Ptr<Packet> packet)
                     NS_LOG_INFO("\t fullPacket size = " << fullPacket->GetSize() << std::endl);
                     source = m_ssManager->GetMacAddress(cid);
                     m_bsRxTrace(fullPacket);
-                    ForwardUp(fullPacket->Copy(), source, Mac48Address("ff:ff:ff:ff:ff:ff"));
+                    ForwardUp(fullPacket->Copy(), source, Mac48Address::GetBroadcast());
                 }
                 else
                 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -752,7 +752,7 @@ FdNetDevice::SetIsBroadcast(bool broadcast) @@
     Address
     FdNetDevice::GetBroadcast() const
     {
-        return Mac48Address("ff:ff:ff:ff:ff:ff");
+        return Mac48Address::GetBroadcast();
     }
     bool
@@ Expand Down @@