Commit Graph

20762 Commits

Author SHA1 Message Date
Anders Broman 04ec1e0984 Use explicit casts.
svn path=/trunk/; revision=48043
2013-03-03 21:22:25 +00:00
Pascal Quantin 0d9dfe4b26 Fixed two wrong encoding parameters found by fix-encoding-args.pl and a typo error
svn path=/trunk/; revision=48041
2013-03-03 19:32:22 +00:00
Gerald Combs 7176e06a63 [Automatic manuf, services and enterprise-numbers update for 2013-03-03]
svn path=/trunk/; revision=48035
2013-03-03 15:03:27 +00:00
Michael Mann 78fe8ac7e9 Replace proto_tree_add_text "error messages" with expert_add_info_format
svn path=/trunk/; revision=48032
2013-03-03 07:29:28 +00:00
Guy Harris 607bb97056 The general convention for "interpreted" fields, where we display a more
human-friendly version of the value followed by the raw value, is to put
the human-friendly name first, with the raw value after it in
parentheses.  Follow that convention for the command code.

svn path=/trunk/; revision=48029
2013-03-03 01:31:49 +00:00
Guy Harris 4d978fd997 proto_tree_add_uint_format_value() puts the field name into the textual
representation for you; the format string should not include the field
name.

Add protocol items to the SliMP3 tree, not to the top-level tree.

If we're fetching a 16-bit value from the protocol tree and multiplying
it by 2, it won't necessarily fit in a guint16; make the variables used
for that guints.

The sequence field of the MP3 data ack packet isn't being fetched from
the packet, so just use proto_tree_add_item() for it (rather than using
a value fetched for a previous field).

Use %u to format unsigned values.

svn path=/trunk/; revision=48028
2013-03-03 01:17:26 +00:00
Pascal Quantin eb9e18a8be Fix copy-paste error introduced in r48021
svn path=/trunk/; revision=48027
2013-03-02 23:30:21 +00:00
Pascal Quantin 2eb92f7b86 Revert file committed by mistake in r48023
svn path=/trunk/; revision=48026
2013-03-02 23:22:19 +00:00
Pascal Quantin 95938370bd From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from tvbparse and tvbuff

svn path=/trunk/; revision=48025
2013-03-02 23:05:27 +00:00
Pascal Quantin 5a37615eeb Remove a useless pointer
svn path=/trunk/; revision=48024
2013-03-02 22:59:50 +00:00
Pascal Quantin 0a17799d61 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from most of the dcerpc code

svn path=/trunk/; revision=48023
2013-03-02 22:54:39 +00:00
Pascal Quantin fc9156a8a0 Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
2013-03-02 22:19:33 +00:00
Evan Huus 5c05c9e0e1 Export some wmem functions using the new scheme.
svn path=/trunk/; revision=48019
2013-03-02 21:29:05 +00:00
Evan Huus a668f359c8 Don't include wmem.h in packet_info.h, just use the struct name directly.
Otherwise wmem tweaks require rebuilding the entire tree for no particular
reason.

svn path=/trunk/; revision=48018
2013-03-02 21:28:29 +00:00
Michael Mann 1658b20e44 Convert at least enough proto_tree_add_text to proto_tree_add_item/expert_info to passify checkAPIs.pl.
Removed check_col calls.

svn path=/trunk/; revision=48016
2013-03-02 21:05:32 +00:00
Guy Harris 47b4b15d80 Move the setting of pt to where it was before the changes, so it's
before the point at which it's added to the protocol tree.

Put the ATM channel in the ATM tree rather than the top-level tree.

Fix the name for the CPI field (copy-and-pasteo).

svn path=/trunk/; revision=48015
2013-03-02 21:01:08 +00:00
Anders Broman 4f5d04e115 From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48013
2013-03-02 19:21:38 +00:00
Evan Huus b20db86a6f Define a new exception for reassembly errors, and throw it in several cases
instead of using DISSECTOR_ASSERT. When a dissector passes bad data to the
reassembly machine, that isn't necessarily the dissector's fault - the data may
come straight from the packet, and the dissector may not have enough information
to know it's bad without telling the reassembly machine in the first place.

Also fix a bug in the reassembly machine. If it were given a fragment and all of
the following conditions were met:
- the other associated fragments were already marked as done (reassembled)
- the fragment went beyond the end of the conceptual reassembled buffer
- the dissector had not set the PARTIAL_REASSEMBLY flag
then the reassembly machine would incorrectly think there was an overlap and
run past the end of the already-reassembled buffer.

Should fix the rest of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8380

#BACKPORT
This is probably too big and intrusive to backport directly, and parts of it
will need adapting anyways since reassemble.c has changed. But the bug exists
and crashes in 1.6 and 1.8, so we'll have to do something.


svn path=/trunk/; revision=48011
2013-03-02 16:39:56 +00:00
Evan Huus 105dbc4027 Pass the same offset to tvb_ensure_bytes_exist and fragment_add.
One minor part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8380

svn path=/trunk/; revision=48010
2013-03-02 16:23:21 +00:00
Michael Mann f473d9a3d7 General cleanup including:
1. Convert proto_tree_add_text to proto_tree_add_item/expert info
2. Change to "new style" dissector
3. Use standard malformed packet interface

Reviewed by Francesco Fondelli

