Hopefully this really fixes late packet handling.
This commit is contained in:
parent
f7b9761000
commit
ca7948fc06
1 changed files with 3 additions and 3 deletions
|
@ -231,20 +231,20 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
|
||||||
|
|
||||||
memset(n->late, 0, sizeof(n->late));
|
memset(n->late, 0, sizeof(n->late));
|
||||||
} else if (inpkt->seqno <= n->received_seqno) {
|
} else if (inpkt->seqno <= n->received_seqno) {
|
||||||
if(inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8 || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
|
if((n->received_seqno >= sizeof(n->late) * 8 && inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8) || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
|
||||||
logger(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
|
logger(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
|
||||||
n->name, n->hostname, inpkt->seqno, n->received_seqno);
|
n->name, n->hostname, inpkt->seqno, n->received_seqno);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
|
for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
|
||||||
n->late[(inpkt->seqno / 8) % sizeof(n->late)] |= 1 << i % 8;
|
n->late[(i / 8) % sizeof(n->late)] |= 1 << i % 8;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
n->late[(inpkt->seqno / 8) % sizeof(n->late)] &= ~(1 << inpkt->seqno % 8);
|
n->late[(inpkt->seqno / 8) % sizeof(n->late)] &= ~(1 << inpkt->seqno % 8);
|
||||||
|
|
||||||
if(n->received_seqno > inpkt->seqno)
|
if(inpkt->seqno > n->received_seqno)
|
||||||
n->received_seqno = inpkt->seqno;
|
n->received_seqno = inpkt->seqno;
|
||||||
|
|
||||||
if(n->received_seqno > MAX_SEQNO)
|
if(n->received_seqno > MAX_SEQNO)
|
||||||
|
|
Loading…
Reference in a new issue