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-nlm.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-nlm.c')
| -rw-r--r-- | packet-nlm.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/packet-nlm.c b/packet-nlm.c index 3db7663cbd..e8297eb339 100644 --- a/packet-nlm.c +++ b/packet-nlm.c @@ -1,7 +1,7 @@ /* packet-nlm.c * Routines for nlm dissection * - * $Id: packet-nlm.c,v 1.22 2001/12/23 21:36:57 guy Exp $ + * $Id: packet-nlm.c,v 1.23 2002/01/24 09:20:50 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -160,7 +160,7 @@ dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int version, i if (tree) { lock_item = proto_tree_add_item(tree, hf_nlm_lock, tvb, - offset, tvb_length_remaining(tvb, offset), FALSE); + offset, -1, FALSE); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); } @@ -252,9 +252,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { lock_item = proto_tree_add_item(tree, hf_nlm_test_stat, tvb, - offset, - tvb_length_remaining(tvb, offset), - FALSE); + offset, -1, FALSE); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); @@ -264,15 +262,13 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo, offset); /* last structure is optional, only supplied for stat==1 (LOCKED) */ - if(!tvb_length_remaining(tvb, offset)){ + if(tvb_reported_length_remaining(tvb, offset) == 0){ return offset; } if (tree) { lock_item = proto_tree_add_item(lock_tree, hf_nlm_holder, tvb, - offset, - tvb_length_remaining(tvb, offset), - FALSE); + offset, -1, FALSE); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); @@ -313,9 +309,7 @@ dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { lock_item = proto_tree_add_item(tree, hf_nlm_share, tvb, - offset, - tvb_length_remaining(tvb, offset), - FALSE); + offset, -1, FALSE); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); |