svn path=/trunk/; revision=48009
2013-03-02 16:00:43 +00:00
Anders Broman 9991973c37 Use explicit casts.
svn path=/trunk/; revision=48008
2013-03-02 14:51:04 +00:00
Pascal Quantin 240af26981 Fix a copy/paste error and factorize dissection of extension header length and next extension header
svn path=/trunk/; revision=48007
2013-03-02 13:12:24 +00:00
Anders Broman c5ee81098c From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48006
2013-03-02 12:10:56 +00:00
Anders Broman 599d2e8a9c From Lakshmi Narayana Madala :
GTP dissector enhanced to support UDP Port extension header.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8418

svn path=/trunk/; revision=48004
2013-03-02 11:33:46 +00:00
Balint Reczey 1b1716638a Move expert_group_vals expert_severity_vals constant definitions to expert.h
svn path=/trunk/; revision=47995
2013-03-02 01:00:20 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Evan Huus 0e67f0c7a1 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8338
Centralize logic related to per-interface conversations, and expose it for use
by class-specific dissectors.

Class-specific descriptor dissectors also need to know the interface in whose
context they are called to work.

This is a prerequisite for a USB Video Class dissector, which needs to decode
many class-specific descriptors.

svn path=/trunk/; revision=47990
2013-03-01 22:57:13 +00:00
Anders Broman 8dbab6179d From beroset:
remove C++ incompatibilities from packet-xml.c

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

svn path=/trunk/; revision=47988
2013-03-01 20:36:59 +00:00
Evan Huus b780fc1b7a Revert r47839, it is not needed with r47979.
svn path=/trunk/; revision=47980
2013-03-01 19:10:04 +00:00
Evan Huus 2c420806b5 Add a much better workaround for bug #8382 and some expert info.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8382

svn path=/trunk/; revision=47979
2013-03-01 19:08:30 +00:00
Pascal Quantin b9f723bb18 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from packet-smb.C

svn path=/trunk/; revision=47977
2013-03-01 18:35:51 +00:00
Evan Huus ba18b3d7d9 Addendum to r47962, caught by Jakub Zawadzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8379

Respect the offset given us by TCP when fetching PDU len.

svn path=/trunk/; revision=47974
2013-03-01 13:24:24 +00:00
Chris Maynard 3478c66464 Fix Coverity CID 280396: Logically dead code.
svn path=/trunk/; revision=47973
2013-03-01 07:02:08 +00:00
Chris Maynard 181751aa74 Fix Coverity CID 280371: Logically dead code.
svn path=/trunk/; revision=47972
2013-03-01 06:52:25 +00:00
Chris Maynard 8a6d78e053 Fix Coverity CID 280369: Logically dead code.
svn path=/trunk/; revision=47970
2013-03-01 06:29:18 +00:00
Anders Broman ffeae7cfbf From beroset:
remove C++ incompatibilities from packet-pw-atm.c

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

svn path=/trunk/; revision=47968
2013-03-01 06:01:51 +00:00
Chris Maynard d4adb608c1 Fix Coverity CID 280367: Logically dead code.
svn path=/trunk/; revision=47967
2013-03-01 05:46:07 +00:00
Chris Maynard 0e1d169409 Fix Coverity CID 280365: Logically dead code.
#BACKPORT (1.8, 1.6)

svn path=/trunk/; revision=47966
2013-03-01 05:40:49 +00:00
Chris Maynard f9bc424a05 Fix Coverity CID 280362: Logically dead code.
#BACKPORT (1.8, 1.6)

svn path=/trunk/; revision=47965
2013-03-01 05:29:12 +00:00
Chris Maynard 595a6d4504 Fix Coverity CID 280391: Logically dead code.
svn path=/trunk/; revision=47964
2013-03-01 05:04:03 +00:00
Chris Maynard 069c1d3fa8 Fix Coverity CID 988967: Logically dead code.
svn path=/trunk/; revision=47963
2013-03-01 04:53:26 +00:00
Evan Huus ade06ecf1c From Sebastiano Di Paola via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8379
New dissector for the honeypot-feeds protocol.

From me: Misc. tweaks to expert info layout and remove a few unneeded initializers.

svn path=/trunk/; revision=47962
2013-03-01 02:07:58 +00:00
Evan Huus b8c73d01b3 Re-add statement accidentally removed in r47950 that was resulting in a
variable being used uninitialized.

svn path=/trunk/; revision=47959
2013-02-28 23:39:47 +00:00
Michael Mann 7eac6729d8 Replace proto_tree_add_text with proto_tree_add_item/expert_info
svn path=/trunk/; revision=47956
2013-02-28 23:01:31 +00:00
Pascal Quantin 8ed55b8eef Fix dissection of feedback with large CID
svn path=/trunk/; revision=47955
2013-02-28 22:22:52 +00:00
Michael Mann 4d1022a5ac Use proto_tree_add_item (or similar) instead of proto_item_add_text.
svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
Michael Mann 7cf5c59d6e Convert proto_item_add_text to proto_item_add_item.
General whitespace cleanup, add modelines.

svn path=/trunk/; revision=47949
2013-02-28 20:07:15 +00:00
Guy Harris 6c29b9edd6 Update a comment.
svn path=/trunk/; revision=47947
2013-02-28 18:13:41 +00:00
Anders Broman e8af5b4e67 Dissect japan ISUP Charging Info IE.
svn path=/trunk/; revision=47946
2013-02-28 17:56:02 +00:00
Pascal Quantin 7adefca1bb From Hadriel Kaplan via https://www.wireshark.org/lists/wireshark-dev/201302/msg00216.html :
Fix dissection of method name in case of RAck header

svn path=/trunk/; revision=47936
2013-02-28 08:13:40 +00:00