Commit Graph

47400 Commits

Author SHA1 Message Date
Anders Broman d3e9ec675a From Javier Godoy:
Proper dissection of responses with insufficient allocation length.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8919

svn path=/trunk/; revision=50481
2013-07-10 05:08:06 +00:00
Anders Broman eff8250555 From Joe McEachern:
SIP stats shows incorrect values for Max/Ave setup times.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8897

BACKPORT 1.8 1.10

svn path=/trunk/; revision=50480
2013-07-10 05:00:43 +00:00
Jakub Zawadzki 40a66a273c Fix bug #8908: Strange behavior of tree expand/collapse in packet details
Only expand subtree when parent was also expanded

svn path=/trunk/; revision=50479
2013-07-10 01:50:27 +00:00
Evan Huus e2768d027c The last bits of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8828
Convert the last DISSECTOR_ASSERTs into potential expert infos, and do the right
offset manipulation and verification to avoid long (or infinite) loops when
those conditions are hit. This includes fixing some long loops I accidentally
introduced in r50432.

svn path=/trunk/; revision=50478
2013-07-10 00:32:57 +00:00
Jakub Zawadzki 83322789d1 tvbuff: use ep_strbuf_append_unichar()
svn path=/trunk/; revision=50477
2013-07-09 23:10:04 +00:00
Martin Kaiser 882d0841ae fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8916
reported by Laurent Butti

a TPDU's length field must never be 0
this length field was decremented without prior checking,
allocating length-1 bytes of memory caused a dissector assert

svn path=/trunk/; revision=50474
2013-07-09 20:51:48 +00:00
Pascal Quantin 8c9ab802ce Upgrade LTE RRC dissector to v11.4.0
svn path=/trunk/; revision=50473
2013-07-09 20:39:09 +00:00
Michael Mann 38ce891424 Fix some uninitialized variable warnings reported in bug 8904 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8904) by setting conversation structure (smtp_session_state) to all zeros.
svn path=/trunk/; revision=50472
2013-07-09 20:35:26 +00:00
Stig Bjørlykke 678913dd09 Avoid having double "Default" entry in "Create New Profile".
#BACKPORT 1.10

svn path=/trunk/; revision=50471
2013-07-09 19:00:11 +00:00
Alexis La Goutte 43c3cb4884 From Thomas ERSFELD (GSOC13) via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8710 QtShark doesn't have a statistics summary window
Add Summary Statistics to qtshark (Statistics => Summary)
Now, use tabs to split summary display (File Capture details, Capture Statistics)

Add also Comment Summary tab (to replace Statistics => Comments Summary)

From me :
Fix order of summary files in Qtshark.pro

svn path=/trunk/; revision=50470
2013-07-09 18:08:40 +00:00
Chris Maynard e8fed416a2 Another change that should have been part of r50465, which removed the limits to the number of characters in the display filter(s). [Technically, there is still the inherent 65535 limit.]
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=50469
2013-07-09 18:01:44 +00:00
Chris Maynard 9c9864976f Use sizeof() instead of hard-coded values. Other minor whitespace cleanup.
svn path=/trunk/; revision=50466
2013-07-09 16:58:07 +00:00
Chris Maynard dacf47c217 Remove the advanced filter field arbitrary text limit of 100 and remove the filter field arbitrary text limit of 256.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8909
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=50465
2013-07-09 16:44:47 +00:00
Jakub Zawadzki 398f94dd24 tvb subset: move setting tvb->ds_tvb to tvb_new_with_subset()
svn path=/trunk/; revision=50464
2013-07-09 16:22:53 +00:00
Jeff Morriss df2c82e642 From X via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8914 :
Correct AVP codes 712 and 713, add 714-719.

Add and fix some enum codes.

Update specification version.

From me: Fix up indentation.

svn path=/trunk/; revision=50463
2013-07-09 14:15:30 +00:00
Alexis La Goutte fd86b76b2b From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8905 SCSI OSD: per-attribute subtree
The response of the OSD-2 LIST command may contain attributes in multi-object retrieved attributes format. Currently all proto_items for that attributes are put under the SCSI Payload tree, yielding a large list of items:

	Partition Id
	Object Type
	Attribute Page
	Attribute Number
	Attribute Length
	(optional attribute-specific fields)
	Attribute Page, ...
	Partition Id
	Object Type
	Attribute Page, ...
	...

This patch classifies the OSD-2 LIST attributes (from the Data In buffer) in one tree per object and one sub-tree per attribute
	Partition Id (ett_osd_multi_object tree)
		Object Type
		Attribute (ett_osd_attribute tree)
			Attribute Page
			Attribute Number
			Attribute Length
			(optional attribute-specific fields)
		Attribute, ...
	Partition Id
		Object Type
		Attribute Page, ...
	...

The same approach is applied to attributes in the Get/Set attributes segments.

A function *attribute_page_numbers_t lookup_osd_attribute(page,number) was created, with common code that is called from dissect_osd_attributes_list, dissect_osd_attribute_value and dissect_osd2_attribute_list_entry.

