Changeset 11190 for trunk/FACT++/src/Connection.h

Timestamp:

06/27/11 13:00:22 (13 years ago)

Author:

tbretz

Message:

Added the possbility to give an IP Address with a port rather than a name which must be resolved; send keep alive packages in 10s intervals

File:

• trunk/FACT++/src/Connection.h (modified) (5 diffs)

trunk/FACT++/src/Connection.h

@@ -4 +4 @@
 #include <deque>
 #include <string>
+#include <boost/bind.hpp>
 #include <boost/asio.hpp>
 #include <boost/function.hpp>
@@ -17 +18 @@
     std::string fAddress;
     std::string fPort;
+
+    boost::asio::ip::tcp::endpoint fEndpoint;
 
     bool fDebugTx;
@@ -48 +51 @@
     void AsyncRead(const boost::asio::mutable_buffers_1 buffers, int type=0);
     void AsyncWrite(const boost::asio::const_buffers_1 &buffers);
+
+    template<class T>
+    void AsyncWaitImp(boost::asio::deadline_timer &timer, int millisec,
+                      void (T::*handler)(const boost::system::error_code&))
+    {
+        // - The boost::asio::basic_deadline_timer::expires_from_now()
+        //   function cancels any pending asynchronous waits, and returns
+        //   the number of asynchronous waits that were cancelled. If it
+        //   returns 0 then you were too late and the wait handler has
+        //   already been executed, or will soon be executed. If it
+        //   returns 1 then the wait handler was successfully cancelled.
+        // - If a wait handler is cancelled, the bs::error_code passed to
+        //   it contains the value bs::error::operation_aborted.
+        timer.expires_from_now(boost::posix_time::milliseconds(millisec));
+
+        timer.async_wait(boost::bind(handler, this, boost::asio::placeholders::error));
+    }
+
     void AsyncWait(boost::asio::deadline_timer &timer, int millisec,
-                   void (Connection::*handler)(const boost::system::error_code&));
+                   void (Connection::*handler)(const boost::system::error_code&))
+    {
+        AsyncWaitImp(timer, millisec, handler);
+    }
+
 
 private:
     void AsyncConnect(boost::asio::ip::tcp::resolver::iterator iterator);
+    void AsyncConnect();
 
     void CloseImp(bool restart=true);
 
-    void ConnectImp(const boost::system::error_code& error,
-                    boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
+    void ConnectAddrImp(const boost::asio::ip::tcp::endpoint &endpoint,
+                        const boost::system::error_code& error);
+    void ConnectIterImp(boost::asio::ip::tcp::resolver::iterator endpoint_iterator,
+                        const boost::system::error_code& error);
 
     void HandleConnectionTimer(const boost::system::error_code &error);
@@ -75 +103 @@
     void SetEndpoint(const std::string &addr, const std::string &port);
     void SetEndpoint(const std::string &addr);
+    void SetEndpoint(const boost::asio::ip::tcp::endpoint &ep) { fEndpoint = ep; }
 
     void StartConnect();
@@ -112 +141 @@
 
     std::string URL() const { return fAddress + ":" + fPort; }
+
+    const boost::asio::ip::tcp::endpoint &GetEndpoint() const { return fEndpoint; }
 };