Commit graph

146 commits

Author SHA1 Message Date
Guy Harris
255f856ec1 It appears that some fields in the Prism header might have a DID value
of 0, and that appears to mean that they're not present.  Check for
that, as well as the status.

svn path=/trunk/; revision=23914
2007-12-18 09:31:54 +00:00
Guy Harris
d51919864f Put radio information from a pseudo-header into its own protocol tree
item, as is done for radio information in a Prism, AVS, or radiotap
header.

svn path=/trunk/; revision=23913
2007-12-18 09:22:17 +00:00
Guy Harris
2def545803 Interpret the signal and noise values in an AVS header appropriately, as
per the signal type (and as per a noise value of 0xffffffff meaning no
noise value was provided).

svn path=/trunk/; revision=23912
2007-12-18 08:57:17 +00:00
Guy Harris
9198a2a166 Fold the Prism and AVS header dissectors into packet-ieee80211.c, and
have them use least some of the radio-information fields, so that the
same field name can be used for multiple radio header types.  The AVS
header can supply the data rate in bits/second, so have that field be in
those units, and make it 64 bits to leave room for the future, Just In
Case.  Display it as Mb/s, however.

svn path=/trunk/; revision=23911
2007-12-18 08:01:11 +00:00
Martin Mathieson
b8ef070e84 My compiler (I think wrongly) says that fnum could be used uninitialised.
svn path=/trunk/; revision=23701
2007-12-03 12:22:13 +00:00
Anders Broman
87503b059e Didier Gautheron:
Call subdissectors preference for retransmitted frames.

svn path=/trunk/; revision=23665
2007-11-29 06:28:07 +00:00
Gerald Combs
e8fd375630 Fixes from Sam Leffler:
In capture_sync.c: Don't clobber the DLT value.

  In packet-cops.c (modified by me): Instead of adding an item as a static,
  mis-cast FT_UINT16 to the tree, add it as an FT_NONE.

  In packet-802.11.c: Add the right address to the tree.

svn path=/trunk/; revision=23624
2007-11-27 19:57:35 +00:00
Guy Harris
9c89cdaaa3 strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda
est.  Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our
own versions if they're missing from GLib (as is the case with GLib
1.x).

In the code to build the list of named fields for Diameter, don't use
g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping
in the hash function and use g_ascii_strcasecmp() in the compare
function.

We do this because there is no guarantee that toupper(), tolower(), and
functions that use them will, for example, map between "I" and "i" in
all locales; in Turkish locales, for example, there are, in both
upper case and lower case, versions of "i" with and without a dot, and
the upper-case version of "i" is "I"-with-a-dot and the lower-case
version of "I" is "i"-without-a-dot.  This causes strings that should
match not to match.

This finishes fixing bug 2010 - an earlier checkin prevented the crash
(as there are other ways to produce the same crash, e.g. a bogus
dictionary.xml file), but didn't fix the case-insensitive string matching.

svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
Gerald Combs
7731b882f2 From Tuomas Maattanen: Fix a .11e QBSS IE endian error.
svn path=/trunk/; revision=23614
2007-11-27 01:02:03 +00:00
Stig Bjørlykke
d6f0b0c2af From Jens Braeuer:
Added support for Wifi Simple Config aka Wifi Protected Setup

From me:
Added standard copyright header to packet-wps

svn path=/trunk/; revision=23549
2007-11-23 17:48:28 +00:00
Anders Broman
1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Richard van der Hoff
c32305f542 From Chris Maynard <christopher.maynard@gtech.com>: Incorrect display filter field naming convention.
svn path=/trunk/; revision=23086
2007-10-07 23:23:23 +00:00
Gerald Combs
937c917d66 Append the packet type and flags to the top-level 802.11 tree item, and append
the flags to the info column.  Make the info column presentation consistent.

svn path=/trunk/; revision=22913
2007-09-19 21:39:52 +00:00
Stig Bjørlykke
72af3183ab Added functionality to highlight the FCS bytes in Ethernet and IEEE 802.11
packets in the Packet Details View.

This "appendix" bytes are not copied with the Copy functions or in the
Export Selected Packet Bytes.

svn path=/trunk/; revision=22887
2007-09-17 12:12:02 +00:00
Guy Harris
8aa23ad121 Fix indentation.
svn path=/trunk/; revision=22797
2007-09-05 22:43:51 +00:00
Stig Bjørlykke
6d9c82338d Fixed a brace placement to enable the default case
svn path=/trunk/; revision=22751
2007-08-30 11:37:49 +00:00
Stig Bjørlykke
49fc9636b9 From Tuomas Maattanen:
Committed changes in r21450 again.

