mirror of
https://github.com/badaix/snapcast.git
synced 2025-04-29 10:17:16 +02:00
b2fd2bf9ef
Since boost 1.87.0 boost::asio::ip::address::from_string is no longer available
ref: c0d1cfce77
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)));
|
124 lines
3.5 KiB
C++
124 lines
3.5 KiB
C++
/***
|
|
This file is part of snapcast
|
|
Copyright (C) 2014-2024 Johannes Pohl
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
// prototype/interface header file
|
|
#include "tcp_stream.hpp"
|
|
|
|
// local headers
|
|
#include "common/aixlog.hpp"
|
|
#include "common/snap_exception.hpp"
|
|
#include "common/str_compat.hpp"
|
|
#include "common/utils/string_utils.hpp"
|
|
#include "encoder/encoder_factory.hpp"
|
|
|
|
// 3rd party headers
|
|
|
|
// standard headers
|
|
#include <cerrno>
|
|
#include <memory>
|
|
|
|
|
|
using namespace std;
|
|
|
|
namespace streamreader
|
|
{
|
|
|
|
static constexpr auto LOG_TAG = "TcpStream";
|
|
|
|
TcpStream::TcpStream(PcmStream::Listener* pcmListener, boost::asio::io_context& ioc, const ServerSettings& server_settings, const StreamUri& uri)
|
|
: AsioStream<tcp::socket>(pcmListener, ioc, server_settings, uri), reconnect_timer_(ioc)
|
|
{
|
|
host_ = uri_.host;
|
|
auto host_port = utils::string::split(host_, ':');
|
|
port_ = 4953;
|
|
if (host_port.size() == 2)
|
|
{
|
|
host_ = host_port[0];
|
|
port_ = cpt::stoi(host_port[1], port_);
|
|
}
|
|
|
|
auto mode = uri_.getQuery("mode", "server");
|
|
if (mode == "server")
|
|
is_server_ = true;
|
|
else if (mode == "client")
|
|
is_server_ = false;
|
|
else
|
|
throw SnapException("mode must be 'client' or 'server'");
|
|
|
|
port_ = cpt::stoi(uri_.getQuery("port", cpt::to_string(port_)), port_);
|
|
|
|
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::make_address(host_), port_));
|
|
}
|
|
|
|
|
|
void TcpStream::connect()
|
|
{
|
|
if (!active_)
|
|
return;
|
|
|
|
if (is_server_)
|
|
{
|
|
acceptor_->async_accept(
|
|
[this](boost::system::error_code ec, tcp::socket socket)
|
|
{
|
|
if (!ec)
|
|
{
|
|
LOG(DEBUG, LOG_TAG) << "New client connection\n";
|
|
stream_ = make_unique<tcp::socket>(std::move(socket));
|
|
on_connect();
|
|
}
|
|
else
|
|
{
|
|
LOG(ERROR, LOG_TAG) << "Accept failed: " << ec.message() << "\n";
|
|
}
|
|
});
|
|
}
|
|
else
|
|
{
|
|
stream_ = make_unique<tcp::socket>(strand_);
|
|
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::make_address(host_), port_);
|
|
stream_->async_connect(endpoint,
|
|
[this](const boost::system::error_code& ec)
|
|
{
|
|
if (!ec)
|
|
{
|
|
LOG(DEBUG, LOG_TAG) << "Connected\n";
|
|
on_connect();
|
|
}
|
|
else
|
|
{
|
|
LOG(DEBUG, LOG_TAG) << "Connect failed: " << ec.message() << "\n";
|
|
wait(reconnect_timer_, 1s, [this] { connect(); });
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
void TcpStream::disconnect()
|
|
{
|
|
reconnect_timer_.cancel();
|
|
if (acceptor_)
|
|
acceptor_->cancel();
|
|
AsioStream<tcp::socket>::disconnect();
|
|
}
|
|
|
|
|
|
} // namespace streamreader
|