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

handle empty mac address

Browse source
This commit is contained in:
badaix 2016-01-02 13:56:20 +01:00
parent 909a17f2f3
commit bbfff03863
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
server/streamServer.cpp
View file

@ -92,6 +92,8 @@ void StreamServer::onResync(const PcmReader* pcmReader, double ms)
void StreamServer::onDisconnect(StreamSession* streamSession) void StreamServer::onDisconnect(StreamSession* streamSession)
{ {
logO << "onDisconnect: " << streamSession->macAddress << "\n"; logO << "onDisconnect: " << streamSession->macAddress << "\n";
if (streamSession->macAddress.empty())
return;
/* auto func = [](StreamSession* s)->void{s->stop();}; /* auto func = [](StreamSession* s)->void{s->stop();};
std::thread t(func, streamSession); std::thread t(func, streamSession);
t.detach(); t.detach();
@ -213,31 +215,42 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseMessage& baseMessage, char* buffer) void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseMessage& baseMessage, char* buffer)
{ {
// logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n"; logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
if (baseMessage.type == message_type::kRequest) if (baseMessage.type == message_type::kRequest)
{ {
msg::Request requestMsg; msg::Request requestMsg;
requestMsg.deserialize(baseMessage, buffer); requestMsg.deserialize(baseMessage, buffer);
// logO << "request: " << requestMsg.request << "\n"; logO << "request: " << requestMsg.request << "\n";
if (requestMsg.request == kTime) if (requestMsg.request == kTime)
{ {
msg::Time timeMsg; msg::Time timeMsg;
timeMsg.refersTo = requestMsg.id; timeMsg.refersTo = requestMsg.id;
timeMsg.latency = (requestMsg.received.sec - requestMsg.sent.sec) + (requestMsg.received.usec - requestMsg.sent.usec) / 1000000.; timeMsg.latency = (requestMsg.received.sec - requestMsg.sent.sec) + (requestMsg.received.usec - requestMsg.sent.usec) / 1000000.;
// logD << "Latency: " << timeMsg.latency << ", refers to: " << timeMsg.refersTo << "\n"; logD << "Latency: " << timeMsg.latency << ", refers to: " << timeMsg.refersTo << "\n";
connection->send(&timeMsg); connection->send(&timeMsg);
} }
else if (requestMsg.request == kServerSettings) else if (requestMsg.request == kServerSettings)
{ {
logO << "request kServerSettings: " << connection->macAddress << "\n";
std::unique_lock<std::mutex> mlock(mutex_); std::unique_lock<std::mutex> mlock(mutex_);
ClientInfoPtr clientInfo = Config::instance().getClientInfo(connection->macAddress, true); ClientInfoPtr clientInfo = Config::instance().getClientInfo(connection->macAddress, true);
msg::ServerSettings serverSettings; if (clientInfo == nullptr)
serverSettings.volume = clientInfo->volume.percent; {
serverSettings.muted = clientInfo->volume.muted; logE << "could not get client info for MAC: " << connection->macAddress << "\n";
serverSettings.latency = clientInfo->latency; }
serverSettings.refersTo = requestMsg.id; else
serverSettings.bufferMs = settings_.bufferMs; {
connection->send(&serverSettings); logO << "request kServerSettings\n";
msg::ServerSettings serverSettings;
serverSettings.volume = clientInfo->volume.percent;
serverSettings.muted = clientInfo->volume.muted;
serverSettings.latency = clientInfo->latency;
serverSettings.refersTo = requestMsg.id;
serverSettings.bufferMs = settings_.bufferMs;
logO << "request kServerSettings\n";
connection->send(&serverSettings);
logO << "request kServerSettings\n";
}
} }
else if (requestMsg.request == kSampleFormat) else if (requestMsg.request == kSampleFormat)
{ {