kopia lustrzana https://gitlab.com/eliggett/wfview
Fix for left over CIV client on server
rodzic
04562a6ca5
commit
fc2d1e24e2
|
@ -461,7 +461,6 @@ void udpServer::civReceived()
|
||||||
if (current == Q_NULLPTR)
|
if (current == Q_NULLPTR)
|
||||||
{
|
{
|
||||||
current = new CLIENT();
|
current = new CLIENT();
|
||||||
|
|
||||||
foreach(CLIENT* client, controlClients)
|
foreach(CLIENT* client, controlClients)
|
||||||
{
|
{
|
||||||
if (client != Q_NULLPTR)
|
if (client != Q_NULLPTR)
|
||||||
|
@ -474,6 +473,13 @@ void udpServer::civReceived()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (current->controlClient == Q_NULLPTR || !current->controlClient->isAuthenticated)
|
||||||
|
{
|
||||||
|
// There is no current controlClient that matches this civClient
|
||||||
|
delete current;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
current->type = "CIV";
|
current->type = "CIV";
|
||||||
current->civId = 0;
|
current->civId = 0;
|
||||||
current->connected = true;
|
current->connected = true;
|
||||||
|
@ -504,10 +510,6 @@ void udpServer::civReceived()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current->controlClient == Q_NULLPTR || !current->controlClient->isAuthenticated)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (r.length())
|
switch (r.length())
|
||||||
{
|
{
|
||||||
|
@ -621,6 +623,14 @@ void udpServer::audioReceived()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (current->controlClient == Q_NULLPTR || !current->controlClient->isAuthenticated)
|
||||||
|
{
|
||||||
|
// There is no current controlClient that matches this audioClient
|
||||||
|
delete current;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
current->type = "Audio";
|
current->type = "Audio";
|
||||||
current->connected = true;
|
current->connected = true;
|
||||||
current->timeConnected = QDateTime::currentDateTime();
|
current->timeConnected = QDateTime::currentDateTime();
|
||||||
|
@ -1581,6 +1591,7 @@ void udpServer::deleteConnection(QList<CLIENT*>* l, CLIENT* c)
|
||||||
while (it != l->end()) {
|
while (it != l->end()) {
|
||||||
CLIENT* client = *it;
|
CLIENT* client = *it;
|
||||||
if (client != Q_NULLPTR && client == c) {
|
if (client != Q_NULLPTR && client == c) {
|
||||||
|
qInfo(logUdpServer()) << "Found" << client->type << "connection to: " << client->ipAddress.toString() << ":" << QString::number(client->port);
|
||||||
it = l->erase(it);
|
it = l->erase(it);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Ładowanie…
Reference in New Issue