commit 3958b015d59ac538d9824ea3354a3f28f85fd553
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 31 15:06:13 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 31 17:24:23 2014 -0800
tree 6af50435201626b331a96e845390dd9ef491b24a
parent 668868196675e05a4d732acd37f455afedc4e0d3

face/tcp: Fixing TcpChannel and TcpFace implementation and enable basic logging in both

Change-Id: If9a00c13caccbeb117204655ced293d49860d6e4
refs: #1134, #1133

daemon/face/tcp-channel.hpp

diff --git a/daemon/face/tcp-channel.hpp b/daemon/face/tcp-channel.hpp
index bd0388a..3e3d956 100644
--- a/daemon/face/tcp-channel.hpp
+++ b/daemon/face/tcp-channel.hpp
@@ -91,7 +91,8 @@
   handleConnection(const boost::system::error_code& error,
                    const shared_ptr<boost::asio::ip::tcp::socket>& socket,
                    const FaceCreatedCallback& onFaceCreated,
-                   const ConnectFailedCallback& onConnectFailed);
+                   const ConnectFailedCallback& onConnectFailed,
+                   bool remoteConnection);
 
   void
   handleSuccessfulConnect(const boost::system::error_code& error,
@@ -112,7 +113,8 @@
                           const shared_ptr<boost::asio::ip::tcp::socket>& socket,
                           const shared_ptr<boost::asio::monotonic_deadline_timer>& timer,
                           const FaceCreatedCallback& onFaceCreated,
-                          const ConnectFailedCallback& onConnectFailed);
+                          const ConnectFailedCallback& onConnectFailed,
+                          const shared_ptr<boost::asio::ip::tcp::resolver>& resolver);
   
 private:
   boost::asio::io_service& m_ioService;