1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
commit 6f8db9522d71409e080726aff7873d10ad68b44f
Author: offa <bm-dev@yandex.com>
Date: Tue Jan 7 18:47:58 2025 +0100
Replace deprecated asio::io_service and asio::ip::tcp::resolver::query
Boost APIs
diff --git a/src/TCP.cxx b/src/TCP.cxx
index 2ebb41a..a72290a 100644
--- 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,7 +52,7 @@ 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)
@@ -60,7 +60,7 @@ namespace influxdb::transports
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
index e1e92e3..b3e1a32 100644
--- 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
index 800d105..718d039 100644
--- 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
index e8f3a95..c4692a0 100644
--- 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
index f6e8f50..05dc7b6 100644
--- 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
index db21540..7b5a068 100644
--- 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;
|