3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-05 18:57:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

protect socket with mutex

Browse source
This commit is contained in:
BadAix 2016-11-13 15:53:48 +01:00
parent 0c5646679e
commit c8fc3ae4b8
6 changed files with 43 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/streamSession.cpp
View file

@ -55,7 +55,7 @@ const PcmStreamPtr StreamSession::pcmStream() const
void StreamSession::start()
{
{
std::lock_guard<std::mutex> mlock(mutex_);
std::lock_guard<std::mutex> activeLock(activeMutex_);
active_ = true;
}
readerThread_.reset(new thread(&StreamSession::reader, this));
@ -66,7 +66,7 @@ void StreamSession::start()
void StreamSession::stop()
{
{
std::lock_guard<std::mutex> mlock(mutex_);
std::lock_guard<std::mutex> activeLock(activeMutex_);
if (!active_)
return;
@ -78,6 +78,7 @@ void StreamSession::stop()
std::error_code ec;
if (socket_)
{
std::lock_guard<std::mutex> socketLock(socketMutex_);
socket_->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
if (ec) logE << "Error in socket shutdown: " << ec.message() << "\n";
socket_->close(ec);
@ -144,8 +145,9 @@ bool StreamSession::send(const msg::BaseMessage* message) const
{
//TODO on exception: set active = false
// logO << "send: " << message->type << ", size: " << message->getSize() << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
std::lock_guard<std::mutex> socketLock(socketMutex_);
{
std::lock_guard<std::mutex> mlock(mutex_);
std::lock_guard<std::mutex> activeLock(activeMutex_);
if (!socket_ || !active_)
return false;
}
@ -176,7 +178,10 @@ void StreamSession::getNextMessage()
// logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size);
socketRead(&buffer[0], baseMessage.size);
{
std::lock_guard<std::mutex> socketLock(socketMutex_);
socketRead(&buffer[0], baseMessage.size);
}
tv t;
baseMessage.received = t;