11 years agoRemove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.
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

11 years agoRemove an (unused) HAVE_ICONV reference.
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

11 years agoDiameter hasn't used libxml in a while, remove the stubs for it.
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

11 years agoChange C++ style comments to C style ...
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

11 years agocheckAPIs: remove '-g abort'; g_assert OK for wsutils files ?
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

11 years agoRemove -g abort from checkAPIs (for now) since existing issues not yet resolved.
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

11 years agoWe require GLIB-2 now so there's no need to attempt to use regular iconv: use
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25758 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoDon't use C-style comments in a shell script. This fixes this error:
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

11 years agoFrom Balint Reczey:
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25756 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agossl_hash() needs the StringInfo.data it is passed to be word aligned and it appears...
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

11 years agoconv_frame_states is an array of pointers, make it a GPtrArray instead of a GArray...
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

11 years agoThe second argument to g_ptr_array_add() is the pointer to add, not a
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25753 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFrom Alex Turbov:
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

11 years agoFrom Alex Turbov:
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

11 years agoisup_message_type_value is an array, there's no need to pass the address-of it to...
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

11 years agoGArrays' data is properly aligned for whatever they are holding (despite
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:


The bug report confirms that the data is properly aligned:


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

Reindent some.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25749 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFrom Joe Eykholt:
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

11 years agoAdd registered fields for the transport class and option bits in
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

