diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-21 06:48:58 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-21 22:38:59 +0000 |
| commit | ebc8ec83fdaefd6253aeb8db587f2d3b413fc340 (patch) | |
| tree | 54c523d543a8e2ea7866e13ba062e2524202fa23 /epan/dissectors/packet-wifi-p2p.c | |
| parent | a2e2c1f99783b5ad1048e9bba5b7a2834680b5fd (diff) | |
Remove deprecated tvb_length from a bunch of dissectors
Change-Id: I5c777806cb1403062a9d85261149d722df57b239
Reviewed-on: https://code.wireshark.org/review/9005
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-wifi-p2p.c')
| -rw-r--r-- | epan/dissectors/packet-wifi-p2p.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 9c255602ff..aeffb3d4dc 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -1209,7 +1209,7 @@ void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - while (tvb_length_remaining(tvb, offset) >= (request ? 4 : 5)) { + while (tvb_reported_length_remaining(tvb, offset) >= (request ? 4 : 5)) { guint16 len; proto_tree *tlv; guint8 type, id, sd_proto; @@ -1219,7 +1219,7 @@ void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, expert_add_info_format(pinfo, item, &ei_wifi_p2p_anqp_length, "Too short Service TLV field"); return; } - if (len > tvb_length_remaining(tvb, offset + 2)) { + if (len > tvb_reported_length_remaining(tvb, offset + 2)) { expert_add_info_format(pinfo, item, &ei_wifi_p2p_anqp_length, "Too short frame for Service TLV field"); return; } @@ -1252,7 +1252,7 @@ void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, offset += len; } - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_reported_length_remaining(tvb, offset) > 0) { expert_add_info(pinfo, item, &ei_wifi_p2p_anqp_unexpected_padding); } } |