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-sap.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-sap.c')
| -rw-r--r-- | packet-sap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/packet-sap.c b/packet-sap.c index 248e430d77..ed434cdea2 100644 --- a/packet-sap.c +++ b/packet-sap.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-sap.c,v 1.26 2002/01/21 07:36:41 guy Exp $ + * $Id: packet-sap.c,v 1.27 2002/01/24 09:20:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -162,8 +162,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tree) { - si = proto_tree_add_item(tree, proto_sap, tvb, offset, - tvb_length_remaining(tvb, offset), FALSE); + si = proto_tree_add_item(tree, proto_sap, tvb, offset, -1, FALSE); sap_tree = proto_item_add_subtree(si, ett_sap); sif = proto_tree_add_uint(sap_tree, hf_sap_flags, tvb, offset, 1, vers_flags); @@ -232,8 +231,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (is_enc && is_comp) mangle = "compressed and encrypted"; else if (is_enc) mangle = "encrypted"; else mangle = "compressed"; - proto_tree_add_text(sap_tree, tvb, offset, - tvb_length_remaining(tvb, offset), + proto_tree_add_text(sap_tree, tvb, offset, -1, "The rest of the packet is %s", mangle); return; } |