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-tftp.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-tftp.c')
| -rw-r--r-- | packet-tftp.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packet-tftp.c b/packet-tftp.c index bc7df10c85..7304ae5ebf 100644 --- a/packet-tftp.c +++ b/packet-tftp.c @@ -5,7 +5,7 @@ * Craig Newell <CraigN@cheque.uq.edu.au> * RFC2347 TFTP Option Extension * - * $Id: packet-tftp.c,v 1.35 2002/01/21 07:36:44 guy Exp $ + * $Id: packet-tftp.c,v 1.36 2002/01/24 09:20:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -143,8 +143,7 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, - tvb_length_remaining(tvb, offset), FALSE); + ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, -1, FALSE); tftp_tree = proto_item_add_subtree(ti, ett_tftp); proto_tree_add_uint(tftp_tree, hf_tftp_opcode, tvb, @@ -220,8 +219,8 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; if (tree) { - proto_tree_add_text(tftp_tree, tvb, offset, tvb_length_remaining(tvb, offset), - "Data (%d bytes)", tvb_length_remaining(tvb, offset)); + proto_tree_add_text(tftp_tree, tvb, offset, -1, + "Data (%d bytes)", tvb_reported_length_remaining(tvb, offset)); } break; @@ -266,8 +265,8 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: if (tree) { - proto_tree_add_text(tftp_tree, tvb, offset, tvb_length_remaining(tvb, offset), - "Data (%d bytes)", tvb_length_remaining(tvb, offset)); + proto_tree_add_text(tftp_tree, tvb, offset, -1, + "Data (%d bytes)", tvb_reported_length_remaining(tvb, offset)); } break; |