Deleted Added
full compact
ieee80211_radiotap.h (154139) ieee80211_radiotap.h (167443)
1/* $FreeBSD: head/sys/net80211/ieee80211_radiotap.h 154139 2006-01-09 17:04:56Z sam $ */
2/* $NetBSD: ieee80211_radiotap.h,v 1.10 2005/01/04 00:34:58 dyoung Exp $ */
1/* $FreeBSD: head/sys/net80211/ieee80211_radiotap.h 167443 2007-03-11 07:42:02Z sam $ */
2/* $NetBSD: ieee80211_radiotap.h,v 1.16 2007/01/06 05:51:15 dyoung Exp $ */
3
4/*-
5 * Copyright (c) 2003, 2004 David Young. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

24 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
25 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
27 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
30 * OF SUCH DAMAGE.
31 */
3
4/*-
5 * Copyright (c) 2003, 2004 David Young. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

24 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
25 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
27 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
30 * OF SUCH DAMAGE.
31 */
32#ifndef _NET_IF_IEEE80211RADIOTAP_H_
33#define _NET_IF_IEEE80211RADIOTAP_H_
32#ifndef _NET80211_IEEE80211_RADIOTAP_H_
33#define _NET80211_IEEE80211_RADIOTAP_H_
34
34
35/* A generic radio capture format is desirable. There is one for
36 * Linux, but it is neither rigidly defined (there were not even
37 * units given for some fields) nor easily extensible.
35/* A generic radio capture format is desirable. It must be
36 * rigidly defined (e.g., units for fields should be given),
37 * and easily extensible.
38 *
38 *
39 * I suggest the following extensible radio capture format. It is
39 * The following is an extensible radio capture format. It is
40 * based on a bitmap indicating which fields are present.
41 *
42 * I am trying to describe precisely what the application programmer
43 * should expect in the following, and for that reason I tell the
44 * units and origin of each measurement (where it applies), or else I
45 * use sufficiently weaselly language ("is a monotonically nondecreasing
46 * function of...") that I cannot set false expectations for lawyerly
47 * readers.
48 */
49#if defined(__KERNEL__) || defined(_KERNEL)
50#ifndef DLT_IEEE802_11_RADIO
51#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus WLAN header */
52#endif
53#endif /* defined(__KERNEL__) || defined(_KERNEL) */
54
40 * based on a bitmap indicating which fields are present.
41 *
42 * I am trying to describe precisely what the application programmer
43 * should expect in the following, and for that reason I tell the
44 * units and origin of each measurement (where it applies), or else I
45 * use sufficiently weaselly language ("is a monotonically nondecreasing
46 * function of...") that I cannot set false expectations for lawyerly
47 * readers.
48 */
49#if defined(__KERNEL__) || defined(_KERNEL)
50#ifndef DLT_IEEE802_11_RADIO
51#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus WLAN header */
52#endif
53#endif /* defined(__KERNEL__) || defined(_KERNEL) */
54
55/* XXX tcpdump/libpcap do not tolerate variable-length headers,
56 * yet, so we pad every radiotap header to 64 bytes. Ugh.
57 */
58#define IEEE80211_RADIOTAP_HDRLEN 64
55#define IEEE80211_RADIOTAP_HDRLEN 64 /* XXX deprecated */
59
56
60/* The radio capture header precedes the 802.11 header. */
57/*
58 * The radio capture header precedes the 802.11 header.
59 *
60 * Note well: all radiotap fields are little-endian.
61 */
61struct ieee80211_radiotap_header {
62 u_int8_t it_version; /* Version 0. Only increases
63 * for drastic changes,
64 * introduction of compatible
65 * new fields does not count.
66 */
67 u_int8_t it_pad;
68 u_int16_t it_len; /* length of the whole

--- 5 unchanged lines hidden (view full) ---

74 * fields are present. Set bit 31
75 * (0x80000000) to extend the
76 * bitmap by another 32 bits.
77 * Additional extensions are made
78 * by setting bit 31.
79 */
80} __attribute__((__packed__));
81
62struct ieee80211_radiotap_header {
63 u_int8_t it_version; /* Version 0. Only increases
64 * for drastic changes,
65 * introduction of compatible
66 * new fields does not count.
67 */
68 u_int8_t it_pad;
69 u_int16_t it_len; /* length of the whole

--- 5 unchanged lines hidden (view full) ---

75 * fields are present. Set bit 31
76 * (0x80000000) to extend the
77 * bitmap by another 32 bits.
78 * Additional extensions are made
79 * by setting bit 31.
80 */
81} __attribute__((__packed__));
82
82/* Name Data type Units
83/*
84 * Name Data type Units
83 * ---- --------- -----
84 *
85 * IEEE80211_RADIOTAP_TSFT u_int64_t microseconds
86 *
87 * Value in microseconds of the MAC's 64-bit 802.11 Time
88 * Synchronization Function timer when the first bit of the
89 * MPDU arrived at the MAC. For received frames, only.
90 *

--- 62 unchanged lines hidden (view full) ---

153 *
154 * Properties of transmitted and received frames. See flags
155 * defined below.
156 *
157 * IEEE80211_RADIOTAP_ANTENNA u_int8_t antenna index
158 *
159 * Unitless indication of the Rx/Tx antenna for this packet.
160 * The first antenna is antenna 0.
85 * ---- --------- -----
86 *
87 * IEEE80211_RADIOTAP_TSFT u_int64_t microseconds
88 *
89 * Value in microseconds of the MAC's 64-bit 802.11 Time
90 * Synchronization Function timer when the first bit of the
91 * MPDU arrived at the MAC. For received frames, only.
92 *

--- 62 unchanged lines hidden (view full) ---

155 *
156 * Properties of transmitted and received frames. See flags
157 * defined below.
158 *
159 * IEEE80211_RADIOTAP_ANTENNA u_int8_t antenna index
160 *
161 * Unitless indication of the Rx/Tx antenna for this packet.
162 * The first antenna is antenna 0.
161 *
162 * IEEE80211_RADIOTAP_FCS u_int32_t data
163 *
164 * FCS from frame in network byte order.
165 */
166enum ieee80211_radiotap_type {
167 IEEE80211_RADIOTAP_TSFT = 0,
168 IEEE80211_RADIOTAP_FLAGS = 1,
169 IEEE80211_RADIOTAP_RATE = 2,
170 IEEE80211_RADIOTAP_CHANNEL = 3,
171 IEEE80211_RADIOTAP_FHSS = 4,
172 IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,

--- 36 unchanged lines hidden (view full) ---

209 */
210#define IEEE80211_RADIOTAP_F_FCS 0x10 /* frame includes FCS */
211#define IEEE80211_RADIOTAP_F_DATAPAD 0x20 /* frame has padding between
212 * 802.11 header and payload
213 * (to 32-bit boundary)
214 */
215#define IEEE80211_RADIOTAP_F_BADFCS 0x40 /* does not pass FCS check */
216
163 */
164enum ieee80211_radiotap_type {
165 IEEE80211_RADIOTAP_TSFT = 0,
166 IEEE80211_RADIOTAP_FLAGS = 1,
167 IEEE80211_RADIOTAP_RATE = 2,
168 IEEE80211_RADIOTAP_CHANNEL = 3,
169 IEEE80211_RADIOTAP_FHSS = 4,
170 IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,

--- 36 unchanged lines hidden (view full) ---

207 */
208#define IEEE80211_RADIOTAP_F_FCS 0x10 /* frame includes FCS */
209#define IEEE80211_RADIOTAP_F_DATAPAD 0x20 /* frame has padding between
210 * 802.11 header and payload
211 * (to 32-bit boundary)
212 */
213#define IEEE80211_RADIOTAP_F_BADFCS 0x40 /* does not pass FCS check */
214
217#endif /* _NET_IF_IEEE80211RADIOTAP_H_ */
215#endif /* !_NET80211_IEEE80211_RADIOTAP_H_ */