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

utils/tracers/ndn-l3-rate-tracer.cc

diff --git a/utils/tracers/ndn-l3-rate-tracer.cc b/utils/tracers/ndn-l3-rate-tracer.cc
index f588503..df76a22 100644
--- a/utils/tracers/ndn-l3-rate-tracer.cc
+++ b/utils/tracers/ndn-l3-rate-tracer.cc
@@ -185,7 +185,7 @@
 
 void
 L3RateTracer::OutInterests  (std::string context,
-                             Ptr<const InterestHeader> header, Ptr<const Face> face)
+                             Ptr<const Interest> header, Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_outInterests ++;
   m_stats[face].get<1> ().m_outInterests += header->GetSerializedSize ();
@@ -193,7 +193,7 @@
 
 void
 L3RateTracer::InInterests   (std::string context,
-                             Ptr<const InterestHeader> header, Ptr<const Face> face)
+                             Ptr<const Interest> header, Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_inInterests ++;
   m_stats[face].get<1> ().m_inInterests += header->GetSerializedSize ();
@@ -201,7 +201,7 @@
 
 void
 L3RateTracer::DropInterests (std::string context,
-                             Ptr<const InterestHeader> header, Ptr<const Face> face)
+                             Ptr<const Interest> header, Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_dropInterests ++;
   m_stats[face].get<1> ().m_dropInterests += header->GetSerializedSize ();
@@ -209,7 +209,7 @@
 
 void
 L3RateTracer::OutNacks  (std::string context,
-                         Ptr<const InterestHeader> header, Ptr<const Face> face)
+                         Ptr<const Interest> header, Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_outNacks ++;
   m_stats[face].get<1> ().m_outNacks += header->GetSerializedSize ();
@@ -217,7 +217,7 @@
 
 void
 L3RateTracer::InNacks   (std::string context,
-                         Ptr<const InterestHeader> header, Ptr<const Face> face)
+                         Ptr<const Interest> header, Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_inNacks ++;
   m_stats[face].get<1> ().m_inNacks += header->GetSerializedSize ();
@@ -225,7 +225,7 @@
 
 void
 L3RateTracer::DropNacks (std::string context,
-                         Ptr<const InterestHeader> header, Ptr<const Face> face)
+                         Ptr<const Interest> header, Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_dropNacks ++;
   m_stats[face].get<1> ().m_dropNacks += header->GetSerializedSize ();
@@ -233,7 +233,7 @@
 
 void
 L3RateTracer::OutData  (std::string context,
-                        Ptr<const ContentObjectHeader> header, Ptr<const Packet> payload,
+                        Ptr<const ContentObject> header, Ptr<const Packet> payload,
                         bool fromCache, Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_outData ++;
@@ -242,7 +242,7 @@
 
 void
 L3RateTracer::InData   (std::string context,
-                        Ptr<const ContentObjectHeader> header, Ptr<const Packet> payload,
+                        Ptr<const ContentObject> header, Ptr<const Packet> payload,
                         Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_inData ++;
@@ -251,7 +251,7 @@
 
 void
 L3RateTracer::DropData (std::string context,
-                        Ptr<const ContentObjectHeader> header, Ptr<const Packet> payload,
+                        Ptr<const ContentObject> header, Ptr<const Packet> payload,
                         Ptr<const Face> face)
 {
   m_stats[face].get<0> ().m_dropData ++;