Wireshark-commits: [Wireshark-commits] master 9aa2921: text2pcap: consolidate ethernet header proto

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 19 Nov 2018 06:18:27 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9aa29213f0923b3f4a55a8645ae2026af56c1683
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

9aa2921 by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    text2pcap: consolidate ethernet header protocol determination
    
    With the addition of the IPv6 dummy header the logic to set the
    correct ethernet protocol has become scattered across the code
    and also poured into the actual packet writing code.
    Once command line parsing is completed a consistent set of frame
    generating parameters should be established.
    
    This change consolidates the ethernet header protocol
    determination to one point, with the added benefit of resolving
    a possible duplicate IPv4 / IPv6 paramter setting in the same
    manner as is done for other conflicting parameters.
    
    Change-Id: I2c0d3ee8ad5a28b216a374dad807406113200fa2
    Signed-off-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/30691
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Vasil Velichkov <vvvelichkov@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  bf9286e   Add an API to get the file extension for a compression type, and use it.
     add  9aa2921   text2pcap: consolidate ethernet header protocol determination


Summary of changes:
 text2pcap.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)