Wireshark-commits: [Wireshark-commits] master 5359a97: text2pcap: Fix -i <proto> when IPv6 (-6) is
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, 31 Oct 2018 02:45:33 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5359a97d4383ca75606b6011006f44b040d5b92b
Submitter: "Michael Mann <mmann78@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

5359a97 by Vasil Velichkov (vvvelichkov@xxxxxxxxx):

    text2pcap: Fix -i <proto> when IPv6 (-6) is specified
    
    When the -i <proto> option is specified the hdr_ip was always set to
    TRUE which resulted in a wrong header length when the IPv6 (-6) option
    is specified as well. To resolve this set hdr_ip only when -i is specified
    without -4 or -6 options.
    
    Change-Id: I21898f27ceaad603b9275ab6878ff4bd8f9586cd
    Reviewed-on: https://code.wireshark.org/review/30411
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  2584426   Qt: omit initial empty line in About Dialog / Acknowledgements
     add  5359a97   text2pcap: Fix -i <proto> when IPv6 (-6) is specified


Summary of changes:
 test/suite_text2pcap.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
 text2pcap.c             |  8 ++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)