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/model/ccnx-interest-header.h b/model/ccnx-interest-header.h
index 4bfebe3..d7be5fe 100644
--- a/model/ccnx-interest-header.h
+++ b/model/ccnx-interest-header.h
@@ -202,17 +202,18 @@
uint32_t
GetNonce () const;
+ enum
+ {
+ NORMAL_INTEREST = 0,
+ NACK_LOOP = 1,
+ NACK_CONGESTION,
+ };
+
void
- SetNack (bool isNack);
+ SetNack (uint32_t nackType);
- bool
- IsNack () const;
-
- void
- SetCongested (bool IsCongested);
-
- bool
- IsCongested () const;
+ uint32_t
+ GetNack () const;
//////////////////////////////////////////////////////////////////
@@ -233,8 +234,7 @@
int8_t m_scope; ///< -1 not set, 0 local scope, 1 this host, 2 immediate neighborhood
Time m_interestLifetime;
uint32_t m_nonce; ///< Nonce. not used if zero
- bool m_nack; ///< is Negative ACK
- bool m_congested; ///< NACK because of congestion
+ uint32_t m_nackType;
};
class CcnxInterestHeaderException {};