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
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
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
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
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
- 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
- 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
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
- 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
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
- 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
- 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
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
- 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
- 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
This patch adds an option to IEEE 802.11 to ignore the wep bit with IV,
as mentioned in
http://www.wireshark.org/lists/wireshark-dev/200704/msg00021.html
I also fixed a bug where the packet is dissected different in the Packet
List with and without "Colorize Packet List" (actually when dissecting
with and without "tree"). Try toggling "Colorize Packet List" with my
previous posted ieee80211-wep.pcap without this patch to see the bug.
The patch is tested on OSX.
svn path=/trunk/; revision=21384
Use "break" instead of "goto done" when possible, don't goto a label
that follows immediately, and get rid of labels for which there's no
goto.
svn path=/trunk/; revision=20846
This patch adds decodes for 802.11n information elements. Since 802.11n
isn't a formal standard yet they are not using the final packet
structures or ie type numbers. But there are already 802.11n pre
release devices out there and these decodes do seem to correctly decode
the IEs that they use.
svn path=/trunk/; revision=20725
the lack of SSID). Wildcarding combines the passphrase with the last
seen SSID and attempts decryption. The last-seen stack is only one
element tall, which means it may get clobbered on busy and diverse
networks. We can expand it if needed.
Make internal functions static in airpdcap.c. Rearrange the
AIRPDCAP_KEY_ITEM struct so that the passphrase and SSID don't get
clobbered when we set our PSK.
svn path=/trunk/; revision=20572
functions to strutil. Use GByteArrays to store SSIDs for decryption,
and let the user specify arbitrary byte strings using percent-encoded
strings. We should probably add percent encoding for pass phrases as
well, so you can escape the ":" character.
Move the key struct key conversion utilities to airpdcap.c, and remove
duplicate code from packet-ieee80211.c. Fix a lot of indentation.
svn path=/trunk/; revision=20388
distcheck failure. Move the nmake build targets for airpdcap from
epan/dissectors to epan. This will probably break the Windows build.
svn path=/trunk/; revision=20231
move the files until these changes are checked in). Add an AC_DEFINE
for airpdcap (which will be removed once the changes have settled).
Update the airpdcap code to compile on non-Windows systems. Fix up
comments and whitespace to conform more closely to the rest of the
code base. Verified to compile under Windows and OS X.
svn path=/trunk/; revision=20227
Jeff Morriss