Commit graph

561 commits

Author SHA1 Message Date
Michael Mann
e8a8d62dc3 proto_tree_add_subtree[_format]
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332
Reviewed-on: https://code.wireshark.org/review/2694
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 14:52:33 +00:00
Michael Mann
14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo
246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Dario Lombardo
971ffd683e Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:13:58 +00:00
Vladimir Kondratiev
97a46ff515 Fix bit fields definition in the "DMG Capability" IE
Bits in the byte was counted wrong direction;
bit0 should be LSB (0x01) and bit7 - MSB (0x80)
Also, all fields are interpreted as little-endian

Change-Id: I3485e8743a156e2e8cb84e726045211f1d332598
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Reviewed-on: https://code.wireshark.org/review/2138
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-11 18:33:27 +00:00
Pascal Quantin
89960510e3 IEEE 80211: fix dissection of HT Capabilities
Bug: 10166
Change-Id: Iafe789968bd5b9a6e593b682f8d42ba42db5fce9
Reviewed-on: https://code.wireshark.org/review/2046
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 01:49:35 +00:00
Michael Mann
73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Guy Harris
799972425d We need a "wlan_datapad" dissector as well.
Change-Id: I8d7e0ebeef2a912737b3afc08fcaf166dfb525b1
Reviewed-on: https://code.wireshark.org/review/1895
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-31 09:28:01 +00:00
Guy Harris
21a1208735 Introduce 802.11 dissectors with wired-in "FCS present" indications.
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-05-29 17:57:14 +00:00
Joerg Mayer
70d67a21ae Make packet-ieee80211.c a tiny bit less unreadable.
<rant>
This file is riddled with lots of magical flags causing the code to do
one thing or another, and then in several cases with non-telling variable
names (e.g. is_centrino). My absolute favourite is

  dissect_ieee80211_common (tvb, pinfo, tree, FALSE,
                            pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, FALSE, FALSE, FALSE);

Is there anyone who is able to understand what the line above does without
looking up the function definition?
</rant>

Change-Id: Id49cc0a2992005c28f66a8558e4b2970b677a360
Reviewed-on: https://code.wireshark.org/review/1805
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-26 19:38:43 +00:00
Evan Huus
08ce84ebbe Grab-bag of dead initializers and two actual bugs.
All caught by cppcheck. The two (semi)-interesting bugs are:
- in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should
  have been inside the brace, causing potential control-flow weirdness with
  exceptions
- in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did
  not match the expert info given

Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569
Reviewed-on: https://code.wireshark.org/review/1793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-25 18:12:00 +00:00
Joerg Mayer
0cb180aae4 Print the values in the BSS Load Element in human readable format as well.
Change-Id: Ie20c340e06b970602a94c601be4c629ccae56e7c
Reviewed-on: https://code.wireshark.org/review/1719
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-21 23:02:59 +00:00
Alexis La Goutte
438d1f8203 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9bccb246817ee442fbb7c216e9a2599c791a54b2
Reviewed-on: https://code.wireshark.org/review/1708
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-20 22:05:30 +00:00
Joerg Mayer
5701cead4b - Modify Cisco Compatible Extentions MFP dissection
- Add Cisco Compatible Extensions DTPC dissection

Change-Id: I3dc7075865c0041ee964d9260339028d0adf17e0
Reviewed-on: https://code.wireshark.org/review/1684
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-18 19:37:42 +00:00
Chun-Yeow Yeoh
89a72f328a Add SAE authentication algorithm in 802.11
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>

Change-Id: If3500dda55aed45bbecd0261191ce1ec6cfbdbca
Reviewed-on: https://code.wireshark.org/review/1661
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Yeoh Chun-Yeow <yeohchunyeow@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-17 07:21:44 +00:00
AndersBroman
c68769765c Fix no previous prototype warnings.
Change-Id: I859597ebc957a58f659800ef63318f94e80feabf
Reviewed-on: https://code.wireshark.org/review/1104
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14 12:50:31 +00:00
Guy Harris
e4756ccacf Comment cleanups.
Remove some more 802.11i references, and replace a reference to the
"WEP" bit with a reference to the "Protected" bit.

