Changeset 273a08e

Timestamp:

09/29/06 15:05:12 (15 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:

6758276

Parents:

40d0efc

Message:

Fix some endianness issues (incomplete)

File:

• lib/link_wireless.c (modified) (9 diffs)

lib/link_wireless.c

@@ -56 +56 @@
         /* Check if the field exists in the radiotap header before proceeding
         */
-        if ((rtap->it_present & (1 << field)) == 0) return NULL;
+        if ((bswap_le_to_host32(rtap->it_present) & (1 << field)) == 0) return NULL;
 
         /* Skip over any extended bitmasks */
         p = (uint8_t *) &(rtap->it_present);
 
-        while ( *((uint32_t*)p) & (1 << TRACE_RADIOTAP_EXT) ) {
+        while ( bswap_le_to_host32(*((uint32_t*)p)) & (1 << TRACE_RADIOTAP_EXT) ) {
                 p += sizeof (uint32_t);
         }
@@ -74 +74 @@
                 /* Always aligned */
                 return (void*)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_TSFT))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_TSFT))
                 p += sizeof (uint64_t);
 
@@ -80 +80 @@
                 /* Always aligned */
                 return (void*)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_FLAGS))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_FLAGS))
                 p += sizeof (uint8_t);
 
@@ -86 +86 @@
                 /* Always aligned */
                 return (void*)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_RATE))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_RATE))
                 p+= sizeof (uint8_t);
 
@@ -94 +94 @@
                 return (void *)p;
         }
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_CHANNEL))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_CHANNEL))
                 p+= sizeof (uint32_t);
 
@@ -102 +102 @@
                 return (void *)p;
         }
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_FHSS))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_FHSS))
                 p+= sizeof (uint16_t);
 
         if (field == TRACE_RADIOTAP_DBM_ANTSIGNAL)
                 return (void *)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_DBM_ANTSIGNAL))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DBM_ANTSIGNAL))
                 p+= sizeof (uint8_t);
 
         if (field == TRACE_RADIOTAP_DBM_ANTNOISE)
                 return (void *)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_DBM_ANTNOISE))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DBM_ANTNOISE))
                 p+= sizeof (uint8_t);
 
@@ -120 +120 @@
                 return (void *)p;
         }
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_LOCK_QUALITY))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_LOCK_QUALITY))
                 p+= sizeof (uint16_t);
 
@@ -128 +128 @@
                 return (void *)p;
         }
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_TX_ATTENUATION))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_TX_ATTENUATION))
                 p+= sizeof (uint16_t);
 
@@ -136 +136 @@
                 return (void *)p;
         }
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_DB_TX_ATTENUATION))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DB_TX_ATTENUATION))
                 p+= sizeof (uint16_t);
 
         if (field == TRACE_RADIOTAP_DBM_TX_POWER)
                 return (void *)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_DBM_TX_POWER))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DBM_TX_POWER))
                 p+= sizeof (uint8_t);
 
         if (field == TRACE_RADIOTAP_ANTENNA)
                 return (void *)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_ANTENNA))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_ANTENNA))
                 p+= sizeof (uint8_t);
 
         if (field == TRACE_RADIOTAP_DB_ANTSIGNAL)
                 return (void *)p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_DB_ANTSIGNAL))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DB_ANTSIGNAL))
                 p+= sizeof (uint8_t);
 
         if (field == TRACE_RADIOTAP_DB_ANTNOISE)
                 return (void *) p;
-        if (rtap->it_present & (1 << TRACE_RADIOTAP_DB_ANTNOISE))
+        if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DB_ANTNOISE))
                 p+= sizeof (uint8_t);