Commit Graph

38 Commits

Author SHA1 Message Date
Gerasimos Dimitriadis fe1e9d6296 Fix for Bug 3747:
use FT_FLOAT for the radiotap data rate because of .5 Mbps granularity

svn path=/trunk/; revision=31526
2010-01-14 18:21:09 +00:00
Kovarththanan Rajaratnam 8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Guy Harris 7b07422574 Don't divide the data rate by 2 - that loses information (yes, I have a
trace with at least one packet transmitted at 5.5 Mb/s).

Clean up indentation.

svn path=/trunk/; revision=29178
2009-07-23 09:32:58 +00:00
Anders Broman 832087bfbf - Ambiguous value for radiotap datarate.
The value given to proto_tree_add_uint_format() was not divided by 2.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3747
- remove check_col()
- Indentation changes.

svn path=/trunk/; revision=29177
2009-07-23 08:56:09 +00:00
Gerald Combs 2391d808af Update documentation links.
svn path=/trunk/; revision=28926
2009-07-02 20:35:46 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Martin Mathieson 09d545038d Add newline to end of file
svn path=/trunk/; revision=28387
2009-05-17 21:41:00 +00:00
Gerald Combs 7ea5c3cba7 From Johannes Berg via bug 3415:
The attached patch updates wireshark to the radiotap RX flags leaving the
non-standard option to dissect bit 14 as "FCS in header".

Merge the patch by hand in a couple of places to avoid conflicts with
r26861.

svn path=/trunk/; revision=28385
2009-05-17 19:18:18 +00:00
Stephen Fisher c36e74116e Enhancements from bug #3043 with a few whitespace cleanups.
svn path=/trunk/; revision=26861
2008-11-27 08:34:41 +00:00
Gerald Combs 20e131acf7 Add a modeline blurb for the predominant indentation style, and update some
whitespace to  match.

svn path=/trunk/; revision=26546
2008-10-24 23:35:50 +00:00
Bill Meier aa30dcd129 Minor proto_reg_handoff cleanup: use find_dissector when appropriate.
svn path=/trunk/; revision=26308
2008-09-30 14:49:44 +00:00
Bill Meier 44af6ef887 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25290
2008-05-14 01:47:41 +00:00
Gerald Combs e679376996 From Sam Leffler: Add support for IEEE80211_RADIOTAP_XCHANNEL.
svn path=/trunk/; revision=23625
2007-11-27 20:03:43 +00:00
Gerald Combs 72daa58e19 Instead of converting between 802.11 frequencies and channels umpteen
different ways, add a set of common conversion routines.  Add a
"Frequency/Channel" column and fill it in where we can.  Fix RSSI column
printing in PPI.

Fix up whitespace along the way.

svn path=/trunk/; revision=22538
2007-08-17 19:34:14 +00:00
Guy Harris 126dedd9b2 I think David Young needs to be granted the power of life and death
over anybody who edits the sys/net80211/ieee80211_radiotap.h header on
any operating system.  I also think he needs to be willing to use that
power when necessary.

svn path=/trunk/; revision=22217
2007-06-27 23:53:24 +00:00
Gerald Combs 55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Guy Harris 3a0381579e Don't cast a "guint8 *" to a pointer to a structure; just use the
pointer to the guint8, plus explicitly defined structure offsets (the
structure had better be the same on all platforms, forever, otherwise
binary compatibility breaks, which would be an error, given that the
structure appears in capture files).

svn path=/trunk/; revision=21619
2007-04-30 06:19:35 +00:00
Gerald Combs c4a52b1995 According to David Young, IEEE80211_RADIOTAP_FCS was never officially
assigned.

svn path=/trunk/; revision=20817
2007-02-15 18:35:30 +00:00
Stephen Fisher 750e036e4c Add descriptions to radiotap fields. Fix some formatting. Add an extra
linebreak between hf field definitions for readability.


svn path=/trunk/; revision=20633
2007-01-30 20:57:51 +00:00
Gerald Combs e3ce33b8e4 Back out most of r19878; it was making the 802.11 dissector overwrite the
RSSI column with the wrong value.

svn path=/trunk/; revision=19963
2006-11-23 01:49:18 +00:00
Gerald Combs 59562378e4 David Young pointed out that we weren't aligning fields according to the
radiotap specification.  Do so.  Add fields for FHSS and Transmit
attenuation (untested).

svn path=/trunk/; revision=19915
2006-11-16 22:27:47 +00:00
Gerald Combs d20f77d3ec Add a plain "radiotap.channel" field to the radiotap dissector.
Check for an invalid channel frequency.  Pass the channel, data rate,
and quality to the 802.11 dissector, so that they show up there
as well.  Clean up whitespace.

svn path=/trunk/; revision=19878
2006-11-12 00:52:05 +00:00
Gerald Combs b61a0b3d16 Make sure we round up to the nearest 4-byte boundary before trying to process
the FCS.

svn path=/trunk/; revision=19746
2006-10-31 01:28:29 +00:00
Gilbert Ramirez 5a13d13021 Fix bug 1085 -- handle the various ways that a radiotap frame can
have an FCS. Also, clean up the parsing and presentation of the various
flags, and show some that aren't already shown.

