diff options
author | Guy Harris <guy@alum.mit.edu> | 2000-05-31 05:09:07 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2000-05-31 05:09:07 +0000 |
commit | 283ce59938ad2be252a6232e40a958e177a40e1a (patch) | |
tree | b451d4a712d9b914022ba872296e70e55b8d9bc5 /packet-mpls.c | |
parent | aa553f63ecc7b9e310a05b743502c50f6dffb800 (diff) |
Add routines for adding items to a protocol tree that take arguments of
a particular type, rather than taking a varargs list, along the lines of
the "proto_tree_add_XXX_format()" routines.
Replace most calls to "proto_tree_add_item()" and
"proto_tree_add_item_hidden()" with calls to those routines.
Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to
"proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and
add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()"
routines that don't take the item to be added as an argument - instead,
they fetch the argument from the packet whose tvbuff was handed to them,
from the offset handed to them.
svn path=/trunk/; revision=2031
Diffstat (limited to 'packet-mpls.c')
-rw-r--r-- | packet-mpls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-mpls.c b/packet-mpls.c index 87adfb23aa..23c385241a 100644 --- a/packet-mpls.c +++ b/packet-mpls.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-mpls.c,v 1.6 2000/05/11 08:15:23 gram Exp $ + * $Id: packet-mpls.c,v 1.7 2000/05/31 05:07:19 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -153,7 +153,7 @@ dissect_mpls(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_mpls, NullTVB, offset, 4, NULL); + ti = proto_tree_add_item(tree, proto_mpls, NullTVB, offset, 4, FALSE); mpls_tree = proto_item_add_subtree(ti, ett_mpls); if (label <= MAX_RESERVED) @@ -162,14 +162,14 @@ dissect_mpls(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) label, val_to_str(label, special_labels, "Reserved - Unknown")); else - proto_tree_add_item(mpls_tree, mpls_filter[MPLSF_LABEL], NullTVB, + proto_tree_add_uint(mpls_tree, mpls_filter[MPLSF_LABEL], NullTVB, offset, 3, label); - proto_tree_add_item(mpls_tree,mpls_filter[MPLSF_EXP], NullTVB, + proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_EXP], NullTVB, offset+2,1, exp); - proto_tree_add_item(mpls_tree,mpls_filter[MPLSF_BOTTOM_OF_STACK], NullTVB, + proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_BOTTOM_OF_STACK], NullTVB, offset+2,1, bos); - proto_tree_add_item(mpls_tree,mpls_filter[MPLSF_TTL], NullTVB, + proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_TTL], NullTVB, offset+3,1, ttl); } offset += 4; |