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-lapb.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-lapb.c')
| -rw-r--r-- | packet-lapb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-lapb.c b/packet-lapb.c index 6f459034eb..79e25b5147 100644 --- a/packet-lapb.c +++ b/packet-lapb.c @@ -2,7 +2,7 @@ * Routines for lapb frame disassembly * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-lapb.c,v 1.33 2002/01/21 07:36:36 guy Exp $ + * $Id: packet-lapb.c,v 1.34 2002/01/24 09:20:49 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,8 +81,8 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Invalid LAPB frame"); if (tree) - ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, - tvb_length(tvb), "Invalid LAPB frame"); + ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, -1, + "Invalid LAPB frame"); return; } @@ -106,7 +106,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ett_lapb_control, is_response, FALSE); /* not end of frame ==> X.25 */ - if (tvb_length(tvb) > 2) { + if (tvb_reported_length(tvb) > 2) { next_tvb = tvb_new_subset(tvb, 2, -1, -1); call_dissector(x25_handle, next_tvb, pinfo, tree); } |