face: remove EndpointId from egress APIs in transport
refs: #4973
Change-Id: I43ca0c0826ec132413c584a1daa2d4687a4965fd
diff --git a/daemon/face/datagram-transport.hpp b/daemon/face/datagram-transport.hpp
index dfe8bee..7798cc8 100644
--- a/daemon/face/datagram-transport.hpp
+++ b/daemon/face/datagram-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -69,7 +69,7 @@
doClose() override;
void
- doSend(const Block& packet, const EndpointId& endpoint) override;
+ doSend(const Block& packet) override;
void
handleSend(const boost::system::error_code& error, size_t nBytesSent);
@@ -157,7 +157,7 @@
template<class T, class U>
void
-DatagramTransport<T, U>::doSend(const Block& packet, const EndpointId&)
+DatagramTransport<T, U>::doSend(const Block& packet)
{
NFD_LOG_FACE_TRACE(__func__);
diff --git a/daemon/face/ethernet-transport.cpp b/daemon/face/ethernet-transport.cpp
index 5a810a3..e98a9a7 100644
--- a/daemon/face/ethernet-transport.cpp
+++ b/daemon/face/ethernet-transport.cpp
@@ -110,7 +110,7 @@
}
void
-EthernetTransport::doSend(const Block& packet, const EndpointId&)
+EthernetTransport::doSend(const Block& packet)
{
NFD_LOG_FACE_TRACE(__func__);
diff --git a/daemon/face/ethernet-transport.hpp b/daemon/face/ethernet-transport.hpp
index a88b95b..8c929d1 100644
--- a/daemon/face/ethernet-transport.hpp
+++ b/daemon/face/ethernet-transport.hpp
@@ -81,7 +81,7 @@
handleNetifStateChange(ndn::net::InterfaceState netifState);
void
- doSend(const Block& packet, const EndpointId& endpoint) final;
+ doSend(const Block& packet) final;
/**
* @brief Sends the specified TLV block on the network wrapped in an Ethernet frame
diff --git a/daemon/face/internal-transport.cpp b/daemon/face/internal-transport.cpp
index e5d598a..a477b14 100644
--- a/daemon/face/internal-transport.cpp
+++ b/daemon/face/internal-transport.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -55,7 +55,7 @@
}
void
-InternalForwarderTransport::doSend(const Block& packet, const EndpointId&)
+InternalForwarderTransport::doSend(const Block& packet)
{
NFD_LOG_FACE_TRACE("Sending to " << m_peer);
diff --git a/daemon/face/internal-transport.hpp b/daemon/face/internal-transport.hpp
index 71ae4d5..fbe4f06 100644
--- a/daemon/face/internal-transport.hpp
+++ b/daemon/face/internal-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -71,7 +71,7 @@
private:
void
- doSend(const Block& packet, const EndpointId& endpoint) final;
+ doSend(const Block& packet) final;
private:
NFD_LOG_MEMBER_DECL();
diff --git a/daemon/face/multicast-udp-transport.cpp b/daemon/face/multicast-udp-transport.cpp
index 5017e7d..0ea9687 100644
--- a/daemon/face/multicast-udp-transport.cpp
+++ b/daemon/face/multicast-udp-transport.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -82,7 +82,7 @@
}
void
-MulticastUdpTransport::doSend(const Block& packet, const EndpointId&)
+MulticastUdpTransport::doSend(const Block& packet)
{
NFD_LOG_FACE_TRACE(__func__);
diff --git a/daemon/face/multicast-udp-transport.hpp b/daemon/face/multicast-udp-transport.hpp
index c85df82..3e17dc9 100644
--- a/daemon/face/multicast-udp-transport.hpp
+++ b/daemon/face/multicast-udp-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -84,7 +84,7 @@
private:
void
- doSend(const Block& packet, const EndpointId& endpoint) final;
+ doSend(const Block& packet) final;
void
doClose() final;
diff --git a/daemon/face/null-transport.hpp b/daemon/face/null-transport.hpp
index 303b1e8..dc4f3b8 100644
--- a/daemon/face/null-transport.hpp
+++ b/daemon/face/null-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -51,7 +51,7 @@
private:
void
- doSend(const Block&, const EndpointId&) OVERRIDE_WITH_TESTS_ELSE_FINAL
+ doSend(const Block&) OVERRIDE_WITH_TESTS_ELSE_FINAL
{
}
};
diff --git a/daemon/face/stream-transport.hpp b/daemon/face/stream-transport.hpp
index 04941b5..a6fcb74 100644
--- a/daemon/face/stream-transport.hpp
+++ b/daemon/face/stream-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -63,7 +63,7 @@
deferredClose();
void
- doSend(const Block& packet, const EndpointId& endpoint) override;
+ doSend(const Block& packet) override;
void
sendFromQueue();
@@ -180,7 +180,7 @@
template<class T>
void
-StreamTransport<T>::doSend(const Block& packet, const EndpointId&)
+StreamTransport<T>::doSend(const Block& packet)
{
NFD_LOG_FACE_TRACE(__func__);
diff --git a/daemon/face/transport.cpp b/daemon/face/transport.cpp
index 6b235bc..467843e 100644
--- a/daemon/face/transport.cpp
+++ b/daemon/face/transport.cpp
@@ -89,7 +89,7 @@
}
void
-Transport::send(const Block& packet, const EndpointId& endpoint)
+Transport::send(const Block& packet)
{
BOOST_ASSERT(packet.isValid());
BOOST_ASSERT(this->getMtu() == MTU_UNLIMITED ||
@@ -106,7 +106,7 @@
this->nOutBytes += packet.size();
}
- this->doSend(packet, endpoint);
+ this->doSend(packet);
}
void
diff --git a/daemon/face/transport.hpp b/daemon/face/transport.hpp
index d3840bc..9fb9c03 100644
--- a/daemon/face/transport.hpp
+++ b/daemon/face/transport.hpp
@@ -165,12 +165,11 @@
/** \brief Send a link-layer packet
* \param packet the packet to be sent, must be a valid and well-formed TLV block
- * \param endpoint the destination endpoint
* \note This operation has no effect if getState() is neither UP nor DOWN
* \warning Behavior is undefined if packet size exceeds the MTU limit
*/
void
- send(const Block& packet, const EndpointId& endpoint = 0);
+ send(const Block& packet);
public: // static properties
/** \return a FaceUri representing local endpoint
@@ -333,11 +332,10 @@
private: // to be overridden by subclass
/** \brief performs Transport specific operations to send a packet
* \param packet the packet to be sent, can be assumed to be valid and well-formed
- * \param endpoint the destination endpoint
* \pre transport state is either UP or DOWN
*/
virtual void
- doSend(const Block& packet, const EndpointId& endpoint) = 0;
+ doSend(const Block& packet) = 0;
private:
Face* m_face;
diff --git a/daemon/face/websocket-transport.cpp b/daemon/face/websocket-transport.cpp
index bd45711..3ac0023 100644
--- a/daemon/face/websocket-transport.cpp
+++ b/daemon/face/websocket-transport.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -78,7 +78,7 @@
}
void
-WebSocketTransport::doSend(const Block& packet, const EndpointId&)
+WebSocketTransport::doSend(const Block& packet)
{
NFD_LOG_FACE_TRACE(__func__);
diff --git a/daemon/face/websocket-transport.hpp b/daemon/face/websocket-transport.hpp
index 10f4b2a..b71206a 100644
--- a/daemon/face/websocket-transport.hpp
+++ b/daemon/face/websocket-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -83,7 +83,7 @@
private:
void
- doSend(const Block& packet, const EndpointId& endpoint) final;
+ doSend(const Block& packet) final;
void
schedulePing();