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-cops.c | |
| parent | 6f334976e03a191e5270813a63f6d454df5cb48b (diff) | |
| download | wireshark-eb2d6593dca282de10e8dc13a5e2cde4523b800a.tar.gz wireshark-eb2d6593dca282de10e8dc13a5e2cde4523b800a.tar.bz2 wireshark-eb2d6593dca282de10e8dc13a5e2cde4523b800a.zip | |
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-cops.c')
| -rw-r--r-- | packet-cops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-cops.c b/packet-cops.c index 8f0d948dfc..740fd67e53 100644 --- a/packet-cops.c +++ b/packet-cops.c @@ -4,7 +4,7 @@ * * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-cops.c,v 1.16 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-cops.c,v 1.17 2002/01/24 09:20:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -283,7 +283,7 @@ static void dissect_cops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint garbage; offset = 0; - ti = proto_tree_add_item(tree, proto_cops, tvb, offset, tvb_length(tvb), FALSE); + ti = proto_tree_add_item(tree, proto_cops, tvb, offset, -1, FALSE); cops_tree = proto_item_add_subtree(ti, ett_cops); /* Version and flags share the same byte, put them in a subtree */ @@ -392,7 +392,7 @@ static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree) char *type_str; int ret; - if (tvb_length_remaining(tvb, offset) < COPS_OBJECT_HDR_SIZE) + if (tvb_reported_length_remaining(tvb, offset) < COPS_OBJECT_HDR_SIZE) return 0; object_len = tvb_get_ntohs(tvb, offset); |