commit 565b50c56f63c0aca88ab2f6990fbe560411aeb6
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 01 13:22:56 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 01 13:22:56 2013 -0800
tree 77f99e4cae2b73da87ce32bab3f0e9eed3001a4c
parent c45c4d69e94cae148af6a167e7d0e61bbb3f659b

model: Resolving bug/regression in ndn::NetDeviceFace that effectively prevented using ndnSIM with network devices other than PointToPointNetDevice in debug mode

model/ndn-net-device-face.cc

diff --git a/model/ndn-net-device-face.cc b/model/ndn-net-device-face.cc
index 7373ed8..997195f 100644
--- a/model/ndn-net-device-face.cc
+++ b/model/ndn-net-device-face.cc
@@ -50,7 +50,7 @@
   return tid;
 }
 
-/** 
+/**
  * By default, Ndn face are created in the "down" state.  Before
  * becoming useable, the user must invoke SetUp on the face
  */
@@ -87,7 +87,7 @@
   NS_LOG_FUNCTION (this);
 
   Face::RegisterProtocolHandler (handler);
-  
+
   m_node->RegisterProtocolHandler (MakeCallback (&NetDeviceFace::ReceiveFromNetDevice, this),
                                    L3Protocol::ETHERNET_FRAME_TYPE, m_netDevice, true/*promiscuous mode*/);
 }
@@ -96,13 +96,13 @@
 NetDeviceFace::SendImpl (Ptr<Packet> packet)
 {
   NS_LOG_FUNCTION (this << packet);
-  
-  NS_ASSERT_MSG (packet->GetSize () <= m_netDevice->GetMtu (), 
+
+  NS_ASSERT_MSG (packet->GetSize () <= m_netDevice->GetMtu (),
                  "Packet size " << packet->GetSize () << " exceeds device MTU "
                  << m_netDevice->GetMtu ()
                  << " for Ndn; fragmentation not supported");
 
-  bool ok = m_netDevice->Send (packet, m_netDevice->GetBroadcast (), 
+  bool ok = m_netDevice->Send (packet, m_netDevice->GetBroadcast (),
                                L3Protocol::ETHERNET_FRAME_TYPE);
   return ok;
 }
@@ -125,14 +125,20 @@
 NetDeviceFace::Print (std::ostream& os) const
 {
 #ifdef NS3_LOG_ENABLE
-  os << "dev[" << GetNode ()->GetId () << "]=net(" << GetId () << ",";
-  os << DynamicCast<PointToPointNetDevice> (m_netDevice)->GetChannel ()->GetDevice (0)->GetNode ()->GetId ();
-  os << "-";
-  os << DynamicCast<PointToPointNetDevice> (m_netDevice)->GetChannel ()->GetDevice (1)->GetNode ()->GetId ();
+  os << "dev[" << GetNode ()->GetId () << "]=net(" << GetId ();
+
+  if (DynamicCast<PointToPointNetDevice> (m_netDevice))
+    {
+      // extra debugging information which available ONLY for PointToPointNetDevice's
+      os << ",";
+      os << DynamicCast<PointToPointNetDevice> (m_netDevice)->GetChannel ()->GetDevice (0)->GetNode ()->GetId ();
+      os << "-";
+      os << DynamicCast<PointToPointNetDevice> (m_netDevice)->GetChannel ()->GetDevice (1)->GetNode ()->GetId ();
+    }
   os << ")";
 #else
   os << "dev=net(" << GetId () << ")";
-#endif  
+#endif
   return os;
 }