diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-11-20 16:07:55 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-11-20 15:12:57 +0000 |
| commit | 9611e751aed1b1358d4f7028572004af11878469 (patch) | |
| tree | 346444b29e26dededf32d17e8c0162cf99ba4967 /epan/dissectors/packet-gsm_rlcmac.c | |
| parent | 9145acb68ac5485d9abe9be23d02964755890c67 (diff) | |
| download | wireshark-9611e751aed1b1358d4f7028572004af11878469.tar.gz | |
Replace tvb_length...() calls.
Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330
Reviewed-on: https://code.wireshark.org/review/5412
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gsm_rlcmac.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index bc9579669c..f1b9460704 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -7401,7 +7401,7 @@ dissect_dl_gprs_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, RlcMa proto_tree *rlcmac_tree = NULL; csnStream_t ar; gint bit_offset = 0; - guint16 bit_length = tvb_length(tvb) * 8; + guint16 bit_length = tvb_reported_length(tvb) * 8; guint8 payload_type = tvb_get_bits8(tvb, 0, 2); guint8 rbsn = tvb_get_bits8(tvb, 8, 1); @@ -7542,7 +7542,7 @@ dissect_egprs_dl_header_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree *rlcmac_tree; csnStream_t ar; - guint16 bit_length = tvb_length(tvb) * 8; + guint16 bit_length = tvb_reported_length(tvb) * 8; col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_str(pinfo->cinfo, COL_INFO, ":", "EGPRS DL:HEADER"); @@ -7587,7 +7587,7 @@ dissect_ul_pacch_access_burst(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_item *ti; proto_tree *rlcmac_tree; csnStream_t ar; - guint16 bit_length = tvb_length(tvb) * 8; + guint16 bit_length = tvb_reported_length(tvb) * 8; col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_str(pinfo->cinfo, COL_INFO, ":", "PACCH ACCESS BURST"); @@ -7628,7 +7628,7 @@ dissect_ul_gprs_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, RlcMa { csnStream_t ar; guint8 payload_type = tvb_get_bits8(tvb, 0, 2); - guint16 bit_length = tvb_length(tvb) * 8; + guint16 bit_length = tvb_reported_length(tvb) * 8; guint16 bit_offset = 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); @@ -7716,7 +7716,7 @@ dissect_egprs_ul_header_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree *rlcmac_tree; csnStream_t ar; guint16 bit_offset = 0; - guint16 bit_length = tvb_length(tvb) * 8; + guint16 bit_length = tvb_reported_length(tvb) * 8; col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_str(pinfo->cinfo, COL_INFO, ":", "EGPRS UL:HEADER"); @@ -7805,7 +7805,7 @@ dissect_egprs_ul_data_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { /* dissect the data segments */ dissect_egprs_data_segments(tvb, pinfo, data_tree, offset, - tvb_length(tvb), li_count, li_array); + tvb_reported_length(tvb), li_count, li_array); } else { @@ -7852,7 +7852,7 @@ dissect_egprs_dl_data_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { /* dissect the data segments */ dissect_egprs_data_segments(tvb, pinfo, data_tree, offset, - tvb_length(tvb), li_count, li_array); + tvb_reported_length(tvb), li_count, li_array); } else { @@ -7908,7 +7908,7 @@ dissect_gsm_rlcmac_downlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; } - return tvb_length(tvb); + return tvb_reported_length(tvb); } @@ -7928,7 +7928,7 @@ dissect_gsm_rlcmac_uplink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v rlc_ul->block_format = rlc_mac->block_format; rlc_ul->flags = rlc_mac->flags; } - else if (tvb_length(tvb) < 3) + else if (tvb_reported_length(tvb) < 3) { /* assume that little packets are PACCH */ rlc_ul->block_format = RLCMAC_PRACH; @@ -7971,7 +7971,7 @@ dissect_gsm_rlcmac_uplink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v break; } - return tvb_length(tvb); + return tvb_reported_length(tvb); } void |