From 229385955109b866a23c4ac2aa03d4d11044c39d Mon Sep 17 00:00:00 2001
From: "Enrico Loparco (eloparco)" <eloparco@cisco.com>
Date: Thu, 24 Jun 2021 09:15:41 +0200
Subject: [HICN-708] Rebase with master

Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
---
 libtransport/src/protocols/indexer.cc | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'libtransport/src/protocols/indexer.cc')

diff --git a/libtransport/src/protocols/indexer.cc b/libtransport/src/protocols/indexer.cc
index ca12330a6..1379a609c 100644
--- a/libtransport/src/protocols/indexer.cc
+++ b/libtransport/src/protocols/indexer.cc
@@ -14,11 +14,9 @@
  */
 
 #include <hicn/transport/utils/branch_prediction.h>
-
 #include <protocols/incremental_indexer.h>
 #include <protocols/indexer.h>
 #include <protocols/manifest_incremental_indexer.h>
-#include <protocols/protocol.h>
 
 namespace transport {
 namespace protocol {
@@ -32,16 +30,16 @@ IndexManager::IndexManager(implementation::ConsumerSocket *icn_socket,
       transport_(transport),
       reassembly_(reassembly) {}
 
-void IndexManager::onContentObject(core::Interest::Ptr &&interest,
-                                   core::ContentObject::Ptr &&content_object) {
+void IndexManager::onContentObject(core::Interest &interest,
+                                   core::ContentObject &content_object) {
   if (first_segment_received_) {
-    indexer_->onContentObject(std::move(interest), std::move(content_object));
+    indexer_->onContentObject(interest, content_object);
   } else {
-    std::uint32_t segment_number = interest->getName().getSuffix();
+    std::uint32_t segment_number = interest.getName().getSuffix();
 
     if (segment_number == 0) {
       // Check if manifest
-      if (content_object->getPayloadType() == PayloadType::MANIFEST) {
+      if (content_object.getPayloadType() == core::PayloadType::MANIFEST) {
         IncrementalIndexer *indexer =
             static_cast<IncrementalIndexer *>(indexer_.release());
         indexer_ =
@@ -49,25 +47,21 @@ void IndexManager::onContentObject(core::Interest::Ptr &&interest,
         delete indexer;
       }
 
-      indexer_->onContentObject(std::move(interest), std::move(content_object));
+      indexer_->onContentObject(interest, content_object);
       auto it = interest_data_set_.begin();
       while (it != interest_data_set_.end()) {
-        indexer_->onContentObject(
-            std::move(const_cast<core::Interest::Ptr &&>(it->first)),
-            std::move(const_cast<core::ContentObject::Ptr &&>(it->second)));
+        indexer_->onContentObject(*it->first, *it->second);
         it = interest_data_set_.erase(it);
       }
 
       first_segment_received_ = true;
     } else {
-      interest_data_set_.emplace(std::move(interest),
-                                 std::move(content_object));
+      interest_data_set_.emplace(interest.shared_from_this(),
+                                 content_object.shared_from_this());
     }
   }
 }
 
-bool IndexManager::onKeyToVerify() { return indexer_->onKeyToVerify(); }
-
 void IndexManager::reset(std::uint32_t offset) {
   indexer_ = std::make_unique<IncrementalIndexer>(icn_socket_, transport_,
                                                   reassembly_);
-- 
cgit 1.2.3-korg