model: Removing assert when interest payload is not zero
In CSMA channels, the minimum required length of a transmitted packet is
46 bytes, resulting in automatically added "payload" to some short
interest packets. There is no problem of ignoring the assert, as it was
intended only for debug purposes, to ensure that decoding was done
properly.
diff --git a/model/ndn-l3-protocol.cc b/model/ndn-l3-protocol.cc
index 4719434..5593040 100644
--- a/model/ndn-l3-protocol.cc
+++ b/model/ndn-l3-protocol.cc
@@ -265,7 +265,14 @@
// Deserialization. Exception may be thrown
packet->RemoveHeader (*header);
- NS_ASSERT_MSG (packet->GetSize () == 0, "Payload of Interests should be zero");
+
+ // this assert is legitimately failing with CSMA-style devices, when interest size is less then
+ // minimally required 46 bytes. At the same time, it is safe to ignore the fact
+ if (packet->GetSize () != 0)
+ {
+ NS_LOG_WARN ("Payload size is not zero. Valid only for CSMA (Ethernet) devices");
+ }
+ // NS_ASSERT_MSG (packet->GetSize () == 0, "Payload of Interests should be zero");
m_forwardingStrategy->OnInterest (face, header, p/*original packet*/);
// if (header->GetNack () > 0)