3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-01 18:31:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix crash in control server

Browse source
This commit is contained in:
badaix 2019-10-10 23:54:38 +02:00
parent 2939ace883
commit 12a11e12a9
4 changed files with 29 additions and 25 deletions

25
server/stream_session.cpp
View file

@ -75,12 +75,15 @@ void StreamSession::stop()
try
{
boost::system::error_code ec;
socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
if (ec)
LOG(ERROR) << "Error in socket shutdown: " << ec.message() << "\n";
socket_.close(ec);
if (ec)
LOG(ERROR) << "Error in socket close: " << ec.message() << "\n";
{
std::lock_guard<std::mutex> socketLock(socketMutex_);
socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
if (ec)
LOG(ERROR) << "Error in socket shutdown: " << ec.message() << "\n";
socket_.close(ec);
if (ec)
LOG(ERROR) << "Error in socket close: " << ec.message() << "\n";
}
if (readerThread_ && readerThread_->joinable())
{
LOG(DEBUG) << "StreamSession joining readerThread\n";
@ -145,10 +148,12 @@ bool StreamSession::send(const msg::message_ptr& message)
{
// TODO on exception: set active = false
// LOG(INFO) << "send: " << message->type << ", size: " << message->getSize() << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
std::lock_guard<std::mutex> activeLock(activeMutex_);
if (!active_)
return false;
std::lock_guard<std::mutex> socketLock(socketMutex_);
{
std::lock_guard<std::mutex> activeLock(activeMutex_);
if (!active_)
return false;
}
boost::asio::streambuf streambuf;
std::ostream stream(&streambuf);
tv t;