svn path=/trunk/; revision=19680
2006-10-25 15:16:49 +00:00
Gerald Combs f9661850d1 Add support for AirPcap, an upcoming wireless product from CACE. Support
is disabled by default, and can be enabled by setting AIRPCAP_CONFIG
in config.nmake.  The code is currently limited to Windows, but should
be adaptable to other platforms.

The official announcement won't come until next week, so you'll have to
read the source for details.  :)

svn path=/trunk/; revision=18928
2006-08-16 18:01:25 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Guy Harris d44c620df0 Don't change rflags for any properties other than
IEEE80211_RADIOTAP_FLAGS.

svn path=/trunk/; revision=18022
2006-04-28 06:29:19 +00:00
Guy Harris 4a84a894d9 This was completely broken, as the "length" variable actually reflected
the amount of data left in the radiotap header after the fields we've
processed so far, not the total length of the header, so it couldn't be
used to skip past the radiotap header and get a tvbuff of the packet
data.  Fix that.

svn path=/trunk/; revision=18020
2006-04-27 19:58:32 +00:00
Guy Harris 878a077605 Add some more sanity checking of the Radiotap header.
svn path=/trunk/; revision=17085
2006-01-23 23:21:02 +00:00
Guy Harris 41c941b49c Call capture_radiotap() when capturing on a device supplying Radiotap
headers.

Fix capture_radiotap() to check for padding between the 802.11 header
and the 802.11 payload and to call different capture routines depending
on whether it's present or not, and create capture_ieee80211_datapad()
to handle the case where it's present.

Fix capture_radiotap() to convert the Radiotap header length from
little-endian, and to do some sanity checking of that length.

Fix capture_ieee80211_common() to use the offset supplied to it to fetch
the frame control field, as that offset isn't necessarily 0.

svn path=/trunk/; revision=17083
2006-01-23 16:56:34 +00:00
Guy Harris d269468356 From Sam Leffler:
1. Fix a bug in caclulating the 802.11 header length for QoS
	   data frames (way bad regression from previous code). 

	2. Add support for packets w/ data padding between the 802.11
	   header and the payload (as indicated in the radiotap flags).

	3. Add support for handling FCS indication in the radiotap
	   flags. 

	4. Fix display of TSF (previous code was not byte swapping).

	5. Update ieee80211_mhz2ieee in radiotap.c to handle more
	   channels. 

	6. Nuke some #if 0 code I left in radiotap.c a while back.

Also, clean up the various macros that extract stuff from 802.11 header
fields or define bitfields within those header fields:

	group them by the fields from which they extract and the values
	they extract, or the header fields to which they belong;

	get rid of some of the COOK_ in the names - COOK_ really doesn't
	indicate anything useful, such as the field from which they're
	extracting (we should get rid of the rest);

	put in some more comments explaining what they do;

	get rid of some unused macros;

	get rid of some values that aren't flag values - they're values
	to test whether something's a data frame with a particular byte
	set in the subtype field, but they're only used on data frames,
	so we only need to test the bit in question, so we define macros
	to test the bit and name them to indicate that they're for use
	on data frames.

Consistently use "CF-Ack" and "CF-Poll" in the strings for various data
frame type/subtype values, and get rid of "802.11" (it should be obvious
to one and all that this is 802.11...).

Comment out some variables used only in commented-out code.

Get rid of some unused variables.

Fix up one "proto_tree_add_text()" call where the format string didn't
match the arguments.

svn path=/trunk/; revision=17080
2006-01-23 09:20:06 +00:00
Guy Harris e6ca1b50a0 Put the units after the values for signal and noise, as that's a bit
more natural.

svn path=/trunk/; revision=15588
2005-08-28 06:38:30 +00:00
Guy Harris 3c01b45ac2 Show dBm and dB signal and noise values differently, so that the user
knows what they're getting.

svn path=/trunk/; revision=15528
2005-08-25 08:16:08 +00:00
Jörg Mayer eb1ff24278 Beginning of radiotap's header dissection
svn path=/trunk/; revision=14985
2005-07-22 07:54:18 +00:00
Jörg Mayer 32b4bac3cc Convert the result of tvb_get_guint8 to (gint8) so that the display
as FT_INT32 shows a negative number if appropriate.

Is there a better way to solve this?
Does this problem occur in other places too?

svn path=/trunk/; revision=14970
2005-07-20 15:08:29 +00:00
Jörg Mayer 9806180700 Add value for FCS (no decoding).
Fix a signedness warning.

svn path=/trunk/; revision=14905
2005-07-12 17:06:09 +00:00
Guy Harris 1e6a5d408c As Sam Leffler notes, the radiotap header isn't BSD-only, it's also used
by his madwifi Atheros driver on Linux; rename
WTAP_ENCAP_IEEE_802_11_WLAN_BSD to WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP,
and change its text name from "ieee-802-11-bsd" to
"ieee-802-11-radiotap".

svn path=/trunk/; revision=12429
2004-10-29 02:40:01 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00