Repair two critical bug with Interest/NACK processing
- There was wrong selection of FIB face order in CcnxForwardingStrategy
- Stop reacting on NACK if there are no incoming faces (i.e., loop
detected after interest is already satisfied)
diff --git a/model/ccnx-face.cc b/model/ccnx-face.cc
index 92bdfee..40ac57b 100644
--- a/model/ccnx-face.cc
+++ b/model/ccnx-face.cc
@@ -26,6 +26,8 @@
#include "ns3/node.h"
#include "ns3/assert.h"
+#include <boost/ref.hpp>
+
NS_LOG_COMPONENT_DEFINE ("CcnxFace");
namespace ns3 {
@@ -127,7 +129,7 @@
bool
CcnxFace::Send (Ptr<Packet> packet)
{
- NS_LOG_FUNCTION_NOARGS ();
+ NS_LOG_FUNCTION (boost::cref (*this) << packet << packet->GetSize ());
/// \todo Implement tracing, if requested
@@ -141,7 +143,7 @@
bool
CcnxFace::Receive (const Ptr<const Packet> &packet)
{
- NS_LOG_FUNCTION_NOARGS ();
+ NS_LOG_FUNCTION (boost::cref (*this) << packet << packet->GetSize ());
/// \todo Implement tracing, if requested