svn path=/trunk/; revision=22691
2007-08-27 21:23:18 +00:00
Jeff Morriss
25df9f2133 From Guillem Hernandez: fix decoding of EOSP bit. From Jaap Keuter: fix description of 'value' in proto_tree_add_boolean() that caused the former bug.
svn path=/trunk/; revision=22293
2007-07-12 22:36:35 +00:00
Gerald Combs
24238df617 Add a missing display filter.
svn path=/trunk/; revision=22285
2007-07-10 23:23:09 +00:00
Gerald Combs
0ed707468e From Dustin Johnson: Fix a typo.
svn path=/trunk/; revision=22280
2007-07-09 17:01:00 +00:00
Gerald Combs
7efcc33a1e In packet-ieee802.11.c, fix a serious preference bug introduced in the
last checkin.  In airpcap.c, appease the toolbar code by returning a
lower-case, non-separated WEP key.

svn path=/trunk/; revision=22152
2007-06-21 20:22:56 +00:00
Gerald Combs
249a747c51 Be less restrictive about WEP key preferences. Use hex_str_to_bytes to
process WEP keys.  Allow the "wep:" prefix for WEP keys even when
HAVE_AIRPDCAP isn't defined.  Add a NULL pointer check to
hex_str_to_bytes().  Fixes bug 1584.

Fixup indentation.

svn path=/trunk/; revision=22151
2007-06-21 17:49:03 +00:00
Gerald Combs
1d567d6e6b The 802.11 dissector calculates the header size, so pass that value to
the WEP/WPA decryption code instead of re-calculating it.  Fixes bug
1639.

Remove fcsPresent, radiotapPresent, and associated code from airpdcap.c
since they were always FALSE.  Glib-ize some data types.  Fixup white
space.

Update the release notes.

svn path=/trunk/; revision=22104
2007-06-14 22:09:14 +00:00
Gerald Combs
64d16f4888 Add a hint for using wlan.fc.type_subtype.
svn path=/trunk/; revision=22102
2007-06-14 16:44:36 +00:00
Gerald Combs
f445de2be5 Add an option to ignore vendor-specific HT elements.
svn path=/trunk/; revision=22064
2007-06-07 17:40:23 +00:00
Guy Harris
5a43799a17 Use G_GINT64_MODIFIER, rather than the PRI[douxX]64 macros, for GLib
routines and routines using those routines.  GLib might use different
modifiers for 64-bit quantities than the platform's C library does.

svn path=/trunk/; revision=21990
2007-05-29 18:52:42 +00:00
Guy Harris
d2ac4f7133 Check for G_GINT64_MODIFIER in Wireshark as we do in Wiretap.
In all the places where a cast to "long long" or "unsigned long long"
was done, use G_GINT64_MODIFIER and get rid of the cast, as

	1) there's no guarantee that "%ll" works

and

	2) there's no guarantee that "long long" works

(the latter definitely does *NOT* work with MSVC++; the former doesn't
work with regular printf in MSVC++, but it might work with the GLib
printf-based functions).

svn path=/trunk/; revision=21978
2007-05-29 06:56:07 +00:00
Sebastien Tandel
76729e5d0f From David Howells :
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).

