kopia lustrzana https://gitlab.com/eliggett/wfview
Ignore wrong ping seq
rodzic
f77defd9d7
commit
9b8221b32e
|
@ -1099,10 +1099,6 @@ void udpBase::dataReceived(QByteArray r)
|
||||||
// This is response to OUR request so increment counter
|
// This is response to OUR request so increment counter
|
||||||
pingSendSeq++;
|
pingSendSeq++;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
// Not sure what to do here, need to spend more time with the protocol but will try sending ping with same seq next time.
|
|
||||||
//qInfo(logUdp()) << this->metaObject()->className() << "Received out-of-sequence ping response. Sent:" << pingSendSeq << " received " << in->seq;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qInfo(logUdp()) << this->metaObject()->className() << "Unhandled response to ping. I have never seen this! 0x10=" << r[16];
|
qInfo(logUdp()) << this->metaObject()->className() << "Unhandled response to ping. I have never seen this! 0x10=" << r[16];
|
||||||
|
|
|
@ -208,15 +208,9 @@ void udpServer::controlReceived()
|
||||||
sendPing(&controlClients, current, in->seq, true);
|
sendPing(&controlClients, current, in->seq, true);
|
||||||
}
|
}
|
||||||
else if (in->reply == 0x01) {
|
else if (in->reply == 0x01) {
|
||||||
if (in->seq == current->pingSeq || in->seq == current->pingSeq - 1)
|
// A Reply to our ping!
|
||||||
{
|
if (in->seq == current->pingSeq) {
|
||||||
// A Reply to our ping!
|
current->pingSeq++;
|
||||||
if (in->seq == current->pingSeq) {
|
|
||||||
current->pingSeq++;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
qInfo(logUdpServer()) << current->ipAddress.toString() << ": got out of sequence ping reply. Got: " << in->seq << " expecting: " << current->pingSeq;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -485,15 +479,9 @@ void udpServer::civReceived()
|
||||||
sendPing(&civClients, current, in->seq, true);
|
sendPing(&civClients, current, in->seq, true);
|
||||||
}
|
}
|
||||||
else if (in->reply == 0x01) {
|
else if (in->reply == 0x01) {
|
||||||
if (in->seq == current->pingSeq || in->seq == current->pingSeq - 1)
|
// A Reply to our ping!
|
||||||
{
|
if (in->seq == current->pingSeq) {
|
||||||
// A Reply to our ping!
|
current->pingSeq++;
|
||||||
if (in->seq == current->pingSeq) {
|
|
||||||
current->pingSeq++;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
qInfo(logUdpServer()) << current->ipAddress.toString() << ": got out of sequence ping reply. Got: " << in->seq << " expecting: " << current->pingSeq;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -632,15 +620,9 @@ void udpServer::audioReceived()
|
||||||
sendPing(&audioClients, current, in->seq, true);
|
sendPing(&audioClients, current, in->seq, true);
|
||||||
}
|
}
|
||||||
else if (in->reply == 0x01) {
|
else if (in->reply == 0x01) {
|
||||||
if (in->seq == current->pingSeq || in->seq == current->pingSeq - 1)
|
// A Reply to our ping!
|
||||||
{
|
if (in->seq == current->pingSeq) {
|
||||||
// A Reply to our ping!
|
current->pingSeq++;
|
||||||
if (in->seq == current->pingSeq) {
|
|
||||||
current->pingSeq++;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
qInfo(logUdpServer()) << current->ipAddress.toString() << ": got out of sequence ping reply. Got: " << in->seq << " expecting: " << current->pingSeq;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue