diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-13 00:10:48 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-13 08:11:19 +0000 |
| commit | 24324a026382eb9ac6b3d1e176443729cdcdc2b1 (patch) | |
| tree | aae459de213e38b5ca2075dcd633bd944e06f49b /wiretap/erf.h | |
| parent | 5539dba1df313816491bb28718433d4d81162aa3 (diff) | |
| download | wireshark-24324a026382eb9ac6b3d1e176443729cdcdc2b1.tar.gz | |
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@alum.mit.edu>
Diffstat (limited to 'wiretap/erf.h')
| -rw-r--r-- | wiretap/erf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wiretap/erf.h b/wiretap/erf.h index 894235c7ad..870db96140 100644 --- a/wiretap/erf.h +++ b/wiretap/erf.h @@ -120,11 +120,13 @@ typedef struct erf_aal2_hdr { } erf_aal2_header_t; typedef struct erf_eth_hdr { - guint16 eth; + guint8 offset; + guint8 pad; } erf_eth_header_t; union erf_subhdr { struct erf_mc_hdr mc_hdr; + struct erf_aal2_hdr aal2_hdr; struct erf_eth_hdr eth_hdr; }; |