Change-Id: I77b50af2b34e2bdc4c21af29b54627ed19219090
Reviewed-on: https://code.wireshark.org/review/821
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-25 03:20:12 +00:00
Guy Harris
4038fa9b0a IEEE 802.11i is dead; long live IEEE 802.11-2012.
802.11i was absorbed into a revision of the 802.11 spec, so speak of
"IEEE 802.11 RSNA EAPOL"/"wlan_rsna_eapol" until somebody comes up with
a better name for it.

Also, add in one more key flags bit that's in 802.11-2012 but not
802.11i-2004.

Change-Id: Ia825f7466f3b3d159706eb681546b5bbb4e066bf
Reviewed-on: https://code.wireshark.org/review/820
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-25 03:08:03 +00:00
Guy Harris
2d7828794c Add a dissector table for EAPOL Key Descriptor types.
Instead of having a switch statement in the EAPOL dissector for Key
Descriptor types, have a dissector table, and:

	have the EAPOL dissector register with a dissector for the RC4
	type;

	have the 802.11 dissector register with dissectors for WPA and
	RSN types.

This means that ieee_80211_add_tagged_parameters() no longer needs to be
public; make it static.

Change-Id: I68e0592c3ea055c693d6d5d5a9eb88634ea37a95
Reviewed-on: https://code.wireshark.org/review/800
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23 19:18:51 +00:00
Guy Harris
2a6e50ca7d Clean up white space.
This makes the code's if/then/else bracketing clearer.

Make the if/then/else style more consistent in one case, which also helps.

Change-Id: I7c765b761d92c6710461181b3e3ccd77d2a40f83
Reviewed-on: https://code.wireshark.org/review/799
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23 18:45:07 +00:00
Hadriel Kaplan
296bc0b2a9 Fix Bug 9909 Buildbot crash correctly
Fixed a null de-reference in packet-ieee80211.c caused by change-id
I742726027bcab7d25ca4a9ce3a406518db6d272f, commit g4b8b83407ac744d114462235a8bcca0d480954c7.

See Bug 9909 for details.

Change-Id: I7189476faee3ae6ab34fb52c1564ac668496679a
Reviewed-on: https://code.wireshark.org/review/780
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22 07:55:56 +00:00
Alexis La Goutte
da83eadf5e Enhance Neighbor report
Closed-bug: 9724

Change-Id: Id6aefcddf5bd8bd490296e84351152808c03004a
Reviewed-on: https://code.wireshark.org/review/731
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 21:56:43 +00:00
Hadriel Kaplan
9c5f199050 Fix bug 9909 Buildbot crash - but only to stop the crashing
This fixes the crashing on buildbot, but only in the sense that
it now calls DESSECTOR_ASSERT_NOT_REACHED() for the case that's
causing the crash - which is a null dereference, due to something
going wrong in add_tagged_field() of packet-ieee80211.c.

I don't know what the right thing to do is, but at least this
gets buildbot going again. (that file is over 25k lines!)

Change-Id: I1658944f9704a071dffc7f4834b9294fffc0e7ba
Reviewed-on: https://code.wireshark.org/review/757
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 04:58:15 +00:00
Alexis La Goutte
d35ccc5cdf Try to fix Mac OS X Buildbot
packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8585: warning: integer constant is too large for 'long' type

Change-Id: I5badc6e0d2595d4353e33cd273d55f28737b34a8
Reviewed-on: https://code.wireshark.org/review/737
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 12:53:54 +00:00
Alexis La Goutte
8c3dee9bc9 Fix warning/error found by CheckAPI
(and fix also fix-encodings-args)

Change-Id: Ic2e99ca02398b7525b1cf68ab0d8279a2909940e
Reviewed-on: https://code.wireshark.org/review/736
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 12:53:43 +00:00
Alexis La Goutte
7bbb3ac24d Try to make Mac OS X buildbot Happy
packet-ieee80211.c:8581: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-ieee80211.c:8582: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8583: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8584: warning: implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: I8f8c5518239c7d6e55006abfca8d9452f9a09c6a
Reviewed-on: https://code.wireshark.org/review/733
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 11:50:48 +00:00
Moraney Jalil
4b8b83407a Support for IEEE 802.11ad
(according to the 9th draft of the standard)

Closed-bug: 8594

