Wireshark-commits: [Wireshark-commits] master eeff506: Separate "Ethernet in capture file" and "Eth
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=eeff506f56c0f3a2e82d0007b7e0c5836be15a33
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
eeff506 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.
Ping-Bug: 9933
Change-Id: I600e1351d468ab31d48369edb96832d6da3e480c
Reviewed-on: https://code.wireshark.org/review/13432
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 47648e0 X509AF: reset algorithm_id global variable when closing a file
adds eeff506 Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors.
Summary of changes:
epan/dissectors/packet-atm.c | 9 +++------
epan/dissectors/packet-cisco-fp-mim.c | 11 ++++-------
epan/dissectors/packet-epon.c | 8 +++-----
epan/dissectors/packet-eth.c | 30 +++++++++++++++++++++++++-----
epan/dissectors/packet-tzsp.c | 8 +++-----
5 files changed, 38 insertions(+), 28 deletions(-)