aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-capwap.c
AgeCommit message (Collapse)AuthorFilesLines
2015-12-09new_create_dissector_handle -> create_dissector_handle for dissector directory.Michael Mann1-2/+2
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25create_dissector_handle -> new_create_dissector_handleMichael Mann1-7/+8
This finalizes the transformation for dissectors. Change-Id: Ie5986b72bb69a6e8779ca3f5e20a80357c9e6fea Reviewed-on: https://code.wireshark.org/review/12122 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-01Treat IPv4 subnet masks as distinct from addressesJeffrey Smith1-2/+2
While IPv4 subnet masks are obviously related and similar to IPv4 addresses, they are distinct enough that they need to be treated seperately in some aspects. For instance, there is no value in attempting to resolve a subnet mask. This change creates a new display type: BASE_NETMASK, which allows distinction from FT_IPv4 (and possible name resolution) where appropriate. Change-Id: I99e19c9a58eb613f8e58d481af84c30e2e5e14d7 Reviewed-on: https://code.wireshark.org/review/10438 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Call reassembly_table_destroy for some dissectorsPeter Wu1-0/+6
This patch adds reassembly_table_destroy calls as cleanup function for dissectors which have a simple init routine that just calls reassembly_table_init (comments are ignored). The changes were automatically generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=4cc0aec05dc67a51926a045e1955b7a956757b5e (with the if and assignment parsers disabled). The only difference from the autogenerated output is that the XXX comments from the init routines in smb-pipe and tds dissectors are kept. Change-Id: I64aedf7189877247282b30b0e0f83757be6199e7 Reviewed-on: https://code.wireshark.org/review/9222 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-11Replace tabs in files with editor modeline "expandtab"Bill Meier1-1/+1
Change-Id: I4667fd4091c510a4c798f79dae333a07dc42dad6 Reviewed-on: https://code.wireshark.org/review/8880 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-05-26CAPWAP: Add Vendor Specific from CiscoAlexis La Goutte1-10/+309
Based on work of actube https://github.com/7u83/actube Change-Id: I4f9b3bfa263446fb380127640ba99ecb0043eef2 Reviewed-on: https://code.wireshark.org/review/8307 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-29CAPWAP: fix wrong offset length for header length hfAlexis La Goutte1-1/+1
Change-Id: I336509ab2ddb6c3c9890fdcbd838f0235738b3cf Reviewed-on: https://code.wireshark.org/review/8225 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27CAPWAP: Add CAPWAP MAC Profile (RFC7494)Alexis La Goutte1-1/+61
Add 2 Message Element * IEEE 802.11 Supported MAC Profiles (1060) * IEEE 802.11 MAC Profile (1061) Change-Id: I53686a0ecc6b59c5049c44068f339c5265c13f58 Reviewed-on: https://code.wireshark.org/review/8200 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05CAPWAP: Fix a typo.AndersBroman1-1/+1
Change-Id: I19031eac4d26a5620dc05f2632c403d82d7a4ab2 Reviewed-on: https://code.wireshark.org/review/6966 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05CAPWAP : fix warning about wrong type after ↵Alexis La Goutte1-3/+3
proto_tree_add_bitmask(_with_flags) change Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 1: proto.c:7802: field capwap.control.message_element.wtp_frame_tunnel_mode is not of an FT_{U}INTn type Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 2: proto.c:7802: field capwap.control.message_element.ac_descriptor.security is not of an FT_{U}INTn type ... Change-Id: I03f70ca664d99771ad27457052e6df11f9d5ad9e Reviewed-on: https://code.wireshark.org/review/6964 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05CAPWAP: Don't try to dissect fragment packet (Only display are "Data")Alexis La Goutte1-1/+2
Issue reported by Massimo Vellucci Bug:10918 Change-Id: I7f3b15536f66496d975696b3ff29fbc5b77ee5a8 Reviewed-on: https://code.wireshark.org/review/6963 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04CAPWAP: Use proto_tree_add_bitmask(_with_flags)Alexis La Goutte1-88/+108
Change-Id: I39ff2e15b91981111f8de091e6e5dfb7586b4599 Reviewed-on: https://code.wireshark.org/review/6937 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-30 CAPWAP: Add support of Cisco Vendor Specific ElementAlexis La Goutte1-1/+150
Change-Id: I62886bda3220d9aa3a5b3aee8b40063a8bb7745d Reviewed-on: https://code.wireshark.org/review/6843 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-27CAPWAP: fix double space on AC Software versionAlexis La Goutte1-1/+1
Change-Id: Ibe9715a1c2bf31e31ddda5ad2ad62fc0eda8164c Reviewed-on: https://code.wireshark.org/review/6812 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-23CAPWAP: Add support of Fortinet Vendor Specific ElementAlexis La Goutte1-3/+1054
Based from FortiAP/WiFi 5.2.x Change-Id: Ia78d15d54db01939a3d91947db39e35b3abc2519 Reviewed-on: https://code.wireshark.org/review/5646 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15CAPWAP: Add a IEE802.11 Message Element Type (RFC5416)Alexis La Goutte1-0/+72
* IEEE 802.11 Information Element (1029) Add add_tagged_field to packet-ieee80211.h (will be used by other dissector) Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e Reviewed-on: https://code.wireshark.org/review/6524 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-15CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)Alexis La Goutte1-3/+288
* IEEE 802.11 OFDM Control (1033) * IEEE 802.11 Update WLAN (1044) Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc Reviewed-on: https://code.wireshark.org/review/6509 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15CAPWAP: Add a new Message Element Type (RFC5415)Alexis La Goutte1-0/+56
* Delete Station (18) Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04 Reviewed-on: https://code.wireshark.org/review/6508 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-3/+1
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-12Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields.Bill Meier1-15/+15
Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e Reviewed-on: https://code.wireshark.org/review/5734 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-08CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)Alexis La Goutte1-6/+607
* IEEE 802.11 Antenna (1025) * IEEE 802.11 Direct Sequence Control (1028) * IEEE 802.11 MAC Operation (1030) * IEEE 802.11 MIC Countermeasures (1031) * IEEE 802.11 Multi-Domain Capability (1032) * IEEE 802.11 Station (1036) * IEEE 802.11 Supported Rates (1040) * IEEE 802.11 Tx Power (1041) * IEEE 802.11 Tx Power Level (1042) * IEEE 802.11 WTP Radio Configuration (1046) Enhance 802.11 Rate Set (1034) Change-Id: Ib37bc4081e75af051d80d023ddba689ecd9bf9ff Reviewed-on: https://code.wireshark.org/review/5481 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-05CAPWAP: Add some new Message Element Type (RFC5415)Alexis La Goutte1-0/+190
* AC Timestamp (6) * Add Station (6) * CAPWAP Local IPv4 Address (30) * CAPWAP Local IPv6 Address (50) * CAPWAP Transport Protocol (51) * MTU Discovery Padding (52) * ECN Support (53) Change-Id: Ib8b2768d5df4b0e1b5b8b5bd28ae66e825020205 Reviewed-on: https://code.wireshark.org/review/3986 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: fix some message type with wrong length (don't use optlen for "fixed ↵Alexis La Goutte1-4/+4
type length") Change-Id: Id666086abdd55e38bcb470f8015363585d40728f Reviewed-on: https://code.wireshark.org/review/3957 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Add some news expert infoAlexis La Goutte1-11/+178
When it is the mininum wrong length for Message Element Type or when the Message Element Type is not yet decoded by Wireshark Change-Id: I49aca0df5ba5ec70d8fb764fef39c17c46ee22a0 Reviewed-on: https://code.wireshark.org/review/3956 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Add new ett variableAlexis La Goutte1-23/+61
Avoid to have all subtree has expended Only 2 ett actually and there is > 20 subtree... Change-Id: Ia4af85345a6f1963d24d1fd589ff8ee09a8ef412 Reviewed-on: https://code.wireshark.org/review/3955 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Split CAPWAP Control and Data in 2 different protocolAlexis La Goutte1-11/+13
Avoid to have 2 CAPWAP in Decode as (and more easy to use too...) Change-Id: I3a332e9b4b069b9215c38b5c08872bd07ac4c2c3 Reviewed-on: https://code.wireshark.org/review/3954 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Use standard boilerplate (see doc/packet-PROTOABBREV.c)Alexis La Goutte1-526/+723
For hf field, reindent code Use 0x0 by default for bitmask Remove also some "boilerplate" comment.. Change-Id: I552ccca2e444f3686ee9ecdad456f2ecfbaa5cba Reviewed-on: https://code.wireshark.org/review/3953 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-03CAPWAP: Wrong usage of FT_BOOLEAN for Reserved field...Alexis La Goutte1-6/+6
Change-Id: Ie1c472f4db105a1a8db9dba265039282872dffb2 Reviewed-on: https://code.wireshark.org/review/3952 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26CAPWAP : Fix wrong offset for AC Name with PriorityAlexis La Goutte1-1/+1
Thanks to Massimo Velluci for sample Change-Id: Ibab2658c2c11c9940d3fdebb0bdc42752d57e1ae Reviewed-on: https://code.wireshark.org/review/3871 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-17Fix copy/paste errors in value_string.Jakub Zawadzki1-1/+1
Also make repetition_coding_indications[] standard terminated. Change-Id: Ice20e1f27f5ab4d111f893608a230b83899efc9f Reviewed-on: https://code.wireshark.org/review/2288 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-10CAPWAP: Fix soft-deprecated APIs warningAlexis La Goutte1-2/+2
tvb_length_remaining => tvb_reported_length_remaining Change-Id: Ie1fa09e00e098c41df2e87771300e3842659dad6 Reviewed-on: https://code.wireshark.org/review/2095 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10CAPWAP: Display incorrect value for Wireless IEEE802.11 RSSI and Data RateAlexis La Goutte1-8/+11
* Wireless data ieee80211 RSSI (dBm) is a signed integer. In the wireless radio the dBm value is negative. * Wireless data ieee80211 Data Rate (Mbps) is a 100Kbps. You need divide this value by 10. Issue found by Massimo Vellucci (SmartCAPWAP) Change-Id: I04dd8a9e38a5f60ee5bf64cd304db1b11413c809 Reviewed-on: https://code.wireshark.org/review/2094 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-29Introduce 802.11 dissectors with wired-in "FCS present" indications.Guy Harris1-1/+1
For a number of protocols that encapsulate 802.11 frames inside packets, whether the frame includes an FCS or not is specified by the protocol, not by whether the link-layer frame carrying the packets *itself* includes an FCS. As we've done with Ethernet, add "_withfcs" and "_withoutfcs" dissectors, which *don't* check the pseudo-header FCS length indication, and call those, rather than dissectors that check the pseudo-header length indication, from the dissectors for those protocols. Change-Id: Ib8c8ecdd872e1782fdfc66e7573415d91911a62e Reviewed-on: https://code.wireshark.org/review/1866 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-18Fix typo in name of Radio Type 802.11b (in IEEE802.11 WTP Radio Information)Alexis La Goutte1-1/+1
Found by Massimo Vellucci Change-Id: Ibbe2d0a4d1e421e647028262baf0398d05905c8d Reviewed-on: https://code.wireshark.org/review/246 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-14Add new IEEE802.11 CAPWAP message type from RFC5416Alexis La Goutte1-0/+279
* Add WLAN * Assigned WTP BSSID * Delete Wlan From SmartCAPWAP Bug #9752 Change-Id: I22fe8366e824a3ec3d3cd09887f0328141c30a69 Reviewed-on: https://code.wireshark.org/review/214 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-12Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP ↵Alexis La Goutte1-3/+6
Control Messages Issue found by Massimo Vellucci (SmartCAPWAP) Partial-Bug: 9752 Change-Id: I6f61a3c8706572e9ea7935e8f00818e6aa9fef7a Reviewed-on: https://code.wireshark.org/review/193 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2013-12-15Fix [-Wmissing-prototypes]Jakub Zawadzki1-3/+3
svn path=/trunk/; revision=54135
2013-10-26Remove unused variableAlexis La Goutte1-1/+1
svn path=/trunk/; revision=52872
2013-10-23#if 0 numerous "unused const variables" (mostly value-string-arrays);Bill Meier1-1/+1
Also; fix a few "set but not used" warnings. svn path=/trunk/; revision=52780
2013-10-17Properly decode CAPWAP Data Keep-Alive's. Bug 9165 ↵Michael Mann1-5/+55
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165) From Andreas Schultz From me: Use expert API instead of throwing exception for a bad length. svn path=/trunk/; revision=52657
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann1-1/+1
svn path=/trunk/; revision=51852
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-09Batch of filterable expert infos.Michael Mann1-1/+13
svn path=/trunk/; revision=49853
2013-03-22Don't wire into the reassembly code the notion that reassemblies shouldGuy Harris1-10/+7
be done on flows from one address to another; reassembly for protocols running atop TCP should be done on flows from one TCP endpoint to another. We do this by: adding "reassembly table" as a data structure; associating hash tables for both in-progress reassemblies and completed reassemblies with that data structure (currently, not all reassemblies use the latter; they might keep completed reassemblies in the first table); having functions to create and destroy keys in that table; offering standard routines for doing address-based and address-and-port-based flow processing, so that dissectors not needing their own specialized flow processing can just use them. This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where the second YPALL response is processed as if it were a continuation of a previous response between different endpoints, even though said response is already reassembled), and also allows the DCE RPC-specific stuff to be moved out of epan/reassembly.c into the DCE RPC dissector. svn path=/trunk/; revision=48491
2013-02-21Replace proto_tree_add_text/uint/boolean by proto_tree_add_item Use bitmask ↵Alexis La Goutte1-53/+92
(remove tvb_get_bits(..)) svn path=/trunk/; revision=47798
2013-02-21Fix indent (Tab => 4 Spaces) and Add ModelinesAlexis La Goutte1-1644/+1655
svn path=/trunk/; revision=47797
2013-02-21Fix CheckAPI about trailing spaceAlexis La Goutte1-1/+1
svn path=/trunk/; revision=47794
2013-02-21From Paul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8319 ↵Alexis La Goutte1-6/+13
CAPWAP Header dissector returns invalid length The problem is when Wireshark dissect CAPWAP packets from Cisco without preference "Cisco Wireless Controller Support" In this case the whole packet decoded wrong, not only Wireless Specific Information field in CAPWAP header I suggest following patch to dissect_capwap_header function to always return correct length of CAPWAP header based on HLEN header field From me: Add expert info to display a warning about Calculate length and Header length are different (and suggest to activate Cisco Wireless Controller Support Preference) svn path=/trunk/; revision=47793
2012-11-16Higlight the Header bytes.Anders Broman1-1/+3
svn path=/trunk/; revision=46037