Change in CcnxApp API. Now callbacks also contain pointer of original
packet (useful to get packet tags, if they exist)
Reflecting changes in PackegTag API
Rescanning bindings
More work on packet-path-weight tracers
diff --git a/helper/ccnx-trace-helper.h b/helper/ccnx-trace-helper.h
index cfff107..37565f5 100644
--- a/helper/ccnx-trace-helper.h
+++ b/helper/ccnx-trace-helper.h
@@ -33,6 +33,8 @@
class CcnxL3Tracer;
class Ipv4AppTracer;
class WindowTracer;
+class CcnxPathWeightTracer;
+class Application;
class CcnxTraceHelper
{
@@ -108,8 +110,26 @@
void
EnableWindowsTcpAll (const std::string &windowTrace);
+ /**
+ * @brief Should be called with node pointer after TCP application
+ *
+ * Workaround because NS-3 needs object to exist before connecting trace
+ */
void TcpConnect (Ptr<Node> node);
+ /**
+ * @brief Enable tracing of path weights
+ */
+ void
+ EnablePathWeights (const std::string &pathWeights);
+
+ /**
+ * @brief Should be called with node pointer after TCP application
+ *
+ * Workaround because NS-3 needs object to exist before connecting trace
+ */
+ void WeightsConnect (Ptr<Node> node, Ptr<Application> AppId);
+
private:
std::string m_appTrace;
std::list<Ptr<CcnxAppTracer> > m_apps;
@@ -131,6 +151,9 @@
std::list<Ptr<WindowTracer> > m_windowsTcp;
std::ostream *m_windowsTcpTrace;
+
+ std::list<Ptr<CcnxPathWeightTracer> > m_pathWeights;
+ std::ostream *m_pathWeightsTrace;
};