git.99rst.org Git - openwrt-packages.git/blob

   1 From b2fd2bf9ef835104a813c40c190d71e3644125d7 Mon Sep 17 00:00:00 2001
   2 From: Rudi Heitbaum <rudi@heitbaum.com>
   3 Date: Thu, 19 Dec 2024 02:23:11 +1100
   4 Subject: [PATCH] use make_address from boost as from_string is deprecated
   5  (#1308)
   6
   7 Since boost 1.87.0 boost::asio::ip::address::from_string is no longer available
   8
   9 ref: https://github.com/boostorg/asio/commit/c0d1cfce7767599c4cf00df36f8017a1073339ae
  10
  11 fixes:
  12     ../server/control_server.cpp: In member function 'void ControlServer::start()':
  13     ../server/control_server.cpp:164:111: error: 'from_string' is not a member of 'boost::asio::ip::address'
  14       164 |                                                                       tcp::endpoint(boost::asio::ip::address::from_string(address), tcp_settings_.port)));
  15           |                                                                                                               ^~~~~~~~~~~
  16     ../server/control_server.cpp:180:112: error: 'from_string' is not a member of 'boost::asio::ip::address'
  17       180 |                                                                        tcp::endpoint(boost::asio::ip::address::from_string(address), http_settings_.port)));
  18           |                                                                                                                ^~~~~~~~~~~
  19     ../server/streamreader/tcp_stream.cpp: In constructor 'streamreader::TcpStream::TcpStream(streamreader::PcmStream::Listener*, boost::asio::io_context&, const ServerSettings&, const streamreader::StreamUri&)':
  20     ../server/streamreader/tcp_stream.cpp:67:97: error: 'from_string' is not a member of 'boost::asio::ip::address'
  21        67 |         acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::address::from_string(host_), port_));
  22           |                                                                                                 ^~~~~~~~~~~
  23     ../server/streamreader/tcp_stream.cpp: In member function 'virtual void streamreader::TcpStream::connect()':
  24     ../server/streamreader/tcp_stream.cpp:96:75: error: 'from_string' is not a member of 'boost::asio::ip::address'
  25        96 |         boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host_), port_);
  26           |                                                                           ^~~~~~~~~~~
  27     ../server/stream_server.cpp: In member function 'void StreamServer::start()':
  28     ../server/stream_server.cpp:234:103: error: 'from_string' is not a member of 'boost::asio::ip::address'
  29       234 |                                                               tcp::endpoint(boost::asio::ip::address::from_string(address), settings_.stream.port)));
  30           |
  31 ---
  32  server/control_server.cpp          | 4 ++--
  33  server/stream_server.cpp           | 2 +-
  34  server/streamreader/tcp_stream.cpp | 4 ++--
  35  3 files changed, 5 insertions(+), 5 deletions(-)
  36
  37 --- a/server/control_server.cpp
  38 +++ b/server/control_server.cpp
  39 @@ -161,7 +161,7 @@ void ControlServer::start()
  40              {
  41                  LOG(INFO, LOG_TAG) << "Creating TCP acceptor for address: " << address << ", port: " << tcp_settings_.port << "\n";
  42                  acceptor_tcp_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()),
  43 -                                                                      tcp::endpoint(boost::asio::ip::make_address(address), settings_.tcp.port)));
  44 +                                                                      tcp::endpoint(boost::asio::ip::make_address(address), tcp_settings_.port)));
  45              }
  46              catch (const boost::system::system_error& e)
  47              {
  48 @@ -177,7 +177,7 @@ void ControlServer::start()
  49              {
  50                  LOG(INFO, LOG_TAG) << "Creating HTTP acceptor for address: " << address << ", port: " << http_settings_.port << "\n";
  51                  acceptor_http_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()),
  52 -                                                                       tcp::endpoint(boost::asio::ip::make_address(address), settings_.http.port)));
  53 +                                                                       tcp::endpoint(boost::asio::ip::make_address(address), http_settings_.port)));
  54              }
  55              catch (const boost::system::system_error& e)
  56              {
  57 --- a/server/stream_server.cpp
  58 +++ b/server/stream_server.cpp
  59 @@ -231,7 +231,7 @@ void StreamServer::start()
  60          {
  61              LOG(INFO, LOG_TAG) << "Creating stream acceptor for address: " << address << ", port: " << settings_.stream.port << "\n";
  62              acceptor_.emplace_back(make_unique<tcp::acceptor>(boost::asio::make_strand(io_context_.get_executor()),
  63 -                                                              tcp::endpoint(boost::asio::ip::address::from_string(address), settings_.stream.port)));
  64 +                                                              tcp::endpoint(boost::asio::ip::make_address(address), settings_.stream.port)));
  65          }
  66          catch (const boost::system::system_error& e)
  67          {
  68 --- a/server/streamreader/tcp_stream.cpp
  69 +++ b/server/streamreader/tcp_stream.cpp
  70 @@ -64,7 +64,7 @@ TcpStream::TcpStream(PcmStream::Listener
  71
  72      LOG(INFO, LOG_TAG) << "TcpStream host: " << host_ << ", port: " << port_ << ", is server: " << is_server_ << "\n";
  73      if (is_server_)
  74 -        acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::address::from_string(host_), port_));
  75 +        acceptor_ = make_unique<tcp::acceptor>(strand_, tcp::endpoint(boost::asio::ip::make_address(host_), port_));
  76  }
  77
  78
  79 @@ -93,7 +93,7 @@ void TcpStream::connect()
  80      else
  81      {
  82          stream_ = make_unique<tcp::socket>(strand_);
  83 -        boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host_), port_);
  84 +        boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::make_address(host_), port_);
  85          stream_->async_connect(endpoint,
  86                                 [this](const boost::system::error_code& ec)
  87                                 {