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

Flush buffers on excessive missing

merge-requests/9/merge
Phil Taylor 2022-01-27 23:24:54 +00:00
rodzic d29c1ddba7
commit fe7bdf1345
2 zmienionych plików z 21 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
udphandler.cpp
Wyświetl plik

@ -1268,14 +1268,6 @@ void udpBase::dataReceived(QByteArray r)
int missCounter = 0;
for (quint16 f = rxSeqBuf.lastKey() + 1; f < in->seq; f++)
{
if (missCounter > 50) {
// More than 50 packets missing, something horrific has happened!
qDebug(logUdp()) << "Too many missing packets, full reset!";
rxSeqBuf.clear();
rxMissing.clear();
missingMutex.unlock();
break;
}
qDebug(logUdp()) << "Detected missing packet" << f;
if (rxSeqBuf.size() > BUFSIZE)
@ -1330,6 +1322,16 @@ void udpBase::sendRetransmitRequest()
if (rxMissing.isEmpty()) {
return;
}
else if (rxMissing.size() > 100) {
qDebug(logUdp()) << "Too many missing packets," << rxMissing.size() << "flushing all buffers";
missingMutex.lock();
rxBufferMutex.lock();
qDebug(logUdp()) << "Too many missing packets, full reset!";
rxSeqBuf.clear();
rxMissing.clear();
missingMutex.unlock();
return;
}
QByteArray missingSeqs;

19
udpserver.cpp
Wyświetl plik

@ -908,14 +908,6 @@ void udpServer::commonReceived(QList<CLIENT*>* l, CLIENT* current, QByteArray r)
for (quint16 f = current->rxSeqBuf.lastKey() + 1; f < in->seq; f++)
{
if (missCounter > 50) {
// More than 50 packets missing, something horrific has happened!
qDebug(logUdpServer()) << "Too many missing packets, full reset!";
current->rxSeqBuf.clear();
current->rxMissing.clear();
current->missMutex.unlock();
break;
}
qInfo(logUdpServer()) << "Detected missing packet" << f;
@ -1696,6 +1688,17 @@ void udpServer::sendRetransmitRequest(CLIENT* c)
if (c->rxMissing.isEmpty()) {
return;
}
else if (c->rxMissing.size() > 100) {
qDebug(logUdp()) << "Too many missing packets," << c->rxMissing.size() << "flushing all buffers";
c->missMutex.lock();
c->rxMutex.lock();
qDebug(logUdp()) << "Too many missing packets, full reset!";
c->rxSeqBuf.clear();
c->rxMissing.clear();
c->missMutex.unlock();
return;
}
QByteArray missingSeqs;