Commit Graph

4540 Commits

Author SHA1 Message Date
Guy Harris ee5ca25d31 Include files from the "epan" directory and subdirectories thereof with
"epan/..." pathnames, so as to avoid collisions with header files in any
of the directories in which we look (e.g., "proto.h", as some other
package has its own "proto.h" file which it installs in the top-level
include directory).

Don't add "-I" flags to search "epan", as that's no longer necessary
(and we want includes of "epan" headers to fail if the "epan/" is left
out, so that we don't re-introduce includes lacking "epan/").

svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
Guy Harris 64c8032c3b "ethereal.spec" is now in the "packaging/rpm/SPECS" directory, so remove
it from the .cvsignore file in the "packaging/rpm" directory.

svn path=/trunk/; revision=4585
2002-01-21 07:24:14 +00:00
Guy Harris 9fb6b48a49 Add a .cvsignore file.
svn path=/trunk/; revision=4584
2002-01-21 07:22:58 +00:00
Guy Harris c78ec94c25 The family and subtype fields in AIM messages are 16-bit fields, and
apparently specified in hex; display them as such in the Info column.

svn path=/trunk/; revision=4583
2002-01-20 23:42:51 +00:00
Guy Harris a45d3d3bfe Fix some problems in protocol preferences blurbs.
svn path=/trunk/; revision=4582
2002-01-20 23:25:55 +00:00
Gerald Combs b11f1955e4 Revamp the RPM building process. For versions of rpm that support
"--define", we now build the RPM and SRPM packages in packages/rpm.
As a result, one need not be root to build RPM-based packages.

Move the specfile to packaging/rpm/SPECS.

Update the INSTALL document to include the various packaging makefile
targets.

svn path=/trunk/; revision=4581
2002-01-20 23:05:25 +00:00
Guy Harris 287425df9c From Michael Tuexen:
put a CRC32C checksum into the header of SCTP packets;

	add a new "-S" option that is similar to "-s" but that also
	includes the DATA chunk header, for input files that contain
	only SCTP payloads.

svn path=/trunk/; revision=4580
2002-01-20 22:36:03 +00:00
Guy Harris bcb323d403 Editorial change, from Michael Tuexen.
svn path=/trunk/; revision=4579
2002-01-20 22:28:50 +00:00
Guy Harris 92915713d3 Allow a length of -1 to be specified when adding FT_NONE and FT_PROTOCOL
items to the protocol tree; it's interpreted as "the rest of the data in
the tvbuff".  This can be used if

	1) the item covers the entire packet or the remaining payload in
	   the packet

or

	2) the item's length won't be known until it's dissected, and
	   will be then set with "proto_item_set_len()" - if an
	   exception is thrown in the dissection, it means the item ran
	   *past* the end of the tvbuff, so saying it runs to the end of
	   the tvbuff is reasonable.

Convert a number of "proto_tree_add_XXX()" calls using
"tvb_length_remaining()", values derived from the result of
"tvb_length()", or 0 (in the case of items whose length is unknown) to
use -1 instead (using 0 means that if an exception is thrown, selecting
the item highlights nothing; using -1 means it highlights all the data
for that item that's available).

In some places where "tvb_length()" or "tvb_length_remaining()" was used
to determine how large a packet is, use "tvb_reported_length()" or
"tvb_reported_length_remaining()", instead - the first two calls
indicate how much captured data was in the packet, the latter two calls
indicate how large the packet actually was (and the fact that using the
latter could cause BoundsError exceptions to be thrown is a feature - if
such an exception is thrown, the frame really *was* short, and it should
be tagged as such).

Replace some "proto_tree_add_XXX()" calls with equivalent
"proto_tree_add_item()" calls.

Fix some indentation.

svn path=/trunk/; revision=4578
2002-01-20 22:12:39 +00:00
Guy Harris a0d7e90519 Make the blurbs for protocol preference items into tooltips. (This also
lets us add tooltips to other preference items whose widgets are created
with the "create_preference_XXX()" routines - just pass in a tooltip
text string rather than a null pointer.)

svn path=/trunk/; revision=4577
2002-01-20 20:05:18 +00:00
Guy Harris e2e7d2961e In "dissect_rpc_opaque_data()":
get rid of some dead code;

	get rid of some unnecessary initializations of variables that
	are set in all code paths;

	get rid of some set-but-not-used variables;

	if the data runs past the end of the tvbuff, throw the
	appropriate exception, to stop the dissection and appropriately
	mark the frame, after putting in the item for the truncated
	data.

svn path=/trunk/; revision=4576
2002-01-20 01:13:41 +00:00
Guy Harris ce6db7ff97 If reassembly is enabled, don't try to do any reassembly work at all on
a fragment unless we've captured all the data in the fragment and (in
IPv4 and CLNP) it has a valid checksum, so that if the first fragment is
a short frame or a frame with an invalid checksum, we'll treat it as if
reassembly weren't enabled, and will dissect what data we have in it,
rather than not dissecting *any* of the fragments above the IP/CLNP
layer.

