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-ospf.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-ospf.c')
| -rw-r--r-- | packet-ospf.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/packet-ospf.c b/packet-ospf.c index 669111e87f..480f631182 100644 --- a/packet-ospf.c +++ b/packet-ospf.c @@ -2,7 +2,7 @@ * Routines for OSPF packet disassembly * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-ospf.c,v 1.54 2002/01/21 07:36:38 guy Exp $ + * $Id: packet-ospf.c,v 1.55 2002/01/24 09:20:50 guy Exp $ * * At this time, this module is able to analyze OSPF * packets as specified in RFC2328. MOSPF (RFC1584) and other @@ -465,9 +465,7 @@ dissect_ospf_hello(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) proto_tree *ospf_hello_tree; proto_item *ti; - ti = proto_tree_add_text(tree, tvb, offset, - tvb_length_remaining(tvb, offset), - "OSPF Hello Packet"); + ti = proto_tree_add_text(tree, tvb, offset, -1, "OSPF Hello Packet"); ospf_hello_tree = proto_item_add_subtree(ti, ett_ospf_hello); switch (version ) { @@ -536,9 +534,7 @@ dissect_ospf_db_desc(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version char flags_string[20] = ""; if (tree) { - ti = proto_tree_add_text(tree, tvb, offset, - tvb_length_remaining(tvb, offset), - "OSPF DB Description"); + ti = proto_tree_add_text(tree, tvb, offset, -1, "OSPF DB Description"); ospf_db_desc_tree = proto_item_add_subtree(ti, ett_ospf_desc); switch (version ) { @@ -682,9 +678,7 @@ dissect_ospf_ls_upd(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version) guint32 lsa_nr; guint32 lsa_counter; - ti = proto_tree_add_text(tree, tvb, offset, - tvb_length_remaining(tvb, offset), - "LS Update Packet"); + ti = proto_tree_add_text(tree, tvb, offset, -1, "LS Update Packet"); ospf_lsa_upd_tree = proto_item_add_subtree(ti, ett_ospf_lsa_upd); lsa_nr = tvb_get_ntohl(tvb, offset); |