diff options
author | Mauro Sardara <msardara@cisco.com> | 2019-03-19 16:21:55 +0100 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2019-03-19 16:23:22 +0100 |
commit | 393a0a4018936134fa1b343523bbafaab606973d (patch) | |
tree | eb587157a3ff5235ec02611287c02c5e08487eba /libtransport/src/hicn/transport/protocols/reassembly.cc | |
parent | 7266728a7857b038679fe35321ace30386f0c461 (diff) |
[HICN-125 HICN-126]
- Add MemBuf as return type of getPayload of transport::core::Packet
- Fix incremental index manager
Change-Id: Ib557d56b1bf42e3974364c611b825b21f1e3d3f1
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/src/hicn/transport/protocols/reassembly.cc')
-rw-r--r-- | libtransport/src/hicn/transport/protocols/reassembly.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libtransport/src/hicn/transport/protocols/reassembly.cc b/libtransport/src/hicn/transport/protocols/reassembly.cc index 53180935c..899f701c7 100644 --- a/libtransport/src/hicn/transport/protocols/reassembly.cc +++ b/libtransport/src/hicn/transport/protocols/reassembly.cc @@ -25,12 +25,11 @@ namespace protocol { BaseReassembly::BaseReassembly(interface::ConsumerSocket *icn_socket, ContentReassembledCallback *content_callback) : reassembly_consumer_socket_(icn_socket), - zero_index_manager_(std::make_unique<ZeroIndexManager>()), incremental_index_manager_( std::make_unique<IncrementalIndexManager>(icn_socket)), manifest_index_manager_( std::make_unique<ManifestIndexManager>(icn_socket)), - index_manager_(zero_index_manager_.get()), + index_manager_(incremental_index_manager_.get()), index_(0) { setContentCallback(content_callback); } @@ -54,14 +53,14 @@ void BaseReassembly::reassemble(ContentObject::Ptr &&content_object) { } void BaseReassembly::copyContent(const ContentObject &content_object) { - utils::Array<> a = content_object.getPayload(); + auto a = content_object.getPayload(); std::shared_ptr<std::vector<uint8_t>> content_buffer; reassembly_consumer_socket_->getSocketOption( interface::GeneralTransportOptions::APPLICATION_BUFFER, content_buffer); - content_buffer->insert(content_buffer->end(), (uint8_t *)a.data(), - (uint8_t *)a.data() + a.length()); + content_buffer->insert(content_buffer->end(), (uint8_t *)a->data(), + (uint8_t *)a->data() + a->length()); bool download_completed = index_manager_->getFinalSuffix() == content_object.getName().getSuffix(); @@ -74,6 +73,7 @@ void BaseReassembly::copyContent(const ContentObject &content_object) { void BaseReassembly::reset() { manifest_index_manager_->reset(); incremental_index_manager_->reset(); + index_ = index_manager_->getNextReassemblySegment(); received_packets_.clear(); } |