Wireshark-commits: [Wireshark-commits] master 2c7c705: http2: fix dissection when using Upgrade
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: Wed, 16 Sep 2015 06:05:49 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2c7c7051575ecc1a0007d07d64816682c3c8c470
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

2c7c705 by Peter Wu (peter@xxxxxxxxxxxxx):

    http2: fix dissection when using Upgrade
    
    The fix for bug 11331 has as side-effect that the HTTP part of a
    conversation is not dissected on the second pass.
    
    Fix it by calling the HTTP2 dissector only when it was detected via
    heuristics, and not via Upgrade (since that would be handled by the
    http loop).
    
    While at it, remove the use of tvb_new_subset_remaining since the
    original tvb is not touched and move the comment about the proxy to the
    right place.
    
    Tested with the capture from Alexis (plain HTTP2 via Upgrade), the one
    from bug 11331 (plain HTTP2 via heuristics) and a HTTP2 in SSL capture
    (via heuristics).
    
    Change-Id: Iead7682aa8d5114e4edcfd54eabcd0d659056cc1
    Reviewed-on: https://code.wireshark.org/review/10541
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  c36ed56   [tcp] Fix case of incorrect "[TCP ACKed unseen segment]"
    adds  2c7c705   http2: fix dissection when using Upgrade


Summary of changes:
 epan/dissectors/packet-http.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)