jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

radiotap: Update radiotap parser to library version

Browse source 
Update the radiotap parser to the latest version of the
http://git.sipsolutions.net/radiotap.git/ library to get
parsing for vendor namespaces.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2014-04-09 11:50:54 +02:00 committed by Jouni Malinen
parent e9b32dae1a
commit bacb984b2d
6 changed files with 396 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/drivers/driver_nl80211.c
View file

@ -7841,7 +7841,7 @@ static void handle_monitor_read(int sock, void *eloop_ctx, void *sock_ctx)
return; return;
} }
if (ieee80211_radiotap_iterator_init(&iter, (void*)buf, len)) { if (ieee80211_radiotap_iterator_init(&iter, (void*)buf, len, NULL)) {
wpa_printf(MSG_INFO, "nl80211: received invalid radiotap frame"); wpa_printf(MSG_INFO, "nl80211: received invalid radiotap frame");
return; return;
} }
@ -7886,11 +7886,11 @@ static void handle_monitor_read(int sock, void *eloop_ctx, void *sock_ctx)
return; return;
if (!injected) if (!injected)
handle_frame(drv, buf + iter.max_length, handle_frame(drv, buf + iter._max_length,
len - iter.max_length, datarate, ssi_signal); len - iter._max_length, datarate, ssi_signal);
else else
handle_tx_callback(drv->ctx, buf + iter.max_length, handle_tx_callback(drv->ctx, buf + iter._max_length,
len - iter.max_length, !failed); len - iter._max_length, !failed);
} }

19
src/utils/platform.h Normal file
View file

@ -0,0 +1,19 @@
#include <stddef.h>
#include <errno.h>
#ifndef _BSD_SOURCE
#define _BSD_SOURCE
#endif
#include <endian.h>
#define le16_to_cpu le16toh
#define le32_to_cpu le32toh
#define get_unaligned(p) \
({ \
struct packed_dummy_struct { \
typeof(*(p)) __val; \
} __attribute__((packed)) *__ptr = (void *) (p); \
\
__ptr->__val; \
})
#define get_unaligned_le16(p) le16_to_cpu(get_unaligned((uint16_t *)(p)))
#define get_unaligned_le32(p) le32_to_cpu(get_unaligned((uint32_t *)(p)))

376
src/utils/radiotap.c
View file

