Commit Graph

36628 Commits

Author SHA1 Message Date
Stig Bjørlykke 3cead1e9df Removed a debug printf.
svn path=/trunk/; revision=38331
2011-08-04 10:02:37 +00:00
Stig Bjørlykke 04041a8f6a Corrected position of FBAR and DOT.
svn path=/trunk/; revision=38330
2011-08-04 08:54:13 +00:00
Guy Harris a468cc1b6a Update some references.
svn path=/trunk/; revision=38329
2011-08-04 00:04:53 +00:00
Bill Meier 3b627d04fd Convert "4 space tabs" to spaces + do other whitespace cleaup.
svn path=/trunk/; revision=38328
2011-08-03 21:14:04 +00:00
Bill Meier e6cb34fbac Minor cleanup
[benign] Remove _U_ from param arg when param is actually used;
[benign] Use 'item' (not 'tree') arg for proto_item_append_text()
Whitespace

svn path=/trunk/; revision=38327
2011-08-03 20:31:51 +00:00
Gerald Combs 6d8c52e6a5 From Dirk Jagdmann via bug 6194:
The attachted patch fixes and enhances the SCPS TCP option dissection. Changes
are:

- fix order of reserved Bit 1,2,3
- fix minimum TCP option length
- fix proto items
- add proto item for Connection ID
- removed the verify_scps() function. It's logic was broken, because it did
reset the scps_capable flag on both flows if one of them did not have it.
However sometimes that flag is only enabled in one flow direction and that flow
direction could see TCP options later on, which would get dissected as invalid.
See the attachted capture file for an example.

svn path=/trunk/; revision=38326
2011-08-03 19:11:07 +00:00
Anders Broman 7dcd23257d Get rid of gdk_draw_layout().
svn path=/trunk/; revision=38325
2011-08-03 18:49:35 +00:00
Chris Maynard 539c74fb0c From Jim Young via bug 3196: Enhancement to Expert Info Composite Tab Labels
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3196

svn path=/trunk/; revision=38324
2011-08-03 18:45:06 +00:00
Bill Meier a71d51d0d7 AFAICT, the item for 'hf_gtpv2_stn_sr' should be used as the parent tree-item in dissect_gtpv2_stn_sr().
This is a different fix for Coverity 1248 than that committed in SVN 38314.  

svn path=/trunk/; revision=38323
2011-08-03 18:38:23 +00:00
Martin Mathieson 0e83124e46 Fix the SR state report for when get SR following SR with no grant or failure in-between.
svn path=/trunk/; revision=38322
2011-08-03 17:05:30 +00:00
Bill Meier 869b51db0e Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38321
2011-08-03 16:06:00 +00:00
Stephen Fisher eaaf35dcfd Fix compiler warning turned error:
graph_analysis.c:1363: warning: unused parameter 'widget'


svn path=/trunk/; revision=38320
2011-08-03 15:39:16 +00:00
Anders Broman 2b93b58f17 Try to make the builbot happy
#	define gtk_widget_is_drawable(x) GDK_IS_DRAWABLE(x)

svn path=/trunk/; revision=38319
2011-08-03 15:25:57 +00:00
Bill Meier 1293999174 '-Wno-error=unused-but-set-parameter' not req'd since no such warnings in Wireshark compile.
svn path=/trunk/; revision=38318
2011-08-03 15:24:06 +00:00
Anders Broman 7bcc6dd237 - Get rid of deprecated functions.
- Include pangocairo.

svn path=/trunk/; revision=38317
2011-08-03 14:54:03 +00:00
Gerald Combs 53c550831b Define PACKAGE in config.h.
svn path=/trunk/; revision=38316
2011-08-02 21:23:00 +00:00
Chris Maynard 4e4f13db59 Fix 45 occurrences of unused values reported under Coverity CID's 1235-1241.
svn path=/trunk/; revision=38315
2011-08-02 20:39:53 +00:00
Chris Maynard e7928ce630 Fix Coverity CID 1248: unused value.
svn path=/trunk/; revision=38314
2011-08-02 19:29:51 +00:00
Gerald Combs d39696be6d Add tap-hosts.c.
svn path=/trunk/; revision=38313
2011-08-02 18:13:16 +00:00
Anders Broman 4b0961fb7a Bug 6146 - Malformed RANAP packets when HandOver procedure on iuh
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6146

