3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-04-28 09:47:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash

Browse source
This commit is contained in:
badaix 2025-01-25 18:03:13 +01:00
parent d7ddfc8b88
commit 3d5744c6b0
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/client_connection.cpp
View file

@ -173,15 +173,15 @@ void ClientConnection::connect(const ResultHandler& handler)
void ClientConnection::sendNext()
{
auto& message = messages_.front();
boost::asio::streambuf streambuf;
std::ostream stream(&streambuf);
std::ostream stream(&streambuf_);
tv t;
message.msg->sent = t;
message.msg->serialize(stream);
ResultHandler handler = message.handler;
write(streambuf, [this, handler](boost::system::error_code ec, std::size_t length)
write(streambuf_, [this, handler](boost::system::error_code ec, std::size_t length)
{
streambuf_.consume(length);
if (ec)
LOG(ERROR, LOG_TAG) << "Failed to send message, error: " << ec.message() << "\n";
else

2
client/client_connection.hpp
View file

@ -173,6 +173,8 @@ protected:
ClientSettings::Server server_;
/// Size of a base message (= message header)
const size_t base_msg_size_;
/// Send stream buffer
boost::asio::streambuf streambuf_;
/// A pending request
struct PendingMessage

21
client/snapclient.cpp
View file

@ -204,14 +204,6 @@ int main(int argc, char** argv)
exit(EXIT_FAILURE);
}
if (!op.non_option_args().empty())
{
streamreader::StreamUri uri(op.non_option_args().front());
settings.server.host = uri.host;
settings.server.port = uri.port.value_or(settings.server.port);
settings.server.protocol = uri.scheme;
}
if (versionSwitch->is_set())
{
cout << "snapclient v" << version::code << (!version::rev().empty() ? (" (rev " + version::rev(8) + ")") : ("")) << "\n"
@ -313,6 +305,19 @@ int main(int argc, char** argv)
else
throw SnapException("Invalid log sink: " + settings.logging.sink);
if (!op.non_option_args().empty())
{
streamreader::StreamUri uri(op.non_option_args().front());
settings.server.host = uri.host;
settings.server.protocol = uri.scheme;
if (uri.port.has_value())
settings.server.port = uri.port.value();
else if (settings.server.protocol == "ws")
settings.server.port = 1780;
else if (settings.server.protocol == "wss")
settings.server.port = 1788;
}
#if !defined(HAS_AVAHI) && !defined(HAS_BONJOUR)
if (settings.server.host.empty())
throw SnapException("Snapserver host not configured and mDNS not available, please configure with \"--host\".");