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-null.c | |
| parent | 162800efb308901e0c302517be01226130e39b19 (diff) | |
| download | wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.tar.gz wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.tar.bz2 wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.zip | |
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-null.c')
| -rw-r--r-- | packet-null.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-null.c b/packet-null.c index b891777687..3de8f390d8 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,7 +1,7 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c,v 1.20 2000/03/27 17:53:19 gram Exp $ + * $Id: packet-null.c,v 1.21 2000/05/11 08:15:30 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -267,7 +267,7 @@ dissect_null( const u_char *pd, frame_data *fd, proto_tree *tree ) */ if (null_header > IEEE_802_3_MAX_LEN) { if (tree) { - ti = proto_tree_add_item(tree, proto_null, 0, 4, NULL); + ti = proto_tree_add_item(tree, proto_null, NullTVB, 0, 4, NULL); fh_tree = proto_item_add_subtree(ti, ett_null); } else fh_tree = NULL; @@ -276,9 +276,9 @@ dissect_null( const u_char *pd, frame_data *fd, proto_tree *tree ) /* populate a tree in the second pane with the status of the link layer (ie none) */ if (tree) { - ti = proto_tree_add_item(tree, proto_null, 0, 4, NULL); + ti = proto_tree_add_item(tree, proto_null, NullTVB, 0, 4, NULL); fh_tree = proto_item_add_subtree(ti, ett_null); - proto_tree_add_item(fh_tree, hf_null_family, 0, 4, null_header); + proto_tree_add_item(fh_tree, hf_null_family, NullTVB, 0, 4, null_header); } switch (null_header) { |