commit 75d9bf53a2b81630fba285b2a297a42a02e715d8
author Ilya Moiseenko <iliamo@ucla.edu> Fri Oct 28 13:18:32 2011 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Fri Oct 28 13:40:13 2011 -0700
tree b8039318395194b81513aa438002f40145708cc1
parent 7e6d0c90ef37f12343c3a5a94180537edc41bcf2

Interesrt header supports nack and congested fields

model/ccnx-interest-header.cc

diff --git a/model/ccnx-interest-header.cc b/model/ccnx-interest-header.cc
index 323c5fc..d44ac45 100644
--- a/model/ccnx-interest-header.cc
+++ b/model/ccnx-interest-header.cc
@@ -56,6 +56,8 @@
   , m_scope (-1)
   , m_interestLifetime (Seconds (0))
   , m_nonce (0)
+  , m_nack (false)
+  , m_congested (false)
 {
 }
 
@@ -174,7 +176,31 @@
 {
   return m_nonce;
 }
-  
+
+void
+CcnxInterestHeader::SetNack (bool isNack)
+{
+  m_nack = isNack;
+}
+    
+bool
+CcnxInterestHeader::IsNack () const
+{
+  return m_nack;
+}
+ 
+void
+CcnxInterestHeader::SetCongested (bool IsCongested)
+{
+  m_congested = IsCongested;
+}
+    
+bool
+CcnxInterestHeader::IsCongested () const
+{
+  return m_congested;
+}
+
 uint32_t
 CcnxInterestHeader::GetSerializedSize (void) const
 {
@@ -206,6 +232,8 @@
 CcnxInterestHeader::Print (std::ostream &os) const
 {
   os << "<Interest>\n  <Name>" << GetName () << "</Name>\n";
+  if (IsNack ())
+    os << "  <NACK />\n";
   if (GetMinSuffixComponents () >= 0)
     os << "  <MinSuffixComponents>" << GetMinSuffixComponents () << "</MinSuffixComponents>\n";
   if (GetMaxSuffixComponents () >= 0)

model/ccnx-interest-header.h

diff --git a/model/ccnx-interest-header.h b/model/ccnx-interest-header.h
index 061c26b..4bfebe3 100644
--- a/model/ccnx-interest-header.h
+++ b/model/ccnx-interest-header.h
@@ -201,6 +201,18 @@
 
   uint32_t
   GetNonce () const;
+    
+  void
+  SetNack (bool isNack);
+    
+  bool
+  IsNack () const;
+    
+  void
+  SetCongested (bool IsCongested);
+    
+  bool
+  IsCongested () const;
 
   //////////////////////////////////////////////////////////////////
   
@@ -221,6 +233,8 @@
   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 
 };
 
 class CcnxInterestHeaderException {};