svn path=/trunk/; revision=38312
2011-08-02 16:47:37 +00:00
Bill Meier 6e97a2e143 For now: treat GCC 4.6 'unused-but-set' reports as just warnings (i.e., when -Werror).
GCC 4.6 has added 'unused but set' reports so this change allows builds to proceed without
erroring out for those building from SVN with GCC 4.6.

(AFAIK Wireshark source distributions do not enable -Werror).

This change can be removed (at least globally) once the code as been fixed.



svn path=/trunk/; revision=38311
2011-08-02 16:17:25 +00:00
Anders Broman 9363362f5f Channel Description includes the element identifier.
svn path=/trunk/; revision=38310
2011-08-02 12:52:59 +00:00
Martin Mathieson 23f8f9cf6a Show version and mode in protocol root. Now dissects details whether tree is NULL or not.
svn path=/trunk/; revision=38309
2011-08-02 10:35:22 +00:00
Anders Broman 538ab09091 From Roland Knall:
openSAFETY: Cleaning up, removing multiple implementations and cleaning up code
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6180

svn path=/trunk/; revision=38307
2011-08-02 05:30:59 +00:00
Anders Broman 4b85603c80 From Jeremy Jones:
Add support for decoding NFSv4.1 OP_BIND_CONN_TO_SESSION.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6182

svn path=/trunk/; revision=38306
2011-08-02 05:18:58 +00:00
Anders Broman 955981834e From Martin Kaiser:
DVB-CI dissector, packet reassembly on the link layer.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6075

svn path=/trunk/; revision=38305
2011-08-02 05:12:53 +00:00
Anders Broman 6d94629c4b Gnenerate the dissector for previous commit.
svn path=/trunk/; revision=38304
2011-08-02 04:17:45 +00:00
Chris Maynard b25c098e0c From Paul Stath via bug 5731: The check for engineID length should only occur if the engineID has a non-zero length.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5731

svn path=/trunk/; revision=38303
2011-08-02 01:54:03 +00:00
Stephen Fisher a7be167fe4 Update documentation to reflect configure option being "--with-gtk3" not
"--enable-gtk3"


svn path=/trunk/; revision=38302
2011-08-01 16:56:45 +00:00
Jörg Mayer b96c45f026 Add tvb_get_bits
svn path=/trunk/; revision=38301
2011-08-01 14:48:19 +00:00
Michael Tüxen b531e56156 gtk_widget_get_sensitive() seems to be available on gtk 2.18
svn path=/trunk/; revision=38300
2011-08-01 14:34:16 +00:00
Stig Bjørlykke ffd28912d3 Another fix for building with MSVC2005.
The previous fixes in r37728 and r37730 did build a wireshark which was
unable to use the native windows file dialog (GetOpenFileName).

svn path=/trunk/; revision=38299
2011-08-01 12:38:58 +00:00
Bill Meier 391a3ebe36 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
svn path=/trunk/; revision=38298
2011-08-01 01:09:04 +00:00
Bill Meier ffde0a10bb Restore saved 'pinfo->fragmented' as appropriate;
Fixes gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

svn path=/trunk/; revision=38297
2011-07-31 23:41:20 +00:00
Anders Broman be297f5f30 Try to fix:
cc1: warnings being treated as errors
../../gtk/sctp_graph_dlg.c: In function ‘draw_tsn_graph’:
../../gtk/sctp_graph_dlg.c:511: error: ‘cr’ may be used uninitialized in this function
../../gtk/sctp_graph_dlg.c: In function ‘draw_sack_graph’:
../../gtk/sctp_graph_dlg.c:163: error: ‘cr’ may be used uninitialized in this function
../../gtk/sctp_graph_dlg.c: In function ‘draw_nr_sack_graph’:
../../gtk/sctp_graph_dlg.c:341: error: ‘cr’ may be used uninitialized in this function

