diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-24 09:20:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-24 09:20:54 +0000 |
| commit | eb2d6593dca282de10e8dc13a5e2cde4523b800a (patch) | |
| tree | 72ec8d9d161bf956703a8111d9457fca75745804 /packet-m2tp.c | |
| parent | 6f334976e03a191e5270813a63f6d454df5cb48b (diff) | |
Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls in
arguments to "proto_tree_add_text()", and to "proto_tree_add_XXX()" calls
that add FT_NONE or FT_PROTO items to the protocol tree, with -1.
Replace some calls to "tvb_length()" or "tvb_length_remaining()" with
calls to "tvb_reported_length()" and "tvb_reported_length_remaining()",
as those give the actual length of the data in the packet, not just the
data that happened to be captured.
svn path=/trunk/; revision=4605
Diffstat (limited to 'packet-m2tp.c')
| -rw-r--r-- | packet-m2tp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-m2tp.c b/packet-m2tp.c index 3fe7a4f6c5..2f86b87172 100644 --- a/packet-m2tp.c +++ b/packet-m2tp.c @@ -5,7 +5,7 @@ * * Copyright 2001, Heinz Prantner <heinz.prantner[AT]radisys.com> * - * $Id: packet-m2tp.c,v 1.2 2002/01/21 07:36:37 guy Exp $ + * $Id: packet-m2tp.c,v 1.3 2002/01/24 09:20:49 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -526,7 +526,7 @@ dissect_m2tp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2tp offset += COMMON_HEADER_LENGTH; /* extract zero or more parameters and process them individually */ - while(tvb_length_remaining(message_tvb, offset)) { + while(tvb_reported_length_remaining(message_tvb, offset)) { length = tvb_get_ntohs(message_tvb, offset + PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); total_length = length + padding_length; @@ -553,7 +553,7 @@ dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) necessary to generate protocol tree items. */ if (tree) { /* create the m2tp protocol tree */ - m2tp_item = proto_tree_add_item(tree, proto_m2tp, message_tvb, 0, tvb_length(message_tvb), FALSE); + m2tp_item = proto_tree_add_item(tree, proto_m2tp, message_tvb, 0, -1, FALSE); m2tp_tree = proto_item_add_subtree(m2tp_item, ett_m2tp); } else { m2tp_item = NULL; |