Changeset 273a08e
- Timestamp:
- 09/29/06 15:05:12 (15 years ago)
- 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
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/link_wireless.c
r5696294 r273a08e 56 56 /* Check if the field exists in the radiotap header before proceeding 57 57 */ 58 if (( rtap->it_present& (1 << field)) == 0) return NULL;58 if ((bswap_le_to_host32(rtap->it_present) & (1 << field)) == 0) return NULL; 59 59 60 60 /* Skip over any extended bitmasks */ 61 61 p = (uint8_t *) &(rtap->it_present); 62 62 63 while ( *((uint32_t*)p) & (1 << TRACE_RADIOTAP_EXT) ) {63 while ( bswap_le_to_host32(*((uint32_t*)p)) & (1 << TRACE_RADIOTAP_EXT) ) { 64 64 p += sizeof (uint32_t); 65 65 } … … 74 74 /* Always aligned */ 75 75 return (void*)p; 76 if ( rtap->it_present& (1 << TRACE_RADIOTAP_TSFT))76 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_TSFT)) 77 77 p += sizeof (uint64_t); 78 78 … … 80 80 /* Always aligned */ 81 81 return (void*)p; 82 if ( rtap->it_present& (1 << TRACE_RADIOTAP_FLAGS))82 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_FLAGS)) 83 83 p += sizeof (uint8_t); 84 84 … … 86 86 /* Always aligned */ 87 87 return (void*)p; 88 if ( rtap->it_present& (1 << TRACE_RADIOTAP_RATE))88 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_RATE)) 89 89 p+= sizeof (uint8_t); 90 90 … … 94 94 return (void *)p; 95 95 } 96 if ( rtap->it_present& (1 << TRACE_RADIOTAP_CHANNEL))96 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_CHANNEL)) 97 97 p+= sizeof (uint32_t); 98 98 … … 102 102 return (void *)p; 103 103 } 104 if ( rtap->it_present& (1 << TRACE_RADIOTAP_FHSS))104 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_FHSS)) 105 105 p+= sizeof (uint16_t); 106 106 107 107 if (field == TRACE_RADIOTAP_DBM_ANTSIGNAL) 108 108 return (void *)p; 109 if ( rtap->it_present& (1 << TRACE_RADIOTAP_DBM_ANTSIGNAL))109 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DBM_ANTSIGNAL)) 110 110 p+= sizeof (uint8_t); 111 111 112 112 if (field == TRACE_RADIOTAP_DBM_ANTNOISE) 113 113 return (void *)p; 114 if ( rtap->it_present& (1 << TRACE_RADIOTAP_DBM_ANTNOISE))114 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DBM_ANTNOISE)) 115 115 p+= sizeof (uint8_t); 116 116 … … 120 120 return (void *)p; 121 121 } 122 if ( rtap->it_present& (1 << TRACE_RADIOTAP_LOCK_QUALITY))122 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_LOCK_QUALITY)) 123 123 p+= sizeof (uint16_t); 124 124 … … 128 128 return (void *)p; 129 129 } 130 if ( rtap->it_present& (1 << TRACE_RADIOTAP_TX_ATTENUATION))130 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_TX_ATTENUATION)) 131 131 p+= sizeof (uint16_t); 132 132 … … 136 136 return (void *)p; 137 137 } 138 if ( rtap->it_present& (1 << TRACE_RADIOTAP_DB_TX_ATTENUATION))138 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DB_TX_ATTENUATION)) 139 139 p+= sizeof (uint16_t); 140 140 141 141 if (field == TRACE_RADIOTAP_DBM_TX_POWER) 142 142 return (void *)p; 143 if ( rtap->it_present& (1 << TRACE_RADIOTAP_DBM_TX_POWER))143 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DBM_TX_POWER)) 144 144 p+= sizeof (uint8_t); 145 145 146 146 if (field == TRACE_RADIOTAP_ANTENNA) 147 147 return (void *)p; 148 if ( rtap->it_present& (1 << TRACE_RADIOTAP_ANTENNA))148 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_ANTENNA)) 149 149 p+= sizeof (uint8_t); 150 150 151 151 if (field == TRACE_RADIOTAP_DB_ANTSIGNAL) 152 152 return (void *)p; 153 if ( rtap->it_present& (1 << TRACE_RADIOTAP_DB_ANTSIGNAL))153 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DB_ANTSIGNAL)) 154 154 p+= sizeof (uint8_t); 155 155 156 156 if (field == TRACE_RADIOTAP_DB_ANTNOISE) 157 157 return (void *) p; 158 if ( rtap->it_present& (1 << TRACE_RADIOTAP_DB_ANTNOISE))158 if (bswap_le_to_host32(rtap->it_present) & (1 << TRACE_RADIOTAP_DB_ANTNOISE)) 159 159 p+= sizeof (uint8_t); 160 160
Note: See TracChangeset
for help on using the changeset viewer.