3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-10 07:36:41 +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) 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(); ) for (auto it = sessions_.begin(); it != sessions_.end(); )
{ {
if (!(*it)->active()) if (!(*it)->active())
{ {
logO << "Session inactive. Removing\n"; logO << "Session inactive. Removing\n";
// don't block: remove ServerSession in a thread
auto func = [](shared_ptr<ServerSession> s)->void{s->stop();}; auto func = [](shared_ptr<ServerSession> s)->void{s->stop();};
std::thread t(func, *it); std::thread t(func, *it);
t.detach(); t.detach();
@ -74,16 +75,19 @@ void ControlServer::onMessageReceived(ServerSession* connection, const msg::Base
} }
else if (requestMsg.request == kServerSettings) else if (requestMsg.request == kServerSettings)
{ {
std::unique_lock<std::mutex> mlock(mutex_);
serverSettings_->refersTo = requestMsg.id; serverSettings_->refersTo = requestMsg.id;
connection->send(serverSettings_); connection->send(serverSettings_);
} }
else if (requestMsg.request == kSampleFormat) else if (requestMsg.request == kSampleFormat)
{ {
std::unique_lock<std::mutex> mlock(mutex_);
sampleFormat_->refersTo = requestMsg.id; sampleFormat_->refersTo = requestMsg.id;
connection->send(sampleFormat_); connection->send(sampleFormat_);
} }
else if (requestMsg.request == kHeader) else if (requestMsg.request == kHeader)
{ {
std::unique_lock<std::mutex> mlock(mutex_);
headerChunk_->refersTo = requestMsg.id; headerChunk_->refersTo = requestMsg.id;
connection->send(headerChunk_); connection->send(headerChunk_);
} }
@ -118,7 +122,7 @@ void ControlServer::acceptor()
logS(kLogNotice) << "ControlServer::NewConnection: " << sock->remote_endpoint().address().to_string() << endl; logS(kLogNotice) << "ControlServer::NewConnection: " << sock->remote_endpoint().address().to_string() << endl;
ServerSession* session = new ServerSession(this, sock); ServerSession* session = new ServerSession(this, sock);
{ {
std::unique_lock<std::mutex> mlock(mutex); std::unique_lock<std::mutex> mlock(mutex_);
session->start(); session->start();
sessions_.insert(shared_ptr<ServerSession>(session)); sessions_.insert(shared_ptr<ServerSession>(session));
} }

2
server/publishAvahi.cpp
View file

@ -134,7 +134,7 @@ void PublishAvahi::create_services(AvahiClient *c) {
if (!group) if (!group)
{ {
if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) { if (!(group = avahi_entry_group_new(c, entry_group_callback, this))) {
logE << "avahi_entry_group_new() failed: " << avahi_strerror(avahi_client_errno(c)) << "\n"; logE << "avahi_entry_group_new() failed: " << avahi_strerror(avahi_client_errno(c)) << "\n";
goto fail; goto fail;
} }

10
server/serverSession.cpp
View file

@ -16,10 +16,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#include "serverSession.h"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <iostream> #include <iostream>
#include <mutex> #include <mutex>
#include "serverSession.h"
#include "common/log.h" #include "common/log.h"
using namespace std; using namespace std;
@ -69,7 +69,7 @@ void ServerSession::stop()
} }
if (writerThread_) if (writerThread_)
{ {
logD << "joining readerThread\n"; logD << "joining writerThread\n";
writerThread_->join(); writerThread_->join();
delete writerThread_; delete writerThread_;
} }
@ -155,7 +155,7 @@ void ServerSession::reader()
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
logS(kLogErr) << "Exception: " << e.what() << ", trying to reconnect" << endl; logS(kLogErr) << "Exception in ServerSession::reader(): " << e.what() << endl;
} }
active_ = false; active_ = false;
} }
@ -176,9 +176,9 @@ void ServerSession::writer()
send(message.get()); send(message.get());
} }
} }
catch (std::exception& e) catch (const std::exception& e)
{ {
logE << "Exception in thread: " << e.what() << "\n"; logS(kLogErr) << "Exception in ServerSession::writer(): " << e.what() << endl;
} }
active_ = false; active_ = false;
} }