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

report disconnect to control clients

Browse source
This commit is contained in:
badaix 2015-09-12 19:26:43 +02:00
parent 87ce37df8c
commit a60ed3597e
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/streamServer.cpp
View file

@ -54,7 +54,7 @@ void StreamServer::send(const msg::BaseMessage* message)
auto func = [](shared_ptr<ClientSession> s)->void{s->stop();}; auto func = [](shared_ptr<ClientSession> s)->void{s->stop();};
std::thread t(func, *it); std::thread t(func, *it);
t.detach(); t.detach();
controlServer_->send("Client gone: " + (*it)->macAddress); onDisconnect(it->get());
sessions_.erase(it++); sessions_.erase(it++);
} }
else else
@ -83,11 +83,13 @@ void StreamServer::onResync(const PipeReader* pipeReader, double ms)
void StreamServer::onDisconnect(ClientSession* connection) void StreamServer::onDisconnect(ClientSession* connection)
{ {
ClientInfoPtr client = Config::instance().getClientInfo(connection->macAddress); ClientInfoPtr client = Config::instance().getClientInfo(connection->macAddress);
if (!client->connected)
return;
client->connected = false; client->connected = false;
gettimeofday(&client->lastSeen, NULL); gettimeofday(&client->lastSeen, NULL);
Config::instance().save(); Config::instance().save();
json notification = JsonNotification::getJson("Client.OnDisconnect", client->toJson()); json notification = JsonNotification::getJson("Client.OnDisconnect", client->toJson());
controlServer_->send(notification.dump(4)); controlServer_->send(notification.dump());
} }
@ -253,7 +255,7 @@ void StreamServer::onMessageReceived(ClientSession* connection, const msg::BaseM
Config::instance().save(); Config::instance().save();
json notification = JsonNotification::getJson("Client.OnConnect", client->toJson()); json notification = JsonNotification::getJson("Client.OnConnect", client->toJson());
controlServer_->send(notification.dump(4)); controlServer_->send(notification.dump());
} }
} }
@ -304,7 +306,6 @@ void StreamServer::start()
pipeReader_->start(); pipeReader_->start();
acceptor_ = make_shared<tcp::acceptor>(*io_service_, tcp::endpoint(tcp::v4(), settings_.port)); acceptor_ = make_shared<tcp::acceptor>(*io_service_, tcp::endpoint(tcp::v4(), settings_.port));
startAccept(); startAccept();
// acceptThread_ = thread(&StreamServer::acceptor, this);
} }
@ -312,17 +313,9 @@ void StreamServer::stop()
{ {
controlServer_->stop(); controlServer_->stop();
acceptor_->cancel(); acceptor_->cancel();
// io_service_.stop();
// acceptThread_.join();
pipeReader_->stop(); pipeReader_->stop();
std::unique_lock<std::mutex> mlock(mutex_); std::unique_lock<std::mutex> mlock(mutex_);
for (auto it = sessions_.begin(); it != sessions_.end(); ++it) for (auto it = sessions_.begin(); it != sessions_.end(); ++it)
(*it)->stop(); (*it)->stop();
} }
//void StreamServer::acceptor()
//{
// io_service_.run();
//}