Change-Id: I742726027bcab7d25ca4a9ce3a406518db6d272f
Reviewed-on: https://code.wireshark.org/review/632
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 11:18:33 +00:00
Alexis La Goutte
66d0b1893a Fix some typo on 802.11 dissector
(Found by Jalil Moraney in change to add 802.11ad support review 632)

Change-Id: I547bf647ae7400633ad27c7849088fd088928075
Reviewed-on: https://code.wireshark.org/review/708
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 12:57:57 +00:00
Bill Meier
4fbcfc1289 (Benign) Don't use "address-of" operator on arg of VALS() (not that it makes any actual difference)..
Change-Id: I0766d0f130648aaa5a58d9f4062fa24e898cbdc3
Reviewed-on: https://code.wireshark.org/review/545
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-07 05:03:41 +00:00
Alexis La Goutte
296591399f Remove all $Id$ from top of file
(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-03-04 14:27:33 +00:00
Alexis La Goutte
34933eb805 802.11 : Add channel number custom (to display info when report channel 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-25 20:16:14 +00:00
Alexis La Goutte
f5ebc083c6 802.11: Regulatory Class => Operating Class (changed in 802.11-2012)
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-25 20:15:53 +00:00
Bill Meier
93fe4d53e2 Remove trailing whitespace.
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-25 16:36:38 +00:00
Alexis La Goutte
d3e03e97f0 Fix packet-ieee80211.c:13115:7: error: will never be executed [-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-25 15:37:53 +00:00
Alexis La Goutte
53deb521e7 Neighbor report (802.11k) may be have no subelement (len == 13)
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-25 05:57:17 +00:00
Gilbert Ramirez
4cc694839d Fix all -fstrict-alias warnings found by gcc 4.1.2
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>
2014-02-03 09:26:10 +00:00
Evan Huus
a6415ece0a Rename a couple of to_str functions to have ep_ in the name. This makes it
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-19 15:49:09 +00:00
Jakub Zawadzki
c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Bill Meier
ebaeed5a1f (Trivial)
- Fix indentation to match editor modelines (tabs-->spaces);
 - Rework/add some whitespace;

svn path=/trunk/; revision=53978
2013-12-12 20:16:30 +00:00
Jakub Zawadzki
3ae2e5ece2 Fix warnings
svn path=/trunk/; revision=53885
2013-12-09 20:15:47 +00:00
Guy Harris
d62b116380 Make the code testing the Rx MCS Bitmask subfield of the Supported MCS
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-30 10:17:30 +00:00
Michael Mann
e1532f39ec Tx MCS set is not interpreted properly in WLAN beacon frame. Bug 8894 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8894)
#BACKPORT

svn path=/trunk/; revision=53670
2013-11-30 01:35:03 +00:00
Jakub Zawadzki
d99fdfda63 Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.
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-29 19:21:20 +00:00
Jakub Zawadzki
5ac6474c94 Rename some of pint.h macros to match common style (bits number on the end).
pntohs  -> pntoh16
   pntohl  -> pntoh32
   pletohs -> pletoh16
   pletohl -> pletoh32
   phtons  -> phton16
   phtonl  -> phton32


svn path=/trunk/; revision=53652
2013-11-29 18:59:06 +00:00
Michael Mann
9fa6c9fb80 Create new dissectors when a protocol goes across ethernet and "something 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-21 19:51:17 +00:00
Alexis La Goutte
374683f052 Fix indent (2 spaces) and remove trailing whitespace
svn path=/trunk/; revision=53392
2013-11-17 14:28:42 +00:00
Jakub Zawadzki
4f78d3c69b Don't include <epan/bitswap.h> when not needed
svn path=/trunk/; revision=53364
2013-11-16 09:11:26 +00:00
Jakub Zawadzki
b5916f0f12 Expand CHECK_DISPLAY_AS_X ('this macro looks like a hack') macro in packet-ieee80211.c, remove it.
svn path=/trunk/; revision=53327
2013-11-14 22:40:40 +00:00
Jakub Zawadzki
ae59b09443 Add missing includes in order to remove exceptions.h from proto.h (next commit).
svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
Jakub Zawadzki
c9b2ee3768 include <wsutil/pint.h> only when needed.
svn path=/trunk/; revision=53196
2013-11-09 15:44:29 +00:00