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-lapd.c | |
| parent | 9145acb68ac5485d9abe9be23d02964755890c67 (diff) | |
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-lapd.c')
| -rw-r--r-- | epan/dissectors/packet-lapd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index f62829e0bf..6de2aa410c 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -283,7 +283,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Consume tvb bytes */ - available = tvb_length_remaining(tvb, offset); + available = tvb_reported_length_remaining(tvb, offset); while (offset < available) { byte = tvb_get_guint8(tvb,offset); offset++; @@ -539,11 +539,11 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean if (has_crc) { /* check checksum */ - checksum_offset = tvb_length(tvb) - 2; + checksum_offset = tvb_reported_length(tvb) - 2; checksum = tvb_get_guint8(tvb, checksum_offset); /* high byte */ checksum <<= 8; checksum |= tvb_get_guint8(tvb, checksum_offset+1) & 0x00FF; /* low byte */ - checksum_calculated = crc16_ccitt_tvb(tvb, tvb_length(tvb) - 2); + checksum_calculated = crc16_ccitt_tvb(tvb, tvb_reported_length(tvb) - 2); checksum_calculated = g_htons(checksum_calculated); /* Note: g_htons() macro may eval arg multiple times */ if (checksum == checksum_calculated) { @@ -560,7 +560,7 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean expert_add_info(pinfo, pi, &ei_lapd_checksum_bad); } - next_tvb = tvb_new_subset_length(tvb, lapd_header_len, tvb_length_remaining(tvb,lapd_header_len) - 2); + next_tvb = tvb_new_subset_length(tvb, lapd_header_len, tvb_reported_length_remaining(tvb,lapd_header_len) - 2); } else next_tvb = tvb_new_subset_remaining(tvb, lapd_header_len); |