commit c9266044f285f243c8e73a22a366a4b4f37b79aa
author Ilya Moiseenko <iliamo@ucla.edu> Wed Nov 02 17:49:21 2011 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Wed Nov 02 17:51:58 2011 -0700
tree 4837b87fefb3c8c57f691baa14b7d813be49847d
parent beceb367b093c354d6da83f77b00a9bcd823d032

Ccnx-grid example

model/ccnx-l3-protocol.cc

diff --git a/model/ccnx-l3-protocol.cc b/model/ccnx-l3-protocol.cc
index e5f7f0c..4b832a4 100644
--- a/model/ccnx-l3-protocol.cc
+++ b/model/ccnx-l3-protocol.cc
@@ -279,11 +279,16 @@
   if ((header->IsNack()) && (pitEntry != m_pit->end ()))
     {
       //m_pit->erase (pitEntry);
+        NS_LOG_INFO("TRUE");
         m_pit->modify(pitEntry, CcnxPitEntry::DeleteIncoming(incomingFace));
     }
     
     NS_LOG_INFO("Before WasRecentlySatisfied");
-  if (m_rit->WasRecentlySatisfied (*header))
+    if (m_rit->WasRecentlySatisfied (*header))
+    {
+        return;
+    }
+  /*if (m_rit->WasRecentlySatisfied (*header))
     {
         NS_LOG_INFO("Entering WasRecentlySatisfied");
       // duplicate interests (same nonce) from applications are just ignored
@@ -300,11 +305,12 @@
                                m_node->GetObject<Ccnx> (), incomingFace);
         
       bool isMine = false;
-      TypeId tid = TypeId ("ns3::CcnxProducer");
+      //TypeId tid = TypeId ("ns3::CcnxProducer");
       for(uint32_t i=0; i<m_node->GetNApplications();i++)
         {
             Ptr<Application> app = m_node->GetApplication(i);
-            if(app->GetTypeId() == tid)
+            NS_LOG_INFO("ApplicationName = " << app->GetTypeId().GetName());
+            if(app->GetTypeId().GetName() == "ns3::CcnxProducer")
               {
                 if((DynamicCast<CcnxProducer>(app))->GetPrefix () == header->GetName ())
                 {
@@ -423,7 +429,7 @@
         
       if(pitEntry->m_fibEntry.m_faces.size() == 0)  
         return;
-    }
+    }*/
     
   // Otherwise,
   // propagate the interest