Commit Graph

47432 Commits

Author SHA1 Message Date
Jeff Morriss d7466120c9 Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c3
(the last remaining problem in that bug report):

When we expand a tree, check if any of its children need to be expanded too
(because the user left them expanded when s/he closed the parent).

In the process, rename expand_finfos() to check_expand_children() since the
function expands any children (subtrees) which should be expanded.  Remove
one of that function's parameters too: just reference the global preference
that controls whether scrolling should be done or not.

Replace some tabs with spaces (for consistency).

svn path=/trunk/; revision=50516
2013-07-11 23:01:13 +00:00
Guy Harris 0f003babb3 Fix cut-and-pasteo found by a compiler warning.
Mark an unused parameter as unused.

svn path=/trunk/; revision=50515
2013-07-11 21:54:23 +00:00
Guy Harris b125950d9a Fix typo found by a compiler warning.
svn path=/trunk/; revision=50514
2013-07-11 21:53:19 +00:00
Anders Broman 614194e61f The beginning of an openflow dissector.
svn path=/trunk/; revision=50513
2013-07-11 21:13:27 +00:00
Anders Broman 5dec6b5603 From Tommy Wu:
Add 3gpp2_cvse.

svn path=/trunk/; revision=50512
2013-07-11 21:12:31 +00:00
Anders Broman 7fa8bd0f05 From Tommy Wu:
Use terminology from RFC 4303

svn path=/trunk/; revision=50511
2013-07-11 21:11:28 +00:00
Chris Maynard 6c371815d3 Fix an obvious case of incorrectly comparing the return value of tvb_length_remaining() against non-zero instead of greater than zero. There are other questionable uses of tvb_length_remaining() as well ... and maybe these should all be replaced with tvb_reported_length_remaining() as well?
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=50510
2013-07-11 15:55:52 +00:00
Jeff Morriss b53ced1e6a get_hfi_and_length() hasn't returned the hfi since r50015: rename it
to get_hfi_length().

svn path=/trunk/; revision=50509
2013-07-11 15:03:43 +00:00
Jeff Morriss b0c5fecc62 Don't mark a used parameter _U_.
svn path=/trunk/; revision=50508
2013-07-11 15:00:39 +00:00
Jeff Morriss 160c35c8e9 For consistency:
s/hf_index/hfindex/g
s/hf_info/hfinfo/g

svn path=/trunk/; revision=50507
2013-07-11 14:58:11 +00:00
Jeff Morriss b6ee11e928 Fix the very long loop fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8923 :
Apply the fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3290
to proto_tree_add_bits_item().  That is, test that we have offset+length bytes
left in the TVB before trying to fake the item.

svn path=/trunk/; revision=50504
2013-07-11 14:46:30 +00:00
Michael Mann c38a750821 Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552)
svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
Guy Harris 359fb84023 Throw in a cast to squelch warnings about a value not fitting in a
time_t.  (That also lets us not care how big a time_t is, except that we
have a not-fixable Y2.038K problem with 32-bit time_t, about which we
merely warn in a comment.)

svn path=/trunk/; revision=50502
2013-07-11 09:51:30 +00:00
Guy Harris 2009a08706 You now have to update three count 'em three files when adding a new
source file at the top level - top-level Makefile.common, top-level
CMakeLists.txt, *and* qui/qt/QtShark.pro.

svn path=/trunk/; revision=50501
2013-07-11 09:45:51 +00:00
Guy Harris 88a1a0249b Get rid of an unused variable.
Don't nest g_strconcat() calls: g_strconcat(a, g_strconcat(b, c, NULL), NULL)
is equivalent to g_strconcat(a, b, c, NULL).  (And g_strconcat(b, c) is
incorrect - you need a NULL at the end of the list.)

Checking whether a pointer is "> 0" is useful only in platform-dependent
situations or if you're doing a really greasy hack such as stuffing a
flag into the uppermost bit of the pointer; the test should just check
whether the pointer is null or not.

