Wireshark-commits: [Wireshark-commits] master-2.0 7c0edd8: Separate "Ethernet in capture file" and
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, 11 May 2016 23:44:31 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7c0edd88b3dd6df64748ca03c2c46797d90b5a29
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

7c0edd8 by Guy Harris (guy@xxxxxxxxxxxx):

    Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors.
    
    Have a dissector that is passed a "struct eth_phdr" pointer, indicating
    whether there is an FCS, there is no FCS, or there's maybe an FCS, and
    an "eth_maybefcs" dissector, to be called from other dissectors.  The
    latter takes no data argument.
    
    That obviates the need for callers of the latter to fill in an
    "eth_phdr" structure.
    
    Note in a comment that setting the "assume an FCS" preference overrides
    a file format handler in Wiretap saying "we have no FCS".  I seem to
    remember that this might be intentional.
    
    Change-Id: Ied48a3c0ae2b2ff1010032aa5a4a97fe394d48f6
    Ping-Bug: 9933
    Reviewed-on: https://code.wireshark.org/review/15388
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  72f1bfe   Handle frames where the type field is a length field.
    adds  7c0edd8   Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors.


Summary of changes:
 epan/dissectors/packet-atm.c  |    9 +++------
 epan/dissectors/packet-epon.c |    8 +++-----
 epan/dissectors/packet-eth.c  |   29 ++++++++++++++++++++++++-----
 epan/dissectors/packet-mim.c  |   11 ++++-------
 epan/dissectors/packet-tzsp.c |    8 +++-----
 5 files changed, 37 insertions(+), 28 deletions(-)