Changeset 1023ff4

Timestamp:

08/21/06 23:23:57 (14 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

c0fdf31

Parents:

8e6ac85

Message:

Endianness fixes to 802.11 structures

File:

• lib/libtrace.h.in (modified) (1 diff)

lib/libtrace.h.in

@@ -430 +430 @@
 /** 802.11 header */
 typedef struct libtrace_80211_t {
+#ifdef BYTE_ORDER == LITTLE_ENDIAN
         LT_BITFIELD32      protocol:2;
         LT_BITFIELD32      type:2;
         LT_BITFIELD32      subtype:4;
-        LT_BITFIELD32      to_ds:1;             /**< Packet to Distribution Service */
+#else
+        LT_BITFIELD32      subtype:4;
+        LT_BITFIELD32      type:2;
+        LT_BITFIELD32      protocol:2;
+#endif
+        LT_BITFIELD32      to_ds:1;     /**< Packet to Distribution Service */
         LT_BITFIELD32      from_ds:1;   /**< Packet from Distribution Service */
         LT_BITFIELD32      more_frag:1; /**< Packet has more fragments */
-        LT_BITFIELD32      retry:1;             /**< Packet is a retry */
+        LT_BITFIELD32      retry:1;     /**< Packet is a retry */
         LT_BITFIELD32      power:1;
         LT_BITFIELD32      more_data:1;
         LT_BITFIELD32      wep:1;
         LT_BITFIELD32      order:1;
+#else
+        LT_BITFIELD32      order:1;
+        LT_BITFIELD32      wep:1;
+        LT_BITFIELD32      more_data:1;
+        LT_BITFIELD32      power:1;
+        LT_BITFIELD32      retry:1;     /**< Packet is a retry */
+        LT_BITFIELD32      more_frag:1; /**< Packet has more fragments */
+        LT_BITFIELD32      from_ds:1;   /**< Packet from Distribution Service */
+        LT_BITFIELD32      to_ds:1;     /**< Packet to Distribution Service */
+#endif
         uint16_t     duration;
         uint8_t      mac1[6];