aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
AgeCommit message (Collapse)AuthorFilesLines
2014-02-25802.11 : Add channel number custom (to display info when report channel ↵Alexis La Goutte1-13/+26
number is 0 or 255) Fix also indent for other custom... Change-Id: Ic95b65d5217a0d1e967892ac2694f3ba749242fb Reviewed-on: https://code.wireshark.org/review/379 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25802.11: Regulatory Class => Operating Class (changed in 802.11-2012)Alexis La Goutte1-59/+59
Fix also typo for hf_ieee80211_tag_measure_request_regulatory_class wrong hf name... Change-Id: I49e582c7683e58abb8785958dcc043789fd79a26 Reviewed-on: https://code.wireshark.org/review/378 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25Remove trailing whitespace.Bill Meier1-4/+4
Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6 Reviewed-on: https://code.wireshark.org/review/372 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25Fix packet-ieee80211.c:13115:7: error: will never be executed ↵Alexis La Goutte1-1/+0
[-Werror,-Wunreachable-code] Change-Id: I0a87e6a2e9a819148a816ad1bc9da008b8cc1518 Reviewed-on: https://code.wireshark.org/review/324 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-25Neighbor report (802.11k) may be have no subelement (len == 13)Alexis La Goutte1-0/+5
Fix some malformed frame from sample on Bug 9724 Change-Id: I0874c2aab57799426f13e18123b05a7e73c6a75f Partialy-Bug:9724 Reviewed-on: https://code.wireshark.org/review/340 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-03Fix all -fstrict-alias warnings found by gcc 4.1.2Gilbert Ramirez1-1/+1
The majority of the fixes are for calls to uat_new(). Instead of having each caller cast its private data to (void**), we use void* in the uat_new() API itself. Inside uat_new(), we cast the void* to void**. Some dissectors use val64_string arrays, so a VALS64() macro was added for those, to avoid using VALS(), which is useful only for value_string arrays. packet-mq.c was changed because dissect_nt_sid() requires a char**, not a guint**. All other callers of dissect_nt_sid() use char*'s (and take the address of it) for their local storage. So, this was changed to follow the other practices. A confusion between gint and absolute_time_display_e in packet-time.c was cleared up. The ugliest fix is the addition of ip6_guint8_to_str(), for exactly one caller. The caller uses one type of ip6 address byte array, while ip6_to_str() expects another. This new function is in place until the various address implementations can be consolidated. Add VALS64() to the developer documentation. Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 Reviewed-on: https://code.wireshark.org/review/48 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2013-12-19Rename a couple of to_str functions to have ep_ in the name. This makes itEvan Huus1-1/+1
obvious that the returned string is ephemeral, and opens up the original names in the API for versions that take a wmem pool (and thus can work in any scope). svn path=/trunk/; revision=54249
2013-12-15Fix [-Wmissing-prototypes]Jakub Zawadzki1-0/+3
svn path=/trunk/; revision=54135
2013-12-12(Trivial)Bill Meier1-23/+23
- Fix indentation to match editor modelines (tabs-->spaces); - Rework/add some whitespace; svn path=/trunk/; revision=53978
2013-12-09Fix warningsJakub Zawadzki1-3/+0
svn path=/trunk/; revision=53885
2013-11-30Make the code testing the Rx MCS Bitmask subfield of the Supported MCSGuy Harris1-17/+54
Set field of the HT Capabilities element a bit clearer, and add comments. Fix it so it doesn't assign a variable to itself, as clang warns about that. svn path=/trunk/; revision=53674
2013-11-30Tx MCS set is not interpreted properly in WLAN beacon frame. Bug 8894 ↵Michael Mann1-4/+58
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8894) #BACKPORT svn path=/trunk/; revision=53670
2013-11-29Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.Jakub Zawadzki1-1/+1
XXX, people are not aware that expression of this macros might be evaluated multiple times, like: - BSWAP16(tvb_get_letohs(tvb, off)) : \ + GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \ Should be tvb_get_ntohs() called? svn path=/trunk/; revision=53653
2013-11-29Rename some of pint.h macros to match common style (bits number on the end).Jakub Zawadzki1-2/+2
pntohs -> pntoh16 pntohl -> pntoh32 pletohs -> pletoh16 pletohl -> pletoh32 phtons -> phton16 phtonl -> phton32 svn path=/trunk/; revision=53652
2013-11-21Create new dissectors when a protocol goes across ethernet and "something ↵Michael Mann1-9/+21
else" instead a single dissector that uses pinfo->ethertype to determine if it's the "ethernet" or the "something else" case. svn path=/trunk/; revision=53488
2013-11-17Fix indent (2 spaces) and remove trailing whitespaceAlexis La Goutte1-44/+44
svn path=/trunk/; revision=53392
2013-11-16Don't include <epan/bitswap.h> when not neededJakub Zawadzki1-1/+0
svn path=/trunk/; revision=53364
2013-11-14Expand CHECK_DISPLAY_AS_X ('this macro looks like a hack') macro in ↵Jakub Zawadzki1-1/+5
packet-ieee80211.c, remove it. svn path=/trunk/; revision=53327
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53230
2013-11-09include <wsutil/pint.h> only when needed.Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53196
2013-11-04From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9373Alexis La Goutte1-0/+269
ieee80211: Decode Radio Measurements (Action Frames) The length of the fixed fields are dependent on the radio measurement action. Before this patch, fields following the action code were ignored, leading to wrong decoding results. This patch adds recognition for the Radio Measurement action management frames as specified in IEEE Std 802.11-2012. From me: * Rename some hf (Add ff_ in name) * Link Margin and Transmit Power are signed * Use always proto_tree_add_item (replace proto_tree_add_text) svn path=/trunk/; revision=53074
2013-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier1-2/+2
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-27Treat IE 173 (symbol proprietary) like we treat the vendor IEJörg Mayer1-0/+1
svn path=/trunk/; revision=52886
2013-10-25Add a very small hack to make the UAT update callback error string freeable, andEvan Huus1-6/+6
convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-23Remove trailing spaces from hf name values (to satisfy checkAPIs).Jeff Morriss1-5/+5
svn path=/trunk/; revision=52796
2013-10-23The interpretation of Max Power Constraint in VHT TPE is incorrect. Bug ↵Michael Mann1-7/+20
8939 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8939). From chaitanya svn path=/trunk/; revision=52791
2013-10-06Add IEEE802.11ac VHT NDP announcement dissection. Bug 9224 ↵Michael Mann1-0/+122
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9224) From Luca Coelho From me: make sure return value of tvb_length_remaining is positive. svn path=/trunk/; revision=52391
2013-09-22emem -> wmem conversion:Pascal Quantin1-7/+7
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - update docs accordingly svn path=/trunk/; revision=52172
2013-09-19From Chun-Yeow via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9163 ↵Alexis La Goutte1-1/+11
Ability to Decode the Number of Mesh Peerings Decode the mesh formation information fields related to the number of mesh peerings Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@cozybit.com> svn path=/trunk/; revision=52152
2013-09-15Remove unused variables, fix typos.Evan Huus1-2/+1
svn path=/trunk/; revision=52046
2013-09-15Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if ↵Michael Mann1-10/+8
hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann1-86/+86
svn path=/trunk/; revision=51852
2013-09-03Similar to the IPv4 dissector's hf_ip_dst_host, hf_ip_src_host and ↵Chris Maynard1-5/+193
hf_ip_host fields, add to the Ethernet dissector: hf_eth_dst_resolved hf_eth_src_resolved hf_eth_addr_resolved and add to the IEEE802.11 dissector: hf_ieee80211_addr_da_resolved hf_ieee80211_addr_sa_resolved hf_ieee80211_addr_ra_resolved hf_ieee80211_addr_ta_resolved hf_ieee80211_addr_bssid_resolved hf_ieee80211_addr_resolved Change motivated by: http://ask.wireshark.org/questions/24314/possible-to-use-the-mac-info-in-the-wireshark-manuf-file-as-part-of-display-filter svn path=/trunk/; revision=51742
2013-09-03Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
svn path=/trunk/; revision=51734
2013-08-28Slightly improve the decoding of unknown Aironet IEsJörg Mayer1-2/+9
svn path=/trunk/; revision=51570
2013-08-28As reported by Ben Smith (thex1le@gmail.com) on #wireshark:Jörg Mayer1-1/+13
Aironet IE 20 is ClientMFP svn path=/trunk/; revision=51561
2013-08-27From Chun-Yeow:Anders Broman1-1/+60
Decode the Mesh Configuration Capabilities Info in Details. With a change to use tfs_yes_no. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9070 svn path=/trunk/; revision=51526
2013-08-26Make all expert info filterable. Display filter names may need review, but ↵Michael Mann1-114/+149
at least the filtering is in place. svn path=/trunk/; revision=51520
2013-08-24Use the correct length field when tagging the SSID. Fixes the first valgrindEvan Huus1-3/+4
fuzz failure. svn path=/trunk/; revision=51508
2013-08-21FromChun-Yeow via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9059Alexis La Goutte1-1/+79
Add Support of Decoding 802.11s Mesh Channel Switch Parameter Element From me: Remove some trailing whitespace Add subtree for flag Change typo of display filter svn path=/trunk/; revision=51453
2013-08-13From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9038Alexis La Goutte1-1/+1
802.11 HT Extended Capabilities B10 decode incorrect #Backport 1.10 and 1.8 Within the 802.11 HT Capabilities IE the "HT Extended Capabilities" B10's name is incorrect. It is currently titled "High Throughput". This is incorrect/missleading. It should be something like "High Throughput Control (+HTC)". The field indicates if the "High Throughput Control (HTC)" field is supported - not if HT itself is supported. svn path=/trunk/; revision=51339
2013-07-31Don't use emem or wmem in base_custom functions, just use a buffer on the stack,Evan Huus1-14/+7
since it's not needed after we write it into the output field. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8996 which was introduced by the wmem conversion. svn path=/trunk/; revision=51065
2013-07-31Revert one tiny bit of r51043 where UAT code got wmemed by accident.Evan Huus1-1/+1
svn path=/trunk/; revision=51044
2013-07-31Convert SSL and TCP dissectors to wmem (with the exception of UAT).Evan Huus1-18/+18
svn path=/trunk/; revision=51043
2013-07-26From Jouni Malinen via ↵Alexis La Goutte1-1/+156
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8972 ieee80211: Dissect QoS Mapping information This patch adds support for dissecting QoS Map Configure frame and QoS Map Set element per Interworking functionality that was added in IEEE 802.11u svn path=/trunk/; revision=50908
2013-07-22Beginnings of Nintendo StreetProtocol supportJörg Mayer1-1/+127
svn path=/trunk/; revision=50783
2013-07-17Remove fragment_data, add fragment_head, fragment_item - for now alias it to ↵Jakub Zawadzki1-2/+2
the same structure. This is begin of work to split fragment head and fragments items. svn path=/trunk/; revision=50708
2013-06-23From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8837 ↵Alexis La Goutte1-6/+121
Add support for VHT Transmit Power Envelope IE Added support for VHT TPE IE and also tested it Also fixed a small typo from "IEEE Stc" to "IEEE Std" for all 802.11ac references. From me: * Remove some trailing whitespace * Fix bitmask PWR Info Unit * Modify expert_info to display error in PWR Info Count * Fix (possibility) loop * Fix value_string (not need to have Reserved...) svn path=/trunk/; revision=50123
2013-05-27From Jouni Malinen via ↵Alexis La Goutte1-1/+0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8711 Wi-Fi Display dissector This matches the style used for Wi-Fi Display and gets rid of a minimal header file for functionality that extends packet-ieee80211.c. svn path=/trunk/; revision=49594
2013-05-27From Jouni Malinen via ↵Alexis La Goutte1-0/+5
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8711 Wi-Fi Display dissector The attached patch adds initial support for dissecting Wi-Fi Display information element svn path=/trunk/; revision=49593