@ -2,6 +2,7 @@
* Radiotap parser * Radiotap parser
* *
* Copyright 2007 Andy Green <andy@warmcat.com> * Copyright 2007 Andy Green <andy@warmcat.com>
* Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -10,34 +11,44 @@
* Alternatively, this software may be distributed under the terms of BSD * Alternatively, this software may be distributed under the terms of BSD
* license. * license.
* *
* See README and COPYING for more details. * See COPYING for more details.
*
*
* Modified for userspace by Johannes Berg <johannes@sipsolutions.net>
* I only modified some things on top to ease syncing should bugs be found.
*/ */
#include "includes.h"
#include "common.h"
#include "radiotap_iter.h" #include "radiotap_iter.h"
#include "platform.h"
#define le16_to_cpu le_to_host16
#define le32_to_cpu le_to_host32
#define __le32 uint32_t
#define ulong unsigned long
#define unlikely(cond) (cond)
#define get_unaligned(p) \
({ \
struct packed_dummy_struct { \
typeof(*(p)) __val; \
} __attribute__((packed)) *__ptr = (void *) (p); \
\
__ptr->__val; \
})
/* function prototypes and related defs are in radiotap_iter.h */ /* function prototypes and related defs are in radiotap_iter.h */
static const struct radiotap_align_size rtap_namespace_sizes[] = {
[IEEE80211_RADIOTAP_TSFT] = { .align = 8, .size = 8, },
[IEEE80211_RADIOTAP_FLAGS] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_RATE] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_CHANNEL] = { .align = 2, .size = 4, },
[IEEE80211_RADIOTAP_FHSS] = { .align = 2, .size = 2, },
[IEEE80211_RADIOTAP_DBM_ANTSIGNAL] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_DBM_ANTNOISE] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_LOCK_QUALITY] = { .align = 2, .size = 2, },
[IEEE80211_RADIOTAP_TX_ATTENUATION] = { .align = 2, .size = 2, },
[IEEE80211_RADIOTAP_DB_TX_ATTENUATION] = { .align = 2, .size = 2, },
[IEEE80211_RADIOTAP_DBM_TX_POWER] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_ANTENNA] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_DB_ANTSIGNAL] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_DB_ANTNOISE] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_RX_FLAGS] = { .align = 2, .size = 2, },
[IEEE80211_RADIOTAP_TX_FLAGS] = { .align = 2, .size = 2, },
[IEEE80211_RADIOTAP_RTS_RETRIES] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
[IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
[IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
/*
* add more here as they are defined in radiotap.h
*/
};
static const struct ieee80211_radiotap_namespace radiotap_ns = {
.n_bits = sizeof(rtap_namespace_sizes) / sizeof(rtap_namespace_sizes[0]),
.align_size = rtap_namespace_sizes,
};
/** /**
* ieee80211_radiotap_iterator_init - radiotap parser iterator initialization * ieee80211_radiotap_iterator_init - radiotap parser iterator initialization
* @iterator: radiotap_iterator to initialize * @iterator: radiotap_iterator to initialize
@ -73,38 +84,52 @@
* get_unaligned((type *)iterator.this_arg) to dereference * get_unaligned((type *)iterator.this_arg) to dereference
* iterator.this_arg for type "type" safely on all arches. * iterator.this_arg for type "type" safely on all arches.
* *
* Example code: * Example code: parse.c
* See Documentation/networking/radiotap-headers.txt
*/ */
int ieee80211_radiotap_iterator_init( int ieee80211_radiotap_iterator_init(
struct ieee80211_radiotap_iterator *iterator, struct ieee80211_radiotap_iterator *iterator,
struct ieee80211_radiotap_header *radiotap_header, struct ieee80211_radiotap_header *radiotap_header,
int max_length) int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns)
{ {
/* must at least have the radiotap header */
if (max_length < (int)sizeof(struct ieee80211_radiotap_header))
return -EINVAL;
/* Linux only supports version 0 radiotap format */ /* Linux only supports version 0 radiotap format */
if (radiotap_header->it_version) if (radiotap_header->it_version)
return -EINVAL; return -EINVAL;
/* sanity check for allowed length and radiotap length field */ /* sanity check for allowed length and radiotap length field */
if (max_length < le16_to_cpu(get_unaligned(&radiotap_header->it_len))) if (max_length < get_unaligned_le16(&radiotap_header->it_len))
return -EINVAL; return -EINVAL;
iterator->rtheader = radiotap_header; iterator->_rtheader = radiotap_header;
iterator->max_length = le16_to_cpu(get_unaligned( iterator->_max_length = get_unaligned_le16(&radiotap_header->it_len);
&radiotap_header->it_len)); iterator->_arg_index = 0;
iterator->arg_index = 0; iterator->_bitmap_shifter = get_unaligned_le32(&radiotap_header->it_present);
iterator->bitmap_shifter = le32_to_cpu(get_unaligned( iterator->_arg = (uint8_t *)radiotap_header + sizeof(*radiotap_header);
&radiotap_header->it_present)); iterator->_reset_on_ext = 0;
iterator->arg = (u8 *)radiotap_header + sizeof(*radiotap_header); iterator->_next_bitmap = &radiotap_header->it_present;
iterator->this_arg = NULL; iterator->_next_bitmap++;
iterator->_vns = vns;
iterator->current_namespace = &radiotap_ns;
iterator->is_radiotap_ns = 1;
#ifdef RADIOTAP_SUPPORT_OVERRIDES
iterator->n_overrides = 0;
iterator->overrides = NULL;
#endif
/* find payload start allowing for extended bitmap(s) */ /* find payload start allowing for extended bitmap(s) */
if (unlikely(iterator->bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT))) { if (iterator->_bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT)) {
while (le32_to_cpu(get_unaligned((__le32 *)iterator->arg)) & if ((unsigned long)iterator->_arg -
(1<<IEEE80211_RADIOTAP_EXT)) { (unsigned long)iterator->_rtheader + sizeof(uint32_t) >
iterator->arg += sizeof(u32); (unsigned long)iterator->_max_length)
return -EINVAL;
while (get_unaligned_le32(iterator->_arg) &
(1 << IEEE80211_RADIOTAP_EXT)) {
iterator->_arg += sizeof(uint32_t);
/* /*
* check for insanity where the present bitmaps * check for insanity where the present bitmaps
@ -112,12 +137,14 @@ int ieee80211_radiotap_iterator_init(
* stated radiotap header length * stated radiotap header length
*/ */
if (((ulong)iterator->arg - (ulong)iterator->rtheader) if ((unsigned long)iterator->_arg -
> (ulong)iterator->max_length) (unsigned long)iterator->_rtheader +
sizeof(uint32_t) >
(unsigned long)iterator->_max_length)
return -EINVAL; return -EINVAL;
} }
iterator->arg += sizeof(u32); iterator->_arg += sizeof(uint32_t);
/* /*
* no need to check again for blowing past stated radiotap * no need to check again for blowing past stated radiotap
@ -126,11 +153,57 @@ int ieee80211_radiotap_iterator_init(
*/ */
} }
iterator->this_arg = iterator->_arg;
/* we are all initialized happily */ /* we are all initialized happily */
return 0; return 0;
} }
static void find_ns(struct ieee80211_radiotap_iterator *iterator,
uint32_t oui, uint8_t subns)
{
int i;
iterator->current_namespace = NULL;
if (!iterator->_vns)
return;
for (i = 0; i < iterator->_vns->n_ns; i++) {
if (iterator->_vns->ns[i].oui != oui)
continue;
if (iterator->_vns->ns[i].subns != subns)
continue;
iterator->current_namespace = &iterator->_vns->ns[i];
break;
}
}
#ifdef RADIOTAP_SUPPORT_OVERRIDES
static int find_override(struct ieee80211_radiotap_iterator *iterator,
int *align, int *size)
{
int i;
if (!iterator->overrides)
return 0;
for (i = 0; i < iterator->n_overrides; i++) {
if (iterator->_arg_index == iterator->overrides[i].field) {
*align = iterator->overrides[i].align;
*size = iterator->overrides[i].size;
if (!*align) /* erroneous override */
return 0;
return 1;
}
}
return 0;
}
#endif
/** /**
* ieee80211_radiotap_iterator_next - return next radiotap parser iterator arg * ieee80211_radiotap_iterator_next - return next radiotap parser iterator arg
@ -156,99 +229,106 @@ int ieee80211_radiotap_iterator_init(
*/ */
int ieee80211_radiotap_iterator_next( int ieee80211_radiotap_iterator_next(
struct ieee80211_radiotap_iterator *iterator) struct ieee80211_radiotap_iterator *iterator)
{ {
while (1) {
/*
* small length lookup table for all radiotap types we heard of
* starting from b0 in the bitmap, so we can walk the payload
* area of the radiotap header
*
* There is a requirement to pad args, so that args
* of a given length must begin at a boundary of that length
* -- but note that compound args are allowed (eg, 2 x u16
* for IEEE80211_RADIOTAP_CHANNEL) so total arg length is not
* a reliable indicator of alignment requirement.
*
* upper nybble: content alignment for arg
* lower nybble: content length for arg
*/
static const u8 rt_sizes[] = {
[IEEE80211_RADIOTAP_TSFT] = 0x88,
[IEEE80211_RADIOTAP_FLAGS] = 0x11,
[IEEE80211_RADIOTAP_RATE] = 0x11,
[IEEE80211_RADIOTAP_CHANNEL] = 0x24,
[IEEE80211_RADIOTAP_FHSS] = 0x22,
[IEEE80211_RADIOTAP_DBM_ANTSIGNAL] = 0x11,
[IEEE80211_RADIOTAP_DBM_ANTNOISE] = 0x11,
[IEEE80211_RADIOTAP_LOCK_QUALITY] = 0x22,
[IEEE80211_RADIOTAP_TX_ATTENUATION] = 0x22,
[IEEE80211_RADIOTAP_DB_TX_ATTENUATION] = 0x22,
[IEEE80211_RADIOTAP_DBM_TX_POWER] = 0x11,
[IEEE80211_RADIOTAP_ANTENNA] = 0x11,
[IEEE80211_RADIOTAP_DB_ANTSIGNAL] = 0x11,
[IEEE80211_RADIOTAP_DB_ANTNOISE] = 0x11,
[IEEE80211_RADIOTAP_RX_FLAGS] = 0x22,
[IEEE80211_RADIOTAP_TX_FLAGS] = 0x22,
[IEEE80211_RADIOTAP_RTS_RETRIES] = 0x11,
[IEEE80211_RADIOTAP_DATA_RETRIES] = 0x11,
/*
* add more here as they are defined in
* include/net/ieee80211_radiotap.h
*/
};
/*
* for every radiotap entry we can at
* least skip (by knowing the length)...
*/
while (iterator->arg_index < (int) sizeof(rt_sizes)) {
int hit = 0; int hit = 0;
int pad; int pad, align, size, subns;
uint32_t oui;
if (!(iterator->bitmap_shifter & 1)) /* if no more EXT bits, that's it */
if ((iterator->_arg_index % 32) == IEEE80211_RADIOTAP_EXT &&
!(iterator->_bitmap_shifter & 1))
return -ENOENT;
if (!(iterator->_bitmap_shifter & 1))
goto next_entry; /* arg not present */ goto next_entry; /* arg not present */
/* get alignment/size of data */
switch (iterator->_arg_index % 32) {
case IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE:
case IEEE80211_RADIOTAP_EXT:
align = 1;
size = 0;
break;
case IEEE80211_RADIOTAP_VENDOR_NAMESPACE:
align = 2;
size = 6;
break;
default:
#ifdef RADIOTAP_SUPPORT_OVERRIDES
if (find_override(iterator, &align, &size)) {
/* all set */
} else
#endif
if (!iterator->current_namespace ||
iterator->_arg_index >= iterator->current_namespace->n_bits) {
if (iterator->current_namespace == &radiotap_ns)
return -ENOENT;
align = 0;
} else {
align = iterator->current_namespace->align_size[iterator->_arg_index].align;
size = iterator->current_namespace->align_size[iterator->_arg_index].size;
}
if (!align) {
/* skip all subsequent data */
iterator->_arg = iterator->_next_ns_data;
/* give up on this namespace */
iterator->current_namespace = NULL;
goto next_entry;
}
break;
}
/* /*
* arg is present, account for alignment padding * arg is present, account for alignment padding
* 8-bit args can be at any alignment
* 16-bit args must start on 16-bit boundary
* 32-bit args must start on 32-bit boundary
* 64-bit args must start on 64-bit boundary
* *
* note that total arg size can differ from alignment of * Note that these alignments are relative to the start
* elements inside arg, so we use upper nybble of length * of the radiotap header. There is no guarantee
* table to base alignment on
*
* also note: these alignments are ** relative to the
* start of the radiotap header **. There is no guarantee
* that the radiotap header itself is aligned on any * that the radiotap header itself is aligned on any
* kind of boundary. * kind of boundary.
* *
* the above is why get_unaligned() is used to dereference * The above is why get_unaligned() is used to dereference
* multibyte elements from the radiotap area * multibyte elements from the radiotap area.
*/ */
pad = (((ulong)iterator->arg) - pad = ((unsigned long)iterator->_arg -
((ulong)iterator->rtheader)) & (unsigned long)iterator->_rtheader) & (align - 1);
((rt_sizes[iterator->arg_index] >> 4) - 1);
if (pad) if (pad)
iterator->arg += iterator->_arg += align - pad;
(rt_sizes[iterator->arg_index] >> 4) - pad;
if (iterator->_arg_index % 32 == IEEE80211_RADIOTAP_VENDOR_NAMESPACE) {
int vnslen;
if ((unsigned long)iterator->_arg + size -
(unsigned long)iterator->_rtheader >
(unsigned long)iterator->_max_length)
return -EINVAL;
oui = (*iterator->_arg << 16) |
(*(iterator->_arg + 1) << 8) |
*(iterator->_arg + 2);
subns = *(iterator->_arg + 3);
find_ns(iterator, oui, subns);
vnslen = get_unaligned_le16(iterator->_arg + 4);
iterator->_next_ns_data = iterator->_arg + size + vnslen;
if (!iterator->current_namespace)
size += vnslen;
}
/* /*
* this is what we will return to user, but we need to * this is what we will return to user, but we need to
* move on first so next call has something fresh to test * move on first so next call has something fresh to test
*/ */
iterator->this_arg_index = iterator->arg_index; iterator->this_arg_index = iterator->_arg_index;
iterator->this_arg = iterator->arg; iterator->this_arg = iterator->_arg;
hit = 1; iterator->this_arg_size = size;
/* internally move on the size of this arg */ /* internally move on the size of this arg */
iterator->arg += rt_sizes[iterator->arg_index] & 0x0f; iterator->_arg += size;
/* /*
* check for insanity where we are given a bitmap that * check for insanity where we are given a bitmap that
@ -257,31 +337,57 @@ int ieee80211_radiotap_iterator_next(
* max_length on the last arg, never exceeding it. * max_length on the last arg, never exceeding it.
*/ */
if (((ulong)iterator->arg - (ulong)iterator->rtheader) > if ((unsigned long)iterator->_arg -
(ulong) iterator->max_length) (unsigned long)iterator->_rtheader >
(unsigned long)iterator->_max_length)
return -EINVAL; return -EINVAL;
next_entry: /* these special ones are valid in each bitmap word */
iterator->arg_index++; switch (iterator->_arg_index % 32) {
if (unlikely((iterator->arg_index & 31) == 0)) { case IEEE80211_RADIOTAP_VENDOR_NAMESPACE:
/* completed current u32 bitmap */ iterator->_reset_on_ext = 1;
if (iterator->bitmap_shifter & 1) {
/* b31 was set, there is more */ iterator->is_radiotap_ns = 0;
/* move to next u32 bitmap */ /*
iterator->bitmap_shifter = le32_to_cpu( * If parser didn't register this vendor
get_unaligned(iterator->next_bitmap)); * namespace with us, allow it to show it
iterator->next_bitmap++; * as 'raw. Do do that, set argument index
} else * to vendor namespace.
/* no more bitmaps: end */ */
iterator->arg_index = sizeof(rt_sizes); iterator->this_arg_index =
} else /* just try the next bit */ IEEE80211_RADIOTAP_VENDOR_NAMESPACE;
iterator->bitmap_shifter >>= 1; if (!iterator->current_namespace)
hit = 1;
goto next_entry;
case IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE:
iterator->_reset_on_ext = 1;
iterator->current_namespace = &radiotap_ns;
iterator->is_radiotap_ns = 1;
goto next_entry;
case IEEE80211_RADIOTAP_EXT:
/*
* bit 31 was set, there is more
* -- move to next u32 bitmap
*/
iterator->_bitmap_shifter =
get_unaligned_le32(iterator->_next_bitmap);
iterator->_next_bitmap++;
if (iterator->_reset_on_ext)
iterator->_arg_index = 0;
else
iterator->_arg_index++;
iterator->_reset_on_ext = 0;
break;
default:
/* we've got a hit! */
hit = 1;
next_entry:
iterator->_bitmap_shifter >>= 1;
iterator->_arg_index++;
}
/* if we found a valid arg earlier, return it now */ /* if we found a valid arg earlier, return it now */
if (hit) if (hit)
return 0; return 0;
} }
/* we don't know how to handle any more args, we're done */
return -ENOENT;
} }

56
src/utils/radiotap.h
View file

@ -1,6 +1,3 @@
/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
/* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */
/*- /*-
* Copyright (c) 2003, 2004 David Young. All rights reserved. * Copyright (c) 2003, 2004 David Young. All rights reserved.
* *
@ -178,6 +175,14 @@ struct ieee80211_radiotap_header {
* *
* Number of unicast retries a transmitted frame used. * Number of unicast retries a transmitted frame used.
* *
* IEEE80211_RADIOTAP_MCS u8, u8, u8 unitless
*
* Contains a bitmap of known fields/flags, the flags, and
* the MCS index.
*
* IEEE80211_RADIOTAP_AMPDU_STATUS u32, u16, u8, u8 unitlesss
*
* Contains the AMPDU information for the subframe.
*/ */
enum ieee80211_radiotap_type { enum ieee80211_radiotap_type {
IEEE80211_RADIOTAP_TSFT = 0, IEEE80211_RADIOTAP_TSFT = 0,
@ -198,6 +203,13 @@ enum ieee80211_radiotap_type {
IEEE80211_RADIOTAP_TX_FLAGS = 15, IEEE80211_RADIOTAP_TX_FLAGS = 15,
IEEE80211_RADIOTAP_RTS_RETRIES = 16, IEEE80211_RADIOTAP_RTS_RETRIES = 16,
IEEE80211_RADIOTAP_DATA_RETRIES = 17, IEEE80211_RADIOTAP_DATA_RETRIES = 17,
IEEE80211_RADIOTAP_MCS = 19,
IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
/* valid in every it_present bitmap, even vendor namespaces */
IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
IEEE80211_RADIOTAP_EXT = 31 IEEE80211_RADIOTAP_EXT = 31
}; };
@ -230,8 +242,10 @@ enum ieee80211_radiotap_type {
* 802.11 header and payload * 802.11 header and payload
* (to 32-bit boundary) * (to 32-bit boundary)
*/ */
#define IEEE80211_RADIOTAP_F_BADFCS 0x40 /* frame failed FCS check */
/* For IEEE80211_RADIOTAP_RX_FLAGS */ /* For IEEE80211_RADIOTAP_RX_FLAGS */
#define IEEE80211_RADIOTAP_F_RX_BADFCS 0x0001 /* frame failed crc check */ #define IEEE80211_RADIOTAP_F_RX_BADPLCP 0x0002 /* bad PLCP */
/* For IEEE80211_RADIOTAP_TX_FLAGS */ /* For IEEE80211_RADIOTAP_TX_FLAGS */
#define IEEE80211_RADIOTAP_F_TX_FAIL 0x0001 /* failed due to excessive #define IEEE80211_RADIOTAP_F_TX_FAIL 0x0001 /* failed due to excessive
@ -240,4 +254,38 @@ enum ieee80211_radiotap_type {
#define IEEE80211_RADIOTAP_F_TX_RTS 0x0004 /* used rts/cts handshake */ #define IEEE80211_RADIOTAP_F_TX_RTS 0x0004 /* used rts/cts handshake */
#define IEEE80211_RADIOTAP_F_TX_NOACK 0x0008 /* don't expect an ACK */ #define IEEE80211_RADIOTAP_F_TX_NOACK 0x0008 /* don't expect an ACK */
/* For IEEE80211_RADIOTAP_AMPDU_STATUS */
#define IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN 0x0001
#define IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN 0x0002
#define IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN 0x0004
#define IEEE80211_RADIOTAP_AMPDU_IS_LAST 0x0008
#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR 0x0010
#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN 0x0020
/* For IEEE80211_RADIOTAP_MCS */
#define IEEE80211_RADIOTAP_MCS_HAVE_BW 0x01
#define IEEE80211_RADIOTAP_MCS_HAVE_MCS 0x02
#define IEEE80211_RADIOTAP_MCS_HAVE_GI 0x04
#define IEEE80211_RADIOTAP_MCS_HAVE_FMT 0x08
#define IEEE80211_RADIOTAP_MCS_HAVE_FEC 0x10
#define IEEE80211_RADIOTAP_MCS_HAVE_STBC 0x20
#define IEEE80211_RADIOTAP_MCS_HAVE_NESS 0x40
#define IEEE80211_RADIOTAP_MCS_NESS_BIT1 0x80
#define IEEE80211_RADIOTAP_MCS_BW_MASK 0x03
#define IEEE80211_RADIOTAP_MCS_BW_20 0
#define IEEE80211_RADIOTAP_MCS_BW_40 1
#define IEEE80211_RADIOTAP_MCS_BW_20L 2
#define IEEE80211_RADIOTAP_MCS_BW_20U 3
#define IEEE80211_RADIOTAP_MCS_SGI 0x04
#define IEEE80211_RADIOTAP_MCS_FMT_GF 0x08
#define IEEE80211_RADIOTAP_MCS_FEC_LDPC 0x10
#define IEEE80211_RADIOTAP_MCS_STBC_MASK 0x60
#define IEEE80211_RADIOTAP_MCS_STBC_SHIFT 5
#define IEEE80211_RADIOTAP_MCS_STBC_1 1
#define IEEE80211_RADIOTAP_MCS_STBC_2 2
#define IEEE80211_RADIOTAP_MCS_STBC_3 3
#define IEEE80211_RADIOTAP_MCS_NESS_BIT0 0x80
#endif /* IEEE80211_RADIOTAP_H */ #endif /* IEEE80211_RADIOTAP_H */

110
src/utils/radiotap_iter.h
View file

@ -1,56 +1,96 @@
/*
* Radiotap parser
*
* Copyright 2007 Andy Green <andy@warmcat.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* Alternatively, this software may be distributed under the terms of BSD
* license.
*
* See README and COPYING for more details.
*/
#ifndef __RADIOTAP_ITER_H #ifndef __RADIOTAP_ITER_H
#define __RADIOTAP_ITER_H #define __RADIOTAP_ITER_H
#include <stdint.h>
#include "radiotap.h" #include "radiotap.h"
/* Radiotap header iteration /* Radiotap header iteration
* implemented in radiotap.c * implemented in radiotap.c
*/ */
struct radiotap_override {
uint8_t field;
uint8_t align:4, size:4;
};
struct radiotap_align_size {
uint8_t align:4, size:4;
};
struct ieee80211_radiotap_namespace {
const struct radiotap_align_size *align_size;
int n_bits;
uint32_t oui;
uint8_t subns;
};
struct ieee80211_radiotap_vendor_namespaces {
const struct ieee80211_radiotap_namespace *ns;
int n_ns;
};
/** /**
* struct ieee80211_radiotap_iterator - tracks walk thru present radiotap args * struct ieee80211_radiotap_iterator - tracks walk thru present radiotap args
* @rtheader: pointer to the radiotap header we are walking through * @this_arg_index: index of current arg, valid after each successful call
* @max_length: length of radiotap header in cpu byte ordering * to ieee80211_radiotap_iterator_next()
* @this_arg_index: IEEE80211_RADIOTAP_... index of current arg * @this_arg: pointer to current radiotap arg; it is valid after each
* @this_arg: pointer to current radiotap arg * call to ieee80211_radiotap_iterator_next() but also after
* @arg_index: internal next argument index * ieee80211_radiotap_iterator_init() where it will point to
* @arg: internal next argument pointer * the beginning of the actual data portion
* @next_bitmap: internal pointer to next present u32 * @this_arg_size: length of the current arg, for convenience
* @bitmap_shifter: internal shifter for curr u32 bitmap, b0 set == arg present * @current_namespace: pointer to the current namespace definition
* (or internally %NULL if the current namespace is unknown)
* @is_radiotap_ns: indicates whether the current namespace is the default
* radiotap namespace or not
*
* @overrides: override standard radiotap fields
* @n_overrides: number of overrides
*
* @_rtheader: pointer to the radiotap header we are walking through
* @_max_length: length of radiotap header in cpu byte ordering
* @_arg_index: next argument index
* @_arg: next argument pointer
* @_next_bitmap: internal pointer to next present u32
* @_bitmap_shifter: internal shifter for curr u32 bitmap, b0 set == arg present
* @_vns: vendor namespace definitions
* @_next_ns_data: beginning of the next namespace's data
* @_reset_on_ext: internal; reset the arg index to 0 when going to the
* next bitmap word
*
* Describes the radiotap parser state. Fields prefixed with an underscore
* must not be used by users of the parser, only by the parser internally.
*/ */
struct ieee80211_radiotap_iterator { struct ieee80211_radiotap_iterator {
struct ieee80211_radiotap_header *rtheader; struct ieee80211_radiotap_header *_rtheader;
int max_length; const struct ieee80211_radiotap_vendor_namespaces *_vns;
int this_arg_index; const struct ieee80211_radiotap_namespace *current_namespace;
unsigned char *this_arg;
int arg_index; unsigned char *_arg, *_next_ns_data;
unsigned char *arg; uint32_t *_next_bitmap;
uint32_t *next_bitmap;
uint32_t bitmap_shifter; unsigned char *this_arg;
#ifdef RADIOTAP_SUPPORT_OVERRIDES
const struct radiotap_override *overrides;
int n_overrides;
#endif
int this_arg_index;
int this_arg_size;
int is_radiotap_ns;
int _max_length;
int _arg_index;
uint32_t _bitmap_shifter;
int _reset_on_ext;
}; };
extern int ieee80211_radiotap_iterator_init( extern int ieee80211_radiotap_iterator_init(
struct ieee80211_radiotap_iterator *iterator, struct ieee80211_radiotap_iterator *iterator,
struct ieee80211_radiotap_header *radiotap_header, struct ieee80211_radiotap_header *radiotap_header,
int max_length); int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns);
extern int ieee80211_radiotap_iterator_next( extern int ieee80211_radiotap_iterator_next(
struct ieee80211_radiotap_iterator *iterator); struct ieee80211_radiotap_iterator *iterator);
#endif /* __RADIOTAP_ITER_H */ #endif /* __RADIOTAP_ITER_H */

8
wlantest/process.c
View file

@ -276,7 +276,7 @@ void wlantest_process(struct wlantest *wt, const u8 *data, size_t len)
wpa_hexdump(MSG_EXCESSIVE, "Process data", data, len); wpa_hexdump(MSG_EXCESSIVE, "Process data", data, len);
if (ieee80211_radiotap_iterator_init(&iter, (void *) data, len)) { if (ieee80211_radiotap_iterator_init(&iter, (void *) data, len, NULL)) {
add_note(wt, MSG_INFO, "Invalid radiotap frame"); add_note(wt, MSG_INFO, "Invalid radiotap frame");
return; return;
} }
@ -309,12 +309,12 @@ void wlantest_process(struct wlantest *wt, const u8 *data, size_t len)
} }
} }
if (iter.max_length == 8) { if (iter._max_length == 8) {
add_note(wt, MSG_DEBUG, "Skip frame inserted by wlantest"); add_note(wt, MSG_DEBUG, "Skip frame inserted by wlantest");
return; return;
} }
frame = data + iter.max_length; frame = data + iter._max_length;
frame_len = len - iter.max_length; frame_len = len - iter._max_length;
if (fcs && frame_len >= 4) { if (fcs && frame_len >= 4) {
frame_len -= 4; frame_len -= 4;