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-socks.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-socks.c')
| -rw-r--r-- | packet-socks.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packet-socks.c b/packet-socks.c index d5cab46e7e..c024133604 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.34 2002/01/21 07:36:43 guy Exp $ + * $Id: packet-socks.c,v 1.35 2002/01/24 09:20:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -409,8 +409,8 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_add_fstr(pinfo->cinfo, COL_INFO, "Version: 5, UDP Associated packet"); if ( tree) { - ti = proto_tree_add_protocol_format( tree, proto_socks, tvb, offset, - tvb_length_remaining(tvb, offset), "Socks" ); + ti = proto_tree_add_protocol_format( tree, proto_socks, tvb, + offset, -1, "Socks" ); socks_tree = proto_item_add_subtree(ti, ett_socks); @@ -897,8 +897,7 @@ display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr col_append_str(pinfo->cinfo, COL_INFO, ", Results"); if ( tree){ - proto_tree_add_text(tree, tvb, offset, - tvb_length_remaining(tvb, offset), + proto_tree_add_text(tree, tvb, offset, -1, (hash_info->command == PING_COMMAND) ? "Ping Results:" : "Traceroute Results"); @@ -1035,8 +1034,8 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* if proto tree, decode and display */ if (tree) { - ti = proto_tree_add_item( tree, proto_socks, tvb, offset, - tvb_length_remaining(tvb, offset), FALSE ); + ti = proto_tree_add_item( tree, proto_socks, tvb, offset, -1, + FALSE ); socks_tree = proto_item_add_subtree(ti, ett_socks); |