1 files changed, 30 insertions, 7 deletions

diff --git a/libtransport/src/protocols/reassembly.h b/libtransport/src/protocols/reassembly.h
index fdc9f2a05..c0c4de3d8 100644
--- a/libtransport/src/protocols/reassembly.h
+++ b/libtransport/src/protocols/reassembly.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Copyright (c) 2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -36,7 +36,7 @@ class Reassembly {
  public:
   class ContentReassembledCallback {
    public:
-    virtual void onContentReassembled(std::error_code ec) = 0;
+    virtual void onContentReassembled(const std::error_code &ec) = 0;
   };
 
   Reassembly(implementation::ConsumerSocket *icn_socket,
@@ -46,19 +46,42 @@ class Reassembly {
 
   virtual ~Reassembly() = default;
 
-  virtual void reassemble(core::ContentObject::Ptr &&content_object) = 0;
-  virtual void reassemble(
-      std::unique_ptr<core::ContentObjectManifest> &&manifest) = 0;
+  /**
+   * Handle reassembly of content object.
+   */
+  virtual void reassemble(core::ContentObject &content_object) = 0;
+
+  /**
+   * Handle reassembly of content object.
+   */
+  virtual void reassemble(utils::MemBuf &buffer, uint32_t suffix) = 0;
+
+  /**
+   * Reset reassembler for new round
+   */
   virtual void reInitialize() = 0;
-  virtual void setIndexer(Indexer *indexer) { index_manager_ = indexer; }
+
+  /**
+   * Use indexer to get next segments to reassembly
+   */
+  virtual void setIndexer(Indexer *indexer) { indexer_verifier_ = indexer; }
+
+  /**
+   * Decide if it is required to pass to application buffers whose verification
+   * has been delayed (e.g. because the manifest is missing). False by default.
+   */
+  virtual bool reassembleUnverified() { return false; }
 
  protected:
+  /**
+   * Notify application there is data to read.
+   */
   virtual void notifyApplication();
 
  protected:
   implementation::ConsumerSocket *reassembly_consumer_socket_;
   TransportProtocol *transport_protocol_;
-  Indexer *index_manager_;
+  Indexer *indexer_verifier_;
   std::unique_ptr<utils::MemBuf> read_buffer_;
 };