Changeset 20005

Timestamp:

11/18/20 14:42:04 (4 years ago)

Author:

tbretz

Message:

The API in boost 1.70 changed.

Location:

trunk/FACT++/src

Files:

• Connection.cc (modified) (1 diff)
• ConnectionSSL.cc (modified) (2 diffs)

trunk/FACT++/src/Connection.cc

@@ -266 +266 @@
 
         const int optval = 30;
+
+#if BOOST_VERSION <107000
         // First keep alive after 30s
         setsockopt(native(), SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval));
         // New keep alive after 30s
         setsockopt(native(), SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval));
+#else
+        // First keep alive after 30s
+        setsockopt(native_handle(), SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval));
+        // New keep alive after 30s
+        setsockopt(native_handle(), SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval));
+#endif
 
         if (fVerbose)

trunk/FACT++/src/ConnectionSSL.cc

@@ -267 +267 @@
         lowest_layer().set_option(boost::asio::socket_base::keep_alive(true));
 
-        const int optval = 30;
+        const int optval = 30;
+
+#if BOOST_VERSION <107000
         // First keep alive after 30s
         setsockopt(lowest_layer().native(), SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval));
         // New keep alive after 30s
         setsockopt(lowest_layer().native(), SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval));
+#else
+        // First keep alive after 30s
+        setsockopt(lowest_layer().native_handle(), SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval));
+        // New keep alive after 30s
+        setsockopt(lowest_layer().native_handle(), SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval));
+#endif
 
         if (fVerbose)
@@ -521 +529 @@
 
 ConnectionSSL::ConnectionSSL(ba::io_service& ioservice, ostream &out) : MessageImp(out),
-ssl::context(ioservice, boost::asio::ssl::context::method::sslv23_client), stream(ioservice, *this),
-fLog(0), fVerbose(true), fDebugTx(false),
+ssl::context(ioservice, boost::asio::ssl::context::method::sslv23_client),
+stream(ioservice, *this), fLog(0), fVerbose(true), fDebugTx(false),
 fInTimeout(ioservice), fOutTimeout(ioservice), fConnectionTimer(ioservice),
 fQueueSize(0), fConnectionStatus(kDisconnected)