diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:22:18 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:22:50 +0000 |
| commit | f92fab41a5266cb380c443882ce5efd5a7ee3318 (patch) | |
| tree | 13e190875507342a2c5847b2629a6dab44d2d61d /epan/dissectors/packet-nbt.c | |
| parent | ad784bc7ce29c2d8ad64bca73e4863a6353c578f (diff) | |
Remove a bunch more deprecated tvb_length calls
(getting really close!)
Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce
Reviewed-on: https://code.wireshark.org/review/9081
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nbt.c')
| -rw-r--r-- | epan/dissectors/packet-nbt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c index 7a707747c1..65c01bc9e9 100644 --- a/epan/dissectors/packet-nbt.c +++ b/epan/dissectors/packet-nbt.c @@ -1538,7 +1538,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBSS"); col_clear(pinfo->cinfo, COL_INFO); - max_data = tvb_length(tvb); + max_data = tvb_captured_length(tvb); msg_type = tvb_get_guint8(tvb, offset); @@ -1594,7 +1594,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) * So if it is a SESSION_MESSAGE and SMB1 or SMB2 * mark it as is_cifs. */ - if (tvb_length_remaining(tvb, offset) >= 8 + if (tvb_captured_length_remaining(tvb, offset) >= 8 && tvb_get_guint8(tvb,offset+0) == SESSION_MESSAGE && tvb_get_guint8(tvb,offset+5) == 'S' && tvb_get_guint8(tvb,offset+6) == 'M' @@ -1762,7 +1762,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) * there is an SMB header there ... */ if( ((int)plen>tvb_reported_length_remaining(tvb, offset)) - &&(tvb_length_remaining(tvb, offset) >= 8) + &&(tvb_captured_length_remaining(tvb, offset) >= 8) &&(tvb_get_guint8(tvb,offset+5) == 'S') &&(tvb_get_guint8(tvb,offset+6) == 'M') &&(tvb_get_guint8(tvb,offset+7) == 'B') ){ |