commit b3a23ca7112aa0866e6538ec779a6ccf526195f8
author Davide Pesavento <davidepesa@gmail.com> Sat May 04 20:40:21 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Tue May 07 00:32:57 2019 -0400
tree 8ff908dacb617d9da0ec158f09402e7f2d8cbbd8
parent 075bb7dac4bf72cbfcff5e3c2da25c6476090787

face: eliminate Transport::Packet wrapper type

Refs: #4843
Change-Id: I5977be55e8bdac33c989e3b8523fea764f304c37

daemon/face/stream-transport.hpp

diff --git a/daemon/face/stream-transport.hpp b/daemon/face/stream-transport.hpp
index e0a7d6d..04941b5 100644
--- a/daemon/face/stream-transport.hpp
+++ b/daemon/face/stream-transport.hpp
@@ -63,7 +63,7 @@
   deferredClose();
 
   void
-  doSend(Transport::Packet&& packet) override;
+  doSend(const Block& packet, const EndpointId& endpoint) override;
 
   void
   sendFromQueue();
@@ -180,7 +180,7 @@
 
 template<class T>
 void
-StreamTransport<T>::doSend(Transport::Packet&& packet)
+StreamTransport<T>::doSend(const Block& packet, const EndpointId&)
 {
   NFD_LOG_FACE_TRACE(__func__);
 
@@ -188,8 +188,8 @@
     return;
 
   bool wasQueueEmpty = m_sendQueue.empty();
-  m_sendQueue.push(packet.packet);
-  m_sendQueueBytes += packet.packet.size();
+  m_sendQueue.push(packet);
+  m_sendQueueBytes += packet.size();
 
   if (wasQueueEmpty)
     sendFromQueue();
@@ -255,7 +255,7 @@
     offset += element.size();
     BOOST_ASSERT(offset <= m_receiveBufferSize);
 
-    this->receive(Transport::Packet(std::move(element)));
+    this->receive(element);
   }
 
   if (!isOk && m_receiveBufferSize == ndn::MAX_NDN_PACKET_SIZE && offset == 0) {