11 years agoMove the OSI transport protocol dissectors (ISO 8073/ITU-T X.224
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25746 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoUse the latest wireshark-win32-libs tag (updated zlib).
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

11 years agoFrame numbers are unsigned, so 0xffffffff isn't a special out-of-band
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

11 years agoFrom Kip McAtee:
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

11 years agoFix for revision 25730:
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

11 years agoCTDB isn't an ASN.1-based protocol.
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

11 years agoOops... missed one ;
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

11 years agoJust have a scalar handle_t for the Infiniband handle, for now. (The
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

11 years agoFrom Richard Kuemmel (bug 2668):
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25738 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoRename the ERF "erfhdlc" preference to "hdlc_type" ("erf" is redundant,
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

11 years agoReplace the old "erfatm" preference for the ERF dissector with an
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"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25736 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoList the ERF dissector as one of the "clean" dissectors, so that
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

11 years agoFix declaration to match change in SVN #25731
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

11 years agoFrom Stephen Donnelly:
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

11 years agoThe PPP protocol type of 0031 is for the PPP Bridging Control Protocol;
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

11 years agoIf we know that an Ethernet packet includes the FCS, remove the FCS from
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

11 years agoFrom Francesco Fondelli:
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

11 years agoDissect the PPP Bridge Control Protocol header. Hand Ethernet packets
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

11 years agoFrom Jess Balint (bug 2700):
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

11 years agoFrom J. Bruce Fields (bug 2634):
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

11 years agoSmall whitespace fix.
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

11 years agoCorrect help topic for firewall dialog.
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

11 years agoMake erf.ethfcs a Boolean, with "FCS present" and "FCS not present" the
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

11 years agoClean up indentation.
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

11 years agoFix an off-by-one error which caused capturing with
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

11 years agoMove the registration for SSL sockets to the protocol dissectors themselves.
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

11 years agoRename the preference values to something that leaves out the "eth" (as
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

11 years agoERF Ethernet records always contain Ethernet packets, as the name
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

11 years agoMore stats tree unsigned->signed char cleanup
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

11 years agoMore (mostly stats tree) unsigned->signed char cleanup
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

11 years agoChange the stats tree API to use signed chars instead of guint8s for all its
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

11 years agoFix a couple gint/guint mismatches
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

11 years agotvb_format_text() returns a pointer chars, not guint8s
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

11 years agoFix a couple signed/unsigned char mismatches (still more here)
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

11 years agoCast away the unsignedness of a string (which has had EBCDIC_to_ASCII() run on it)
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

11 years agoprefs_register_uint_preference() takes a pointer to a guint, not a pointer to gint.
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

11 years agoprefs_register_uint_preference() takes as its argument a pointer to a uint, not a...
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

11 years agoIn a call to proto_tree_add_bytes_format(): actually pass a pointer to the start...
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

11 years agoChange a string's declaration from guint8 to a gchar
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

11 years agoChange a guchar to gchar: it's used as a regular string
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

11 years agoRemove some dead (statement not reached) code (while trying to avoid any false contro...
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

11 years agopacket-k12.c expects pseudo_header->k12.extra_info to be guchar so make it a unsigned
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

11 years agounicode-utils.c is only for Windows; don't build it on UN*X. Put in a check
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

11 years agoFrom Frank Wang:
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

11 years ago(Finally) stop guint16s to access a string: just treat it as an array of chars and...
morriss [Fri, 11 Jul 2008 15:16:03 +0000 (15:16 +0000)]
(Finally) stop guint16s to access a string: just treat it as an array of chars and swap them "the hard way".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25702 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoASCII (well, alphabetic, really) until proven otherwise; that fixes a
guy [Fri, 11 Jul 2008 03:16:54 +0000 (03:16 +0000)]
ASCII (well, alphabetic, really) until proven otherwise; that fixes a
warning, which is a valid warning if the length is 0.

Clean up indentation a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25701 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoNote bug 2699, which reports a bug in xdg-open.
guy [Thu, 10 Jul 2008 18:36:19 +0000 (18:36 +0000)]
Note bug 2699, which reports a bug in xdg-open.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25700 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoInclude <ctype.h> to define isalpha().
guy [Thu, 10 Jul 2008 18:35:11 +0000 (18:35 +0000)]
Include <ctype.h> to define isalpha().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25699 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoCast that guint16 into a char before trying to NULL terminate the string (so that...
morriss [Thu, 10 Jul 2008 13:42:51 +0000 (13:42 +0000)]
Cast that guint16 into a char before trying to NULL terminate the string (so that we only set 1 byte to 0, not 2).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25697 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoReplace r25638 with a better fix. On Windows, don't open a console window if
gerald [Wed, 9 Jul 2008 23:28:18 +0000 (23:28 +0000)]
Replace r25638 with a better fix. On Windows, don't open a console window if
we've been passed "-i -", since it clobbers stdio.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25695 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoDon't declare a char[] then cast it into a guint16 to use it as both a guint16 and...
morriss [Wed, 9 Jul 2008 21:22:00 +0000 (21:22 +0000)]
Don't declare a char[] then cast it into a guint16 to use it as both a guint16 and a char: the char[] alignment may not be correct for a guint16. Instead declare a guint16[] and cast it to char when needed.  This is still weird but it fixes a Solaris/SPARC warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25693 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoDon't cast a char[] into a guint32/64: the array may not be aligned correctly. This...
morriss [Wed, 9 Jul 2008 20:16:24 +0000 (20:16 +0000)]
Don't cast a char[] into a guint32/64: the array may not be aligned correctly. This fixes a warning on Solaris/SPARC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25692 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoReindent some to get things a bit more consistent/readable.
morriss [Wed, 9 Jul 2008 20:09:23 +0000 (20:09 +0000)]
Reindent some to get things a bit more consistent/readable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25691 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoAdd MP3 to the list of magic types
morriss [Wed, 9 Jul 2008 19:15:50 +0000 (19:15 +0000)]
Add MP3 to the list of magic types

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25690 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFrom Sven Eckelmann:
jake [Wed, 9 Jul 2008 19:10:54 +0000 (19:10 +0000)]
From Sven Eckelmann:
Just forgot to set inited variable in reg_handoff_bat_*().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25689 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFrom Motonori Shindo:
jake [Wed, 9 Jul 2008 18:37:50 +0000 (18:37 +0000)]
From Motonori Shindo:
Currently, sFlow dissector only recongnizes "Header" as the packet data type.
This patch enhances it to support "IPv4" and "IPv6" packet data type.

This patch seems to work well against sFlow packets exported from AlaxalA switch.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25688 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoInitialise type to avoid warning.
martinm [Wed, 9 Jul 2008 14:50:05 +0000 (14:50 +0000)]
Initialise type to avoid warning.

I'm pretty sure that it won't be used uninitialised, and that the code could be more clearly arranged to make this obvious to the compiler too.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25685 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFrom Paolo Abeni:
jake [Wed, 9 Jul 2008 07:24:13 +0000 (07:24 +0000)]
From Paolo Abeni:
- the StringInfo allocator may fail when a 0 data length is requested
- many wrong values into the cipher_suites table
- duplicated code for ssl session state checking before each
  ssl_generate_keyring_material() call
- missing initialization of 'server_data_for_iv.data_len' and
  'client_data_for_iv.data_len' in ssl_session_init()

From Jaap Keuter:
- Some code rationalisation
- Gammatical/factual corrections in output and comments
- Whitespace cleanup

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25684 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix some spacing .....
wmeier [Wed, 9 Jul 2008 02:30:39 +0000 (02:30 +0000)]
Fix some spacing .....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25683 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix some mis-spellings
wmeier [Wed, 9 Jul 2008 01:30:30 +0000 (01:30 +0000)]
Fix some mis-spellings

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25682 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoDisplay "Decompression failed" when appropriate (& Fix some src spacing)
wmeier [Tue, 8 Jul 2008 22:36:35 +0000 (22:36 +0000)]
Display "Decompression failed" when appropriate (& Fix some src spacing)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25681 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoTighten heuristics a bit: if the caplen or iplen is 0 then it's not a valid CSIDS...
morriss [Tue, 8 Jul 2008 22:24:32 +0000 (22:24 +0000)]
Tighten heuristics a bit: if the caplen or iplen is 0 then it's not a valid CSIDS file

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25680 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoTighten heuristics a bit: traces with packets longer than 16k are no good (is this...
morriss [Tue, 8 Jul 2008 22:23:26 +0000 (22:23 +0000)]
Tighten heuristics a bit: traces with packets longer than 16k are no good (is this a valid limit?)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25679 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFrom Randy McEoin (bug 2654):
sake [Tue, 8 Jul 2008 21:44:05 +0000 (21:44 +0000)]
From Randy McEoin (bug 2654):

Avaya IPSI Control dissector

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25678 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2649 by adding some length...
morriss [Tue, 8 Jul 2008 20:04:11 +0000 (20:04 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2649 by adding some length checks to two while loops in tvb_uncompress()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25677 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoRegister raw_sip.line with correct protocol, as noticed while testing
martinm [Tue, 8 Jul 2008 16:32:56 +0000 (16:32 +0000)]
Register raw_sip.line with correct protocol, as noticed while testing
patch for 2581.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25676 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix bug 2662 (ULMAP HARQ_ULMAP_IE decode error).
martinm [Tue, 8 Jul 2008 16:05:41 +0000 (16:05 +0000)]
Fix bug 2662 (ULMAP HARQ_ULMAP_IE decode error).

From Frank Wang.

I'd prefer to delete wrong code, but we'll see if anyone misses it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25675 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix compile error
wmeier [Tue, 8 Jul 2008 03:21:54 +0000 (03:21 +0000)]
Fix compile error

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25674 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
wmeier [Tue, 8 Jul 2008 02:43:40 +0000 (02:43 +0000)]
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
   gtk_button_box_set_spacing()  ==> gtk_box_set_spacing()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25673 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
wmeier [Tue, 8 Jul 2008 02:25:30 +0000 (02:25 +0000)]
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
   gtk_timeout_add()     ==> g_timeout_add
   gtk_timeout_remove()  ==> g_source_remove()

Also: timer callback should return gboolean (not void or gint)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25672 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFix benign usage of incorrect symbol in #ifdef
wmeier [Fri, 4 Jul 2008 12:52:16 +0000 (12:52 +0000)]
Fix benign usage of incorrect symbol in #ifdef

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25669 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoIf we have pcap_free_datalinks(), use it. If not, then, on Windows,
guy [Fri, 4 Jul 2008 03:33:00 +0000 (03:33 +0000)]
If we have pcap_free_datalinks(), use it.  If not, then, on Windows,
just leak the list returned by pcap_list_datalinks(), as there's no
guarantee that if you have a library built with one version of the
MSVC++ run-time library, and it returns a pointer to allocated data, you
can free that data from a program linked with another version of the
MSVC++ run-time library.  (This is not an issue on UN*X.)

This should fix bug 2677.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25668 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoGet rid of #defines that are no longer being used (we now have a port
guy [Thu, 3 Jul 2008 19:50:15 +0000 (19:50 +0000)]
Get rid of #defines that are no longer being used (we now have a port
range list preference for HTTP, which we initialize to the default list).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25667 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agopacket-pkcs12-template.c uses the libgcrypt symbol GCRY_CIPHER_RFC2268_40
morriss [Thu, 3 Jul 2008 15:57:34 +0000 (15:57 +0000)]
packet-pkcs12-template.c uses the libgcrypt symbol GCRY_CIPHER_RFC2268_40
which, according to:


is new to the 1.1.92 release of libgcrypt.  Bump our required version of
libgcrypt from 1.1.42 to 1.1.92 .

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25666 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoFrom: Kovarththanan Rajaratnam; Add Windows browse file makefile target
wmeier [Thu, 3 Jul 2008 00:16:28 +0000 (00:16 +0000)]
From: Kovarththanan Rajaratnam; Add Windows browse file makefile target

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25665 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoRevert previous change.
etxrab [Wed, 2 Jul 2008 18:11:27 +0000 (18:11 +0000)]
Revert previous change.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25664 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoSee if this gets rid of some unused code warnings...
etxrab [Wed, 2 Jul 2008 16:32:48 +0000 (16:32 +0000)]
See if this gets rid of some unused code warnings...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25663 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoCOPYING is already put into the tarball; we don't need to add it here.
guy [Wed, 2 Jul 2008 08:50:11 +0000 (08:50 +0000)]
COPYING is already put into the tarball; we don't need to add it here.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25662 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoPush EXTRA_DIST entries into the lowest-level Makefile.am available.
guy [Wed, 2 Jul 2008 07:12:42 +0000 (07:12 +0000)]
Push EXTRA_DIST entries into the lowest-level Makefile.am available.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25661 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoPut the EXTRA_DIST items for the doc directory in doc/Makefile.am (which
guy [Wed, 2 Jul 2008 05:08:43 +0000 (05:08 +0000)]
Put the EXTRA_DIST items for the doc directory in doc/Makefile.am (which
doesn't need to be one of those items).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25660 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoInclude the new Makefile.common file.
guy [Wed, 2 Jul 2008 02:18:53 +0000 (02:18 +0000)]
Include the new Makefile.common file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25659 f5534014-38df-0310-8fa8-9805f1628bb7

11 years agoThis directory needs some checkapi love; it's not yet ready for that to
guy [Wed, 2 Jul 2008 02:00:28 +0000 (02:00 +0000)]
This directory needs some checkapi love; it's not yet ready for that to
be a default part of the build process, now that we're doing some more

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25658 f5534014-38df-0310-8fa8-9805f1628bb7