Commit Graph

54 Commits

Author SHA1 Message Date
Guy Harris 0b02239c68 Eliminate the packet_info pointer argument from routines that don't use
it.

svn path=/trunk/; revision=7532
2003-04-22 18:59:45 +00:00
Michael Tüxen 58fb40b8d0 - handle the col_set_fence stuff for upper layers.
- the control chunk info in the info column can be suppressed
  by using an option in the protocol preferences menu. The
  default is to show always control chunks in the Info column
  which is the old behaviour.

svn path=/trunk/; revision=7530
2003-04-22 13:52:37 +00:00
Michael Tüxen f9dcb193a1 - a 'quick hack' for col_set_fence support for better INOF column handling (a new version
of the SCTP dissector is in development...)
- change of my e-mail address.

svn path=/trunk/; revision=7504
2003-04-19 20:16:18 +00:00
Guy Harris ab552d3746 Get rid of BASE_BIN - it's just the same as BASE_DEC, but people seemed
to be using it for stuff that should be hex, and for stuff that should
be Boolean.  Use BASE_DEC if it should be decimal, BASE_HEX if it should
be hex, and make it Boolean if it should be Boolean.

svn path=/trunk/; revision=7053
2003-01-31 03:17:56 +00:00
Michael Tüxen 91767f9d29 Get rid of old ASAP PPID.
svn path=/trunk/; revision=6948
2003-01-20 22:46:27 +00:00
Guy Harris cdbf86b42a Don't have two entries for the official ASAP PPID, have one for it and
one for the old one.

svn path=/trunk/; revision=6929
2003-01-15 01:20:32 +00:00
Guy Harris a002a0fec4 From Christian Falckenberg: beginnings of a MEGACO dissector.
Move SCTP payload protocol IDs to a header file, and get the PPIDs from
that header file rather than defining them in dissectors running atop
SCTP.  Use both the old(?) and official PPID for ASAP.

svn path=/trunk/; revision=6926
2003-01-14 23:53:40 +00:00
Guy Harris e3fe8c0d34 From Anders Broman: some additional SCTP payload protocol IDs.
svn path=/trunk/; revision=6925
2003-01-14 22:54:20 +00:00
Michael Tüxen 4744edb0be Fixed a typo.
svn path=/trunk/; revision=6918
2003-01-13 14:04:31 +00:00
Michael Tüxen 385249b3c1 Fixed a bug regarding the handling of correlation ids.
svn path=/trunk/; revision=6745
2002-12-05 10:19:13 +00:00
Michael Tüxen d154bf7d16 Added support for the Implementers Guide.
svn path=/trunk/; revision=6744
2002-12-04 17:07:26 +00:00
Guy Harris 59932f2722 Don't cast away constness, and fix variable and structure member
qualifiers as necessary to ensure that we don't have to.

"strcmp()", "strcasecmp()", and "memcmp()" don't return booleans; don't
test their results as if they did.

Use "guint8", not "guchar", for a pointer to (one or more) 8-bit bytes.

Update Michael Tuexen's e-mail address.

svn path=/trunk/; revision=6726
2002-12-02 23:43:30 +00:00
Michael Tüxen e87b15d031 Fixed a bug on 64 bit machines in the CRC32C algorithm. Thanks to
Jerome Forissier.

svn path=/trunk/; revision=6444
2002-10-17 18:44:10 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris cb4c2bdc3e From Michael Tuexen:
get rid of presumably-unneeded #includes;

	correct the DATA chunk handling when padding bytes are
	available.

svn path=/trunk/; revision=5857
2002-07-10 21:01:57 +00:00
Guy Harris fb7638472f From Michael Tuexen: update to match the latest I-Ds for two extensions:
http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-addip-sctp-06.txt
	http://www.ietf.org/internet-drafts/draft-stewart-tsvwg-prsctp-01.txt

