URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8ec153f93816a302a325e40924f4e13383ad8eaf
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
8ec153f by Guy Harris (guy@xxxxxxxxxxxx):
Have the "maybe an FCS" version of the Ethernet dissector take a data argument.
It's called from some places other than packet-frame.c, at least one of
which currently can't call anything else (the ATM dissector, for
VC-multiplexed bridged frames, where you don't know whether the frames
include the FCS or not), so the frame's pseudo-data doesn't necessarily
have the appropriate "FCS length" value. Have it explicitly check the
data argument, and explicitly pass the appropriate value to it.
Ping-Bug: 9933
Change-Id: I0c75f921d25d1e2b75e476c15ff9625205036b25
Reviewed-on: https://code.wireshark.org/review/13382
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 5fe11fb Call the "without FCS" version of the Ethernet dissector.
adds 8ec153f Have the "maybe an FCS" version of the Ethernet dissector take a data argument.
Summary of changes:
epan/dissectors/packet-atm.c | 5 ++++-
epan/dissectors/packet-cisco-fp-mim.c | 10 ++++++++--
epan/dissectors/packet-epon.c | 8 +++++++-
epan/dissectors/packet-eth.c | 7 ++++---
epan/dissectors/packet-pcap_pktdata.c | 21 ++++++++++++++++++++-
5 files changed, 43 insertions(+), 8 deletions(-)