The trees are built in function dissect_osd_attribute_list_entry. That function was modified for avoiding code duplication with case 0x09 of dissect_osd_attributes_list. A missing padding was added in the process.

The function dissect_osd_partition_id now returns proto_item*, so that we can create a subtree rooted at the partition_id (previously it returned an offset, but the return value was unused).

From me:
Fix clang warning duplicate code...
Remove some trailing whitespace

svn path=/trunk/; revision=50462
2013-07-09 13:09:05 +00:00
Guy Harris e51c046ed5 Fix uninstallation of Cairo - uninstall, don't install!
svn path=/trunk/; revision=50461
2013-07-09 09:54:19 +00:00
Guy Harris b4c719086d Fix missing $ before variable name.
Look at the lua-*-done file to get the version number of the version of
Lua we installed.

svn path=/trunk/; revision=50460
2013-07-09 09:31:45 +00:00
Guy Harris 5967dc6820 CPPFLAGS contains the flags for the C preprocessor; CXXFLAGS contains
the flags for the C++ compiler.

If we're building for 10.5, force a 32-bit build.

svn path=/trunk/; revision=50459
2013-07-09 08:48:07 +00:00
Guy Harris c72d5f08fb Fix the uninstall procedure for Lua - the man pages are installed into
/usr/local/man/man1, not /usr/local/man.

svn path=/trunk/; revision=50458
2013-07-09 08:47:05 +00:00
Anders Broman 06f748c0b5 prefs.c: In function 'capture_column_set_cb':
prefs.c:1745: warning: unused variable 'syntax_error'

svn path=/trunk/; revision=50457
2013-07-09 05:14:33 +00:00
Guy Harris ff15b893d8 Use older versions of some libraries, and build 32-bit, when building
for Leopard.  Fix some issues that came up with the older versions.

We don't support building *on* Leopard - we check for that up front - so
eliminate some code to handle that.

When uninstalling, check for the installed version by looking at the
name of the -done file, so we don't have to trust the _VERSION settings.

We don't appear to need to build our own versions of libpng or pixman
when building *on* Snow Leopard *for* Leopard.

The libffi configure patch for GLib appears not to be necessary -
perhaps building and installing pkg-config *before* building GLib makes
it no longer necessary - and it doesn't work with older versions of
GLib, so don't apply it.

svn path=/trunk/; revision=50456
2013-07-09 04:41:34 +00:00
Anders Broman bbf7636e61 From Cal Turney:
Wireshark crashes when switching from a v1.11.0 profile to a v1.4.6 prof and then to a v1.5.1 profile.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8884

#BACKPORT 1.10

svn path=/trunk/; revision=50455
2013-07-09 04:22:43 +00:00
Michael Mann 6b3ac2d952 Batch of filterable expert infos.
svn path=/trunk/; revision=50454
2013-07-09 01:18:52 +00:00
Guy Harris c5ca0c8b16 Download, build, and install pkg-config before GLib, courtesy of the
"use your internal version of GLib" flag for pkg-config's configure
script.  This simplifies things a little bit.

Fix an indentation error while we're at it.

svn path=/trunk/; revision=50453
2013-07-08 22:56:55 +00:00
Jeff Morriss 5541c28ae6 Fix the very long loop reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8911 :
In parseFields() ensure that we have at least one byte so that callers
don't have to protect against it returning an offset which hasn't incremented.

