commit 18861808291cbee24b4611af2f92022d52080494
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jun 13 17:49:03 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jun 13 20:30:55 2014 -0700
tree c28880277037cebbafe33543763f6465691f7dc1
parent f86b5c44ae089afec555a8cb9ee16c1eccb44dda

faces: Replace deadline_timer usage in TcpChannel with Scheduler-based events

Change-Id: I37a7a3203b3187e029697a21e3314cfacbbed314
Refs: #1368

daemon/face/tcp-channel.hpp

diff --git a/daemon/face/tcp-channel.hpp b/daemon/face/tcp-channel.hpp
index c4f269c..f126a47 100644
--- a/daemon/face/tcp-channel.hpp
+++ b/daemon/face/tcp-channel.hpp
@@ -26,8 +26,8 @@
 #define NFD_DAEMON_FACE_TCP_CHANNEL_HPP
 
 #include "channel.hpp"
-#include <ndn-cxx/util/monotonic_deadline_timer.hpp>
 #include "tcp-face.hpp"
+#include "core/scheduler.hpp"
 
 namespace nfd {
 
@@ -124,21 +124,19 @@
   void
   handleSuccessfulConnect(const boost::system::error_code& error,
                           const shared_ptr<boost::asio::ip::tcp::socket>& socket,
-                          const shared_ptr<ndn::monotonic_deadline_timer>& timer,
+                          const EventId& connectTimeoutEvent,
                           const FaceCreatedCallback& onFaceCreated,
                           const ConnectFailedCallback& onConnectFailed);
 
   void
-  handleFailedConnect(const boost::system::error_code& error,
-                      const shared_ptr<boost::asio::ip::tcp::socket>& socket,
-                      const shared_ptr<ndn::monotonic_deadline_timer>& timer,
+  handleFailedConnect(const shared_ptr<boost::asio::ip::tcp::socket>& socket,
                       const ConnectFailedCallback& onConnectFailed);
 
   void
   handleEndpointResolution(const boost::system::error_code& error,
                            boost::asio::ip::tcp::resolver::iterator remoteEndpoint,
                            const shared_ptr<boost::asio::ip::tcp::socket>& socket,
-                           const shared_ptr<ndn::monotonic_deadline_timer>& timer,
+                           const EventId& connectTimeoutEvent,
                            const FaceCreatedCallback& onFaceCreated,
                            const ConnectFailedCallback& onConnectFailed,
                            const shared_ptr<boost::asio::ip::tcp::resolver>& resolver);