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

model/fib/ndn-fib-impl.cc

diff --git a/model/fib/ndn-fib-impl.cc b/model/fib/ndn-fib-impl.cc
index 18ee6ac..1e0f04f 100644
--- a/model/fib/ndn-fib-impl.cc
+++ b/model/fib/ndn-fib-impl.cc
@@ -72,7 +72,7 @@
 
 
 Ptr<Entry>
-FibImpl::LongestPrefixMatch (const InterestHeader &interest)
+FibImpl::LongestPrefixMatch (const Interest &interest)
 {
   super::iterator item = super::longest_prefix_match (interest.GetName ());
   // @todo use predicate to search with exclude filters

model/fib/ndn-fib-impl.h

diff --git a/model/fib/ndn-fib-impl.h b/model/fib/ndn-fib-impl.h
index 9b45ba2..0755b35 100644
--- a/model/fib/ndn-fib-impl.h
+++ b/model/fib/ndn-fib-impl.h
@@ -86,7 +86,7 @@
   FibImpl ();
 
   virtual Ptr<Entry>
-  LongestPrefixMatch (const InterestHeader &interest);
+  LongestPrefixMatch (const Interest &interest);
   
   virtual Ptr<Entry>
   Add (const Name &prefix, Ptr<Face> face, int32_t metric);

model/fib/ndn-fib.h

diff --git a/model/fib/ndn-fib.h b/model/fib/ndn-fib.h
index 141a402..85e0eaf 100644
--- a/model/fib/ndn-fib.h
+++ b/model/fib/ndn-fib.h
@@ -29,7 +29,7 @@
 namespace ns3 {
 namespace ndn {
 
-class InterestHeader;
+class Interest;
 
 /**
  * \ingroup ndn
@@ -63,7 +63,7 @@
    * \returns If entry found a valid iterator (Ptr<fib::Entry>) will be returned, otherwise End () (==0)
    */
   virtual Ptr<fib::Entry>
-  LongestPrefixMatch (const InterestHeader &interest) = 0;
+  LongestPrefixMatch (const Interest &interest) = 0;
   
   /**
    * \brief Add or update FIB entry