Commit Graph

25209 Commits

Author SHA1 Message Date
Guy Harris 2e18ba7873 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.

svn path=/trunk/; revision=25739
2008-07-14 20:26:58 +00:00
Sake Blok 03e0f71e8f 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.


svn path=/trunk/; revision=25738
2008-07-14 19:56:37 +00:00
Guy Harris e95265b926 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.

svn path=/trunk/; revision=25737
2008-07-14 19:28:19 +00:00
Guy Harris 1349de5532 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.

svn path=/trunk/; revision=25736
2008-07-14 18:56:25 +00:00
Guy Harris 4c5cc4c5e1 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.

svn path=/trunk/; revision=25735
2008-07-14 18:55:57 +00:00
Bill Meier 27f79440f5 Fix declaration to match change in SVN #25731
svn path=/trunk/; revision=25734
2008-07-14 11:32:19 +00:00
Jaap Keuter 2665b689c1 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.

svn path=/trunk/; revision=25733
2008-07-14 05:46:09 +00:00
Guy Harris 33c1d1206e 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.

svn path=/trunk/; revision=25732
2008-07-13 19:04:53 +00:00
Guy Harris a985d71ec1 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.

svn path=/trunk/; revision=25731
2008-07-13 18:56:54 +00:00
Jaap Keuter e86825b8f8 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

svn path=/trunk/; revision=25730
2008-07-13 17:19:33 +00:00
Guy Harris 2509b0e0c9 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.

svn path=/trunk/; revision=25729
2008-07-13 17:11:02 +00:00
Stig Bjørlykke 1d4deb0f19 From Jess Balint (bug 2700):
Implement field decoding in mysql protocol dissector.

svn path=/trunk/; revision=25728
2008-07-12 20:02:10 +00:00
Stig Bjørlykke 963ed71cfc 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.

svn path=/trunk/; revision=25727
2008-07-12 19:53:53 +00:00
Stig Bjørlykke 657104a0db Small whitespace fix.
svn path=/trunk/; revision=25726
2008-07-12 19:28:24 +00:00
Stig Bjørlykke b1e0d8edc5 Correct help topic for firewall dialog.
svn path=/trunk/; revision=25725
2008-07-12 19:28:08 +00:00
Guy Harris f805676e19 Make erf.ethfcs a Boolean, with "FCS present" and "FCS not present" the
only options, and default to "FCS present".

svn path=/trunk/; revision=25724
2008-07-12 18:26:47 +00:00
Guy Harris cb21120f17 Clean up indentation.
svn path=/trunk/; revision=25723
2008-07-12 17:37:22 +00:00
Sake Blok 58b30f1567 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


