Merge branch 'dev-1.2.1'

Author: sophec

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 
 project(absscpi
-  VERSION 1.2.0
+  VERSION 1.2.1
   DESCRIPTION "ABS SCPI driver library"
   HOMEPAGE_URL "https://github.com/BloomyControls/abs-scpi-driver"
 )

README.md

@@ -133,7 +133,7 @@ In your CMakeLists.txt, fetch and link with the driver:
 ```cmake
 FetchContent_Declare(abs-driver
   GIT_REPOSITORY https://github.com/BloomyControls/abs-scpi-driver.git
-  GIT_TAG v1.2.0
+  GIT_TAG v1.2.1
   GIT_SHALLOW TRUE
 )
 FetchContent_MakeAvailable(abs-driver)
@@ -145,7 +145,7 @@ If you have already installed the driver to a standard location on your system,
 you can use `find_package` instead:
 
 ```cmake
-find_package(absscpi 1.2.0 REQUIRED)
+find_package(absscpi 1.2.1 REQUIRED)
 
 target_link_libraries(my_program PRIVATE bci::absscpi)
 ```

src/TcpDriver.cpp

@@ -66,13 +66,7 @@ Result<std::string> TcpDriver::ReadLine(unsigned int timeout_ms) const {
 }
 
 TcpDriver::Impl::Impl()
-    : io_context_(),
-      socket_(io_context_),
-      input_buffer_() {
-  boost::system::error_code ignored;
-  socket_.set_option(boost::asio::socket_base::linger(false, 0), ignored);
-  socket_.set_option(boost::asio::socket_base::keep_alive(true), ignored);
-}
+    : io_context_(), socket_(io_context_), input_buffer_() {}
 
 TcpDriver::Impl::~Impl() { Close(); }
 
@@ -99,6 +93,19 @@ ErrorCode TcpDriver::Impl::Connect(std::string_view ip,
     return ErrorCode::kConnectionFailed;
   }
 
+  socket_.set_option(boost::asio::socket_base::linger(false, 0), ec);
+  socket_.set_option(boost::asio::socket_base::keep_alive(true), ec);
+  socket_.set_option(
+      boost::asio::detail::socket_option::integer<IPPROTO_TCP, TCP_KEEPIDLE>(1),
+      ec);
+  socket_.set_option(
+      boost::asio::detail::socket_option::integer<IPPROTO_TCP, TCP_KEEPINTVL>(
+          1),
+      ec);
+  socket_.set_option(
+      boost::asio::detail::socket_option::integer<IPPROTO_TCP, TCP_KEEPCNT>(5),
+      ec);
+
   return ErrorCode::kSuccess;
 }