diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-24 09:20:54 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-24 09:20:54 +0000 |
| commit | b1e732f09ee97a548ef9741daa81f0e59622b280 (patch) | |
| tree | 72ec8d9d161bf956703a8111d9457fca75745804 /packet-m3ua.c | |
| parent | 093d8c47611909fa3ae4cdd8796fef02d0da4a84 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4605 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-m3ua.c')
| -rw-r--r-- | packet-m3ua.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-m3ua.c b/packet-m3ua.c index ddf22ad50a..a2694f2d12 100644 --- a/packet-m3ua.c +++ b/packet-m3ua.c @@ -8,7 +8,7 @@ * * Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-m3ua.c,v 1.11 2002/01/21 07:36:37 guy Exp $ + * $Id: packet-m3ua.c,v 1.12 2002/01/24 09:20:49 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -802,7 +802,7 @@ dissect_m3ua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree if (m3ua_tree) { /* 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; @@ -829,7 +829,7 @@ dissect_m3ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) necessary to generate protocol tree items. */ if (tree) { /* create the m3ua protocol tree */ - m3ua_item = proto_tree_add_item(tree, proto_m3ua, message_tvb, 0, tvb_length(message_tvb), FALSE); + m3ua_item = proto_tree_add_item(tree, proto_m3ua, message_tvb, 0, -1, FALSE); m3ua_tree = proto_item_add_subtree(m3ua_item, ett_m3ua); } else { m3ua_tree = NULL; |