commit 47ab029798d0290aa6777d1b35aa5ef8a6d13016
author Davide Pesavento <davide.pesavento@lip6.fr> Mon Nov 02 18:45:39 2015 +0100
committer Davide Pesavento <davide.pesavento@lip6.fr> Wed Nov 04 19:49:58 2015 +0100
tree eb4543e0602604b2862dc767f48314eccb3ffb97
parent ed89ccc521aa8678ac180c814ab5c151b10d58c4

face: deduplicate callback typedefs between Channel and ProtocolFactory

This should have been part of commit 1d7e7afd381b91b6194d516826294b7f41f78745

Change-Id: I61623152180d4df288fc7dd3c225518e438d2bda
Refs: #3258

daemon/face/udp-channel.cpp

diff --git a/daemon/face/udp-channel.cpp b/daemon/face/udp-channel.cpp
index a1ff92c..d3791e4 100644
--- a/daemon/face/udp-channel.cpp
+++ b/daemon/face/udp-channel.cpp
@@ -45,7 +45,7 @@
 
 void
 UdpChannel::listen(const FaceCreatedCallback& onFaceCreated,
-                   const ConnectFailedCallback& onReceiveFailed)
+                   const FaceCreationFailedCallback& onReceiveFailed)
 {
   if (isListening()) {
     NFD_LOG_WARN("[" << m_localEndpoint << "] Already listening");
@@ -70,7 +70,7 @@
 UdpChannel::connect(const udp::Endpoint& remoteEndpoint,
                     ndn::nfd::FacePersistency persistency,
                     const FaceCreatedCallback& onFaceCreated,
-                    const ConnectFailedCallback& onConnectFailed)
+                    const FaceCreationFailedCallback& onConnectFailed)
 {
   shared_ptr<face::LpFaceWrapper> face;
   try {
@@ -136,7 +136,7 @@
 UdpChannel::handleNewPeer(const boost::system::error_code& error,
                           size_t nBytesReceived,
                           const FaceCreatedCallback& onFaceCreated,
-                          const ConnectFailedCallback& onReceiveFailed)
+                          const FaceCreationFailedCallback& onReceiveFailed)
 {
   if (error) {
     if (error == boost::asio::error::operation_aborted) // when the socket is closed by someone