Commit Graph

20 Commits

Author SHA1 Message Date
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Bill Meier c544c20956 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27050
2008-12-18 19:08:49 +00:00
Jörg Mayer 4149a23cc5 Trivial warning fixes
svn path=/trunk/; revision=26899
2008-12-02 08:11:23 +00:00
Stig Bjørlykke 63a2017571 Add a cast to avoid a warning.
svn path=/trunk/; revision=26315
2008-09-30 22:01:04 +00:00
Bill Meier aa30dcd129 Minor proto_reg_handoff cleanup: use find_dissector when appropriate.
svn path=/trunk/; revision=26308
2008-09-30 14:49:44 +00:00
Anders Broman 637761d295 From Francesco Fusco:
Endace ERFII (extension header) support.

svn path=/trunk/; revision=26287
2008-09-29 16:20:24 +00:00
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
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 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 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
Guy Harris 18bc1a2fef Make the default for HDLC traffic "Raw data", just as it is for other
record types, so that people know they have to set the preference.

svn path=/trunk/; revision=25609
2008-06-26 01:47:59 +00:00
Guy Harris 1f08653d0e Make the preference settings for the dissector to use for various ERF
link-layer types static.

If the preference is set to "raw data" for any of those types, display
the raw data with an indication that the preference in question has been
set to "raw data", so people don't just wonder why ERF files aren't
working right any more.  (See bug 2641; I had the same surprise when I
tried it on some ERF captures I have.)

Pull the dissect_erf_header() code into dissect_erf() - it's dissecting
the *payload*, not the *header*.

Fill in the Info column with the record type.

When using tvb_new_subset() to chop a header off of a tvbuff, just
specify lengths of -1, so we go all the way to the end.

Clean up the Infiniband dissector call.

svn path=/trunk/; revision=25608
2008-06-26 01:38:38 +00:00
Bill Meier 392d7f7376 Convert C++ style comments ...
svn path=/trunk/; revision=25273
2008-05-11 17:18:59 +00:00
Gerald Combs 68d23708bc From Stephen Donnelly via bug 2235:
This plugin implements a dissector for Infiniband. It is released 
under the GPL v2.

Rather than using say libpcap to capture raw (unframed) IP packets 
from near the top of an IPoIB stack, this plugin dissects link level
Infiniband frames.

Infiniband trace files can be read from Endace ERF format trace 
files, or from libpcap DLT_ERF files containing ERF TYPE_INFINIBAND 
records. There is currently no native DLT_INFINIBAND in libpcap.

Each record contains a hardware timestamp, capture metadata such as 
port Id, and a complete link level Infiniband frame starting from
the Local Route Header.

svn path=/trunk/; revision=24628
2008-03-14 17:47:53 +00:00
Stig Bjørlykke 42fe2398b9 Added missing "svn:keywords Id" and "svn:eol-style native" for some
c and h files.

svn path=/trunk/; revision=24290
2008-02-08 09:45:36 +00:00
Guy Harris aa2d38ffb3 pinfo->pseudo_header can and should be assumed to be non-null by a
dissector.  This fixes Coverity CID 238 (as we *were* assuming it was
non-null in one statement, and then only checking it later).

Set pinfo->p2p_dir to one of P2P_DIR_RECV or P2P_DIR_SENT, as it's
supposed to be, not to a Boolean value, and explain the basis on which
it's being set.

svn path=/trunk/; revision=24055
2008-01-10 09:40:15 +00:00
Jörg Mayer c2390c4ef7 Bugfix: Array overflow (found by gcc43)
svn path=/trunk/; revision=23907
2007-12-18 00:44:49 +00:00
Anders Broman b9f9b33e0e From Florent DROUIN:
This is a replacement of the existing decoding of ERF files (Extensible Record
Format from Endace). 
For the decoding of the ERF files, according to the "type of record" given in
the ERF header, several decoders can be used. Up to now, the decoder is
determined according to an environment variable, or with a kind of heuristic.
And, all the treatment is done during the file extraction.

The new architecture, will separate the ERF file decoding, and the ERF record
decoding. The ERF records will be decoded with a specific dissector. This
dissector can be configured with options, to replace the environment variable.

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1839

svn path=/trunk/; revision=23092
2007-10-08 11:41:21 +00:00