Wireshark-commits: [Wireshark-commits] master 24324a0: Clean up handling of the data before the Eth
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=24324a026382eb9ac6b3d1e176443729cdcdc2b1
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
24324a0 by Guy Harris (guy@xxxxxxxxxxxx):
Clean up handling of the data before the Ethernet packet in ERF files.
The data before the Ethernet packet isn't a 16-bit little-endian
integer, it's two bytes, one byte of offset and one byte of padding.
Change-Id: I327b88f058dda184b79d3c2c6cf0dea52c0d28b1
Reviewed-on: https://code.wireshark.org/review/13254
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 5539dba Do not apply color rule filter every dissection
adds 24324a0 Clean up handling of the data before the Ethernet packet in ERF files.
Summary of changes:
epan/dissectors/packet-erf.c | 25 ++++++++++---------------
wiretap/erf.c | 20 ++++++++++++--------
wiretap/erf.h | 4 +++-
wiretap/pcap-common.c | 17 +++++++++++++----
wiretap/wtap.h | 5 ++++-
5 files changed, 42 insertions(+), 29 deletions(-)