commit 59090db0ddb47de610a0f31b71da0e44670e107d
author Alexander Afanasyev <aa@cs.fiu.edu> Fri Feb 21 16:37:43 2020 -0500
committer Alexander Afanasyev <aa@cs.fiu.edu> Sun May 31 14:23:15 2020 -0400
tree 3dbb0b85efd4708159bdb7420fc29cd4b834ce0c
parent 58233a4c3aa68a265c423d400fafb9b1720dd92a

Various fixes for NFD/ndn-cxx 0.7.0

Change-Id: I68e5d4d57d81c3f2e46fc59680cd416b06c8190c

model/ndn-net-device-transport.cpp

diff --git a/model/ndn-net-device-transport.cpp b/model/ndn-net-device-transport.cpp
index a8565fb..e0439f0 100644
--- a/model/ndn-net-device-transport.cpp
+++ b/model/ndn-net-device-transport.cpp
@@ -106,7 +106,7 @@
 }
 
 void
-NetDeviceTransport::doSend(Packet&& packet)
+NetDeviceTransport::doSend(const Block& packet, const nfd::EndpointId& endpoint)
 {
   NS_LOG_FUNCTION(this << "Sending packet from netDevice with URI"
                   << this->getLocalUri());
@@ -125,10 +125,10 @@
 // callback
 void
 NetDeviceTransport::receiveFromNetDevice(Ptr<NetDevice> device,
-                                      Ptr<const ns3::Packet> p,
-                                      uint16_t protocol,
-                                      const Address& from, const Address& to,
-                                      NetDevice::PacketType packetType)
+                                         Ptr<const ns3::Packet> p,
+                                         uint16_t protocol,
+                                         const Address& from, const Address& to,
+                                         NetDevice::PacketType packetType)
 {
   NS_LOG_FUNCTION(device << p << protocol << from << to << packetType);
 
@@ -138,9 +138,7 @@
   BlockHeader header;
   packet->RemoveHeader(header);
 
-  auto nfdPacket = Packet(std::move(header.getBlock()));
-
-  this->receive(std::move(nfdPacket));
+  this->receive(std::move(header.getBlock()));
 }
 
 Ptr<NetDevice>