mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Tidy-up server shutdown

merge-requests/7/head
Phil Taylor 2021-10-20 12:47:16 +01:00
rodzic 24a88794e6
commit 620d7890cd
1 zmienionych plików z 5 dodań i 69 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

74
udpserver.cpp
Wyświetl plik

@ -67,82 +67,22 @@ udpServer::~udpServer()
{ {
qInfo(logUdpServer()) << "Closing udpServer"; qInfo(logUdpServer()) << "Closing udpServer";
connMutex.lock();
foreach(CLIENT * client, controlClients) foreach(CLIENT * client, controlClients)
{ {
if (client->idleTimer != Q_NULLPTR) deleteConnection(&controlClients, client);
{
client->idleTimer->stop();
delete client->idleTimer;
}
if (client->pingTimer != Q_NULLPTR) {
client->pingTimer->stop();
delete client->pingTimer;
}
if (client->retransmitTimer != Q_NULLPTR) {
client->retransmitTimer->stop();
delete client->retransmitTimer;
}
controlClients.removeAll(client);
delete client;
} }
foreach(CLIENT * client, civClients) foreach(CLIENT * client, civClients)
{ {
if (client->idleTimer != Q_NULLPTR) deleteConnection(&civClients, client);
{
client->idleTimer->stop();
delete client->idleTimer;
}
if (client->pingTimer != Q_NULLPTR) {
client->pingTimer->stop();
delete client->pingTimer;
}
if (client->retransmitTimer != Q_NULLPTR) {
client->retransmitTimer->stop();
delete client->retransmitTimer;
}
civClients.removeAll(client);
delete client;
} }
foreach(CLIENT * client, audioClients) foreach(CLIENT * client, audioClients)
{ {
if (client->idleTimer != Q_NULLPTR) deleteConnection(&audioClients, client);
{
client->idleTimer->stop();
delete client->idleTimer;
}
if (client->pingTimer != Q_NULLPTR) {
client->pingTimer->stop();
delete client->pingTimer;
}
if (client->retransmitTimer != Q_NULLPTR) {
client->retransmitTimer->stop();
delete client->retransmitTimer;
}
audioClients.removeAll(client);
delete client;
}
if (rxAudioTimer != Q_NULLPTR) {
rxAudioTimer->stop();
delete rxAudioTimer;
rxAudioTimer = Q_NULLPTR;
}
if (rxAudioThread != Q_NULLPTR) {
rxAudioThread->quit();
rxAudioThread->wait();
}
if (txAudioThread != Q_NULLPTR) {
txAudioThread->quit();
txAudioThread->wait();
} }
// Now all connections are deleted, close and delete the sockets.
if (udpControl != Q_NULLPTR) { if (udpControl != Q_NULLPTR) {
udpControl->close(); udpControl->close();
delete udpControl; delete udpControl;
@ -155,10 +95,6 @@ udpServer::~udpServer()
udpAudio->close(); udpAudio->close();
delete udpAudio; delete udpAudio;
} }
connMutex.unlock();
} }