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>

1 files changed, 1 insertions, 0 deletions

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 0335607b2a..39707abc15 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -940,6 +940,7 @@ struct erf_mc_phdr {
     {
         guint16 eth_hdr;
         guint32 mc_hdr;
+        guint32 aal2_hdr;
     } subhdr;
 };