Commit graph

9 commits

Author SHA1 Message Date
Guy Harris
6bf61848b7 Add braces to squelch a warning from GCC 2.8.1 on Solaris 7/x86.
svn path=/trunk/; revision=2076
2000-06-17 03:05:02 +00:00
Guy Harris
72ad5b91d6 Fix typos in some printf formats - "+%d", not "%+d"
svn path=/trunk/; revision=2069
2000-06-15 04:09:22 +00:00
Gilbert Ramirez
0ab8dd8cbd Convert IPX-and-friend dissectors in packet-ipx.c to use
tvbuffs.

In doing so, I realied that my recommendation for using
tvb_new_subset(pi.compat_top_tvb, -1, -1) was incorrect, because
some dissectors (ethernet!) change pi.len and pi.cap_len. So, I have
to take those two variables into account instead of using -1 and -1.

So, I provide a macro called tvb_create_from_top(offset), where
offset is the name of your offset variable. It is a wrapper around
tvb_new_subset().

I converted the lines that followed my suggestion to use
tvb_create_from_top().

In proto.c I added
proto_tree_add_debug_text(proto_tree*, const char*, ...)
It's much like proto_tree_add_text(), except that it takes no offset
or length; it's soley for temporarily putting debug text into the
proto_tree while debugging a dissector. In making sure that its
use is temporary, the funciton also prints the debug string to stdout
to remind the programmer that the debug code needs to be removed
before shipping the code.

svn path=/trunk/; revision=2068
2000-06-15 03:49:00 +00:00
Guy Harris
9a52ba3506 When building under Win32, "boolean" appears to be defined in a fashion
that causes "packet-x11.c" to fail to compile due to it defining its own
function named "boolean", so we rename the "packet-x11.c" "boolean()"
function to "add_boolean()".

svn path=/trunk/; revision=2066
2000-06-14 07:16:07 +00:00
Guy Harris
9dd3dda4c9 In "stringCopy()", make the character temporary unsigned, so that it
doesn't get sign-extended before being handed to "isgraph()".

svn path=/trunk/; revision=2065
2000-06-14 00:24:39 +00:00
Gilbert Ramirez
835e8bea10 Initialize 'int next_offset' to 0 instead of NULL.
svn path=/trunk/; revision=2063
2000-06-12 19:19:54 +00:00
Guy Harris
5a957e006a Don't include <X11/Xlib.h> to get AllPlanes defined; that causes the
build to fail on Win32 systems.  It's defined (at least in the X11R6 on
my FreeBSD 3.4 system) as "((unsigned long)~0L)", which presumably means
"set all the bits" - which means "set all 32 bits" in the "value_string"
table where it appears, as the value member of an entry in such a table
is a "guint32", so just use 0xFFFFFFFF.

Get rid of other unneeded #includes as well.

svn path=/trunk/; revision=2061
2000-06-12 09:32:06 +00:00
Guy Harris
22f6f8b468 Partial tvbuffification of the X11 dissector; we construct a tvbuff from
the top-level "compatibility" tvbuff, so that we don't blow up if we get
short frames *or* misinterpret data due to, for example, trying to treat
the initial client->server message in a connection as an X11 request, or
interpreting the middle of a multi-frame request (e.g., a big PutImage)
as if it contained requests.  (I have a capture file on which the
non-tvbuffified code crashed.)

Attempt to dissect requests until we reach the end of the frame, even if
that would take us past the end of the captured data in the frame before
we reach the end of the frame; the tvbuff code will throw an exception
if we go past the end of the captured data, which means it'll put a
"Short frame" indication into the protocol tree, which is what we want
(the frame *is* short, because the capture length was too short).

Define functions taking no arguments with a "(void)" argument list, so
that the compiler knows that they must not be passed any arguments.

svn path=/trunk/; revision=2059
2000-06-12 08:28:13 +00:00
Guy Harris
515f6811c0 Christophe Tronche's X11 dissector.
svn path=/trunk/; revision=2057
2000-06-12 02:30:35 +00:00