Virtualise call to print bridge to allow for subclasses to override it

diff --git a/src/devices/bridge/model/bridge-net-device.cc b/src/devices/bridge/model/bridge-net-device.cc
index 933130417e7277b788cfd1a65019ea216c0359db..d42efee8f5635995cf6d197c192187ebfb27221a 100644 (file)
--- a/src/devices/bridge/model/bridge-net-device.cc
+++ b/src/devices/bridge/model/bridge-net-device.cc
@@ -450,11 +450,15 @@ Address BridgeNetDevice::GetMulticast (Ipv6Address addr) const
   return Mac48Address::GetMulticast (addr);
 }
 
-std::ostream& operator<<(std::ostream& file, BridgeNetDevice& dev){
+std::ostream& BridgeNetDevice::Print(std::ostream& file){
        file << 1 << std::endl;
-       file << dev.m_address << std::endl;
-       file << *(dev.m_state);
+       file << m_address << std::endl;
+       file << *m_state;
        return file;
 }
 
+std::ostream& operator<<(std::ostream& file, BridgeNetDevice& dev){
+       return dev.Print(file);
+}
+
 } // namespace ns3

diff --git a/src/devices/bridge/model/bridge-net-device.h b/src/devices/bridge/model/bridge-net-device.h
index 47e6d61e7bac85351b9f7da666a5cbb7d3d9f358..dd55ab3ebb43385f6ea0c7b9401140b087857de9 100644 (file)
--- a/src/devices/bridge/model/bridge-net-device.h
+++ b/src/devices/bridge/model/bridge-net-device.h
@@ -136,6 +136,8 @@ protected:
 
   virtual Ptr<BridgePortNetDevice> CreateBridgePort(Ptr<BridgeNetDevice> bridge, Ptr<NetDevice> device, Ptr<Node> node);
 
+  virtual std::ostream& Print(std::ostream&);
+
 private:
   NetDevice::ReceiveCallback m_rxCallback;
   NetDevice::PromiscReceiveCallback m_promiscRxCallback;