3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-10 15:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add client mode to TcpStream

Browse source
This commit is contained in:
badaix 2019-11-28 20:07:43 +01:00
parent 43c58febd7
commit fd616956cb
3 changed files with 75 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/str_compat.hpp
View file

@ -66,6 +66,18 @@ static int stoi(const std::string& str)
#endif
}
static int stoi(const std::string& str, int def)
{
try
{
return cpt::stoi(str);
}
catch(...)
{
return def;
}
}
static double stod(const std::string& str)
{
#ifdef NO_CPP11_STRING

80
server/streamreader/tcp_stream.cpp
View file

@ -25,6 +25,7 @@
#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"
#include "tcp_stream.hpp"
@ -33,37 +34,74 @@ using namespace std;
TcpStream::TcpStream(PcmListener* pcmListener, boost::asio::io_context& ioc, const StreamUri& uri) : AsioStream<tcp::socket>(pcmListener, ioc, uri)
TcpStream::TcpStream(PcmListener* pcmListener, boost::asio::io_context& ioc, const StreamUri& uri)
: AsioStream<tcp::socket>(pcmListener, ioc, uri), reconnect_timer_(ioc)
{
size_t port = 4953;
try
{
port = cpt::stoi(uri_.getQuery("port", cpt::to_string(port)));
}
catch (...)
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_);
}
LOG(INFO) << "TcpStream port: " << port << "\n";
acceptor_ = make_unique<tcp::acceptor>(ioc_, tcp::endpoint(boost::asio::ip::address::from_string(uri_.host), 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) << "TcpStream host: " << host_ << ", port: " << port_ << ", is server: " << is_server_ << "\n";
if (is_server_)
acceptor_ = make_unique<tcp::acceptor>(ioc_, tcp::endpoint(boost::asio::ip::address::from_string(host_), port_));
}
void TcpStream::connect()
{
auto self = shared_from_this();
acceptor_->async_accept([this, self](boost::system::error_code ec, tcp::socket socket) {
if (!ec)
{
LOG(DEBUG) << "New client connection\n";
stream_ = make_unique<tcp::socket>(move(socket));
on_connect();
}
else
{
LOG(ERROR) << "Accept failed: " << ec.message() << "\n";
}
});
if (is_server_)
{
acceptor_->async_accept([this, self](boost::system::error_code ec, tcp::socket socket) {
if (!ec)
{
LOG(DEBUG) << "New client connection\n";
stream_ = make_unique<tcp::socket>(move(socket));
on_connect();
}
else
{
LOG(ERROR) << "Accept failed: " << ec.message() << "\n";
}
});
}
else
{
stream_ = make_unique<tcp::socket>(ioc_);
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::address::from_string(host_), port_);
stream_->async_connect(endpoint, [self, this](const boost::system::error_code& ec) {
if (!ec)
{
LOG(DEBUG) << "Connected\n";
on_connect();
}
else
{
LOG(DEBUG) << "Connect failed: " << ec.message() << "\n";
reconnect_timer_.expires_from_now(boost::posix_time::milliseconds(1000));
reconnect_timer_.async_wait([self, this](const boost::system::error_code& ec) {
if (!ec)
connect();
});
}
});
}
}

4
server/streamreader/tcp_stream.hpp
View file

@ -40,6 +40,10 @@ protected:
void connect() override;
void disconnect() override;
std::unique_ptr<tcp::acceptor> acceptor_;
std::string host_;
size_t port_;
bool is_server_;
boost::asio::deadline_timer reconnect_timer_;
};