Socket abstraction.

Author: kinyoklion

libs/networking/include/launchdarkly/network/curl_multi_manager.hpp

@@ -4,11 +4,7 @@
 
 #include <curl/curl.h>
 #include <boost/asio/any_io_executor.hpp>
-#ifdef _WIN32
-#include <boost/asio/windows/stream_handle.hpp>
-#else
-#include <boost/asio/posix/stream_descriptor.hpp>
-#endif
+#include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/steady_timer.hpp>
 
 #include <functional>
@@ -18,12 +14,8 @@
 
 namespace launchdarkly::network {
 
-// Platform-specific socket handle type
-#ifdef _WIN32
-using SocketHandle = boost::asio::windows::stream_handle;
-#else
-using SocketHandle = boost::asio::posix::stream_descriptor;
-#endif
+// Use tcp::socket for cross-platform socket operations
+using SocketHandle = boost::asio::ip::tcp::socket;
 
 /**
  * Manages CURL multi interface integrated with ASIO event loop.
@@ -35,7 +27,7 @@ using SocketHandle = boost::asio::posix::stream_descriptor;
  *
  * Key features:
  * - Non-blocking I/O using curl_multi_socket_action
- * - Socket monitoring via ASIO (posix::stream_descriptor on POSIX, windows::stream_handle on Windows)
+ * - Cross-platform socket monitoring via ASIO tcp::socket
  * - Timer integration with ASIO steady_timer
  * - Thread-safe operation on ASIO executor
  */

libs/networking/src/curl_multi_manager.cpp

@@ -217,15 +217,20 @@ void CurlMultiManager::check_multi_info() {
 void CurlMultiManager::start_socket_monitor(SocketInfo* socket_info,
                                             const int action) {
     if (!socket_info->handle) {
-        // Create handle for this socket
+        // Create tcp::socket and assign the native socket handle
+        // This works cross-platform (Windows and POSIX)
         socket_info->handle = std::make_shared<SocketHandle>(executor_);
-#ifdef _WIN32
-        // On Windows, we need to cast the socket to HANDLE for stream_handle
-        socket_info->handle->assign(reinterpret_cast<HANDLE>(socket_info->sockfd));
-#else
-        // On POSIX, we can assign the socket descriptor directly
-        socket_info->handle->assign(socket_info->sockfd);
-#endif
+
+        // Assign the CURL socket to the ASIO socket
+        // tcp::socket::assign works with native socket handles on both platforms
+        boost::system::error_code ec;
+        socket_info->handle->assign(boost::asio::ip::tcp::v4(), socket_info->sockfd, ec);
+
+        if (ec) {
+            std::cerr << "Failed to assign socket: " << ec.message() << std::endl;
+            socket_info->handle.reset();
+            return;
+        }
     }
 
     // Check if action has changed
@@ -255,7 +260,7 @@ void CurlMultiManager::start_socket_monitor(SocketInfo* socket_info,
                 }
 
                 handle->async_wait(
-                    SocketHandle::wait_read,
+                    boost::asio::ip::tcp::socket::wait_read,
                     [weak_self, sockfd, weak_handle, weak_read_handler](
                         const boost::system::error_code& ec) {
                         // If operation was canceled or had an error, don't re-register
@@ -298,7 +303,7 @@ void CurlMultiManager::start_socket_monitor(SocketInfo* socket_info,
                 }
 
                 handle->async_wait(
-                    SocketHandle::wait_write,
+                    boost::asio::ip::tcp::socket::wait_write,
                     [weak_self, sockfd, weak_handle, weak_write_handler](
                         const boost::system::error_code& ec) {
                         // If operation was canceled or had an error, don't re-register