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-umts_fp.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-umts_fp.c')
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 58d54fa74d..7446279f9a 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -985,7 +985,7 @@ dissect_spare_extension_and_crc(tvbuff_t *tvb, packet_info *pinfo, int offset, guint header_length) { int crc_size = 0; - int remain = tvb_length_remaining(tvb, offset); + int remain = tvb_captured_length_remaining(tvb, offset); /* Payload CRC (optional) */ if ((dch_crc_present == 1) || ((dch_crc_present == 2) && (remain >= 2))) { @@ -1529,7 +1529,7 @@ dissect_rach_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Info introduced in R6 */ /* only check if it looks as if they are present */ if (((p_fp_info->release == 6) || (p_fp_info->release == 7)) && - (tvb_length_remaining(tvb, offset) > 2)) + (tvb_reported_length_remaining(tvb, offset) > 2)) { int n; guint8 flags; @@ -1753,7 +1753,7 @@ dissect_fach_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* New IE flags (if it looks as though they are present) */ if ((p_fp_info->release == 7) && - (tvb_length_remaining(tvb, offset) > 2)) { + (tvb_reported_length_remaining(tvb, offset) > 2)) { guint8 flags = tvb_get_guint8(tvb, offset); guint8 aoa_present = flags & 0x01; @@ -1915,7 +1915,7 @@ dissect_usch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* New IEs */ if ((p_fp_info->release == 7) && - (tvb_length_remaining(tvb, offset) > 2)) { + (tvb_reported_length_remaining(tvb, offset) > 2)) { guint8 flags = tvb_get_guint8(tvb, offset); guint8 bits_extended = flags & 0x01; @@ -2166,7 +2166,7 @@ dissect_dch_rx_timing_deviation(packet_info *pinfo, proto_tree *tree, /* May be extended in R7, but in this case there are at least 2 bytes remaining */ if ((p_fp_info->release == 7) && - (tvb_length_remaining(tvb, offset) >= 2)) { + (tvb_reported_length_remaining(tvb, offset) >= 2)) { /* New IE flags */ guint64 extended_bits_present; @@ -2361,7 +2361,7 @@ dissect_dch_timing_advance(proto_tree *tree, packet_info *pinfo, offset++; if ((p_fp_info->release == 7) && - (tvb_length_remaining(tvb, offset) > 0)) { + (tvb_reported_length_remaining(tvb, offset) > 0)) { /* New IE flags */ guint8 flags = tvb_get_guint8(tvb, offset); @@ -3213,7 +3213,7 @@ dissect_hsdsch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Extra IEs (if there is room for them) */ if (((p_fp_info->release == 6) || (p_fp_info->release == 7)) && - (tvb_length_remaining(tvb, offset) > 2)) { + (tvb_reported_length_remaining(tvb, offset) > 2)) { int n; guint8 flags; |