commit 816de836753ee5c5c8fa50ee3d401cfc99bf51c1
author Ilya Moiseenko <iliamo@ucla.edu> Thu Dec 15 16:32:24 2011 -0800
committer Ilya Moiseenko <iliamo@ucla.edu> Thu Dec 15 16:32:24 2011 -0800
tree 7aedea4cd2b02e807a77fa2c6c7fb046601a6c30
parent 7dbdcafa76293d08ff592d483b7b52734e3d0532

Tracing

model/ccnx-l3-protocol.h

diff --git a/model/ccnx-l3-protocol.h b/model/ccnx-l3-protocol.h
index 13bdf94..d55ccd4 100644
--- a/model/ccnx-l3-protocol.h
+++ b/model/ccnx-l3-protocol.h
@@ -94,13 +94,18 @@
   {
     NDN_DUPLICATE_INTEREST,  ///< \brief Duplicate Interest
     NDN_SUPPRESSED_INTEREST, ///< \brief Suppressed Interest
-    NDN_UNSOLICITED_DATA,    ///< \brief Unsolicited ContentObject (duplicate?)
+    NDN_UNSOLICITED_DATA,    ///< \brief Unsolicited ContentObject(duplicate?)
     NDN_PIT_TIMER_EXPIRED,
     INTERFACE_DOWN,          ///< \brief Interface is down
 
-    DROP_CONGESTION, /**< Congestion detected */
+    NACK_SUPPRESSED,
+    NACK_AFTER_SATISFIED,
+    NACK_NONDUPLICATE,
+
     DROP_NO_ROUTE,   /**< No route to host */
   };
+    
+    
 
   /**
    * \enum DropReason
@@ -241,25 +246,25 @@
   Time    m_bucketLeakInterval;
   EventId m_bucketLeakEvent;
   
-  // TracedCallback<Ptr<const CcnxInterestHeader>,
-  //                Ptr<Ccnx>, Ptr<const CcnxFace> > m_receivedInterestsTrace;
-  // TracedCallback<Ptr<const CcnxInterestHeader>,
-  //                Ptr<Ccnx>, Ptr<const CcnxFace> > m_transmittedInterestsTrace;
-  // TracedCallback<Ptr<const CcnxInterestHeader>,
-  //                DropReason,
-  //                Ptr<Ccnx>, Ptr<const CcnxFace> > m_droppedInterestsTrace;
+  TracedCallback<Ptr<const CcnxInterestHeader>,
+                  Ptr<Ccnx>, Ptr<const CcnxFace> > m_receivedInterestsTrace;
+  TracedCallback<Ptr<const CcnxInterestHeader>,
+                  Ptr<Ccnx>, Ptr<const CcnxFace> > m_transmittedInterestsTrace;
+  TracedCallback<Ptr<const CcnxInterestHeader>,
+                  DropReason,
+                  Ptr<Ccnx>, Ptr<const CcnxFace> > m_droppedInterestsTrace;
 
-  // TracedCallback<Ptr<const CcnxContentObjectHeader>,
-  //                Ptr<const Packet>,/*payload*/
-  //                Ptr<Ccnx>, Ptr<const CcnxFace> > m_receivedDataTrace;
-  // TracedCallback<Ptr<const CcnxContentObjectHeader>,
-  //                Ptr<const Packet>,/*payload*/
-  //                ContentObjectSource,
-  //                Ptr<Ccnx>, Ptr<const CcnxFace> > m_transmittedDataTrace;
-  // TracedCallback<Ptr<const CcnxContentObjectHeader>,
-  //                Ptr<const Packet>,/*payload*/
-  //                DropReason,
-  //                Ptr<Ccnx>, Ptr<const CcnxFace> > m_droppedDataTrace;
+  TracedCallback<Ptr<const CcnxContentObjectHeader>,
+                  Ptr<const Packet>,/*payload*/
+                  Ptr<Ccnx>, Ptr<const CcnxFace> > m_receivedDataTrace;
+  TracedCallback<Ptr<const CcnxContentObjectHeader>,
+                  Ptr<const Packet>,/*payload*/
+                  ContentObjectSource,
+                  Ptr<Ccnx>, Ptr<const CcnxFace> > m_transmittedDataTrace;
+  TracedCallback<Ptr<const CcnxContentObjectHeader>,
+                  Ptr<const Packet>,/*payload*/
+                  DropReason,
+                  Ptr<Ccnx>, Ptr<const CcnxFace> > m_droppedDataTrace;
 };
   
 } // Namespace ns3