svn path=/trunk/; revision=38296
2011-07-31 21:54:46 +00:00
Anders Broman 12e3f06543 This circle should not be filled.
svn path=/trunk/; revision=38294
2011-07-31 20:23:59 +00:00
Anders Broman 00de9edf12 Add comment.
svn path=/trunk/; revision=38293
2011-07-31 20:20:30 +00:00
Anders Broman 65bca7c0ed Code cleanup.
svn path=/trunk/; revision=38292
2011-07-31 20:20:05 +00:00
Anders Broman 1b9087a5ed Use Cairo for drawing.
svn path=/trunk/; revision=38291
2011-07-31 20:19:33 +00:00
Gerald Combs a1b2af5539 [Automatic manuf, services and enterprise-numbers update for 2011-07-31]
svn path=/trunk/; revision=38288
2011-07-31 14:03:28 +00:00
Jörg Mayer 9283597c75 Configuring with --enable-ui-manager would not work - fix this.
svn path=/trunk/; revision=38287
2011-07-31 13:32:05 +00:00
Anders Broman 95f2d72155 Use pinfo->iphdrlen rather than a fixed vaue of 20 to make
the calculation correct for IPv6 too.

svn path=/trunk/; revision=38286
2011-07-31 13:25:13 +00:00
Jörg Mayer 00bf90f82f GdkDrawable is also used in one place.
svn path=/trunk/; revision=38285
2011-07-31 12:07:23 +00:00
Jörg Mayer 4d9d16761d Update status file. Special mention is given to removed structs in GDK3.
svn path=/trunk/; revision=38284
2011-07-31 11:32:15 +00:00
Bill Meier 6955cf3068 Whitespace cleanup.
svn path=/trunk/; revision=38283
2011-07-30 19:00:43 +00:00
Bill Meier 5ecac35e6f Remove unneeded #includes
svn path=/trunk/; revision=38282
2011-07-30 18:15:39 +00:00
Alexis La Goutte 0b0515d800 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 8/9] add support for Root Announcement (RANN) IEs

svn path=/trunk/; revision=38281
2011-07-30 15:47:47 +00:00
Alexis La Goutte 0ca0a54d09 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 8/9] add support for Root Announcement (RANN) IEs

svn path=/trunk/; revision=38280
2011-07-30 15:36:47 +00:00
Alexis La Goutte 0a00741085 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 7/9] update parsing of mesh control field

During development of the 80211s standard, a "mesh header" was conceived. This mesh header has been renamed the "mesh control field". Further, the conditions under which it is expected to appear have also changed. Specifically, the mesh control field appears in multihop action frames and mesh data frames. In the former case, it appears after the action category and action code, so no special header parsing is required to parse it.

The latter case is a bit more complicated. We know the mesh control field is present if the data frame was transmitted by a mesh STA, AND the new "Mesh Control Present" bit in the QoS control field is set.  This second thing is easy enough to check. But the first thing is not. So we continue to rely on heuristics.  Specifically, we only expect the mesh control field for valid from-ds/to-ds settings, and if the mesh control field itself is valid.

Other relevant changes in this patch include:

-- rename mesh_header to mesh_control as appropriate
-- consider the mesh control field to be part of the header when accounting for payload padding.
-- parse some of the qos fields earlier so they can be used to determine if the mesh control field is present.
-- use existing mesh control parsing code instead of duplicating it.

svn path=/trunk/; revision=38279
2011-07-30 15:31:59 +00:00
Alexis La Goutte 3726e53776 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 6/9] update mesh path discovery (hwmp) IEs to 802.11s v12

This includes adding the new mesh reason codes

From me
Fix checkAPI Errors (the blurb field matches the field name)

svn path=/trunk/; revision=38278
2011-07-30 15:29:09 +00:00