svn path=/trunk/; revision=4575
2002-01-20 01:04:18 +00:00
Guy Harris b6c6ff4106 We no longer do explicit checks in low-level routines for running past
the end of the data in the packet, so we don't need to do those checks
in the callers of those routines - and thus don't need to do those
checks in the callers of *those* routines.

svn path=/trunk/; revision=4574
2002-01-19 23:59:03 +00:00
Guy Harris 7504382c40 When dissecting an RPC array, make the initial length of the protocol
tree item for the entire array the amount of captured data remaining in
the tvbuff, rather than 0, so that if we run out of captured data and
throw an exception, the length is correct.

svn path=/trunk/; revision=4573
2002-01-19 19:15:33 +00:00
Guy Harris 13fe7dd35c Put one NDMP top-level protocol tree item in for every NDMP PDU (which
means *no* top-level tree item if we don't find any NDMP PDUs).

Check for desegmentation before checking anything else, so that we don't
fail to desegment merely because we have, for example, only the record
marker in the first TCP segment (I've seen a capture where the first TCP
segment of an NDMP message has only the record marker).

svn path=/trunk/; revision=4572
2002-01-18 22:37:56 +00:00
Guy Harris 973980e2e3 Add an option to turn off TCP checksum checking (and to *allow*
desegmentation even though we don't know whether the checksum is valid).
I've seen packets with bad TCP checksums in Solaris network traces, but
the traffic appears to indicate that the packet *was* received; I
suspect the packets were sent by the host on which the capture was being
done, on a network interface to which checksumming was offloaded, so
that DLPI supplied an un-checksummed packet to the capture program but a
checksummed packet got put onto the wire.

svn path=/trunk/; revision=4571
2002-01-18 22:35:19 +00:00
Nathan Neulinger f808c9f0de get-entry-by-name-u updates
svn path=/trunk/; revision=4570
2002-01-18 21:46:51 +00:00
Nathan Neulinger 805aa64c89 slight improvements to afs parsing, bulkstatus still needs work
svn path=/trunk/; revision=4569
2002-01-18 21:30:05 +00:00
Guy Harris 8e18ef8bbc Make the default for NDMP desegmentation TRUE, as is the case for most
other protocols running atop TCP (and which should be the case for *all*
of them, if it isn't so already; there's already a flag to control
desegmentation in TCP, and it should, by default, be possible to turn
that on and get desegmentation of all protocols).

svn path=/trunk/; revision=4568
2002-01-18 21:16:39 +00:00
Guy Harris 4d81335d28 Squelch a valid compiler warning (passing a "char" to the "is..." macros
can give the wrong answer if the 8th bit of the "char" is set).

svn path=/trunk/; revision=4567
2002-01-18 19:46:19 +00:00
Guy Harris ea34f3728c Put back the check for gzseek() when building with the GTK+ build flags
(well, the check used to be a check for gzgets(), but we now have our
own version of that), so that, on a system with multiple versions of
zlib where the GTK+ -L flags get you an old version without gzgets(),
the configure fails, rather than the build failing.

svn path=/trunk/; revision=4566
2002-01-18 08:28:22 +00:00
Guy Harris 7fbd9f378f Memory freeing fix, from Jirka Novak.
svn path=/trunk/; revision=4565
2002-01-18 07:29:40 +00:00
Guy Harris b4867007ca Support for hex dump mode in "Follow TCP Stream" window showing hex and
ASCII data, from Jirka Novak.

svn path=/trunk/; revision=4564
2002-01-18 07:25:22 +00:00
Guy Harris 203d0680a1 The time base in an EtherPeek capture isn't necessarily the start time
of the capture, so change some names and comments.

svn path=/trunk/; revision=4563
2002-01-18 01:08:36 +00:00
Guy Harris 68115d6089 It's EtherPeek, not Etherpeek, as WildPackets' Web site indicates.
svn path=/trunk/; revision=4562
2002-01-18 00:48:37 +00:00
Guy Harris 6cdc5dfde2 In the EtherPeek file reader, keep the capture start time in a private
data structure attached to the "wtap" structure, rather than in a
pseudo-header structure; get rid of the EtherPeek pseudo-header
structure, as it's not actually used as a pseudo-header, it's just used
as private data for the EtherPeek reader.

Get rid of an extra level of indentation in switch statements.

svn path=/trunk/; revision=4561
2002-01-18 00:25:50 +00:00
Guy Harris 3ee2d34a23 The packet length field in a TNS packet is 16 bits; make it an
FT_UINT16.

svn path=/trunk/; revision=4560
2002-01-18 00:03:50 +00:00
Guy Harris 63b390cd74 Use "proto_tree_add_item()" whenever possible; this fixes some bugs
where the wrong "proto_tree_add_XXX" routine was being called.

svn path=/trunk/; revision=4559
2002-01-17 20:47:33 +00:00
Guy Harris 816e7978c4 Mark un-reassembled TCP segments as (possibly) being un-reassembled, by
setting the "pinfo->fragmented" flag.

If a ReportedBoundsError occurs, flag the frame as being an
unreassembled packet, not an unreassembled fragmented packet, as it may
have been segmented across TCP segment boundaries rather than being part
of an IPv4/IPv6/CLNP/etc. fragmented/segmented packet.

svn path=/trunk/; revision=4558
2002-01-17 09:28:22 +00:00
Guy Harris cd172815f6 Do desegmentation.
Collapse the two loops through the TCP segment into one.

Use "tvb_reported_length()", not "tvb_length()", to find out how big the
TCP segment is ("tvb_length()" says how much of it was captured, not how
much of it there is).

svn path=/trunk/; revision=4557
2002-01-17 09:25:55 +00:00
Guy Harris 833fd03080 "pinfo->desegment_len" is initialized by TCP only if desegmentation is
being done; otherwise, it contains random data.  As such, don't use it
as a way for the SSL2 and SSL3 record dissectors to indicate to the
top-level SSL dissector that the last record is continued in a
subsequent TCP segment - pass a pointer to a flag and have the record
dissectors set that flag if they record that we need to do
desegmentation.

svn path=/trunk/; revision=4556
2002-01-17 09:24:05 +00:00
Guy Harris fb1e26fe6a Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that).  Mark the latter as being
unreasembled rather than malformed.

Properly initialize, save, and restore that field, and properly set it,
so that works.

svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
Guy Harris 28d7063364 Put the "-s" option in the SYNOPSIS section.
svn path=/trunk/; revision=4554
2002-01-16 21:06:22 +00:00
Guy Harris 4deaae7705 SCTP support in text2pcap, and fix to usage message for "-u", from
Michael Tuexen.

Documentation of SCTP support in text2pcap, from me.

svn path=/trunk/; revision=4553
2002-01-16 21:05:10 +00:00
Guy Harris 704493f4e2 From Mark Burton: reinstate data segment digest handling, and stop the
SCSI dissector from treating data digests as payload.

svn path=/trunk/; revision=4552
2002-01-16 20:25:07 +00:00
Gilbert Ramirez 06348ee4e0 Tethereal needs to allocate space for col_expr[] and col_expr_val[] too.
Capturing with non-verbose output being printed segfaulted w/o this.

svn path=/trunk/; revision=4551
2002-01-15 23:11:02 +00:00
Guy Harris 61147d4da2 Collapse the two entries for Mark Burton into one.
svn path=/trunk/; revision=4550
2002-01-15 23:07:20 +00:00
Guy Harris e1af77c959 Make the label for the SCTP checksum type preference item indicate that
it's a checksum type (and remove "SCTP", as that's redundant), and make
the blurb explain it in a bit more detail.

