Commit Graph

62 Commits

Author SHA1 Message Date
Olivier Biot d605594b18 Add a preference to the Diameter dissector allowing to control whether
application ID zero is a valid application ID (it is often used as
experimental applciation ID). By default, the preference is disabled.

Fix the XML dictionary parser so it skips comment lines too.

svn path=/trunk/; revision=10320
2004-03-05 22:25:23 +00:00
Guy Harris 5e60a77f7d Make both the Diameter-over-TCP and Diameter-over-SCTP dissectors
"new-style" dissectors, and have them reject packets that don't start
with a version number of 1, in the hopes that it'll be less likely to
try to dissect non-Diameter packets to/from port 1812 as Diameter and
thus less likely to spew out a bunch of warnings that cause users to ask
the Ethereal mailing lists what the problem is.

Use "tcp_dissect_pdus()" to handle Diameter-over-TCP.

svn path=/trunk/; revision=10165
2004-02-21 10:29:52 +00:00
Guy Harris dc883b3bc7 Include <errno.h> to declare "errno".
svn path=/trunk/; revision=10157
2004-02-21 04:26:29 +00:00
Guy Harris 2789dccd2c Report a failure to open the XML disctionary file with
"report_open_failure()".

svn path=/trunk/; revision=10155
2004-02-21 02:59:53 +00:00
Jörg Mayer 193ed36457 Trivial warning fixes: func(void), not func()
svn path=/trunk/; revision=9733
2004-01-19 18:28:14 +00:00
Ulf Lamping 8020cdf176 splitted some of the preferences texts into more than one line,
to reduce the size of the preferences dialog.
This becoming necessary, as some of the texts were huge

svn path=/trunk/; revision=9693
2004-01-17 12:51:00 +00:00
Guy Harris 7d27085948 From Steve Ford: "prefs_register_string_preference()" makes a copy of
any string pointed to by the preference variable - as the value we set
it to is allocated, we should free it after registering the preference.

The register routine is called only once - don't worry about whether
"gbl_diameterDictionary" is null or not.

Get rid of a duplicate credit entry in the man page.

svn path=/trunk/; revision=8813
2003-10-29 21:19:44 +00:00
Tim Potter 0e2d9b4341 Removed duplicate definitions of flags_set_truth.
svn path=/trunk/; revision=8001
2003-07-09 05:37:47 +00:00
Guy Harris e1647e4504 From Richard Urwin:
add support for a system-wide color filter file;

	fix a bug where "read_filters()" didn't close the file handle.

Use the "get_datafile_path()" routine he added to construct the pathname
of the Diameter directory, the global preferences file, and the manuf
file.

svn path=/trunk/; revision=7677
2003-05-15 07:44:54 +00:00
Guy Harris e0d9bb60a2 Fix a typo.
svn path=/trunk/; revision=7441
2003-04-12 05:48:26 +00:00
Guy Harris dab0d3a7e9 From David Frascone: use a string constant rather than a global variable
for the full name of the Diameter protocol.

svn path=/trunk/; revision=7434
2003-04-10 01:30:34 +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 ae88c45ef0 From Joerg Mayer: make a pile of stuff not used outside one source file
static, and add a new "packet-data.h" to declare "proto_data".

Display escape sequences in octal in the IAPP dissector, as is now done
in the RADIUS dissector.