svn path=/trunk/; revision=5784
2002-06-28 22:38:42 +00:00
Guy Harris 2be8f3e875 When looking for dissectors for the source and destination port numbers
in TCP, UDP, and SCTP, try the lower port number first, and then the
higher port number; this means that, for packets where a dissector is
registered for *both* port numbers:

	1) we pick the same dissector for traffic going in both directions;

	2) we prefer the port number that's more likely to be the right
	   one (as that prefers well-known ports to reserved ports);

although there is, of course, no guarantee that any such strategy will
always pick the right port number.

Ignore port numbers of 0, as some dissectors use a port number of 0 to
disable the port, and as RFC 768 says that the source port in UDP
datagrams is optional and is 0 if not used.

svn path=/trunk/; revision=5656
2002-06-08 21:54:52 +00:00
Guy Harris 531cb17873 From Albert Chin: fix various non-GCC compiler warnings.
svn path=/trunk/; revision=5600
2002-05-30 08:34:19 +00:00
Guy Harris e63d569f57 From Michael Tuexen: updates to later IETF drafts:
draft-ietf-tsvwg-addip-sctp-05.txt for the add-IP extension
	draft-stewart-prsctp-00.txt for the 'Partial Reliability' extension
	draft-ietf-tsvwg-sctpcsum-07.txt

svn path=/trunk/; revision=5503
2002-05-18 20:33:53 +00:00
Guy Harris 7ac653c0b4 From Michael Tuexen: add missing support for the T-Bit in ABORT chunks.
svn path=/trunk/; revision=5174
2002-04-16 19:58:53 +00:00
Guy Harris 64fe90a383 From Joerg Mayer: get rid of some unused variables and arguments.
Use "tvb_get_ntohs()" to fetch the checksum from a VJ compressed packet,
rather than doing the ntoh by hand.

svn path=/trunk/; revision=5163
2002-04-14 23:22:22 +00:00
Guy Harris 35b6984183 From Michael Tuexen: report the type of an unrecognized parameter.
svn path=/trunk/; revision=4855
2002-03-03 22:42:08 +00:00
Guy Harris ceb7646a79 From Michael Tuexen: update the CRC32 checksum code to match
draft-ietf-tsvwg-sctpcsum-03.

svn path=/trunk/; revision=4844
2002-03-02 07:29:10 +00:00
Guy Harris db4892b8a3 From Michael Tuexen:
add a hidden "sctp.port" field, with two instances per protocol
	    tree, one with the source port and one with the destination
	    port (like "tcp.port" and "udp.port");

	replace "sctp.checksum_correct" with "sctp.checksum_bad" (like
	    "tcp.checksum_bad" and "udp.checksum_bad").

svn path=/trunk/; revision=4682
2002-02-02 21:17:10 +00:00
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 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 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 b2e832d9ca From Michael Tuexen - SCTP updates:
- Support for the Add-IP extension defined in
 http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-addip-sctp-03.txt
- Support for the Limited Retransmission extension of SCTP defined in
 http://www.sctp.org/draft-ietf-tsvwg-usctp-01.txt
- Defining sctp.checksum_correct as a hidden boolean item to be able
 to search for SCTP packet with an incorrect checksum.

svn path=/trunk/; revision=4426
2001-12-19 20:01:56 +00:00
Guy Harris 23319ff023 Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.

That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.

svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
Guy Harris 75cc056222 Attach a descriptive name field type and base to dissector tables; that
specifies how the selector values used as keys in those tables are to be
displayed, and the title to use when displaying the table.

Use that information in the code to display the initial and current
entries of various dissector tables.

Have the dissector for BACnet APDUs register itself by name, and have
the BACnet NPDU dissector call it iff the BAC_CONTROL_NET bit isn't set,
rather than doing it with a dissector table.

svn path=/trunk/; revision=4358
2001-12-08 06:41:48 +00:00
Guy Harris bced8711f6 Make "dissector_add()", "dissector_delete()", and "dissector_change()"
take a dissector handle as an argument, rather than a pointer to a
dissector function and a protocol ID.  Associate dissector handles with
dissector table entries.

svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
Guy Harris 7e27e176c0 Show parameter types in hex.
Make enumerated types be fields with a value_string table, so that you
can filter on them by name.

svn path=/trunk/; revision=4070
2001-10-23 20:14:20 +00:00
Guy Harris aa4cd01b9b Get rid of "proto_tree_add_notext()" - if you create a subtree using it,
but, before you set the text, you throw an exception while putting stuff
under the subtree, you end up with an absolutely blank protocol tree
item, which is really gross.  Instead of calling
"proto_tree_add_notext()", call "proto_tree_add_text()" with at least a
minimal label - yes, it does mean you do some work that will probably be
unnecessary, but, absent a scheme to arrange to do that work if it *is*
necessary (e.g., catching exceptions), the alternative is an ugly
protocol tree display.

svn path=/trunk/; revision=3879
2001-08-28 08:28:19 +00:00
Guy Harris 541af0c740 Use the "pinfo" argument, rather than the global "pi", to refer to the
packet information in tvbuffified dissectors.

svn path=/trunk/; revision=3645
2001-07-03 04:56:46 +00:00
Guy Harris 8e50692576 Fix a typo.
svn path=/trunk/; revision=3597
2001-06-21 22:35:33 +00:00
Guy Harris 8412393197 From Joerg Mayer: explicitly fill in all members of a
"header_field_info" structure, including the ones that are later set by
the routines to register fields.

svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
Guy Harris c75f555d8c Move the declarations of IP protocol numbers to "ipproto.h" from
"packet-ip.h".

Fix Gerald's address in some files while we're at it.

svn path=/trunk/; revision=3366
2001-04-23 17:51:37 +00:00
Guy Harris 3c1508a6b3 Fix Gerald's e-mail address - and fix it in "README.developer", so
people don't blindly insert the old address into new dissectors, which
is probably how it got into the dissectors being fixed here.

svn path=/trunk/; revision=3348
2001-04-20 20:34:31 +00:00
Guy Harris 16964010e1 SCTP dissector fix from Michael Tuexen.
svn path=/trunk/; revision=3272
2001-04-09 00:21:07 +00:00
Guy Harris 32d63ecb30 Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.

Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.

"Tvbuffify" the Mobile IP dissector (it took old-style arguments, and
then converted them into tvbuff arguments, so there wasn't much to do,
other than to fix references to "fd" to refer to "pinfo->fd").

In the SCTP dissector, refer to the port type and source and destination
ports through "pinfo" rather than through the global "pi", as it's a
tvbuffified dissector.

In the SMTP and Time Protocol dissectors, use "pinfo->match_port" rather
than "TCP_PORT_SMTP" when checking whether the packet is a request or
reply, just in case somebody makes a non-standard port be dissected as
SMTP or Time.  (Also, remove a bogus comment from the Time dissector; it
was probably cut-and-pasted from the TFTP dissector.)

svn path=/trunk/; revision=2938
2001-01-25 06:14:14 +00:00
Guy Harris 5531f6945c Update from Michael Tuexen to enhance handling of bundled upper layer
packets.

svn path=/trunk/; revision=2897
2001-01-14 08:27:25 +00:00
Guy Harris d88ed3d445 Support for dissectors registering themselves with a particular SCTP
payload protocol ID as well as with a particular SCTP port number, from
Michael Tuexen.

svn path=/trunk/; revision=2891
2001-01-13 04:30:20 +00:00
Gilbert Ramirez 9e6d0e1717 Update the SCTP dissector, and add a dissector for
ISDN Q.921-User Adaptation Layer (IUA).
Both are from Michael.Tuexen@icn.siemens.de>

svn path=/trunk/; revision=2876
2001-01-11 16:46:21 +00:00
Guy Harris 43ccfd8054 Add an additional "protocol index" argument to "{old_}dissector_add()",
"{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and
"register_dissector()", so that an entry in those tables has associated
with it the protocol index of the protocol the dissector handles (or -1,
if there is no protocol index for it).

This is for future use in a number of places.