The failures fall into two categories:
  (1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'.  This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
  (2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size.  Such values need to be cast to 'long
long' or 'unsigned long long'.

svn path=/trunk/; revision=21975
2007-05-29 02:43:18 +00:00
Gerald Combs
a33ebc8d5c Throw an exception instead of trying to add a 4GB fragment.
svn path=/trunk/; revision=21943
2007-05-25 21:32:32 +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
Gerald Combs
b482e10da4 From Dustin Johnson: Fix a couple of spelling errors. Normalize the display
of A-MPDU and A-MSDU trees.

svn path=/trunk/; revision=21771
2007-05-14 18:27:47 +00:00
Gerald Combs
797545d2e5 Fix a bunch of spelling errors.
svn path=/trunk/; revision=21751
2007-05-12 00:01:57 +00:00
Gerald Combs
6c940e0714 implented -> implemented.
svn path=/trunk/; revision=21749
2007-05-11 22:51:48 +00:00
Gerald Combs
790061f5c7 Add separate filters for vendor-specific HT items.
svn path=/trunk/; revision=21748
2007-05-11 15:52:13 +00:00
Gerald Combs
e2733321e9 Bug fixes and cleanup from Dustin Johnson and myself:
- Remove unused hf_block_ack_ssc code.
  - Fix +HTC detection and frame length calculation.
  - Fix Channel Width dissection.
  - Fix Primary Channel dissection.
  - Tweak the TID field width.
  - Display the Block Ack Buffer Size as decimal.
  - Display the SSC fragment and sequence numbers as decimal.
  - Fix the spelling of "recommended".

svn path=/trunk/; revision=21721
2007-05-07 21:57:05 +00:00
Gerald Combs
bb76982d2c Add a routine to dissect the MCS Set. Add a tree for the MCS Set
Rx Bitmask.  "Steams" -> "Scheme".

svn path=/trunk/; revision=21654
2007-05-02 23:26:33 +00:00
Gerald Combs
8a2810c15a From Dustin Johnson: Normalize indentation.
svn path=/trunk/; revision=21634
2007-05-01 16:55:15 +00:00
Guy Harris
0bbac7a3e2 Parenthesize to squelch a compiler warning (a warning that suggests that
the parentheses are needed - not that I can remember which of && and ||
have higher precedence, anyway, which is why I like parenthesizing
expressions such as this...).

svn path=/trunk/; revision=21631
2007-05-01 01:56:58 +00:00
Gerald Combs
78b475fc0c From Dustin Johnson and myself:
- HT Control fixes and updates
  - Add an is_ht flag to the common dissection and capture routines, along
    with a registered dissector (which is used in code that hasn't been
    checked in yet.)
  - Action Fixed Parameter updates
  - Control Wrapper fixes and updates
  - Beacon Interval fixes and updates
  - Capability Info fixes and updates
  - Block Ack / Block Ack Request fixes
  - Lots of miscellaneous fixes and updates

svn path=/trunk/; revision=21630
2007-04-30 23:50:35 +00:00
Gerald Combs
99c0698b95 From Dustin Johnson:
- A-MSDU updates
  - Secondary Channel Offset tag updates
  - A-MPDU parameter updates
  - Lots of string fixes updates
  
Fixup whitespace.

svn path=/trunk/; revision=21564
2007-04-25 19:38:47 +00:00
Gerald Combs
cde0384abc From Stig Bjørlykke:
Fix break placement for control frames in dissect_ieee80211_common()

svn path=/trunk/; revision=21562
2007-04-25 17:39:38 +00:00
Gerald Combs
02926636da Move some data frame back out of the control frame scope, so Wireshark
will stop crashing.

More .11n additions and updates from Dustin:

  - Power Capability tag
  - Supported Channels tag
  - Block Ack/Block Ack Request

Fixup whitespace.

svn path=/trunk/; revision=21484
2007-04-20 22:29:11 +00:00
Gerald Combs
2c9c0f3651 Fix 64-bit integer handling and whitespace.
svn path=/trunk/; revision=21483
2007-04-20 18:09:31 +00:00
Gerald Combs
24b3b66ba8 More .11n-related updates and additions from Dustin Johnson and myself:
- MIMO Control frame support
  - Control Wrapper frame support
  - Measurement Pilot
  - Action No Ack
  - Block Ack Action
  - PCO Phase Control
  - PSMP Parameter Set
  - Antenna Selection
  - Extended Channel Switch Announcement
  - HT Information
  - HT Action
  - MIMO CSI Matrices Report
  - Fill in and update a bunch of hf strings
  
Fixup(?) whitespace.

svn path=/trunk/; revision=21482
2007-04-20 17:40:13 +00:00
Jeff Morriss
ab97c31bb2 Fix warnings of the form "long long unsigned int format, guint64 arg": use
the PRI macros instead of %llu, etc.

svn path=/trunk/; revision=21454
2007-04-17 10:11:41 +00:00
Gerald Combs
5285c91f9a More .11k/n updates from Dustin Johnson:
- Measurement Pilot frame support
  - Various Block Ack fields
  - Various Power fields
  - Measurement Pilot field
  - Country String field
  - Channel Width field
  - QoS Information fields

svn path=/trunk/; revision=21452
2007-04-17 00:34:32 +00:00
Gerald Combs
d0a793c353 From Tuomas Maattanen:
the current SVN (rev 21448) 802.11 WMM TSPEC dissector seems to have
some bugs.

TS Info field should be three bytes long, not two.  Suspension Interval
field is missing altogether, shifting all other fields by four bytes.
Maximum Burst Size, Minimum PHY Rate, Peak Data Rate and Delay Bound
are in wrong order.


svn path=/trunk/; revision=21450
2007-04-16 18:35:22 +00:00
Stephen Fisher
63692e83f8 Remove unused variable that is causing a warning
svn path=/trunk/; revision=21420
2007-04-13 22:50:47 +00:00
Gerald Combs
1295325704 802.11k/n updates from Dustin Johnson:
- Refactored Frame Control into its own function
  - Refactored the Action field
  - Add Block Ack/Block Ack Request
  - Add a Control Wrapper stub
  - Add the Neigbor Report tag
  - Add the Extended Channel Switch Announcement tag
  - Add the Supported Regulatory Classes tag
  - Add the Secondary Channel Offset tag

svn path=/trunk/; revision=21415
2007-04-13 19:28:03 +00:00
Gerald Combs
94dbb06046 Additional 802.11k/n support from Dustin Johnson and myself:
- Break out and display A-MSDUs
  - HT Control field (currently disabled)
  - Action No Ack
  - HT Information IE
  - HT Capability IE
  - Block Ack Request
  - Secondary Channel Offset Tag
  - Measurement Request Tag
  - Measurement Report Tag

...along with a bunch of other updates, including displaying the
type/subtype as a hex value (first nibble: type, second nibble: subtype).

svn path=/trunk/; revision=21391
2007-04-12 18:42:19 +00:00