commit c86c2832d8c443bcbf7eab0d680a062444d98182
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Dec 23 02:56:22 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Dec 23 02:56:22 2011 -0800
tree 9c9f13bded6ce20ff8c47c1346c2bbba30b76938
parent 5beb35aad175f8a260788aac5e94552d7c903e44

Rate recorder trace helper

Also a small change in CCNx trace API

model/ccnx-content-store.cc

diff --git a/model/ccnx-content-store.cc b/model/ccnx-content-store.cc
index 4875386..b0c4858 100644
--- a/model/ccnx-content-store.cc
+++ b/model/ccnx-content-store.cc
@@ -150,7 +150,7 @@
 }
 
 
-boost::tuple<Ptr<Packet>, Ptr<const CcnxContentObjectHeader> >
+boost::tuple<Ptr<Packet>, Ptr<const CcnxContentObjectHeader>, Ptr<const Packet> >
 CcnxContentStore::Lookup (Ptr<const CcnxInterestHeader> interest)
 {
   NS_LOG_FUNCTION_NOARGS ();
@@ -162,9 +162,9 @@
                                            m_contentStore.project<i_mru> (it));
 
       // return fully formed CCNx packet
-      return boost::make_tuple (it->GetFullyFormedCcnxPacket (), it->GetHeader ());
+      return boost::make_tuple (it->GetFullyFormedCcnxPacket (), it->GetHeader (), it->GetPacket ());
     }
-  return boost::tuple<Ptr<Packet>, Ptr<CcnxContentObjectHeader> > (0, 0);
+  return boost::tuple<Ptr<Packet>, Ptr<CcnxContentObjectHeader>, Ptr<Packet> > (0, 0, 0);
 }   
     
 void