etxrab [Wed, 23 Jul 2008 13:26:43 +0000 (13:26 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25804
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 23 Jul 2008 12:45:24 +0000 (12:45 +0000)]
Get rid of some unused code warnings and fix an Id marking and some indentation changes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25803
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 23 Jul 2008 11:36:27 +0000 (11:36 +0000)]
Disable value_string check for now.
Apparently the "regex which matches double-quoted strings"
doesn't work with some versions of Perl (eg: 5.8.8) if the
string contains a 'line-continuation' (\ folowed by a new-line).
(This works for Perl 5.10.0).
So: disable value_string check until I look into this further.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25802
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 23 Jul 2008 11:18:33 +0000 (11:18 +0000)]
Fix bug 2663 (DLMAP HAEQ_DLMAP_UE decode error).
From Frank Wang.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25801
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 22 Jul 2008 22:27:08 +0000 (22:27 +0000)]
Add test to check if value_string arrays are NULL terminated;
default: test is enabled.
Check for error return from GetOptions
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25800
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 22 Jul 2008 21:53:50 +0000 (21:53 +0000)]
Add NULL termination element to value_string arrays
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25799
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 22 Jul 2008 20:20:17 +0000 (20:20 +0000)]
Add NULL termination element to value_string array
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25798
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 22 Jul 2008 20:19:17 +0000 (20:19 +0000)]
Add NULL termination element to value_string arrays;
Fix some indentation
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25797
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 22 Jul 2008 18:55:49 +0000 (18:55 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25796
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 22 Jul 2008 18:40:32 +0000 (18:40 +0000)]
Remove unnecessary comma from value_string initializer
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25795
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 22 Jul 2008 18:36:40 +0000 (18:36 +0000)]
Add NULL termination element to value_string arrays.
(Done for consistency although not strictly required in these cases);
(Also: so no kickouts on this file when doing automated checking
for missing NULL termination elements in value-string arrays).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25794
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 22 Jul 2008 18:27:13 +0000 (18:27 +0000)]
Add NULL termination element to value_string arrays
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25793
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Tue, 22 Jul 2008 18:01:13 +0000 (18:01 +0000)]
Add Bahaa Naamneh to AUTHORS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25792
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 22 Jul 2008 17:28:38 +0000 (17:28 +0000)]
Get rid of some unused code warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25791
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 22 Jul 2008 15:56:26 +0000 (15:56 +0000)]
Try again.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25790
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 22 Jul 2008 15:21:07 +0000 (15:21 +0000)]
Get rid of some unused code warnings...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25789
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Tue, 22 Jul 2008 15:19:10 +0000 (15:19 +0000)]
Filter autocompletion from Bahaa Naamneh (bug 2581).
There are still display filter controls where this isn't being used
yet, but I'm committing it now so hopefully people can report any
problems.
Some commenting and formatting was done by myself.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25788
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 22 Jul 2008 12:13:38 +0000 (12:13 +0000)]
From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2707
The SMPP dissector currently supports only version 3.4. The latest version of
the protocol is version 5.0 and it has been around for a while. However, the
usage of this version of the protocol is only now picking up.
This patch adds basic support for SMPP 5.0. By basic I mean:
- New Operations and Responses.
- New TLVs.
- New Error codes.
- Any changes to earlier values.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25787
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 22:00:00 +0000 (22:00 +0000)]
See if this gets rid of some unused code warnings...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25785
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 21:22:42 +0000 (21:22 +0000)]
See if this gets rid of some unused code warnings...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25784
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 20:26:37 +0000 (20:26 +0000)]
See if this gets rid of some unused code warnings...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25783
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 19:39:47 +0000 (19:39 +0000)]
See if this gets rid of some unused code warnings...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25782
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 21 Jul 2008 18:51:05 +0000 (18:51 +0000)]
From Dustin Johnson: Don't pop up a warning dialog every time we can't save
our AirPcap configuration. Just print out a warning to the console instead.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25781
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 18:34:04 +0000 (18:34 +0000)]
Fix compile error.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25780
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 18:22:51 +0000 (18:22 +0000)]
Update to version 7.9.0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25779
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 10:05:07 +0000 (10:05 +0000)]
Use the tag...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25778
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 21 Jul 2008 10:03:47 +0000 (10:03 +0000)]
Use the latest GTK libraries for GTK+ 2.12.11
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25777
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 20 Jul 2008 22:11:58 +0000 (22:11 +0000)]
Try again ;)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25776
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 20 Jul 2008 22:11:21 +0000 (22:11 +0000)]
Fix a warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25775
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 20 Jul 2008 21:59:45 +0000 (21:59 +0000)]
Will gcc be happy now?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25774
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 20 Jul 2008 21:59:06 +0000 (21:59 +0000)]
Fix a warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25773
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 20 Jul 2008 21:32:59 +0000 (21:32 +0000)]
Uggly hack to fix:
packet-gsm_a.c:4914: warning: comparison between signed and unsigned
packet-gsm_a.c:4944: warning: comparison between signed and unsigned
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25772
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 20 Jul 2008 21:31:49 +0000 (21:31 +0000)]
Fix a warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25771
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sun, 20 Jul 2008 20:45:18 +0000 (20:45 +0000)]
From Neil Piercy :
Addition dissection for packet-gsm_a.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25770
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Sat, 19 Jul 2008 20:17:42 +0000 (20:17 +0000)]
From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2723
Tigran Mkrtchyan: decode and display fattr4_fs_layout_types.
Thijs Stuurman: Synchronize names used by wireshark with those used in
latest pnfs draft.
J. Bruce Fields: Use large default max_rpc_tcp_pdu_size setting
The linux server will do up to 1M these days, so the current default is
very likely to discard all reads and writes from such a server.
Thanks to Jim Rees for catching this.
Jeff Morriss: limit the max_rpc_tcp_pdu_size increase to 4M instead of the 16M
proposed. Memory is cheap but still not unlimited.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25769
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Sat, 19 Jul 2008 15:04:20 +0000 (15:04 +0000)]
From Edward J. Paradise via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2693 :
The rfc4938bis draft extends the Point-to-Point over Ethernet (PPPoE) protocol
with an optional credit-based flow control mechanism and an optional Link
Quality Metric report. These optional extensions improve the performance of
PPPoE over media with variable bandwidth and limited buffering, such as mobile
point-to-point radio links.
Support for rfc4938 already exists in wireshark, but rfc4938bis specifies a new
credit scale factor TLV and the use of the reserved field of the PADQ to
specify max and current data-rate scaling.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25768
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 18 Jul 2008 23:44:35 +0000 (23:44 +0000)]
Hyphenate "per-packet information".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25767
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Fri, 18 Jul 2008 19:31:01 +0000 (19:31 +0000)]
From Edward J. Paradise:
The #defines for PADG, PADC, and PADQ are incorrect and these packets are
showing up as unknown.
I would be happy to fix this bug as I would like to enhance the current support
for rfc4938 and rfc4938bis to include filtering and inband credit grant decoding.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25766
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 18 Jul 2008 12:11:08 +0000 (12:11 +0000)]
Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25765
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 18 Jul 2008 11:21:00 +0000 (11:21 +0000)]
Remove an (unused) HAVE_ICONV reference.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25764
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 18 Jul 2008 11:18:07 +0000 (11:18 +0000)]
Diameter hasn't used libxml in a while, remove the stubs for it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25763
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 18 Jul 2008 02:48:37 +0000 (02:48 +0000)]
Change C++ style comments to C style ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25762
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 17 Jul 2008 21:40:28 +0000 (21:40 +0000)]
checkAPIs: remove '-g abort'; g_assert OK for wsutils files ?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25761
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 17 Jul 2008 16:35:56 +0000 (16:35 +0000)]
Remove -g abort from checkAPIs (for now) since existing issues not yet resolved.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25759
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 17 Jul 2008 13:53:26 +0000 (13:53 +0000)]
We require GLIB-2 now so there's no need to attempt to use regular iconv: use
the GLIB version instead.
Reindent some (does someone have their tabstops set to 4?).
Create and use some #defines instead of hard-coded values. For example,
replace 0x00 with ANSI_X34 in both the value_string and the case statement.
(This file could use a lot more of such changes.)
packet-bacapp.c appears to compile cleanly now so move it to
CLEAN_DISSECTOR_SOURCE.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25758
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 16 Jul 2008 20:26:32 +0000 (20:26 +0000)]
Don't use C-style comments in a shell script. This fixes this error:
./configure: line 21850: /bin: is a directory
when running configure.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25757
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Wed, 16 Jul 2008 18:09:24 +0000 (18:09 +0000)]
From Balint Reczey:
When saving preferences, wireshark saves the description of each preference in
a one line comment. Unfortunately if the description consists of several lines,
wireshark comments out only the fist one.
The attached patch solves the problem by commenting out every lines in the
description.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25756
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 16 Jul 2008 14:21:14 +0000 (14:21 +0000)]
ssl_hash() needs the StringInfo.data it is passed to be word aligned and it appears that it is (it is ep_malloc'd in ssl_save_session()). Add an intermediate cast to tell the compiler the alignment is okay and comments explaining the cast and warning anyone who might change how it is allocated to keep it aligned.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25755
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 16 Jul 2008 13:29:21 +0000 (13:29 +0000)]
conv_frame_states is an array of pointers, make it a GPtrArray instead of a GArray with casts
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25754
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 16 Jul 2008 08:08:17 +0000 (08:08 +0000)]
The second argument to g_ptr_array_add() is the pointer to add, not a
pointer to that pointer - unlike g_array_append_vals, which takes a
pointer to an array of values and a count of the number of values in the
array.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25753
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Wed, 16 Jul 2008 05:33:25 +0000 (05:33 +0000)]
From Alex Turbov:
Function dissect_aim_tlv_value_uint32 have consumed 24 bits instead of 32 to
obtain a value.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25752
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Wed, 16 Jul 2008 05:17:32 +0000 (05:17 +0000)]
From Alex Turbov:
AIM 'New Connection' packet dissector have incorrect size for details pane of
TLV 0x14. Actual size is 4 (not 2).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25751
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 15 Jul 2008 21:35:58 +0000 (21:35 +0000)]
isup_message_type_value is an array, there's no need to pass the address-of it to VALS
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25750
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Tue, 15 Jul 2008 21:06:31 +0000 (21:06 +0000)]
GArrays' data is properly aligned for whatever they are holding (despite
the fact that 'data' is a pointer to a char). GLIB fixed this in their
accessor macro here:
http://svn.gnome.org/viewvc/glib?view=revision&revision=6092
The bug report confirms that the data is properly aligned:
http://bugzilla.gnome.org/show_bug.cgi?id=502927
So, add some intermediate (void *) casts to avoid "cast increases required
alignment of target type" on SPARC. (No, we can't use the accessor macro
because we want to access the whole array not just the ith element.)
Since build_dict->ett is actually an array of pointers, change it to a
GPtrArray.
Reindent some.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25749
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 15 Jul 2008 20:56:22 +0000 (20:56 +0000)]
From Joe Eykholt:
FIP is the FCoE Initialization Protocol. FCoE is Fibre-Channel over Ethernet.
FIP is being finalized in t11.org, and further changes are not expected.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25748
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Jul 2008 18:47:11 +0000 (18:47 +0000)]
Add registered fields for the transport class and option bits in
connection requests.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25747
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Jul 2008 16:33:15 +0000 (16:33 +0000)]
Move the OSI transport protocol dissectors (ISO 8073/ITU-T X.224
connection-oriented transport protocol and ISO 8602/ITU-T X.234
connectionless transport protocol) out of packet-clnp.c into
packet-isotp.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25746
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 15 Jul 2008 16:27:30 +0000 (16:27 +0000)]
Use the latest wireshark-win32-libs tag (updated zlib).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25745
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Jul 2008 07:08:30 +0000 (07:08 +0000)]
Frame numbers are unsigned, so 0xffffffff isn't a special out-of-band
value. They start at 1, though, so 0 *is* a special out-of-band value.
There is no guarantee that you can use a pointer as a 32-bit integral
value; the compiler warns if you do, at least on some platforms.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25744
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 15 Jul 2008 05:46:37 +0000 (05:46 +0000)]
From Kip McAtee:
Added eth, PPP, and IP decodes to the ATM dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25743
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Tue, 15 Jul 2008 05:15:48 +0000 (05:15 +0000)]
Fix for revision 25730:
Add packet-pw-eth.c to Makefile.common
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25742
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Jul 2008 01:46:52 +0000 (01:46 +0000)]
CTDB isn't an ASN.1-based protocol.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25741
f5534014-38df-0310-8fa8-
9805f1628bb7
sake [Mon, 14 Jul 2008 21:02:30 +0000 (21:02 +0000)]
Oops... missed one ;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25740
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Jul 2008 20:26:58 +0000 (20:26 +0000)]
Just have a scalar handle_t for the Infiniband handle, for now. (The
old code had the type value past the end of the array.)
Rename the handle variables.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25739
f5534014-38df-0310-8fa8-
9805f1628bb7
sake [Mon, 14 Jul 2008 19:56:37 +0000 (19:56 +0000)]
From Richard Kuemmel (bug 2668):
Removed the line
tvb_ensure_bytes_exist(tvb, offset, 44);
from again.
This is not correct, because the frame might have been captured before the
os added the padding bytes. E.g. in Windows the frames are captured on the
protocol layer. When another protocol driver sends a frame this frame does
not include the padding bytes.
Also the dataLength variable in case of bMox==TRUE was not calculated
correctly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25738
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Jul 2008 19:28:19 +0000 (19:28 +0000)]
Rename the ERF "erfhdlc" preference to "hdlc_type" ("erf" is redundant,
and "hdlc" doesn't indicate that it's a protocol type), and, instead of
a "raw" option, have a "try to guess the traffic type" option - for now,
if the first byte is 0x0f or 0x8f, treat it as Cisco HDLC, otherwise
treat it as PPP.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25737
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Jul 2008 18:56:25 +0000 (18:56 +0000)]
Replace the old "erfatm" preference for the ERF dissector with an
"aal5_type" dissector, which offers only "guess the traffic type" and
"LLC multiplexed" as options, defaulting to "guess the type".
Add a separate preference to control whether to treat single ATM cells
as raw data or as the first cell of an AAL5 PDU (and dissecting them as
short AAL5 PDUs).
Don't reach inside the tvbuff to get the data and the length; use
tvb_length() and tvb_get_ptr().
Pass the data *after* the AAL5 header to the "guess the traffic type"
routine.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25736
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Jul 2008 18:55:57 +0000 (18:55 +0000)]
List the ERF dissector as one of the "clean" dissectors, so that
warnings (such as the warning you get when you say
"prefs_register_boolean_preference" rather than
"prefs_register_bool_preference") show up as errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25735
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 14 Jul 2008 11:32:19 +0000 (11:32 +0000)]
Fix declaration to match change in SVN #25731
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25734
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Mon, 14 Jul 2008 05:46:09 +0000 (05:46 +0000)]
From Stephen Donnelly:
ERF files can contain records of type TYPE_PAD. These records are not related
to captured packets, have a zero timestamp value and no associated packet data.
Normally TYPE_PAD records are stripped out during capture, but in rare cases
unstripped files may exist.
Previously wiretap/erf.c generated an 'unknown record encapsulation' error when
encountering TYPE_PAD records.
With this patch Wireshark skips over any TYPE_PAD records within ERF traces
files without reporting an error. TYPE_PAD records are not counted, displayed
or decoded.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25733
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 13 Jul 2008 19:04:53 +0000 (19:04 +0000)]
The PPP protocol type of 0031 is for the PPP Bridging Control Protocol;
it's not the "Bridge Control Protocol", and the packets aren't "BPDU"s
in the sense of Spanning Tree Protocol packets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25732
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 13 Jul 2008 18:56:54 +0000 (18:56 +0000)]
If we know that an Ethernet packet includes the FCS, remove the FCS from
the payload we hand to the next dissector.
Check whether the length field in an 802.3 header doesn't go past the
(presumed) end of the payload.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25731
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Sun, 13 Jul 2008 17:19:33 +0000 (17:19 +0000)]
From Francesco Fondelli:
Attached is a patch for:
- PW Associated Channel Header dissection as per RFC 4385
- PW MPLS Control Word dissection as per RFC 4385
- mpls subdissector table indexed by label value
- enhanced "what's past last mpls label?" heuristic
- Ethernet PW (w/o CW) support as per RFC 4448
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25730
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 13 Jul 2008 17:11:02 +0000 (17:11 +0000)]
Dissect the PPP Bridge Control Protocol header. Hand Ethernet packets
to the "no FCS" dissector if the "FCS present" flag isn't set. Strip
off padding. Don't hand non-Ethernet packets to the Ethernet dissector.
Update the RFC number for the PPP Multilink protocol. Add a preference
for short sequence numbers. Check only the "first fragment" and "last
fragment" flags when constructing the summary description for the flags
field. Use the global "tfs_yes_no" true_false_string structure rather
than defining our own "Yes"/"No" true_false_string structure.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25729
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 12 Jul 2008 20:02:10 +0000 (20:02 +0000)]
From Jess Balint (bug 2700):
Implement field decoding in mysql protocol dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25728
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 12 Jul 2008 19:53:53 +0000 (19:53 +0000)]
From J. Bruce Fields (bug 2634):
The attached patches bring the wireshark code up to date with the latest
NFSv4.1 protocol drafts (in ietf last call now, so hopefully not too much more
of this will be required).
They also cover more of the protocol, and do some minor cleanup (e.g. remove
some operations which were really only used by one prototype implementation,
and never part of the protocol.)
A few ops and attributes are still missing.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25727
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 12 Jul 2008 19:28:24 +0000 (19:28 +0000)]
Small whitespace fix.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25726
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sat, 12 Jul 2008 19:28:08 +0000 (19:28 +0000)]
Correct help topic for firewall dialog.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25725
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 12 Jul 2008 18:26:47 +0000 (18:26 +0000)]
Make erf.ethfcs a Boolean, with "FCS present" and "FCS not present" the
only options, and default to "FCS present".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25724
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 12 Jul 2008 17:37:22 +0000 (17:37 +0000)]
Clean up indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25723
f5534014-38df-0310-8fa8-
9805f1628bb7
sake [Sat, 12 Jul 2008 17:23:18 +0000 (17:23 +0000)]
Fix an off-by-one error which caused capturing with
a duration limit of X seconds per file to actually
save X+1 seconds per file
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25722
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Sat, 12 Jul 2008 14:42:14 +0000 (14:42 +0000)]
Move the registration for SSL sockets to the protocol dissectors themselves.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25721
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 12 Jul 2008 02:42:33 +0000 (02:42 +0000)]
Rename the preference values to something that leaves out the "eth" (as
it's redundant).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25720
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 12 Jul 2008 02:36:32 +0000 (02:36 +0000)]
ERF Ethernet records always contain Ethernet packets, as the name
indicates; replace the "erf.eth" preference with an "erf.ethfcs"
preference, specifying whether the FCS is present in Ethernet frames,
and offer the options "present", "not present", and "maybe present" -
for "maybe present", call the regular Ethernet dissector, which tries to
figure out whether there's an FCS at the end of the packet or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25719
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Sat, 12 Jul 2008 02:01:42 +0000 (02:01 +0000)]
More stats tree unsigned->signed char cleanup
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25718
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Sat, 12 Jul 2008 01:48:24 +0000 (01:48 +0000)]
More (mostly stats tree) unsigned->signed char cleanup
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25717
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 21:13:39 +0000 (21:13 +0000)]
Change the stats tree API to use signed chars instead of guint8s for all its
strings; this should fix a number of signed/unsigned char warnings.
Reindent a bunch, too.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25716
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 20:19:52 +0000 (20:19 +0000)]
Fix a couple gint/guint mismatches
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25715
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 20:15:52 +0000 (20:15 +0000)]
tvb_format_text() returns a pointer chars, not guint8s
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25714
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 20:12:22 +0000 (20:12 +0000)]
Fix a couple signed/unsigned char mismatches (still more here)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25713
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 20:05:44 +0000 (20:05 +0000)]
Cast away the unsignedness of a string (which has had EBCDIC_to_ASCII() run on it)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25712
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 20:00:41 +0000 (20:00 +0000)]
prefs_register_uint_preference() takes a pointer to a guint, not a pointer to gint.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25711
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 19:56:43 +0000 (19:56 +0000)]
prefs_register_uint_preference() takes as its argument a pointer to a uint, not a pointer to a gboolean. Similarly prefs_register_enum_preference takes a pointer to a gint, not a guint.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25710
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 19:48:30 +0000 (19:48 +0000)]
In a call to proto_tree_add_bytes_format(): actually pass a pointer to the start of the bytes
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25709
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 19:30:10 +0000 (19:30 +0000)]
Change a string's declaration from guint8 to a gchar
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25708
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 19:18:54 +0000 (19:18 +0000)]
Change a guchar to gchar: it's used as a regular string
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25707
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 18:56:03 +0000 (18:56 +0000)]
Remove some dead (statement not reached) code (while trying to avoid any false control reaches end of non-void function warnings)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25706
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 16:37:21 +0000 (16:37 +0000)]
packet-k12.c expects pseudo_header->k12.extra_info to be guchar so make it a unsigned
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25705
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 11 Jul 2008 16:18:32 +0000 (16:18 +0000)]
unicode-utils.c is only for Windows; don't build it on UN*X. Put in a check
to cause it to fail when built on UN*X.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25704
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Fri, 11 Jul 2008 16:03:06 +0000 (16:03 +0000)]
From Frank Wang:
The ULMAP decoder can get a wrong bit offset when decoding CQICH_Alloc_IE.
The finishing position shoud not pad to byte but pad to the length specified,
which can be nibble aligned.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25703
f5534014-38df-0310-8fa8-
9805f1628bb7