commit c91ebfa9004b08de1122c76a5a8fb8f50e874c5c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 03 18:09:57 2015 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jan 06 10:50:27 2015 -0800
tree 669b932c53f9a0244f6c52f525aeb00d1067eed3
parent 8934c4212a3803d7ae06c92e147bfa51a5d26543

table: Allow iteration over CS entries

Change-Id: I23bf0da9a853de70187c9e72a0f7a5cb98107fbd
Refs: #2340

daemon/table/cs-entry.cpp

diff --git a/daemon/table/cs-entry.cpp b/daemon/table/cs-entry.cpp
index 1262065..0bcdefc 100644
--- a/daemon/table/cs-entry.cpp
+++ b/daemon/table/cs-entry.cpp
@@ -35,12 +35,9 @@
 
 NFD_LOG_INIT("CsEntry");
 
-void
-Entry::release()
+Entry::Entry()
+  : m_isUnsolicited(false)
 {
-  BOOST_ASSERT(m_layerIterators.empty());
-
-  m_dataPacket.reset();
 }
 
 void
@@ -58,27 +55,18 @@
   m_staleAt = time::steady_clock::now() + m_dataPacket->getFreshnessPeriod();
 }
 
-void
-Entry::setIterator(int layer, const Entry::LayerIterators::mapped_type& layerIterator)
+bool
+Entry::isStale() const
 {
-  m_layerIterators[layer] = layerIterator;
+  return m_staleAt < time::steady_clock::now();
 }
 
 void
-Entry::removeIterator(int layer)
+Entry::reset()
 {
-  m_layerIterators.erase(layer);
-}
-
-void
-Entry::printIterators() const
-{
-  for (LayerIterators::const_iterator it = m_layerIterators.begin();
-       it != m_layerIterators.end();
-       ++it)
-    {
-      NFD_LOG_TRACE("[" << it->first << "]" << " " << &(*it->second));
-    }
+  m_staleAt = time::steady_clock::TimePoint();
+  m_dataPacket.reset();
+  m_isUnsolicited = false;
 }
 
 } // namespace cs