diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-12 21:21:42 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-13 05:22:12 +0000 |
commit | d286243d0d7f83e39b5ac3aec4524eea3294147f (patch) | |
tree | dc7918b75b5b25c16c2d8a64264b8c2af4ff11f9 /wiretap/erf.h | |
parent | b7dc77312720bb1bfa3698f3b48e21c991c49632 (diff) |
Dissect the MC and AAL2 headers as 32-bit words.
That's how they're extracted in the libwiretap module, and that's how
they're shown in the ERF spec.
This gets rid of some compiler warnings about type-punning.
Merge some reserved bit fields to match what's in the ERF spec.
Renumber others.
Process the AAL2 and MC headers differently; yes, they're both
big-endian 32-bit values, but that makes the code a bit clearer, and,
heck, the optimizer may well combine the two sequences of code.
Change-Id: Ief7f976e77e8f2fba1685ad5a50ee677a8070ae7
Reviewed-on: https://code.wireshark.org/review/13251
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/erf.h')
-rw-r--r-- | wiretap/erf.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wiretap/erf.h b/wiretap/erf.h index 7922f5016f..894235c7ad 100644 --- a/wiretap/erf.h +++ b/wiretap/erf.h @@ -115,6 +115,10 @@ typedef struct erf_mc_hdr { guint32 mc; } erf_mc_header_t; +typedef struct erf_aal2_hdr { + guint32 aal2; +} erf_aal2_header_t; + typedef struct erf_eth_hdr { guint16 eth; } erf_eth_header_t; |