Changeset 8780774 for libpacketdump

Timestamp:

08/30/13 13:27:04 (7 years ago)

Author:

Shane Alcock <salcock@…>

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:

8b49230

Parents:

7a529a9

Message:

Fixed libpacketdump decode issues with 802.11 on big endian hosts

File:

• libpacketdump/link_4.c (modified) (3 diffs)

libpacketdump/link_4.c

@@ -30 +30 @@
 
 typedef struct ieee80211_frame_control {
+# if __BYTE_ORDER == __LITTLE_ENDIAN    
         uint8_t         version:2;
         uint8_t         type:2;
@@ -41 +42 @@
         uint8_t         wep:1;
         uint8_t         order:1;
+# elif __BYTE_ORDER == __BIG_ENDIAN
+        uint8_t         subtype:4;
+        uint8_t         type:2;
+        uint8_t         version:2;
+        uint8_t         order:1;
+        uint8_t         wep:1;
+        uint8_t         more_data:1;
+        uint8_t         power:1;
+        uint8_t         retry:1;
+        uint8_t         more_frag:1;
+        uint8_t         from_ds:1;
+        uint8_t         to_ds:1;
+#else
+#       error "Adjust your <bits/endian.h> defines"
+# endif 
 } __attribute__ ((__packed__)) ieee80211_frame_control;
 
@@ -107 +123 @@
 
 typedef struct ieee80211_capinfo {
-        uint16_t        ess:1;
-        uint16_t        ibss:1;
-        uint16_t        cf_pollable:1;
-        uint16_t        cf_poll_req:1;
-        uint16_t        privacy:1;
-        uint16_t        short_preamble:1;
-        uint16_t        pbcc:1;
-        uint16_t        channel_agility:1;
-        uint16_t        spectrum_mgmt:1;
-        uint16_t        qos:1;
-        uint16_t        short_slot_time:1;
-        uint16_t        apsd:1;
-        uint16_t        res1:1;
-        uint16_t        dsss_ofdm:1;
-        uint16_t        delayed_block_ack:1;
-        uint16_t        immediate_block_ack:1;
+#if __BYTE_ORDER == __LITTLE_ENDIAN 
+        uint8_t ess:1;
+        uint8_t ibss:1;
+        uint8_t cf_pollable:1;
+        uint8_t cf_poll_req:1;
+        uint8_t privacy:1;
+        uint8_t short_preamble:1;
+        uint8_t pbcc:1;
+        uint8_t channel_agility:1;
+        uint8_t spectrum_mgmt:1;
+        uint8_t qos:1;
+        uint8_t short_slot_time:1;
+        uint8_t apsd:1;
+        uint8_t res1:1;
+        uint8_t dsss_ofdm:1;
+        uint8_t delayed_block_ack:1;
+        uint8_t immediate_block_ack:1;
+#elif __BYTE_ORDER == __BIG_ENDIAN
+        uint8_t channel_agility:1;
+        uint8_t pbcc:1;
+        uint8_t short_preamble:1;
+        uint8_t privacy:1;
+        uint8_t cf_poll_req:1;
+        uint8_t cf_pollable:1;
+        uint8_t ibss:1;
+        uint8_t ess:1;
+        uint8_t immediate_block_ack:1;
+        uint8_t delayed_block_ack:1;
+        uint8_t dsss_ofdm:1;
+        uint8_t res1:1;
+        uint8_t apsd:1;
+        uint8_t short_slot_time:1;
+        uint8_t qos:1;
+        uint8_t spectrum_mgmt:1;
+#else
+# error "Unknown byte order -- please check <bits/endian.h>"
+#endif
 } __attribute__ ((__packed__)) ieee80211_capinfo;