diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2020-03-10 15:50:18 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2020-03-10 15:57:31 +0100 |
| commit | 23657bc8a770734a74f73f6d07075130a366ef00 (patch) | |
| tree | e5c00a85ceca00db9d8926824f7f59de67536972 /libtransport/src/protocols/byte_stream_reassembly.cc | |
| parent | 01d76a603fba7db5cfb83a1fbc3b369f2e4a4823 (diff) | |
[HICN-544] Do not block reading incoming messages in memif connector.
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I844dfa64a977c9c41bfc103bb110c274802b1839
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/src/protocols/byte_stream_reassembly.cc')
| -rw-r--r-- | libtransport/src/protocols/byte_stream_reassembly.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libtransport/src/protocols/byte_stream_reassembly.cc b/libtransport/src/protocols/byte_stream_reassembly.cc index e15498bb1..12631637e 100644 --- a/libtransport/src/protocols/byte_stream_reassembly.cc +++ b/libtransport/src/protocols/byte_stream_reassembly.cc @@ -39,7 +39,7 @@ ByteStreamReassembly::ByteStreamReassembly( void ByteStreamReassembly::reassemble( std::unique_ptr<ContentObjectManifest> &&manifest) { - if (TRANSPORT_EXPECT_TRUE(manifest != nullptr)) { + if (TRANSPORT_EXPECT_TRUE(manifest != nullptr) && read_buffer_->capacity()) { received_packets_.emplace( std::make_pair(manifest->getName().getSuffix(), nullptr)); assembleContent(); @@ -47,7 +47,8 @@ void ByteStreamReassembly::reassemble( } void ByteStreamReassembly::reassemble(ContentObject::Ptr &&content_object) { - if (TRANSPORT_EXPECT_TRUE(content_object != nullptr)) { + if (TRANSPORT_EXPECT_TRUE(content_object != nullptr) && + read_buffer_->capacity()) { received_packets_.emplace(std::make_pair( content_object->getName().getSuffix(), std::move(content_object))); assembleContent(); |