svn path=/trunk/; revision=4549
2002-01-15 23:05:36 +00:00
Guy Harris eb1d00480f From Michael Tuexen:
- Support of the crc32c algorithm.
	- Selection of the checksum algorithm (none, adler-32, crc32c,
	  automatic) in the preferences/protocols menu.
	- Display of the IP address in asconf chunks.

svn path=/trunk/; revision=4548
2002-01-15 22:58:06 +00:00
Guy Harris b8157b393c From Marc Milgram: fix to allow VMS TCPIPtrace files that don't have
exactly 3 spaces before the word "TCPIPtrace" to be recognized.

svn path=/trunk/; revision=4547
2002-01-15 20:18:02 +00:00
Guy Harris f4c930c8e2 From Martti Kuparinen: update the HMIPv6 support to match the latest
draft (draft-ietf-mobileip-hmipv6-05.txt).

svn path=/trunk/; revision=4546
2002-01-15 20:11:10 +00:00
Guy Harris df6fa9cc90 Include <resolv.h> after "globals.h", as, at least on some platforms,
headers included by "globals.h" define MAXNAMELEN, and <resolv.h>
defines it if it's not already defined.

svn path=/trunk/; revision=4545
2002-01-15 20:09:55 +00:00
Guy Harris e4f05dcac2 Correctly handle BGP attributes with lists of entries when the attribute
has the "extended length" flag set - the starting offset of the list
depends on whether the "extended length" bit was set or not.

