v2: overlook old interests within RTT (close #25)

named-data · Dec 19, 2023 · ad72811 · ad72811
1 parent f998c2b
commit ad72811
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/ndn-svs/core.cpp b/ndn-svs/core.cpp
@@ -348,6 +348,10 @@ SVSyncCore::mergeStateVector(const VersionVector& vvOther)
     SeqNo seq = entry.second;
     SeqNo seqOther = vvOther.get(nid);
 
+    // Ignore this node if it was last updated within network RTT
+    if (time::system_clock::now() - m_vv.getLastUpdate(nid) < m_maxSuppressionTime)
+      continue;
+
     if (seqOther < seq)
     {
       myVectorNew = true;

diff --git a/ndn-svs/version-vector.hpp b/ndn-svs/version-vector.hpp
@@ -52,6 +52,7 @@ class VersionVector
   set(const NodeID& nid, SeqNo seqNo)
   {
     m_map[nid] = seqNo;
+    m_lastUpdate[nid] = time::system_clock::now();
     return seqNo;
   }
 
@@ -62,6 +63,13 @@ class VersionVector
     return elem == m_map.end() ? 0 : elem->second;
   }
 
+  time::system_clock::time_point
+  getLastUpdate(const NodeID& nid) const
+  {
+    auto elem = m_lastUpdate.find(nid);
+    return elem == m_lastUpdate.end() ? time::system_clock::time_point::min() : elem->second;
+  }
+
   const_iterator
   begin() const noexcept
   {
@@ -82,6 +90,7 @@ class VersionVector
 
 private:
   std::map<NodeID, SeqNo> m_map;
+  std::map<NodeID, time::system_clock::time_point> m_lastUpdate;
 };
 
 } // namespace ndn::svs