Commit Graph

172 Commits

Author SHA1 Message Date
Bill Meier 8afa208ffb Windows build: #include winsock2.h only when needed.
#include winsock2.h pulls in about 90 distinct .h files
and about 140 total .h files. 
Currently winsock2.h is (mostly unnecessarily) included
for each dissector via packet.h/wtap.h.
This patch removes #include winsock2.h from wtap.h and 
then includes winsock2.h (or windows.h) in the 
few specific places required. 
With this patch, my Windows Wireshark build takes 
about 30% less time.


svn path=/trunk/; revision=26535
2008-10-24 00:42:09 +00:00
Jaap Keuter 75d4f03f87 From beanniecai:
Change non-printable characters(code page 936, simplified Chineses) 0x96 in
packet-ieee80211.c and 0xa7 in packet-sndcp-xid.c to '-' and null character,
otherwise there is always warning C4819 using MS compiler.

Additional some whitespace cleanups applied.

svn path=/trunk/; revision=26489
2008-10-18 14:24:33 +00:00
Jaap Keuter f293b1639e From Alexis La Goutte:
I'm a user of Aruba / Alcatel OAW Wireless Switch ( www.arubanetworks.com )
The stream (802.11 Frame) is encapsulated in a tunnel GRE. 

svn path=/trunk/; revision=26446
2008-10-13 20:40:26 +00:00
Guy Harris dbf7b99e97 The Official Home of the AVS header spec appears to bhe the
linux-wlan-ng source tree; just insert it verbatim into a big honking
comment, rather than trying to play Find The URL with it.

svn path=/trunk/; revision=26239
2008-09-20 01:57:18 +00:00
Anders Broman aadfcc546c Allways show the Vendor OUI in the vedors specific IE.
svn path=/trunk/; revision=26193
2008-09-14 15:14:46 +00:00
Guy Harris 7bdebbdb00 In the radio-information dissector, set the current protocol name before
calling the 802.11 dissector, so if we have a malformed frame or short
frame the right protocol name will be shown.

svn path=/trunk/; revision=26173
2008-09-10 21:48:15 +00:00
Anders Broman 7530143278 Add extended cap decoding.
svn path=/trunk/; revision=26145
2008-09-05 16:04:02 +00:00
Guy Harris 6321274b52 Mark unused argument as such.
Style changes.

svn path=/trunk/; revision=26139
2008-09-04 21:21:27 +00:00
Anders Broman 0b53441f69 Modified patch from Siva Jupudi adding support for
WAVE Service information element Dissection - IEEE 802.11p Draft 4.0

svn path=/trunk/; revision=26138
2008-09-04 20:54:22 +00:00
Guy Harris 3acd12510b The first argument to vendor IE dissectors is a proto_item *, not a
proto_tree * (yes, they're the same data type, but they're thought of
differently - it's a long story).

Just call the IE type in a Marvell vendor IE the "type".  For IEs with
no known type, show the IE data as raw data, as is done with
Aironet/Cisco vendor IEs.

Get rid of an unused variable, and mark as unused an unused parameter.

svn path=/trunk/; revision=26050
2008-08-20 23:57:50 +00:00
Anders Broman ec064849c5 From David Woodhouse:
The IEEE80211 part of "Add support for OLPC 802.11s-like mesh protocol".
With some changes to make it a bit more generic.

svn path=/trunk/; revision=26049
2008-08-20 19:50:26 +00:00
Anders Broman bba165265c Fix bug:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2285
7.3.2.22 Measurement Report element min length is 3
Added dissection of 
7.3.2.18 TPC Report element

svn path=/trunk/; revision=26042
2008-08-19 21:26:35 +00:00
Anders Broman 8417cf0fab Add a comment.
svn path=/trunk/; revision=26041
2008-08-19 08:11:49 +00:00
Guy Harris d9416525b6 Add to a comment.
svn path=/trunk/; revision=26036
2008-08-19 03:42:40 +00:00
Guy Harris 83fc9d5e09 Constify a bunch of stuff, to squelch -Wwrite-strings warnings.
epan/dissectors/packet-ncp2222.inc is a bit hard to fix, so we're not
ready to enable that warning by default yet.

Throw in some casts to handle GLib routines that take arbitrary
non-const pointers (they can later return the pointers, and some
callers might want to modify or free up those pointers in cases where
they're known to be writable or allocated).

Use ep_tvb_memdup() rather than a combination of ep_alloc() and
tvb_memcpy().

Clean up some indentation.

svn path=/trunk/; revision=25601
2008-06-25 09:12:35 +00:00
Bill Meier 44af6ef887 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25290
2008-05-14 01:47:41 +00:00
Anders Broman 45b8ffd1ec Remove depreciated functions g_string_sprint, g_string_sprintfa.
svn path=/trunk/; revision=25238
2008-05-05 19:52:59 +00:00
Stig Bjørlykke f51d73bb5d Handle SSID as binary in WLAN Traffic Statistics.
svn path=/trunk/; revision=25237
2008-05-05 19:35:16 +00:00
Stig Bjørlykke c7bbc2a33a Added a hidden SSID (wlan_mgt.ssid) to be able to filter on the ssid.
svn path=/trunk/; revision=25224
2008-05-04 22:20:58 +00:00
Anders Broman 63c5c71cf8 Remove:
#ifdef NEED_G_ASCII_STRCASECMP_H
#include "g_ascii_strcasecmp.h"
#endif

svn path=/trunk/; revision=24859
2008-04-09 05:36:08 +00:00
Jeff Morriss 689e8bd855 From http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1539 :
Hexadecimal and octal are unsigned.  Don't let dissectors register signed
fields (FT_INT*) to be displayed in hexadecimal (including HEX_DEC and DEC_HEX)
or octal.  Fix dissectors that do that mostly by changing the fields to
unsigned though in PANA it appears the fields are meant to be signed so
change those fields to be displayed in decimal.

This fixes an assertion crash in hfinfo_numeric_format() if/when someone tries
to create a filter using one of these mixed signed/unsigned fields (because
that routine does not know how to present the user with a signed value in
hex).

Also add FT_*INT64 to the "make sure it's not BASE_NONE" check.

svn path=/trunk/; revision=24643
2008-03-15 22:41:57 +00:00
Gerald Combs f8e75ecd32 Make the SMI preference a little more verbose. In the COPS and SNMP
preferences, tell the user where they can change the SMI settings. In
the 802.11 preferences, fix a tooltip.

svn path=/trunk/; revision=24620
2008-03-13 22:17:11 +00:00
Stig Bjørlykke b091b8d26c Rewrote to use g_strlcpy and g_strlcat.
svn path=/trunk/; revision=24525
2008-03-01 17:23:39 +00:00
Gerald Combs 7a6d8d7955 Replace a g_snprintf() with a strncpy(). Fixes bugs 2260 to 2262.
svn path=/trunk/; revision=24316
2008-02-13 04:10:20 +00:00
Stig Bjørlykke a356f552b4 Added WLAN Traffic Statistics dialog.
svn path=/trunk/; revision=24310
2008-02-12 14:17:18 +00:00
Stig Bjørlykke 70d1699bb2 SSI dBm signal is signed.
svn path=/trunk/; revision=24218
2008-01-29 09:56:11 +00:00
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