Skip to content

Fix build with modern Boost.Asio (io_service / resolver::query removed in 1.87) #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
idesign0 wants to merge 1 commit into
base: ros2_master
Choose a base branch
from
Open

Fix build with modern Boost.Asio (io_service / resolver::query removed in 1.87) #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/network_interface/network_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class UDPInterface

private:
uint32_t receive_buffer_size_ = 1024;
boost::asio::io_service io_service_;
boost::asio::io_context io_service_;
boost::asio::ip::udp::socket socket_;
boost::asio::ip::udp::endpoint sender_endpoint_;
};
Expand All @@ -78,7 +78,7 @@ class TCPInterface
// Send a message
ReturnStatuses write(const std::vector<uint8_t> &msg);
private:
boost::asio::io_service io_service_;
boost::asio::io_context io_service_;
boost::asio::ip::tcp::socket socket_;
boost::system::error_code error_;
};
Expand Down
2 changes: 1 addition & 1 deletion include/network_interface/udp_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class UDPServer
void handleSend(std::vector<uint8_t> sent_payload,
const boost::system::error_code& ec, std::size_t bytes_transferred);

boost::asio::io_service io_service_;
boost::asio::io_context io_service_;
boost::asio::ip::udp::socket socket_;
boost::asio::ip::udp::endpoint server_endpoint_;
boost::asio::ip::udp::endpoint client_endpoint_;
Expand Down
8 changes: 4 additions & 4 deletions src/tcp_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ ReturnStatuses TCPInterface::open(std::string ip_address, const int &port)
std::stringstream sPort;
sPort << port;
tcp::resolver res(io_service_);
tcp::resolver::query query(tcp::v4(), ip_address, sPort.str());
tcp::resolver::iterator it = res.resolve(query);
auto endpoints = res.resolve(tcp::v4(), ip_address, sPort.str());
auto it = endpoints.begin();
boost::system::error_code ec;

socket_.connect(*it, ec);
Expand Down Expand Up @@ -78,7 +78,7 @@ ReturnStatuses TCPInterface::read(std::vector<uint8_t> *msg)
boost::asio::read(socket_, boost::asio::buffer(*msg), error_);

// Reset the io service so that it is available for the next call to TCPInterface::read
io_service_.reset();
io_service_.restart();

if (error_.value() == boost::system::errc::success)
return ReturnStatuses::OK;
Expand All @@ -97,7 +97,7 @@ ReturnStatuses TCPInterface::read_exactly(std::vector<uint8_t> *msg, const size_
boost::asio::read(socket_, boost::asio::buffer(*msg), boost::asio::transfer_exactly(bytes_to_read));

// Reset the io service so that it is available for the next call to TCPInterface::read_exactly
io_service_.reset();
io_service_.restart();

if (error_.value() == boost::system::errc::success)
return ReturnStatuses::OK;
Expand Down
4 changes: 2 additions & 2 deletions src/udp_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ ReturnStatuses UDPInterface::open(const std::string& ip_address, uint32_t port)
std::stringstream sPort;
sPort << port;
udp::resolver res(io_service_);
udp::resolver::query query(udp::v4(), ip_address.c_str(), sPort.str());
sender_endpoint_ = *res.resolve(query);
auto endpoints = res.resolve(udp::v4(), ip_address.c_str(), sPort.str());
sender_endpoint_ = *endpoints.begin();
boost::system::error_code ec;

socket_.connect(sender_endpoint_, ec);
Expand Down
4 changes: 2 additions & 2 deletions src/udp_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ ReturnStatuses UDPServer::open(const std::string& ip_address, uint32_t port)
std::stringstream sPort;
sPort << port;
udp::resolver res(io_service_);
udp::resolver::query query(udp::v4(), ip_address.c_str(), sPort.str());
server_endpoint_ = *res.resolve(query);
auto endpoints = res.resolve(udp::v4(), ip_address.c_str(), sPort.str());
server_endpoint_ = *endpoints.begin();
boost::system::error_code ec;

socket_.open(boost::asio::ip::udp::v4(), ec);
Expand Down