Skip to content

Commit

Permalink
use make_address from boost as from_string is deprecated (#1308)
Browse files Browse the repository at this point in the history
Since boost 1.87.0 boost::asio::ip::address::from_string is no longer available

ref: boostorg/asio@c0d1cfc

fixes:
    ../server/control_server.cpp: In member function 'void ControlServer::start()':
    ../server/control_server.cpp:164:111: error: 'from_string' is not a member of 'boost::asio::ip::address'
      164 |                                                                       tcp::endpoint(boost::asio::ip::address::from_string(address), tcp_settings_.port)));
          |                                                                                                               ^~~~~~~~~~~
    ../server/control_server.cpp:180:112: error: 'from_string' is not a member of 'boost::asio::ip::address'
      180 |                                                                        tcp::endpoint(boost::asio::ip::address::from_string(address), http_settings_.port)));
          |                                                                                                                ^~~~~~~~~~~
    ../server/streamreader/tcp_stream.cpp: In constructor 'streamreader::TcpStream::TcpStream(streamreader::PcmStream::Listener*, boost::asio::io_context&, const ServerSettings&, const streamreader::StreamUri&)':
    ../server/streamreader/tcp_stream.cpp:67:97: error: 'from_string' is not a member of 'boost::asio::ip::address'
       67 |         acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::address::from_string(host_), port_));
          |                                                                                                 ^~~~~~~~~~~
    ../server/streamreader/tcp_stream.cpp: In member function 'virtual void streamreader::TcpStream::connect()':
    ../server/streamreader/tcp_stream.cpp:96:75: error: 'from_string' is not a member of 'boost::asio::ip::address'
       96 |         boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host_), port_);
          |                                                                           ^~~~~~~~~~~
    ../server/stream_server.cpp: In member function 'void StreamServer::start()':
    ../server/stream_server.cpp:234:103: error: 'from_string' is not a member of 'boost::asio::ip::address'
      234 |                                                               tcp::endpoint(boost::asio::ip::address::from_string(address), settings_.stream.port)));
          |
  • Loading branch information
heitbaum authored Dec 18, 2024
1 parent f6ce4f3 commit b2fd2bf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions server/control_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void ControlServer::start()
{
LOG(INFO, LOG_TAG) << "Creating TCP acceptor for address: " << address << ", port: " << tcp_settings_.port << "\n";
acceptor_tcp_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()),
tcp::endpoint(boost::asio::ip::address::from_string(address), tcp_settings_.port)));
tcp::endpoint(boost::asio::ip::make_address(address), tcp_settings_.port)));
}
catch (const boost::system::system_error& e)
{
Expand All @@ -177,7 +177,7 @@ void ControlServer::start()
{
LOG(INFO, LOG_TAG) << "Creating HTTP acceptor for address: " << address << ", port: " << http_settings_.port << "\n";
acceptor_http_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()),
tcp::endpoint(boost::asio::ip::address::from_string(address), http_settings_.port)));
tcp::endpoint(boost::asio::ip::make_address(address), http_settings_.port)));
}
catch (const boost::system::system_error& e)
{
Expand Down
2 changes: 1 addition & 1 deletion server/stream_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ void StreamServer::start()
{
LOG(INFO, LOG_TAG) << "Creating stream acceptor for address: " << address << ", port: " << settings_.stream.port << "\n";
acceptor_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()),
tcp::endpoint(boost::asio::ip::address::from_string(address), settings_.stream.port)));
tcp::endpoint(boost::asio::ip::make_address(address), settings_.stream.port)));
}
catch (const boost::system::system_error& e)
{
Expand Down
4 changes: 2 additions & 2 deletions server/streamreader/tcp_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ TcpStream::TcpStream(PcmStream::Listener* pcmListener, boost::asio::io_context&

LOG(INFO, LOG_TAG) << "TcpStream host: " << host_ << ", port: " << port_ << ", is server: " << is_server_ << "\n";
if (is_server_)
acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::address::from_string(host_), port_));
acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::make_address(host_), port_));
}


Expand Down Expand Up @@ -93,7 +93,7 @@ void TcpStream::connect()
else
{
stream_ = make_unique<tcp::socket>(strand_);
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host_), port_);
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::make_address(host_), port_);
stream_->async_connect(endpoint,
[this](const boost::system::error_code& ec)
{
Expand Down

0 comments on commit b2fd2bf

Please sign in to comment.