commit 8f5a9bbe845300e398e72d3a5ce04c66889726a2
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Dec 18 19:49:02 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Dec 18 19:49:02 2011 -0800
tree 1f550d4f807fd558decbf532fdf11aa79c2655d4
parent 141d131d6351ba50313d67a6e55efa7c59e9bdc3

Rescanned bindings. Slight change in input format for AnnotatedTopology

model/annotated-topology-reader.cc

diff --git a/model/annotated-topology-reader.cc b/model/annotated-topology-reader.cc
index 15c0d6b..8caceb1 100644
--- a/model/annotated-topology-reader.cc
+++ b/model/annotated-topology-reader.cc
@@ -252,14 +252,14 @@
 
       if (link.GetAttributeFailSafe ("DataRate", tmp))
         {
-          NS_LOG_INFO ("DataRate = " + link.GetAttribute("DataRate")+"Kbps");
-          p2p.SetDeviceAttribute ("DataRate", StringValue(link.GetAttribute("DataRate")+"Kbps"));
+          NS_LOG_INFO ("DataRate = " + link.GetAttribute("DataRate"));
+          p2p.SetDeviceAttribute ("DataRate", StringValue(link.GetAttribute("DataRate")));
         }
 
       if (link.GetAttributeFailSafe("Delay", tmp))
         {
-          NS_LOG_INFO ("Delay = " + link.GetAttribute("Delay")+"ms");
-          p2p.SetChannelAttribute ("Delay", StringValue(link.GetAttribute("Delay")+"ms"));
+          NS_LOG_INFO ("Delay = " + link.GetAttribute("Delay"));
+          p2p.SetChannelAttribute ("Delay", StringValue(link.GetAttribute("Delay")));
         }
         
       NetDeviceContainer nd = p2p.Install(link.GetFromNode (), link.GetToNode ());

model/ccnx-l3-protocol.cc

diff --git a/model/ccnx-l3-protocol.cc b/model/ccnx-l3-protocol.cc
index 4ee61f7..4e3e460 100644
--- a/model/ccnx-l3-protocol.cc
+++ b/model/ccnx-l3-protocol.cc
@@ -318,9 +318,9 @@
 
   if (outFace == pitEntry.m_outgoing.end ())
     {
-      NS_ASSERT_MSG (false,
-                     "Node " << GetObject<Node> ()->GetId () << ", outgoing entry should exist for face " << boost::cref(*incomingFace) << "\n" <<
-                     "size: " << pitEntry.m_outgoing.size ());
+//      NS_ASSERT_MSG (false,
+//                     "Node " << GetObject<Node> ()->GetId () << ", outgoing entry should exist for face " << boost::cref(*incomingFace) << "\n" <<
+//                     "size: " << pitEntry.m_outgoing.size ());
       
       // m_dropNacks (header, NON_DUPLICATE, incomingFace);
       return;