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/tcp-channel.cpp

diff --git a/daemon/face/tcp-channel.cpp b/daemon/face/tcp-channel.cpp
index 2549c66..f9873c2 100644
--- a/daemon/face/tcp-channel.cpp
+++ b/daemon/face/tcp-channel.cpp
@@ -44,7 +44,7 @@
 
 void
 TcpChannel::listen(const FaceCreatedCallback& onFaceCreated,
-                   const ConnectFailedCallback& onAcceptFailed,
+                   const FaceCreationFailedCallback& onAcceptFailed,
                    int backlog/* = tcp::acceptor::max_connections*/)
 {
   if (isListening()) {
@@ -66,8 +66,8 @@
 
 void
 TcpChannel::connect(const tcp::Endpoint& remoteEndpoint,
-                    const TcpChannel::FaceCreatedCallback& onFaceCreated,
-                    const TcpChannel::ConnectFailedCallback& onConnectFailed,
+                    const FaceCreatedCallback& onFaceCreated,
+                    const FaceCreationFailedCallback& onConnectFailed,
                     const time::seconds& timeout/* = time::seconds(4)*/)
 {
   auto it = m_channelFaces.find(remoteEndpoint);
@@ -133,7 +133,7 @@
 
 void
 TcpChannel::accept(const FaceCreatedCallback& onFaceCreated,
-                   const ConnectFailedCallback& onAcceptFailed)
+                   const FaceCreationFailedCallback& onAcceptFailed)
 {
   m_acceptor.async_accept(m_acceptSocket, bind(&TcpChannel::handleAccept, this,
                                                boost::asio::placeholders::error,
@@ -143,7 +143,7 @@
 void
 TcpChannel::handleAccept(const boost::system::error_code& error,
                          const FaceCreatedCallback& onFaceCreated,
-                         const ConnectFailedCallback& onAcceptFailed)
+                         const FaceCreationFailedCallback& onAcceptFailed)
 {
   if (error) {
     if (error == boost::asio::error::operation_aborted) // when the socket is closed by someone
@@ -168,7 +168,7 @@
                           const shared_ptr<ip::tcp::socket>& socket,
                           const scheduler::EventId& connectTimeoutEvent,
                           const FaceCreatedCallback& onFaceCreated,
-                          const ConnectFailedCallback& onConnectFailed)
+                          const FaceCreationFailedCallback& onConnectFailed)
 {
   scheduler::cancel(connectTimeoutEvent);
 
@@ -200,7 +200,7 @@
 
 void
 TcpChannel::handleConnectTimeout(const shared_ptr<ip::tcp::socket>& socket,
-                                 const ConnectFailedCallback& onConnectFailed)
+                                 const FaceCreationFailedCallback& onConnectFailed)
 {
   NFD_LOG_DEBUG("Connect to remote endpoint timed out");