svn path=/trunk/; revision=4544
2002-01-15 10:12:17 +00:00
Guy Harris 86d348aed1 Fix some preferences to eliminate the extra copy of the protocol name at
the beginning, and to use underscores rather than periods where the
preference's name really isn't part of a hierarchical namespace.

Use "%u" rather than "%d" to print unsigned quantities.

svn path=/trunk/; revision=4543
2002-01-15 10:01:21 +00:00
Guy Harris c8f8db531f When checking whether to do DCERPC-over-SMB reassembly on a Read and X
response, don't assume that we saw the request and therefore that
"si->sip" is non-null - we might well not have seen the request and thus
might not have set "si->sip".

svn path=/trunk/; revision=4542
2002-01-15 09:42:26 +00:00
Uwe Girlich 164e11c137 From Ronnie Sahlberg:
this fixes the bug that nfs name snooping did not work for nfs v2.

svn path=/trunk/; revision=4541
2002-01-14 13:16:31 +00:00
Uwe Girlich eebc0a4a66 NFSv3 fsstat reply label texts explanded. "afiles" and similar names were not
really that useful.

svn path=/trunk/; revision=4540
2002-01-14 12:22:58 +00:00
Guy Harris d520b16754 Give each LDAP packet its own top-level protocol tree item. (This also
means if there are no complete LDAP packets in a TCP segment, there is
no LDAP top-level protocol tree item, which is as it should be.)

svn path=/trunk/; revision=4539
2002-01-14 03:01:13 +00:00
Guy Harris cbd0ae1706 Add support for TCP desegmentation.
svn path=/trunk/; revision=4538
2002-01-14 02:50:28 +00:00
Guy Harris 32d7eac1ce Get the current value of Boolean preferences before adding widgets for
them (by putting back a line that got accidentally deleted in a previous
checkin).

svn path=/trunk/; revision=4537
2002-01-14 01:14:52 +00:00