SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PICloud change protocol > server_uuid

Browse Source
This commit is contained in:
Бычков Андрей
2021-04-12 11:35:34 +03:00
parent f75ce1e8e0
commit dbd2267a8c
12 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/cloud_dispatcher/dispatcherserver.cpp
View File

@@ -70,12 +70,12 @@ void DispatcherServer::updateConnectionsTile(TileList * tl) {
case PICloud::TCP::Client : {
role = "Client";
CloudServer * cs = index_c_clients.value(c, nullptr);
if (cs) role += " \"" + cs->serverName() + "\"";
if (cs) role += " \"" + cs->serverUUID().toHex().left(8) + "...\"";
} break;
case PICloud::TCP::Server : {
role = "Server";
CloudServer * cs = index_c_servers.value(c, nullptr);
if (cs) role += " \"" + cs->serverName() + "\"";
if (cs) role += " \"" + cs->serverUUID().toHex().left(8) + "...\"";
} break;
default:
break;
@@ -91,7 +91,7 @@ void DispatcherServer::updateServersTile(TileList * tl, PISet<const DispatcherCl
tl->content.clear();
auto mi = c_servers.makeIterator();
while (mi.next()) {
tl->content << TileList::Row(mi.value()->serverName() + " - " + PIString::fromNumber(mi.value()->getClients().size()), PIScreenTypes::CellFormat());
tl->content << TileList::Row(mi.value()->serverUUID().toHex().left(8) + "... - " + PIString::fromNumber(mi.value()->getClients().size()), PIScreenTypes::CellFormat());
if (servers.contains(mi.value()->getConnection())) tl->selected << (tl->content.size_s() - 1);
}
map_mutex.unlock();
@@ -167,7 +167,7 @@ void DispatcherServer::disconnectClient(DispatcherClient *client) {
csc->close();
csc->deleteLater();
}
c_servers.remove(cs->serverName());
c_servers.remove(cs->serverUUID());
index_c_servers.removeOne(client);
delete cs;
}
@@ -185,13 +185,13 @@ void DispatcherServer::disconnectClient(DispatcherClient *client) {
void DispatcherServer::newConnection(PIEthernet *cl) {
DispatcherClient * client = new DispatcherClient(cl, client_gid++);
CONNECTU(client, disconnectEvent, this, disconnectClient);
CONNECTL(client, registerServer, [this](PIString sname, DispatcherClient * c){
CONNECTL(client, registerServer, [this](const PIByteArray & sname, DispatcherClient * c){
map_mutex.lock();
CloudServer * cs = c_servers.value(sname, nullptr);
if (cs) {
rm_clients << c;
} else {
piCoutObj << "add new Server ->" << sname;
piCoutObj << "add new Server ->" << sname.toHex();
CloudServer * cs = new CloudServer(c, sname);
c_servers.insert(sname, cs);
index_c_servers.insert(c, cs);
@@ -199,11 +199,11 @@ void DispatcherServer::newConnection(PIEthernet *cl) {
}
map_mutex.unlock();
});
CONNECTL(client, registerClient, [this](PIString sname, DispatcherClient * c){
CONNECTL(client, registerClient, [this](const PIByteArray & sname, DispatcherClient * c){
map_mutex.lock();
CloudServer * cs = c_servers.value(sname, nullptr);
if (cs) {
piCoutObj << "add new Client to Server ->" << sname;
piCoutObj << "add new Client to Server ->" << sname.toHex();
cs->addClient(c);
index_c_clients.insert(c, cs);
c->authorise(true);