(Arguably, "proto_register_protocol()" should take a dissector pointer
as an argument, but

	1) it'd have to handle both regular and heuristic dissectors;

	2) making it take either a "dissector_t" or a union of that and
	   a "heur_dissector_t" introduces some painful header-file
	   interdependencies

so I'm punting on that for now.  As with other Ethereal internal APIs,
these APIs are subject to change in the future, at least until Ethereal
1.0 comes out....)

svn path=/trunk/; revision=2849
2001-01-09 06:32:10 +00:00
Guy Harris 0e7c1de08a Have "proto_register_protocol()" build a list of data structures for
protocols, in addition to adding structures to the list of filterable
fields.  Give it an extra argument that specifies a "short name" for the
protocol, for use in such places as

	pinfo->current_proto;

	the dialog box for constructing filters;

	the preferences tab for the protocol;

and so on (although we're not yet using it in all those places).

Make the preference name that appears in the preferences file and the
command line for the DIAMETER protocol "diameter", not "Diameter"; the
convention is that the name in question be all-lower-case.

Make some routines and variables that aren't exported static.

Update a comment in the ICP dissector to make it clear that the
dissector won't see fragments other than the first fragment of a
fragmented datagram.

svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
Guy Harris 252d55d80f For each column, have both a buffer into which strings for that column
can be put, and a pointer to the string for the column, which might or
might not point to that buffer.

Add a routine "col_set_str()", which sets the string for the column to
the string passed to it as an argument; it should only be handed a
static string (a string constant would be ideal).  It doesn't do any
copying, so it's faster than "col_add_str()".

Make the routines that append to columns check whether the pointer to
the string for the column points to the buffer for the column and, if
not, copy the string for the column to the buffer for the column so that
you can append to it (so you can use "col_set_str()" and then use
"col_append_str()" or "col_append_fstr()").

Convert a bunch of "col_add_str()" calls that take a string constant as
an argument to "col_set_str()" calls.

Convert some "col_add_fstr()" calls that take a string constant as the
only argument - i.e., the format string doesn't have any "%" slots into
which to put strings for subsequent arguments to "col_set_str()" calls
(those calls are just like "col_add_str()" calls).

Replace an END_OF_FRAME reference in a tvbuffified dissector with a
"tvb_length(tvb)" call.

svn path=/trunk/; revision=2670
2000-11-19 08:54:37 +00:00
Guy Harris d62f730035 Michael Tuexen's patch to add "sctp.port" as a dissector table so that
protocols running atop SCTP can register themselves with a particular
SCTP port number.

Also, clean up the credits for him - there were two entries, one for
some initial SCTP support in "ipprotostr()" and in the capture dialog,
and one for the SCTP dissector itself - the latter subsumes the former,
so just keep the latter.

svn path=/trunk/; revision=2296
2000-08-19 08:37:43 +00:00
Laurent Deniel cc36f0b931 Add the "Edit:Protocols..." feature which currently only implements
the following:

It is now possible to enable/disable a particular protocol decoding
(i.e. the protocol dissector is void or not). When a protocol
is disabled, it is displayed as Data and of course, all linked
sub-protocols are disabled as well.

Disabling a protocol could be interesting:

- in case of buggy dissectors
- in case of wrong heuristics
- for performance reasons
- to decode the data as another protocol (TODO)

Currently (if I am not wrong), all dissectors but NFS can be disabled
(and dissectors that do not register protocols :-)

I do not like the way the RPC sub-dissectors are disabled (in the
sub-dissectors) since this could be done in the RPC dissector itself,
knowing the sub-protocol hfinfo entry (this is why, I've not modified
the NFS one yet).

Two functions are added in proto.c :

gboolean proto_is_protocol_enabled(int n);
void proto_set_decoding(int n, gboolean enabled);

and two MACROs which can be used in dissectors:

OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree)
CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree)

See also the XXX in proto_dlg.c and proto.c around the new functions.

svn path=/trunk/; revision=2267
2000-08-13 14:09:15 +00:00