diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 11:13:21 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 18:13:41 +0000 |
| commit | 9723c7a2f877f635f308c1534935ec4a90c661f8 (patch) | |
| tree | 449c3aff0c2f004569356ee987a9906805d2f9b7 /epan/dissectors/packet-fcp.c | |
| parent | bc1472502f871d5d7d178f5588f9b5ed7a226180 (diff) | |
Remove more deprecated tvb_length calls
Change-Id: Ie40a195db622ebfb096fa5088c5467a1385e69bf
Reviewed-on: https://code.wireshark.org/review/9062
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-fcp.c')
| -rw-r--r-- | epan/dissectors/packet-fcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 2935a73515..8d2c88de5e 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -398,7 +398,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro proto_tree_add_item(tree, hf_fcp_rddata, tvb, offset+11, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcp_wrdata, tvb, offset+11, 1, ENC_BIG_ENDIAN); - tvb_len = tvb_length_remaining(tvb, offset+12); + tvb_len = tvb_captured_length_remaining(tvb, offset+12); if (tvb_len > (16 + add_len)) tvb_len = 16 + add_len; @@ -415,7 +415,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro } if ( ((rwflags & 0x03) == 0x03) - && tvb_length_remaining(tvb, offset+12+16+add_len+4) >= 4) { + && tvb_reported_length_remaining(tvb, offset+12+16+add_len+4) >= 4) { proto_tree_add_item(tree, hf_fcp_bidir_dl, tvb, offset+12+16+add_len+4, 4, ENC_BIG_ENDIAN); if (request_data->itlq) { @@ -547,7 +547,7 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot if (rsplen) { tvbuff_t *rspinfo_tvb; - rspinfo_tvb = tvb_new_subset(tvb, offset, MIN(rsplen, tvb_length_remaining(tvb, offset)), rsplen); + rspinfo_tvb = tvb_new_subset(tvb, offset, MIN(rsplen, tvb_captured_length_remaining(tvb, offset)), rsplen); dissect_fcp_rspinfo(rspinfo_tvb, tree, 0); offset += rsplen; @@ -557,7 +557,7 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot if (snslen) { tvbuff_t *sns_tvb; - sns_tvb = tvb_new_subset(tvb, offset, MIN(snslen, tvb_length_remaining(tvb, offset)), snslen); + sns_tvb = tvb_new_subset(tvb, offset, MIN(snslen, tvb_captured_length_remaining(tvb, offset)), snslen); dissect_scsi_snsinfo(sns_tvb, pinfo, parent_tree, 0, snslen, (request_data != NULL) ? request_data->itlq : &empty_itlq, &itl); @@ -716,7 +716,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if (els) { dissect_fcp_els(tvb, pinfo, fcp_tree, fchdr); - return tvb_length(tvb); + return tvb_captured_length(tvb); } switch (r_ctl) { @@ -740,7 +740,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) break; } /*xxx once the subdissectors return bytes consumed: proto_item_set_end(ti, tvb, offset);*/ - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* Register the protocol with Wireshark */ |