diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-10-04 10:14:27 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2021-10-04 21:41:37 +0000 |
| commit | d4c908a57398ae82aaebb958bc17dc07c104082a (patch) | |
| tree | 08eaca8fc988849d34d5381aa090cae104a54a6c | |
| parent | 924bb5b8b30a627e7716654d09202a570817687f (diff) | |
Revert "TCP: last out-of-order packet is marked as a retransmission"
Manually revert commit 4e3ec2d01a in order to work around a conflict
with 2484ad2f72.
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_advanced.adoc | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docbook/wsug_src/WSUG_chapter_advanced.adoc b/docbook/wsug_src/WSUG_chapter_advanced.adoc index c35bcd8265..8c0a2c1664 100644 --- a/docbook/wsug_src/WSUG_chapter_advanced.adoc +++ b/docbook/wsug_src/WSUG_chapter_advanced.adoc @@ -583,7 +583,7 @@ Set when all of the following are true: * This is not a keepalive packet. * In the forward direction, the segment length is greater than zero or the SYN or FIN is set. * The next expected sequence number is greater than the current sequence number. -* The next expected sequence number is greater than or equal to the next sequence number. +* The next expected sequence number and the next sequence number differ. * The last segment arrived within the Out-Of-Order RTT threshold. The threshold is either the value shown in the “iRTT” (tcp.analysis.initial_rtt) field under “SEQ/ACK analysis” if it is present, or the default value of 3ms if it is not. diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index f7ad491812..6960c96593 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2322,7 +2322,7 @@ finished_fwd: if( seq_not_advanced // XXX is this neccessary? && t < ooo_thres - && tcpd->fwd->tcp_analyze_seq_info->nextseq >= seq + seglen ) { + && tcpd->fwd->tcp_analyze_seq_info->nextseq != seq + seglen ) { if(!tcpd->ta) { tcp_analyze_get_acked_struct(pinfo->num, seq, ack, TRUE, tcpd); } |