Wireshark · Wireshark-commits: [Wireshark-commits] master-2.2 4fe6755: tcp: Fix Follow TCP tap data and when its tapped.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4fe67553e96a8d35d51a2d8933a73eb3a08ddda5
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

4fe6755 by Michael Mann (mmann78@xxxxxxxxxxxx):

    tcp: Fix Follow TCP tap data and when its tapped.
    
    Use the model from the 2.0 branch and earlier that only "tapped" the
    follow data in a single location. This fixes duplicate data for
    reassembled data and handles out-of-order packets.
    
    Bug: 12855
    Change-Id: I5268f13e3c08e9271acf026b859de693ad794c94
    Reviewed-on: https://code.wireshark.org/review/18368
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 66fa31415ff8d520c71dc66718599e941ed05c29)
    Reviewed-on: https://code.wireshark.org/review/18736
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  26b9227   tvbuff_composite.c: fix composite_get_ptr when length is over 2 segments
    adds  4fe6755   tcp: Fix Follow TCP tap data and when its tapped.


Summary of changes:
 debian/libwireshark8.symbols   |    1 +
 epan/dissectors/packet-tcp.c   |  263 +++++++++++++++++++++++++++++++++++-----
 epan/follow.c                  |   41 +++++++
 epan/follow.h                  |   10 ++
 ui/cli/tap-follow.c            |    3 +-
 ui/gtk/follow_stream.c         |   17 +--
 ui/qt/follow_stream_dialog.cpp |   24 +++-
 7 files changed, 309 insertions(+), 50 deletions(-)