tracers: Extending helper API in tracers
Now all tracers can be installed on individual nodes.
It is also possible to specify "-" as a file name, leading to tracing on
standard output.
Refs #1007 (http://redmine.named-data.net)
diff --git a/utils/tracers/ndn-l3-tracer.h b/utils/tracers/ndn-l3-tracer.h
index af840f4..bca0022 100644
--- a/utils/tracers/ndn-l3-tracer.h
+++ b/utils/tracers/ndn-l3-tracer.h
@@ -18,8 +18,8 @@
* Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
-#ifndef CCNX_L3_TRACER_H
-#define CCNX_L3_TRACER_H
+#ifndef NDN_L3_TRACER_H
+#define NDN_L3_TRACER_H
#include "ns3/ptr.h"
#include "ns3/simple-ref-count.h"
@@ -40,9 +40,6 @@
class Interest;
class ContentObject;
-typedef Interest InterestHeader;
-typedef ContentObject ContentObjectHeader;
-
/**
* @brief Base class for network-layer (incoming/outgoing Interests and Data) tracing of NDN stack
*/
@@ -87,41 +84,32 @@
Connect ();
virtual void
- OutInterests (std::string context,
- Ptr<const Interest>, Ptr<const Face>) = 0;
+ OutInterests (Ptr<const Interest>, Ptr<const Face>) = 0;
virtual void
- InInterests (std::string context,
- Ptr<const Interest>, Ptr<const Face>) = 0;
+ InInterests (Ptr<const Interest>, Ptr<const Face>) = 0;
virtual void
- DropInterests (std::string context,
- Ptr<const Interest>, Ptr<const Face>) = 0;
+ DropInterests (Ptr<const Interest>, Ptr<const Face>) = 0;
virtual void
- OutNacks (std::string context,
- Ptr<const Interest>, Ptr<const Face>) = 0;
+ OutNacks (Ptr<const Interest>, Ptr<const Face>) = 0;
virtual void
- InNacks (std::string context,
- Ptr<const Interest>, Ptr<const Face>) = 0;
+ InNacks (Ptr<const Interest>, Ptr<const Face>) = 0;
virtual void
- DropNacks (std::string context,
- Ptr<const Interest>, Ptr<const Face>) = 0;
+ DropNacks (Ptr<const Interest>, Ptr<const Face>) = 0;
virtual void
- OutData (std::string context,
- Ptr<const ContentObject>, Ptr<const Packet>, bool fromCache, Ptr<const Face>) = 0;
+ OutData (Ptr<const ContentObject>, Ptr<const Packet>, bool fromCache, Ptr<const Face>) = 0;
virtual void
- InData (std::string context,
- Ptr<const ContentObject>, Ptr<const Packet>, Ptr<const Face>) = 0;
+ InData (Ptr<const ContentObject>, Ptr<const Packet>, Ptr<const Face>) = 0;
virtual void
- DropData (std::string context,
- Ptr<const ContentObject>, Ptr<const Packet>, Ptr<const Face>) = 0;
+ DropData (Ptr<const ContentObject>, Ptr<const Packet>, Ptr<const Face>) = 0;
virtual void
SatisfiedInterests (Ptr<const pit::Entry>) = 0;
@@ -180,4 +168,4 @@
} // namespace ndn
} // namespace ns3
-#endif // CCNX_L3_TRACER_H
+#endif // NDN_L3_TRACER_H