Correcting bugs with cleaning timeouts in PIT/RIT/ContentStore
Removing RIT concept. Instead, keep track of nonces for each PIT entry.
Many changes in CcnxL3Protocol regarding Interest/Data handling (NACK
are not yet handled at all)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!! Remove when is not actual !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Code is not compiling !!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/helper/ccnx-encoding-helper.cc b/helper/ccnx-encoding-helper.cc
index 20ea101..f486c01 100644
--- a/helper/ccnx-encoding-helper.cc
+++ b/helper/ccnx-encoding-helper.cc
@@ -78,7 +78,7 @@
if (!interest.GetInterestLifetime().IsZero())
{
written += AppendBlockHeader (start, CcnbParser::CCN_DTAG_InterestLifetime, CcnbParser::CCN_DTAG);
- written += AppendTimestampBlob (start, interest.GetInterestLifetime());
+ written += AppendTimestampBlob (start, interest.GetInterestLifetime ());
written += AppendCloser (start);
}
if (interest.GetNonce()>0)
@@ -89,16 +89,10 @@
sizeof(nonce));
}
- if (interest.IsNack ())
+ if (interest.GetNack ()>0)
{
- written += AppendBlockHeader (start, CcnbParser::NDN_DTAG_Nack, CcnbParser::CCN_DTAG);
- written += AppendNumber (start, 1);
- written += AppendCloser (start);
- }
- if (interest.IsCongested ())
- {
- written += AppendBlockHeader (start, CcnbParser::NDN_DTAG_Congested, CcnbParser::CCN_DTAG);
- written += AppendNumber (start, 1);
+ written += AppendBlockHeader (start, CcnbParser::CCN_DTAG_Nack, CcnbParser::CCN_DTAG);
+ written += AppendNumber (start, interest.GetNack ());
written += AppendCloser (start);
}
written += AppendCloser (start); // </Interest>