Remove a couple of now-unnecessary length-remaining (aka "will the offset
move?") checks.

In some other checks, use tvb_ensure_length_remaining() rather than calling
tvb_length_remaining() and (potentially) THROWing an exception.  I'm not sure
if these are really necessary now or not...

svn path=/trunk/; revision=50450
2013-07-08 21:12:06 +00:00
Jeff Morriss 2a62d8e8e6 Include the output (fuzz'd) file name in the output when fuzz (or randpkt)
testing fails.

Useful for when you want to use up a few spare CPU cores running multiple
simultaneous fuzz tests...

svn path=/trunk/; revision=50449
2013-07-08 19:49:17 +00:00
Pascal Quantin 3db06ae582 Fix "Could not compile color filter "Checksum Errors" from saved filters: eth.fcs_bad (type=Label) cannot participate in '==' comparison" warning
svn path=/trunk/; revision=50448
2013-07-08 18:49:42 +00:00
Gerald Combs 59644b3899 New Qt feature: Show related packet list items in the frame number
column. Conversation spans (setup frame to last frame) are shown with a
square bracket. Linked frames are shown with a circle.

Use correct column justifications in Qt. Move common
justification-related packet list code to ui/packet_list_utils.[ch].

Add a last_frame element to conversation_t.

svn path=/trunk/; revision=50447
2013-07-08 16:54:18 +00:00
Alexis La Goutte 5b7c3b3105 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50446
2013-07-08 16:37:47 +00:00
Jeff Morriss 36d3734dcb From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8906 :
This patch augments Wireshark's and tshark's augument usage reports (-? and
-t?) and the Wireshark and tshark man pages to list all available timestamp
options available for the -t option.

svn path=/trunk/; revision=50445
2013-07-08 16:25:13 +00:00
Jakub Zawadzki 87646b1126 Fixes for tmp_fld_check_value():
- FT_FRAMENUM can't have strings
- mask hfinfo->display to compare with valid BASE_ value

svn path=/trunk/; revision=50444
2013-07-08 05:59:07 +00:00
Guy Harris 2cc0fb0917 Clean up comments.
svn path=/trunk/; revision=50440
2013-07-07 21:38:04 +00:00
Jakub Zawadzki ed4622dc7f ups? first add + 1, then multiply.
svn path=/trunk/; revision=50438
2013-07-07 21:32:12 +00:00
Martin Kaiser bf6b5d74d6 fixed a typo in the expert infos
svn path=/trunk/; revision=50435
2013-07-07 19:03:03 +00:00
Jakub Zawadzki d4f1a2c599 tree_is_expanded: make it bit array.
Right now we have about 36K of ett items, and tree_is_expanded takes: 144K of memory (36K*sizeof(gboolean))
By making tree_is_expanded bit array, it reduce size to 4.5K (36K/8)

svn path=/trunk/; revision=50434
2013-07-07 17:13:17 +00:00
Jakub Zawadzki 792f35a28c Make tree_is_expanded array static, add setter/getter function.
svn path=/trunk/; revision=50433
2013-07-07 16:33:49 +00:00
Evan Huus cd7712fd2f A bit more of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8828
svn path=/trunk/; revision=50432
2013-07-07 16:18:18 +00:00
Gerald Combs ebf30a7a5d [Automatic manuf, services and enterprise-numbers update for 2013-07-07]
svn path=/trunk/; revision=50429
2013-07-07 14:03:38 +00:00
Evan Huus afa7538f12 Revert part of r50415. As pointed out by Jakub, some of the value_string
functions are called when no dissection is going on, and so can't use
wmem_packet_scope().

svn path=/trunk/; revision=50428
2013-07-06 23:53:09 +00:00
Jakub Zawadzki 5ef777c80b proto.c: add few more cases when oct/hex can show up with signed number
remove invalid comment about HEX/OCT print not supported for signed numbers.

svn path=/trunk/; revision=50427
2013-07-06 23:46:31 +00:00
Guy Harris a39004e4aa Check for an OS X deployment target early, so that as many
tests using the compiler are done using the flags that
we'll be using when building.

Add a -mmacosx-version-min flag to CFLAGS/CPPFLAGS/LDFLAGS so that the
compiler tests use them.  This may, or may not, obviate the need to set
MACOSX_DEPLOYMENT_TARGET in OSX_DEPLOY_TARGET.

svn path=/trunk/; revision=50426
2013-07-06 23:29:50 +00:00
Guy Harris 455f10f4c4 We need Cairo if we're building on 10.5 *or* if we're building *for*
10.5 on a later OS.

Fix the download path for libpng, and update the version to the
currently-available version.

svn path=/trunk/; revision=50425
2013-07-06 23:00:56 +00:00
Evan Huus 5633f7ffd5 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8886

Fix an error in the scaling factor of field I062/380 subfield #28 in the Asterix
dissector.

svn path=/trunk/; revision=50424
2013-07-06 22:03:52 +00:00
Evan Huus 337ad423c1 From Peter Hatina via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8888
We're allocating an array of pointers, not an array of objects, so make the
sizeof() reflect that to avoid over-allocating.

svn path=/trunk/; revision=50423
2013-07-06 21:55:10 +00:00
Pascal Quantin 67e4c15d4e Add UE Id to UDP framing protocol
svn path=/trunk/; revision=50422
2013-07-06 21:43:44 +00:00
Guy Harris 10b4dc9f4a Use consistent 4-space no-tab indentation.
svn path=/trunk/; revision=50421
2013-07-06 21:21:54 +00:00
Pascal Quantin 218608f1a2 Count SDUs even when dumping only the MAC header
svn path=/trunk/; revision=50420
2013-07-06 21:07:42 +00:00
Guy Harris b2475c1c29 Squelch some warnings that show up with, for example, the GCC 4.2.1 that
comes with Xcode 3.2.6 (it's not a real problem, but that requires more
flow analysis than that version of the compiler does, apparently).

svn path=/trunk/; revision=50419
2013-07-06 19:34:21 +00:00
Guy Harris e02563ceae Don't install the GNU autotools on Snow Leopard and earlier; they were
shipped with those versions of OS X, and I had some problems with the
newer versions on Snow Leopard (the Makefile was doing weird stuff that
caused build failures in wsutil, moving .Tlo files to .Plo files; I
didn't investigate futher).

svn path=/trunk/; revision=50418
2013-07-06 19:32:07 +00:00