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

fixed crash in case of ZeroConf name collision

Browse source
This commit is contained in:
badaix 2015-05-24 15:10:46 +02:00
parent 52b0e92a5c
commit 94ee70d0af
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/controlServer.cpp
View file

@ -34,12 +34,13 @@ ControlServer::ControlServer(unsigned short port) : port_(port), headerChunk_(NU
void ControlServer::send(shared_ptr<msg::BaseMessage> message)
{
std::unique_lock<std::mutex> mlock(mutex);
std::unique_lock<std::mutex> mlock(mutex_);
for (auto it = sessions_.begin(); it != sessions_.end(); )
{
if (!(*it)->active())
{
logO << "Session inactive. Removing\n";
// don't block: remove ServerSession in a thread
auto func = [](shared_ptr<ServerSession> s)->void{s->stop();};
std::thread t(func, *it);
t.detach();
@ -74,16 +75,19 @@ void ControlServer::onMessageReceived(ServerSession* connection, const msg::Base
}
else if (requestMsg.request == kServerSettings)
{
std::unique_lock<std::mutex> mlock(mutex_);
serverSettings_->refersTo = requestMsg.id;
connection->send(serverSettings_);
}
else if (requestMsg.request == kSampleFormat)
{
std::unique_lock<std::mutex> mlock(mutex_);
sampleFormat_->refersTo = requestMsg.id;
connection->send(sampleFormat_);
}
else if (requestMsg.request == kHeader)
{
std::unique_lock<std::mutex> mlock(mutex_);
headerChunk_->refersTo = requestMsg.id;
connection->send(headerChunk_);
}
@ -118,7 +122,7 @@ void ControlServer::acceptor()
logS(kLogNotice) << "ControlServer::NewConnection: " << sock->remote_endpoint().address().to_string() << endl;
ServerSession* session = new ServerSession(this, sock);
{
std::unique_lock<std::mutex> mlock(mutex);
std::unique_lock<std::mutex> mlock(mutex_);
session->start();
sessions_.insert(shared_ptr<ServerSession>(session));
}