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-vlan.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-vlan.c')
| -rw-r--r-- | packet-vlan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-vlan.c b/packet-vlan.c index 874873ce1d..bb5c0a78ab 100644 --- a/packet-vlan.c +++ b/packet-vlan.c @@ -1,7 +1,7 @@ /* packet-vlan.c * Routines for VLAN 802.1Q ethernet header disassembly * - * $Id: packet-vlan.c,v 1.10 2000/04/16 22:59:37 guy Exp $ + * $Id: packet-vlan.c,v 1.11 2000/05/11 08:15:55 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -89,12 +89,12 @@ dissect_vlan(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { } if (tree) { - ti = proto_tree_add_item(tree, proto_vlan, offset, 4); + ti = proto_tree_add_item(tree, proto_vlan, NullTVB, offset, 4); vlan_tree = proto_item_add_subtree(ti, ett_vlan); - proto_tree_add_item(vlan_tree, hf_vlan_priority, offset, 2, tci); - proto_tree_add_item(vlan_tree, hf_vlan_cfi, offset, 2, tci); - proto_tree_add_item(vlan_tree, hf_vlan_id, offset, 2, tci); + proto_tree_add_item(vlan_tree, hf_vlan_priority, NullTVB, offset, 2, tci); + proto_tree_add_item(vlan_tree, hf_vlan_cfi, NullTVB, offset, 2, tci); + proto_tree_add_item(vlan_tree, hf_vlan_id, NullTVB, offset, 2, tci); } if ( encap_proto <= IEEE_802_3_MAX_LEN) { |