svn path=/trunk/; revision=5441
2002-05-10 23:20:38 +00:00
Guy Harris 5d7d5bb2d0 From Joerg Mayer: get rid of unused arguments.
svn path=/trunk/; revision=5364
2002-05-02 19:32:19 +00:00
Guy Harris 9a80f0a521 Removal (or, at least, #ifdeffing out) of unused variables and
functions, from David Frascone.

svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
Guy Harris 8661c37ba2 From David Frascone: fix pathname of Diameter directory file.
svn path=/trunk/; revision=4869
2002-03-05 00:24:24 +00:00
Guy Harris fe8a0d2c5e Don't copy the AVP data to a buffer from the tvbuff and then extract
stuff from the buffer - extract what you need directly from the tvbuff.
(And definitely don't extract stuff from the buffer if you haven't
copied stuff to it.)

For integral AVP items, check the length of the item before processing
it.

Put time items into the protocol tree as times, not as byte arrays.

svn path=/trunk/; revision=4645
2002-01-31 01:55:14 +00:00
Guy Harris c2136d0735 Include <string.h> to declare various string functions.
Include "snprintf.h", when needed, to declare "snprintf()" on platforms
that don't have it.

Fix some formats and arguments to various printing routines.

Fix "diameter_time_to_string()" to properly fetch the time value from
the data buffer handed to it.

svn path=/trunk/; revision=4639
2002-01-30 23:08:27 +00:00
Guy Harris 961e0cdfa2 Convert some "col_add_str()" calls to "col_set_str()".
svn path=/trunk/; revision=4592
2002-01-21 23:35:32 +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 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 8fa2aef40e Use "%u", not "%d", to print unsigned quantities.
svn path=/trunk/; revision=4496
2002-01-08 07:14:08 +00:00
Guy Harris 7519e9b831 Vendor ID lookup fix, from David Frascone.
svn path=/trunk/; revision=4494
2002-01-07 20:05:20 +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 425fce6e92 Thou shalt not use C++-style comments in C code, for they upset some C
compilers.

svn path=/trunk/; revision=4284
2001-11-27 07:41:39 +00:00
Guy Harris 60fe401dc7 Get rid of some unused variables.
svn path=/trunk/; revision=4241
2001-11-21 02:01:06 +00:00
Guy Harris cc7347ebf6 Allow a dissector to register preferences that it no longer supports as
obsolete; we silently ignore attempts to set those in a preferences
file, so that we don't spam the user with error messages caused by them
having saved preferences in an earlier release that contained those
preferences.

Make the Diameter and iSCSI dissectors register obsolete preferences.

Crash if some code tries to register a preferences module with a name
that contains something other than lower-case ASCII letters, numbers, or
underscores, or that has already been registered, or if some code tries
to register a preference with a name that contains something other than
lower-case ASCII letters, numbers, underscores, or periods, or that has
already been registered, so that we don't put code like that in a
release and have to shovel code into "prefs.c" to fix it up later.  (The
problem with multiple modules or preferences with the same name should
be obvious; the problem with names with blanks, or upper-case letters,
or punctuation, is that they're a pain to type on the command line.)

svn path=/trunk/; revision=4148
2001-11-04 02:50:21 +00:00
Guy Harris 6778164aed Clean up the Info column, by leaving the ": " that separates bad
packet/flag information from the PDU type if there's no bad packet or
flag informatin.

svn path=/trunk/; revision=4144
2001-11-03 23:13:03 +00:00
Guy Harris 3986cf042e Support for desegmentation of Diameter-over-TCP, from David Frascone.
svn path=/trunk/; revision=4141
2001-11-03 12:19:56 +00:00
Guy Harris f5054cff0d In "addStaticAVP()", add the new entry to the list of AVP types after
it's filled in.

svn path=/trunk/; revision=4137
2001-11-03 04:09:46 +00:00
Guy Harris 5511e79593 Add support for 64-bit signed integers in "int-64bit.[ch]", add an
FT_INT64 type, and make the Diameter dissector use it.

Handle the 64-bit integer types in the display filter semantics checks.

svn path=/trunk/; revision=4125
2001-11-02 10:09:51 +00:00
Guy Harris be7e31be0e From David Frascone: duUpdate to Diameter dissector to load the
dictionary as an XML file rather than building it in, and various
Diameter updates.

svn path=/trunk/; revision=4122
2001-11-01 21:52:44 +00:00
Guy Harris d82c74d757 From Ronnie Sahlberg: FT_UINT64 support, code to handle 64-bit integers
without requiring compiler support for them, and updates to the
Diameter, L2TP, NFS, and NLM dissectors to use it and to the ONC RPC
dissector to allow ONC RPC subdissectors to use it.

svn path=/trunk/; revision=4099
2001-10-29 21:13:13 +00:00
Guy Harris e5474282c1 Don't cast "data" to "unsigned long long"; "long long" - or whatever
data type "gint64" really is - should be sufficiient for a %llx format,
and not all compilers that support 64-bit data types have "long long".

svn path=/trunk/; revision=3820
2001-08-04 19:50:33 +00:00
Guy Harris 76a85d5764 From David Frascone: update to the DIAMETER dissector for
draft-ietf-aaa-diameter-07.  His changenotes:

	Changes:

	o       Flags are now done properly.  (I changed it to dissect
		them like packet-tcp.c does)

	o       Completely re-did the dictionary.  I think it is much
		more maintainable now.  And, it is no longer dynamically
		generated.

	o       Added some lookup routines to work with new dictionary.

	o       Removed lots of old lookup stuff that had been cloned
		from packet-radius.c.  It's much cleaner now.

svn path=/trunk/; revision=3799
2001-07-30 20:08:44 +00:00
Guy Harris b7255e108a Fixes, from Scott Renfro, for some calls to "localtime()" that didn't
check whether the call succeeded (it doesn't always do so on Windows,
for example).

svn path=/trunk/; revision=3722
2001-07-15 19:14:03 +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 9e82be175d Fix the copyright notice to reflect the fact that Gerald holds the
copyright on Ethereal as a whole.

svn path=/trunk/; revision=3473
2001-05-27 21:38:46 +00:00
Guy Harris cd7a95ce41 Updates from David Frascone.
svn path=/trunk/; revision=3287
2001-04-10 21:49:23 +00:00
Guy Harris 9c9abf8c54 Updates from David Frascone: includes DIAMETER-over-SCTP support.
svn path=/trunk/; revision=3073
2001-02-23 19:26:26 +00:00
Guy Harris f0798c6011 In the DIAMETER dissector, clear the Info column before fetching
anything from the packet, so that if we throw an exception before
setting the Info column, it doesn't have stuff left over from the
previous dissector.

Tvbuffify the RADIUS dissector.

svn path=/trunk/; revision=3055
2001-02-20 08:10:14 +00:00
Guy Harris 3787d34ade Don't do anything with 64-bit integral types if G_HAVE_GINT64 isn't
defined.

Use "gint64" and "guint64", not "long long int", for 64-bit integral
types, so that this code works with compilers (such as Microsoft Visual
C++) that have 64-bit integral types but that don't call them "long
long".

Use "pntohll()" to extract 64-bit integral types from a field.

Put a "break;" into a "default:" clause - MSVC++ doesn't like

	switch (XXX) {

		...

	default:
	}

svn path=/trunk/; revision=3051
2001-02-20 01:20:24 +00:00
Guy Harris e917aa9088 As "dissect_diameter()" is now static to "packet-diameter.c", there's no
need to declare it in "packet-diameter.h" - and no need for
"packet-diameter.h".

svn path=/trunk/; revision=3050
2001-02-19 23:16:36 +00:00
Guy Harris 6c655bb1c5 New tvbuffified DIAMETER dissector, from David Frascone.
It doesn't do DIAMETER-over-UDP, so the RADIUS dissector no longer
checks for DIAMETER packets and calls the DIAMETER dissector if it finds
one.

svn path=/trunk/; revision=3049
2001-02-19 23:14:02 +00:00
Gilbert Ramirez 9be2e1df55 3rd time's a charm.
Check against the *correct* buffer size.

svn path=/trunk/; revision=3046
2001-02-16 22:53:07 +00:00
Gilbert Ramirez 4d63c20e59 Off-by-a-little-bit in adjusting the offset.
svn path=/trunk/; revision=3045
2001-02-16 21:44:54 +00:00
Gilbert Ramirez 87b6e2dd62 Don't trust avp_length, which is taken directly from the packet data.
svn path=/trunk/; revision=3044
2001-02-16 21:41:00 +00:00