diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 08:18:09 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 08:18:09 +0000 |
| commit | 292e38e2c61edcd14bfa30ca3c72bacda1bcbe32 (patch) | |
| tree | db4edef02456a48d0f6d505166ac7d70f6c0f644 /packet-data.c | |
| parent | 162800efb308901e0c302517be01226130e39b19 (diff) | |
Add tvbuff class.
Add exceptions routines.
Convert proto_tree_add_*() routines to require tvbuff_t* argument.
Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as
the tvbuff_t* argument to proto_tree_add_*() routines.
dissect_packet() creates a tvbuff_t, wraps the next dissect call in
a TRY block, will print "Short Frame" on the proto_tree if a BoundsError
exception is caught.
The FDDI dissector is converted to use tvbuff's.
svn path=/trunk/; revision=1939
Diffstat (limited to 'packet-data.c')
| -rw-r--r-- | packet-data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-data.c b/packet-data.c index fadbf405df..924f263649 100644 --- a/packet-data.c +++ b/packet-data.c @@ -2,7 +2,7 @@ * Routines for raw data (default case) * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-data.c,v 1.15 2000/03/12 04:47:36 gram Exp $ + * $Id: packet-data.c,v 1.16 2000/05/11 08:15:05 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -44,7 +44,7 @@ void dissect_data(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (IS_DATA_IN_FRAME(offset) && tree) { - proto_tree_add_protocol_format(tree, proto_data, offset, + proto_tree_add_protocol_format(tree, proto_data, NullTVB, offset, END_OF_FRAME, "Data (%d byte%s)", END_OF_FRAME, plurality(END_OF_FRAME, "", "s")); } |