Wireshark-commits: [Wireshark-commits] master 3fea3c3: tcp: fix OoO reassembly when the first data
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 30 Aug 2018 04:07:08 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3fea3c3709a039958cbe2fcb6c87d3f4d5049f11
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

3fea3c3 by Peter Wu (peter@xxxxxxxxxxxxx):

    tcp: fix OoO reassembly when the first data packet is OoO
    
    OoO reassembly assumed that the stream starts with the first data
    segment, but this can already be OoO. Use the hint from SYN instead.
    The test capture is based on a local capture, post-processed with scapy
    to introduce an OoO condition and fixup the frame time.
    
    Bug: 15078
    Change-Id: Id0e312bb3d0e7c7f8f1b243a2be9f15c9851c501
    Fixes: v2.9.0rc0-1097-gca42331437 ("tcp: add support for reassembling out-of-order segments")
    Reviewed-on: https://code.wireshark.org/review/29305
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  28524f1   ESP: improve IPv6 address matching
     add  3fea3c3   tcp: fix OoO reassembly when the first data packet is OoO


Summary of changes:
 epan/dissectors/packet-tcp.c |  10 ++++++++--
 test/captures/dns-ooo.pcap   | Bin 0 -> 418 bytes
 test/suite_dissection.py     |  11 +++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 test/captures/dns-ooo.pcap