Commit Graph

36 Commits

Author SHA1 Message Date
Guy Harris af5b47a0c2 When registering a field, make sure its ID is -1 or 0 - if it's not,
that probably means you've registered two fields with the same field ID
variable, which is an error.

Fix the bugs doing so found.

svn path=/trunk/; revision=8629
2003-10-06 20:46:52 +00:00
Michael Tüxen 2d44a636e9 Fixed a bug introduced by my last update and reported for packet-mtp3.c
by Anders Broman.

svn path=/trunk/; revision=8394
2003-09-05 20:11:45 +00:00
Guy Harris d4c4975571 From Anders Broman: add translation of SI values to strings.
svn path=/trunk/; revision=8375
2003-09-04 19:06:19 +00:00
Michael Tüxen fad6cc2fd0 Indicate the version in the protocol column only if multiple versions are supported.
svn path=/trunk/; revision=8371
2003-09-04 14:32:01 +00:00
Guy Harris 5f0c445718 From Anders Broman: add a few more user IDs to the M3UA Service Indicator.
svn path=/trunk/; revision=8338
2003-09-02 21:14:43 +00:00
Michael Tüxen 27fb63a9fb - get rid of col_set_fence: it will be called in packet-sctp.c only.
- replace DATA1 by DATA in packet-m3ua.c (typo)

svn path=/trunk/; revision=7529
2003-04-22 13:47:38 +00:00
Michael Tüxen 58c20781a0 - add INFO column stuff using fence.
- change my e-mail address

svn path=/trunk/; revision=7500
2003-04-19 20:09:00 +00:00
Guy Harris 151bd457db From Jeff Morriss: don't put stuff in the Info column if a subdissector
is called, so that we don't get a mix of M3UA and subdissector stuff.

svn path=/trunk/; revision=7444
2003-04-12 07:54:29 +00:00
Michael Tüxen 2a86c131fa Fixed a bug in the calculation of number of routing contexts.
svn path=/trunk/; revision=7166
2003-02-18 19:48:31 +00:00
Michael Tüxen 3bae16fc66 Minor corrections and modifications.
svn path=/trunk/; revision=7022
2003-01-28 20:08:36 +00:00
Guy Harris 3fc16d1496 Fix a similar problem in the RFC 3332 version of the protocol.
svn path=/trunk/; revision=7013
2003-01-27 23:17:39 +00:00
Guy Harris de50f9e2c2 From Jeff Morriss: dissect parameters regardless of whether a protocol
tree is being generated or not, so that subdissectors get called.

svn path=/trunk/; revision=7009
2003-01-27 21:40:40 +00:00
Michael Tüxen e66a16258f Added support for version 05 of the (expired) ID describing M3UA.
Updated to support RFC 3332.
Better handling of padding.

svn path=/trunk/; revision=6976
2003-01-22 09:07:26 +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 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
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
Jörg Mayer 173fe5aef4 Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.

svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
Guy Harris 77fa06b899 From Joerg Mayer:
dftest.c:
	     Remove #if-0-ed includes

	packet-ieee80211.c, packet-wtls.c, packet-afp.c, packet-wsp.c,
        packet-wtp.c, ethereal_gen.py:
	     Remove redundant include varargs (already in snprintf.h,
	     and required only for snprintf.h)

	Remove unused include of snprintf.h from files not using
	"snprintf()".

svn path=/trunk/; revision=5889
2002-07-17 00:43:03 +00:00
Guy Harris 44281ebe32 From Joerg Mayer: get rid of an unused argument.
svn path=/trunk/; revision=5320
2002-05-01 00:09:16 +00:00
Guy Harris 66e39af899 From Michael Tuexen: update to draft-ietf-sigtran-m3ua-12.
svn path=/trunk/; revision=5038
2002-03-28 21:48:46 +00:00
Guy Harris 6dacf7e132 Typo fix, from Michael Tuexen.
svn path=/trunk/; revision=4843
2002-03-02 07:23:56 +00:00
Guy Harris fa431b988f From Michael Tuexen: support for another message type.
svn path=/trunk/; revision=4810
2002-02-26 10:18:22 +00:00
Guy Harris 3cb971dd80 Editorial corrections, from Michael Tuexen.
svn path=/trunk/; revision=4807
2002-02-25 23:41:58 +00:00
Guy Harris 5723b50a7d From Michael T�xen: updates to support versions 6 and 10 of the SIGTRAN
draft, and to register all protocol fields.

svn path=/trunk/; revision=4642
2002-01-31 00:47:40 +00:00
Guy Harris eb2d6593dc Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls in
arguments to "proto_tree_add_text()", and to "proto_tree_add_XXX()" calls
that add FT_NONE or FT_PROTO items to the protocol tree, with -1.

Replace some calls to "tvb_length()" or "tvb_length_remaining()" with
calls to "tvb_reported_length()" and "tvb_reported_length_remaining()",
as those give the actual length of the data in the packet, not just the
data that happened to be captured.

svn path=/trunk/; revision=4605
2002-01-24 09:20:54 +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 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 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 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 3f6e57c5c2 MTP3 support, from Michael Tuexen.
svn path=/trunk/; revision=3444
2001-05-24 08:13:56 +00:00
Guy Harris 1882baed1c Get rid of unnecessary includes.
Fix up Gerald's e-mail address in some files while we're at it, and fix
up Michael T�xen's name in one file as well.

svn path=/trunk/; revision=3368
2001-04-23 18:05:19 +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 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 254179eec8 Updates from Michael Tuexen.
XXX - this causes the Info column for M3UA packets to have stuff from
SCTP as well as M3UA, but doesn't cause the Protocol column to say
"SCTP/M3UA", just "M3UA"; fixing that requires that the M3UA dissector
be able to find out whether it's already put "/M3UA" into the Protocol
column, but I Have A Cunning Plan to handle that which might also allow
display filters containing only protocol names (i.e., filters that care
only whether a given packet contains data for a given protocol) to run
much faster.

svn path=/trunk/; revision=2898
2001-01-14 10:15:56 +00:00
Guy Harris e7d080a8c6 Update from Michael Tuexen.
svn path=/trunk/; revision=2895
2001-01-13 18:29:39 +00:00
Guy Harris 47b04baac4 M3UA (MTP3 User Adaptation layer) support, from Michael Tuexen.
svn path=/trunk/; revision=2855
2001-01-10 09:25:13 +00:00