all: InterestHeader and ContentObjectHeader refactoring to Interest and ContentObject
refs #29
diff --git a/disabled/ndn-interest-header-ccnb.h b/disabled/ndn-interest-header-ccnb.h
index 819875a..1daa7d1 100644
--- a/disabled/ndn-interest-header-ccnb.h
+++ b/disabled/ndn-interest-header-ccnb.h
@@ -118,7 +118,7 @@
**/
/**
- * @brief NDN InterestHeader and routines to serialize/deserialize
+ * @brief NDN Interest and routines to serialize/deserialize
*
* Simplifications:
* - Name: binary name components are not supported
@@ -129,7 +129,7 @@
* - InterestLifetime: ?
* - Nonce: 32 bit random integer. If value is 0, will not be serialized
**/
-class InterestHeader : public SimpleRefCount<InterestHeader, Header>
+class Interest : public SimpleRefCount<Interest, Header>
{
public:
/**
@@ -137,12 +137,12 @@
*
* Creates a null header
**/
- InterestHeader ();
+ Interest ();
/**
* @brief Copy constructor
*/
- InterestHeader (const InterestHeader &interest);
+ Interest (const Interest &interest);
/**
* \brief Set interest name
@@ -391,7 +391,7 @@
/**
* @brief Cheat for python bindings
*/
- static Ptr<InterestHeader>
+ static Ptr<Interest>
GetInterest (Ptr<Packet> packet);
private:
@@ -411,7 +411,7 @@
* @ingroup ndn-exceptions
* @brief Class for Interest parsing exception
*/
-class InterestHeaderException {};
+class InterestException {};
} // namespace ndn
} // namespace ns3