svn path=/trunk/; revision=50500
2013-07-11 09:40:44 +00:00
Jakub Zawadzki 97456cde01 Fix two problems in tvbuff.h
svn path=/trunk/; revision=50499
2013-07-11 06:08:28 +00:00
Jakub Zawadzki 356a4613c7 Restore old composite_memcpy() prototype. Remove it from ops.
svn path=/trunk/; revision=50498
2013-07-11 05:51:19 +00:00
Jakub Zawadzki ce81449ed9 packet dissection now takes pointer to tvb instead of guint8 data
implement frame_tvbuff, right now almost a copy of 'real' tvb.

svn path=/trunk/; revision=50497
2013-07-11 05:47:02 +00:00
Jakub Zawadzki 19d2d0dc76 tvbuff: try to fix compilation problems for C++-like compilers.
svn path=/trunk/; revision=50496
2013-07-11 04:35:12 +00:00
Pascal Quantin ef942ca080 Upgrade NAS disssectors to v11.7.0
svn path=/trunk/; revision=50494
2013-07-10 21:31:22 +00:00
Chris Maynard 783902ca74 Darn it - fix typo.
svn path=/trunk/; revision=50493
2013-07-10 20:15:26 +00:00
Chris Maynard 0c3f45a8ec Mention the new -L option to editcap in the release notes.
svn path=/trunk/; revision=50492
2013-07-10 20:12:52 +00:00
Chris Maynard e7a7293bee Add -L option to allow adjustment of original frame length. This change was motivated by a question on ask where the user currently has to jump through hoops to accomplish the same thing which can now be done in 1 step via:
editcap -T wpan -C 16 -L -F libpcap test.pcap test_wpan.pcap

I thought it would be useful enough for others as well.

Ref: http://ask.wireshark.org/questions/22689/problems-with-editcap-and-wpan-encapsulation-option


svn path=/trunk/; revision=50491
2013-07-10 20:02:45 +00:00
Jakub Zawadzki 338f1c9654 tvbuff: remove ->tvb_init() from ops
->tvb_init() knows nothing about new tvb and can only do some kind of bzero()
it's much better if we initialize object after tvb_new() [which anyway must be done]

+ try to fix OSX build.

svn path=/trunk/; revision=50490
2013-07-10 19:25:49 +00:00
Jakub Zawadzki d7175365ab tvbuff: allow tvb-implementations using their own structure (it's fine as long as first member of struct is tvbuff)
Move some stuff outside tvbuff struct.

svn path=/trunk/; revision=50489
2013-07-10 19:08:02 +00:00
Anders Broman bdd8e5bb57 From Cal Turney:
- tshark -q -z io,stat,1 causes core dump for files larger than ~2MB
(with this fix it will still overflow on 32-bits for frame time > 4294s)

- In tshark's "io,stat" eliminate the unrequested "Frames and bytes" col, fix formatting, and add "Duration"

From me:
Added casts to squelch compiler warnings on win7 64bit

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

svn path=/trunk/; revision=50488
2013-07-10 18:41:24 +00:00
Jakub Zawadzki b4d8a3727f Fix previous commit. Devel env with -w in CFLAGS is not so good idea...
svn path=/trunk/; revision=50487
2013-07-10 18:25:24 +00:00
Jakub Zawadzki f3ed13c22e tvbuff: replace type with operation vtable
It's begin of work to allow adding new tvbuff types (think: wtap_tvbuff, base64_tvbuff).

svn path=/trunk/; revision=50486
2013-07-10 18:14:15 +00:00
Gerald Combs dffa72af51 Use QHeaderView::setSectionResizeMode on Qt >= 5.
svn path=/trunk/; revision=50485
2013-07-10 17:57:10 +00:00
Stig Bjørlykke ca9c78088b Document that ProtoField INT64 and UINT64 does not support value string.
svn path=/trunk/; revision=50484
2013-07-10 16:51:54 +00:00
Stig Bjørlykke 5289c9564d Use luaL_optnumber for ProtoField mask, to avoid a signed cast.
This fixes bug 5734.

svn path=/trunk/; revision=50483
2013-07-10 16:33:30 +00:00
Chris Maynard d602662b36 Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make use of it in editcap and mergecap for listing encapsulation types. For example:
Before:
    user0 - USER 0
    user1 - USER 1
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9

After:
    user0 - USER 0
    user1 - USER 1
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15


svn path=/trunk/; revision=50482
2013-07-10 16:18:37 +00:00
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