svn path=/trunk/; revision=25722
2008-07-12 17:23:18 +00:00
Jaap Keuter 445e2212b7 Move the registration for SSL sockets to the protocol dissectors themselves.
svn path=/trunk/; revision=25721
2008-07-12 14:42:14 +00:00
Guy Harris a092f9857d Rename the preference values to something that leaves out the "eth" (as
it's redundant).

svn path=/trunk/; revision=25720
2008-07-12 02:42:33 +00:00
Guy Harris 6d0ad7e140 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.

svn path=/trunk/; revision=25719
2008-07-12 02:36:32 +00:00
Jeff Morriss df97fc7420 More stats tree unsigned->signed char cleanup
svn path=/trunk/; revision=25718
2008-07-12 02:01:42 +00:00
Jeff Morriss c50b4aec09 More (mostly stats tree) unsigned->signed char cleanup
svn path=/trunk/; revision=25717
2008-07-12 01:48:24 +00:00
Jeff Morriss 71c1e4faf0 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.

svn path=/trunk/; revision=25716
2008-07-11 21:13:39 +00:00
Jeff Morriss bde286846f Fix a couple gint/guint mismatches
svn path=/trunk/; revision=25715
2008-07-11 20:19:52 +00:00
Jeff Morriss 1944665283 tvb_format_text() returns a pointer chars, not guint8s
svn path=/trunk/; revision=25714
2008-07-11 20:15:52 +00:00
Jeff Morriss 8b4468cacd Fix a couple signed/unsigned char mismatches (still more here)
svn path=/trunk/; revision=25713
2008-07-11 20:12:22 +00:00
Jeff Morriss 2a89ea15d5 Cast away the unsignedness of a string (which has had EBCDIC_to_ASCII() run on it)
svn path=/trunk/; revision=25712
2008-07-11 20:05:44 +00:00
Jeff Morriss 83b913dd13 prefs_register_uint_preference() takes a pointer to a guint, not a pointer to gint.
svn path=/trunk/; revision=25711
2008-07-11 20:00:41 +00:00
Jeff Morriss 28426d27ff 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.
svn path=/trunk/; revision=25710
2008-07-11 19:56:43 +00:00
Jeff Morriss 83ae90ae83 In a call to proto_tree_add_bytes_format(): actually pass a pointer to the start of the bytes
svn path=/trunk/; revision=25709
2008-07-11 19:48:30 +00:00
Jeff Morriss bb72192654 Change a string's declaration from guint8 to a gchar
svn path=/trunk/; revision=25708
2008-07-11 19:30:10 +00:00
Jeff Morriss 9d67d57cad Change a guchar to gchar: it's used as a regular string
svn path=/trunk/; revision=25707
2008-07-11 19:18:54 +00:00
Jeff Morriss 19e29f228f Remove some dead (statement not reached) code (while trying to avoid any false control reaches end of non-void function warnings)
svn path=/trunk/; revision=25706
2008-07-11 18:56:03 +00:00
Jeff Morriss ccd5751c19 packet-k12.c expects pseudo_header->k12.extra_info to be guchar so make it a unsigned
svn path=/trunk/; revision=25705
2008-07-11 16:37:21 +00:00
Jeff Morriss 2cd9755e81 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.

svn path=/trunk/; revision=25704
2008-07-11 16:18:32 +00:00
Jaap Keuter 77c287a58c 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.

svn path=/trunk/; revision=25703
2008-07-11 16:03:06 +00:00
Jeff Morriss 0c18cbc98f (Finally) stop guint16s to access a string: just treat it as an array of chars and swap them "the hard way".
svn path=/trunk/; revision=25702
2008-07-11 15:16:03 +00:00
Guy Harris b92594e56c 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.

svn path=/trunk/; revision=25701
2008-07-11 03:16:54 +00:00
Guy Harris 08b4f712c8 Note bug 2699, which reports a bug in xdg-open.
svn path=/trunk/; revision=25700
2008-07-10 18:36:19 +00:00
Guy Harris 2577fe6e01 Include <ctype.h> to define isalpha().
svn path=/trunk/; revision=25699
2008-07-10 18:35:11 +00:00
Jeff Morriss 7ab9808489 Cast that guint16 into a char before trying to NULL terminate the string (so that we only set 1 byte to 0, not 2).
svn path=/trunk/; revision=25697
2008-07-10 13:42:51 +00:00
Gerald Combs 98f5096bbd Replace r25638 with a better fix. On Windows, don't open a console window if
we've been passed "-i -", since it clobbers stdio.

svn path=/trunk/; revision=25695
2008-07-09 23:28:18 +00:00
Jeff Morriss 8580c6ab54 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.
svn path=/trunk/; revision=25693
2008-07-09 21:22:00 +00:00
Jeff Morriss 9bd70e0d1d Don't cast a char[] into a guint32/64: the array may not be aligned correctly. This fixes a warning on Solaris/SPARC.
svn path=/trunk/; revision=25692
2008-07-09 20:16:24 +00:00
Jeff Morriss 34e3e26d07 Reindent some to get things a bit more consistent/readable.
svn path=/trunk/; revision=25691
2008-07-09 20:09:23 +00:00
Jeff Morriss 74c02268d8 Add MP3 to the list of magic types
svn path=/trunk/; revision=25690
2008-07-09 19:15:50 +00:00
Jaap Keuter 0f199f4bff From Sven Eckelmann:
Just forgot to set inited variable in reg_handoff_bat_*().

svn path=/trunk/; revision=25689
2008-07-09 19:10:54 +00:00
Jaap Keuter e957d8ad1a 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.

svn path=/trunk/; revision=25688
2008-07-09 18:37:50 +00:00
Martin Mathieson f37686bc6f 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.

svn path=/trunk/; revision=25685
2008-07-09 14:50:05 +00:00