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/apps/ccnx-app.cc b/apps/ccnx-app.cc
index cc5e9b2..5093cf7 100644
--- a/apps/ccnx-app.cc
+++ b/apps/ccnx-app.cc
@@ -84,14 +84,14 @@
}
void
-CcnxApp::OnInterest (const Ptr<const CcnxInterestHeader> &interest)
+CcnxApp::OnInterest (const Ptr<const CcnxInterestHeader> &interest, Ptr<Packet> packet)
{
NS_LOG_FUNCTION (this << interest);
m_receivedInterests (interest, this, m_face);
}
void
-CcnxApp::OnNack (const Ptr<const CcnxInterestHeader> &interest)
+CcnxApp::OnNack (const Ptr<const CcnxInterestHeader> &interest, Ptr<Packet> packet)
{
NS_LOG_FUNCTION (this << interest);
m_receivedNacks (interest, this, m_face);
@@ -99,7 +99,7 @@
void
CcnxApp::OnContentObject (const Ptr<const CcnxContentObjectHeader> &contentObject,
- const Ptr<const Packet> &payload)
+ Ptr<Packet> payload)
{
NS_LOG_FUNCTION (this << contentObject << payload);
m_receivedContentObjects (contentObject, payload, this, m_face);