Replace deprecated asio::io_service and asio::ip::tcp::resolver::query

Boost APIs
offa · Jan 7, 2025 · 6f8db95 · 6f8db95
1 parent 2b8a87c
commit 6f8db95
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 19 deletions.
diff --git a/src/TCP.cxx b/src/TCP.cxx
@@ -30,16 +30,16 @@
 
 namespace influxdb::transports
 {
-    namespace ba = boost::asio;
-
     TCP::TCP(const std::string& hostname, int port)
-        : mSocket(mIoService)
+        : mSocket(mIoContext)
     {
-        ba::ip::tcp::resolver resolver(mIoService);
-        ba::ip::tcp::resolver::query query(hostname, std::to_string(port));
-        ba::ip::tcp::resolver::iterator resolverIterator = resolver.resolve(query);
-        ba::ip::tcp::resolver::iterator end;
-        mEndpoint = *resolverIterator;
+        boost::asio::ip::tcp::resolver resolver(mIoContext);
+        mEndpoint = *(resolver
+                          .resolve(boost::asio::ip::tcp::v4(),
+                                   hostname,
+                                   std::to_string(port),
+                                   boost::asio::ip::resolver_query_base::passive)
+                          .cbegin());
         mSocket.open(mEndpoint.protocol());
         reconnect();
     }
@@ -52,15 +52,15 @@ namespace influxdb::transports
     void TCP::reconnect()
     {
         mSocket.connect(mEndpoint);
-        mSocket.wait(ba::ip::tcp::socket::wait_write);
+        mSocket.wait(boost::asio::ip::tcp::socket::wait_write);
     }
 
     void TCP::send(std::string&& message)
     {
         try
         {
             message.append("\n");
-            const size_t written = mSocket.write_some(ba::buffer(message, message.size()));
+            const size_t written = mSocket.write_some(boost::asio::buffer(message, message.size()));
             if (written != message.size())
             {
                 throw InfluxDBException("Error while transmitting data");

diff --git a/src/TCP.h b/src/TCP.h
@@ -54,7 +54,7 @@ namespace influxdb::transports
 
     private:
         /// Boost Asio I/O functionality
-        boost::asio::io_service mIoService;
+        boost::asio::io_context mIoContext;
 
         /// TCP socket
         boost::asio::ip::tcp::socket mSocket;

diff --git a/src/UDP.cxx b/src/UDP.cxx
@@ -33,12 +33,15 @@ namespace influxdb::transports
 {
 
     UDP::UDP(const std::string& hostname, int port)
-        : mSocket(mIoService, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0))
+        : mSocket(mIoContext, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0))
     {
-        boost::asio::ip::udp::resolver resolver(mIoService);
-        boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(), hostname, std::to_string(port));
-        boost::asio::ip::udp::resolver::iterator resolverInerator = resolver.resolve(query);
-        mEndpoint = *resolverInerator;
+        boost::asio::ip::udp::resolver resolver(mIoContext);
+        mEndpoint = *(resolver
+                          .resolve(boost::asio::ip::udp::v4(),
+                                   hostname,
+                                   std::to_string(port),
+                                   boost::asio::ip::resolver_query_base::passive)
+                          .cbegin());
     }
 
     void UDP::send(std::string&& message)

diff --git a/src/UDP.h b/src/UDP.h
@@ -49,7 +49,7 @@ namespace influxdb::transports
 
     private:
         /// Boost Asio I/O functionality
-        boost::asio::io_service mIoService;
+        boost::asio::io_context mIoContext;
 
         /// UDP socket
         boost::asio::ip::udp::socket mSocket;

diff --git a/src/UnixSocket.cxx b/src/UnixSocket.cxx
@@ -34,7 +34,7 @@ namespace influxdb::transports
 #if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
 
     UnixSocket::UnixSocket(const std::string& socketPath)
-        : mSocket(mIoService), mEndpoint(socketPath)
+        : mSocket(mIoContext), mEndpoint(socketPath)
     {
         mSocket.open();
     }

diff --git a/src/UnixSocket.h b/src/UnixSocket.h
@@ -47,7 +47,7 @@ namespace influxdb::transports
 
     private:
         /// Boost Asio I/O functionality
-        boost::asio::io_service mIoService;
+        boost::asio::io_context mIoContext;
 #if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
         /// Unix socket
         boost::asio::local::datagram_protocol::socket mSocket;