full-producer: do not append hash of IBF to data name

refs #5066 Change-Id: Ie74a9512e6795a02028c82c55484c009d3a3a11f
named-data · Jan 18, 2024 · 62f0800 · 62f0800
1 parent c052d89
commit 62f0800
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/PSync/full-producer.cpp b/PSync/full-producer.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2023,  The University of Memphis
+ * Copyright (c) 2014-2024,  The University of Memphis
  *
  * This file is part of PSync.
  * See AUTHORS.md for complete list of PSync authors and contributors.
@@ -254,38 +254,21 @@ FullProducer::onSyncInterest(const ndn::Name& prefixName, const ndn::Interest& i
 void
 FullProducer::sendSyncData(const ndn::Name& name, const ndn::Block& block)
 {
-  NDN_LOG_DEBUG("Checking if data will satisfy our own pending interest");
-
-  ndn::Name nameWithIblt;
-  m_iblt.appendToName(nameWithIblt);
-
-  // TODO: Remove appending of hash - serves no purpose to the receiver
-  ndn::Name dataName(ndn::Name(name).appendNumber(std::hash<ndn::Name>{}(nameWithIblt)));
+  bool isSatisfyingOwnInterest = m_outstandingInterestName == name;
+  if (isSatisfyingOwnInterest && m_fetcher) {
+    NDN_LOG_DEBUG("Removing our pending interest from face (stop fetcher)");
+    m_fetcher->stop();
+    m_outstandingInterestName.clear();
+  }
 
+  NDN_LOG_DEBUG("Sending sync Data");
   auto content = detail::compress(m_contentCompression, block);
+  m_segmentPublisher.publish(name, name, *content, m_syncReplyFreshness);
 
-  // checking if our own interest got satisfied
-  if (m_outstandingInterestName == name) {
-    NDN_LOG_DEBUG("Satisfied our own pending interest");
-    // remove outstanding interest
-    if (m_fetcher) {
-      NDN_LOG_DEBUG("Removing our pending interest from face (stop fetcher)");
-      m_fetcher->stop();
-      m_outstandingInterestName = ndn::Name("");
-    }
-
-    NDN_LOG_DEBUG("Sending sync Data");
-
-    // Send data after removing pending sync interest on face
-    m_segmentPublisher.publish(name, dataName, *content, m_syncReplyFreshness);
-
+  if (isSatisfyingOwnInterest) {
     NDN_LOG_TRACE("Renewing sync interest");
     sendSyncInterest();
   }
-  else {
-    NDN_LOG_DEBUG("Sending sync Data");
-    m_segmentPublisher.publish(name, dataName, *content, m_syncReplyFreshness);
-  }
 }
 
 void

diff --git a/tests/test-full-sync.cpp b/tests/test-full-sync.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2023,  The University of Memphis
+ * Copyright (c) 2014-2024,  The University of Memphis
  *
  * This file is part of PSync.
  * See AUTHORS.md for complete list of PSync authors and contributors.
@@ -500,8 +500,7 @@ BOOST_AUTO_TEST_CASE(DelayedSecondSegment)
   // Get data name from face and increase segment number to form next interest
   BOOST_REQUIRE(!faces[0]->sentData.empty());
   Name dataName = faces[0]->sentData.front().getName();
-  Name interestName = dataName.getSubName(0, dataName.size() - 2);
-  interestName.appendSegment(1);
+  Name interestName = dataName.getPrefix(-1).appendSegment(1);
   faces[0]->sentData.clear();
 
   nodes[0]->onSyncInterest(syncPrefix, Interest(interestName));