commit e63eaf6df05daaf5174984aa02b87ceebb2b6b5c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jun 30 12:40:55 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jun 30 17:50:15 2014 -0700
tree 034df651afe51dcc080da263a2358e75a3a66af5
parent b1ab0ca823470ffa664f25f6c85123244d32d596

management: Add ExpirationPeriod to nfd::FaceStatus

Change-Id: Ie902991b86653609de3b8e6815c0e3313e7dc815
Refs: #1685

src/management/nfd-face-status.hpp

diff --git a/src/management/nfd-face-status.hpp b/src/management/nfd-face-status.hpp
index 1b86b3c..a92e154 100644
--- a/src/management/nfd-face-status.hpp
+++ b/src/management/nfd-face-status.hpp
@@ -28,6 +28,7 @@
 #include "../encoding/tlv-nfd.hpp"
 #include "../encoding/encoding-buffer.hpp"
 #include "../encoding/block-helpers.hpp"
+#include "../util/time.hpp"
 
 namespace ndn {
 namespace nfd {
@@ -117,6 +118,27 @@
     return *this;
   }
 
+  bool
+  hasExpirationPeriod() const
+  {
+    return m_hasExpirationPeriod;
+  }
+
+  const time::milliseconds&
+  getExpirationPeriod() const
+  {
+    BOOST_ASSERT(m_hasExpirationPeriod);
+    return m_expirationPeriod;
+  }
+
+  FaceStatus&
+  setExpirationPeriod(const time::milliseconds& expirationPeriod)
+  {
+    m_expirationPeriod = expirationPeriod;
+    m_hasExpirationPeriod = true;
+    return *this;
+  }
+
   uint64_t
   getFlags() const
   {
@@ -191,6 +213,8 @@
   uint64_t m_faceId;
   std::string m_remoteUri;
   std::string m_localUri;
+  time::milliseconds m_expirationPeriod;
+  bool m_hasExpirationPeriod;
   uint64_t m_flags;
   uint64_t m_nInInterests;
   uint64_t m_nInDatas;
@@ -203,6 +227,7 @@
 inline
 FaceStatus::FaceStatus()
   : m_faceId(0)
+  , m_hasExpirationPeriod(false)
   , m_flags(0)
   , m_nInInterests(0)
   , m_nInDatas(0)
@@ -227,6 +252,10 @@
                  tlv::nfd::NInInterests, m_nInInterests);
   totalLength += prependNonNegativeIntegerBlock(encoder,
                  tlv::nfd::FaceFlags, m_flags);
+  if (m_hasExpirationPeriod) {
+    totalLength += prependNonNegativeIntegerBlock(encoder,
+                   tlv::nfd::ExpirationPeriod, m_expirationPeriod.count());
+  }
   totalLength += prependByteArrayBlock(encoder, tlv::nfd::LocalUri,
                  reinterpret_cast<const uint8_t*>(m_localUri.c_str()), m_localUri.size());
   totalLength += prependByteArrayBlock(encoder, tlv::nfd::Uri,
@@ -266,7 +295,7 @@
   Block::element_const_iterator val = m_wire.elements_begin();
 
   if (val != m_wire.elements_end() && val->type() == tlv::nfd::FaceId) {
-    m_faceId = static_cast<uint64_t>(readNonNegativeInteger(*val));
+    m_faceId = readNonNegativeInteger(*val);
     ++val;
   }
   else {
@@ -289,8 +318,18 @@
     throw Error("missing required LocalUri field");
   }
 
+  if (val != m_wire.elements_end() && val->type() == tlv::nfd::ExpirationPeriod) {
+    m_expirationPeriod = time::milliseconds(readNonNegativeInteger(*val));
+    m_hasExpirationPeriod = true;
+    ++val;
+  }
+  else {
+    m_hasExpirationPeriod = false;
+    // ExpirationPeriod is optional
+  }
+
   if (val != m_wire.elements_end() && val->type() == tlv::nfd::FaceFlags) {
-    m_flags = static_cast<uint64_t>(readNonNegativeInteger(*val));
+    m_flags = readNonNegativeInteger(*val);
     ++val;
   }
   else {
@@ -298,7 +337,7 @@
   }
 
   if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInInterests) {
-    m_nInInterests = static_cast<uint64_t>(readNonNegativeInteger(*val));
+    m_nInInterests = readNonNegativeInteger(*val);
     ++val;
   }
   else {
@@ -306,7 +345,7 @@
   }
 
   if (val != m_wire.elements_end() && val->type() == tlv::nfd::NInDatas) {
-    m_nInDatas = static_cast<uint64_t>(readNonNegativeInteger(*val));
+    m_nInDatas = readNonNegativeInteger(*val);
     ++val;
   }
   else {
@@ -314,7 +353,7 @@
   }
 
   if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutInterests) {
-    m_nOutInterests = static_cast<uint64_t>(readNonNegativeInteger(*val));
+    m_nOutInterests = readNonNegativeInteger(*val);
     ++val;
   }
   else {
@@ -322,7 +361,7 @@
   }
 
   if (val != m_wire.elements_end() && val->type() == tlv::nfd::NOutDatas) {
-    m_nOutDatas = static_cast<uint64_t>(readNonNegativeInteger(*val));
+    m_nOutDatas = readNonNegativeInteger(*val);
     ++val;
   }
   else {
@@ -336,8 +375,16 @@
   os << "FaceStatus("
      << "FaceID: " << status.getFaceId() << ", "
      << "RemoteUri: " << status.getRemoteUri() << ", "
-     << "LocalUri: " << status.getLocalUri() << ", "
-     << "Flags: " << status.getFlags() << ", "
+     << "LocalUri: " << status.getLocalUri() << ", ";
+
+  if (status.hasExpirationPeriod()) {
+    os << "ExpirationPeriod: " << status.getExpirationPeriod() << ", ";
+  }
+  else {
+    os << "ExpirationPeriod: infinite, ";
+  }
+
+  os << "Flags: " << status.getFlags() << ", "
      << "Counters: " << status.getNInInterests() << "|" << status.getNInDatas()
      << "|" << status.getNOutInterests() << "|" << status.getNOutDatas()
      << ")";