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

More fixes to make client and server behave in same way

merge-requests/9/merge
Phil Taylor 2022-05-04 20:37:58 +01:00
rodzic bdca404457
commit 3aefa68939
2 zmienionych plików z 8 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
udphandler.cpp
Wyświetl plik

@ -1317,10 +1317,6 @@ void udpBase::dataReceived(QByteArray r)
{ {
rxBufferMutex.lock(); rxBufferMutex.lock();
if (rxSeqBuf.isEmpty()) { if (rxSeqBuf.isEmpty()) {
if (rxSeqBuf.size() > BUFSIZE)
{
rxSeqBuf.erase(rxSeqBuf.begin());
}
rxSeqBuf.insert(in->seq, QTime::currentTime()); rxSeqBuf.insert(in->seq, QTime::currentTime());
} }
else else

17
udpserver.cpp
Wyświetl plik

@ -885,10 +885,10 @@ void udpServer::commonReceived(QList<CLIENT*>* l, CLIENT* current, QByteArray r)
else else
{ {
if (in->seq < current->rxSeqBuf.firstKey()) if (in->seq < current->rxSeqBuf.firstKey() || in->seq - current->rxSeqBuf.lastKey() > MAX_MISSING)
{ {
qInfo(logUdpServer()) << current->ipAddress.toString() << "(" << current->type << "): ******* seq number may have rolled over ****** previous highest: " << qInfo(logUdpServer()) << current->ipAddress.toString() << "(" << current->type << "Large seq number gap detected, previous highest: " <<
QString("0x%1").arg(current->rxSeqBuf.lastKey(),0,16) << " current: " << QString("0x%1").arg(in->seq,0,16); QString("0x%1").arg(current->rxSeqBuf.lastKey(), 0, 16) << " current: " << QString("0x%1").arg(in->seq, 0, 16);
// Looks like it has rolled over so clear buffer and start again. // Looks like it has rolled over so clear buffer and start again.
if (current->rxMutex.try_lock_for(std::chrono::milliseconds(LOCK_PERIOD))) if (current->rxMutex.try_lock_for(std::chrono::milliseconds(LOCK_PERIOD)))
{ {
@ -918,6 +918,8 @@ void udpServer::commonReceived(QList<CLIENT*>* l, CLIENT* current, QByteArray r)
// Add incoming packet to the received buffer and if it is in the missing buffer, remove it. // Add incoming packet to the received buffer and if it is in the missing buffer, remove it.
//int missCounter = 0; //int missCounter = 0;
if (in->seq > current->rxSeqBuf.lastKey() + 1) { if (in->seq > current->rxSeqBuf.lastKey() + 1) {
qInfo(logUdpServer()) << current->ipAddress.toString() << "(" << current->type << "1 or more missing packets detected, previous: " <<
QString("0x%1").arg(current->rxSeqBuf.lastKey(), 0, 16) << " current: " << QString("0x%1").arg(in->seq, 0, 16);
// We are likely missing packets then! // We are likely missing packets then!
if (current->missMutex.try_lock_for(std::chrono::milliseconds(LOCK_PERIOD))) if (current->missMutex.try_lock_for(std::chrono::milliseconds(LOCK_PERIOD)))
{ {
@ -931,12 +933,9 @@ void udpServer::commonReceived(QList<CLIENT*>* l, CLIENT* current, QByteArray r)
} }
current->rxSeqBuf.insert(f, QTime::currentTime()); current->rxSeqBuf.insert(f, QTime::currentTime());
if (f != in->seq) { if (f != in->seq && !current->rxMissing.contains(f))
if (!current->rxMissing.contains(f)) {
{ current->rxMissing.insert(f, 0);
qInfo(logUdpServer()) << "Detected new missing packet" << f;
current->rxMissing.insert(f, 0);
}
} }
} }
current->missMutex.unlock(); current->missMutex.unlock();