commit eae83eec953324a6b5784d8ec8ca4fc711cd8a6a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Mar 15 15:01:10 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Mar 15 15:17:26 2013 -0700
tree d7bb5dd16f01ea25ad24be309d1c7870e6ed7383
parent cfdc14fe6c996243299d594740d63a74afad101e

all: InterestHeader and ContentObjectHeader refactoring to Interest and ContentObject

refs #29

examples/custom-apps/dumb-requester.cc

diff --git a/examples/custom-apps/dumb-requester.cc b/examples/custom-apps/dumb-requester.cc
index 3dbcadf..643e24c 100644
--- a/examples/custom-apps/dumb-requester.cc
+++ b/examples/custom-apps/dumb-requester.cc
@@ -90,14 +90,14 @@
   
   Ptr<ndn::Name> prefix = Create<ndn::Name> (m_name); // another way to create name
 
-  // Create and configure ndn::InterestHeader
-  ndn::InterestHeader interestHeader;
+  // Create and configure ndn::Interest
+  ndn::Interest interestHeader;
   UniformVariable rand (0,std::numeric_limits<uint32_t>::max ());
   interestHeader.SetNonce            (rand.GetValue ());
   interestHeader.SetName             (prefix);
   interestHeader.SetInterestLifetime (Seconds (1.0));
 
-  // Create packet and add ndn::InterestHeader
+  // Create packet and add ndn::Interest
   Ptr<Packet> packet = Create<Packet> ();
   packet->AddHeader (interestHeader);
 
@@ -112,7 +112,7 @@
 }
 
 void
-DumbRequester::OnContentObject (const Ptr<const ndn::ContentObjectHeader> &contentObject,
+DumbRequester::OnContentObject (const Ptr<const ndn::ContentObject> &contentObject,
                                 Ptr<Packet> payload)
 {
   NS_LOG_DEBUG ("Receiving ContentObject packet for " << contentObject->GetName ());