From 05c0152370cbe084193ad2946e6fc96a1017c08e Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Wed, 15 Apr 2015 17:20:35 +0200 Subject: Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman --- epan/dissectors/packet-batadv.c | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'epan/dissectors/packet-batadv.c') diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index c40f525296..666ee6d464 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -898,7 +898,7 @@ static void dissect_batadv_v5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre col_set_str(pinfo->cinfo, COL_PROTOCOL, "BATADV_???"); - length_remaining = tvb_length_remaining(tvb, 0); + length_remaining = tvb_reported_length_remaining(tvb, 0); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, 0); call_dissector(data_handle, next_tvb, pinfo, tree); @@ -970,35 +970,35 @@ static void dissect_batadv_batman(tvbuff_t *tvb, packet_info *pinfo, proto_tree switch (version) { case 5: case 6: - while (offset != -1 && tvb_length_remaining(tvb, offset) >= BATMAN_PACKET_V5_SIZE) { + while (offset != -1 && tvb_reported_length_remaining(tvb, offset) >= BATMAN_PACKET_V5_SIZE) { offset = dissect_batadv_batman_v5(tvb, offset, pinfo, tree); } break; case 7: case 8: - while (offset != -1 && tvb_length_remaining(tvb, offset) >= BATMAN_PACKET_V7_SIZE) { + while (offset != -1 && tvb_reported_length_remaining(tvb, offset) >= BATMAN_PACKET_V7_SIZE) { offset = dissect_batadv_batman_v7(tvb, offset, pinfo, tree); } break; case 9: - while (offset != -1 && tvb_length_remaining(tvb, offset) >= BATMAN_PACKET_V9_SIZE) { + while (offset != -1 && tvb_reported_length_remaining(tvb, offset) >= BATMAN_PACKET_V9_SIZE) { offset = dissect_batadv_batman_v9(tvb, offset, pinfo, tree); } break; case 11: case 13: - while (offset != -1 && tvb_length_remaining(tvb, offset) >= BATMAN_PACKET_V11_SIZE) { + while (offset != -1 && tvb_reported_length_remaining(tvb, offset) >= BATMAN_PACKET_V11_SIZE) { offset = dissect_batadv_batman_v11(tvb, offset, pinfo, tree); } break; case 10: case 12: - while (offset != -1 && tvb_length_remaining(tvb, offset) >= BATMAN_PACKET_V10_SIZE) { + while (offset != -1 && tvb_reported_length_remaining(tvb, offset) >= BATMAN_PACKET_V10_SIZE) { offset = dissect_batadv_batman_v10(tvb, offset, pinfo, tree); } break; case 14: - while (offset != -1 && tvb_length_remaining(tvb, offset) >= BATMAN_PACKET_V14_SIZE) { + while (offset != -1 && tvb_reported_length_remaining(tvb, offset) >= BATMAN_PACKET_V14_SIZE) { offset = dissect_batadv_batman_v14(tvb, offset, pinfo, tree); } break; @@ -1599,7 +1599,7 @@ static int dissect_batadv_batman_v14(tvbuff_t *tvb, int offset, packet_info *pin offset += TT_ENTRY_V14_SIZE; } - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); call_dissector(data_handle, next_tvb, pinfo, tree); @@ -1835,7 +1835,7 @@ static void dissect_batadv_bcast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tre tap_queue_packet(batadv_tap, pinfo, bcast_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); if (have_tap_listener(batadv_follow_tap)) { @@ -1896,7 +1896,7 @@ static void dissect_batadv_bcast_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tr tap_queue_packet(batadv_tap, pinfo, bcast_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -1966,7 +1966,7 @@ static void dissect_batadv_bcast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tr tap_queue_packet(batadv_tap, pinfo, bcast_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -2079,7 +2079,7 @@ static void dissect_batadv_icmp_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree tap_queue_packet(batadv_tap, pinfo, icmp_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -2204,7 +2204,7 @@ static void dissect_batadv_icmp_v7(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 1; /* rr data available? */ - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining >= 1 + BAT_RR_LEN * 6) { dissect_batadv_icmp_rr(batadv_icmp_tree, tvb, offset); offset += 1 + BAT_RR_LEN * 6; @@ -2212,7 +2212,7 @@ static void dissect_batadv_icmp_v7(tvbuff_t *tvb, packet_info *pinfo, proto_tree tap_queue_packet(batadv_tap, pinfo, icmp_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); call_dissector(data_handle, next_tvb, pinfo, tree); @@ -2290,7 +2290,7 @@ static void dissect_batadv_icmp_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tre offset += 1; /* rr data available? */ - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining >= 1 + BAT_RR_LEN * 6) { dissect_batadv_icmp_rr(batadv_icmp_tree, tvb, offset); offset += 1 + BAT_RR_LEN * 6; @@ -2298,7 +2298,7 @@ static void dissect_batadv_icmp_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tre tap_queue_packet(batadv_tap, pinfo, icmp_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset(tvb, offset, length_remaining, -1); call_dissector(data_handle, next_tvb, pinfo, tree); @@ -2485,7 +2485,7 @@ static void dissect_batadv_unicast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_t tap_queue_packet(batadv_tap, pinfo, unicast_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -2552,7 +2552,7 @@ static void dissect_batadv_unicast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_ tap_queue_packet(batadv_tap, pinfo, unicast_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -2654,7 +2654,7 @@ static void dissect_batadv_unicast_4addr_v14(tvbuff_t *tvb, packet_info *pinfo, tap_queue_packet(batadv_tap, pinfo, unicast_4addr_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -2760,7 +2760,7 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p tap_queue_packet(batadv_tap, pinfo, unicast_frag_packeth); head = (unicast_frag_packeth->flags & 0x1); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining < 0) length_remaining = 0; frag_msg = fragment_add_seq_check(&msg_reassembly_table, @@ -2860,7 +2860,7 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p tap_queue_packet(batadv_tap, pinfo, unicast_frag_packeth); head = (unicast_frag_packeth->flags & 0x1); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining < 0) length_remaining = 0; frag_msg = fragment_add_seq_check(&msg_reassembly_table, @@ -3143,7 +3143,7 @@ static void dissect_batadv_vis_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += entry_size; } - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -3238,7 +3238,7 @@ static void dissect_batadv_vis_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += VIS_ENTRY_V8_SIZE; } - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -3336,7 +3336,7 @@ static void dissect_batadv_vis_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += VIS_ENTRY_V8_SIZE; } - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -3499,7 +3499,7 @@ static void dissect_batadv_tt_query_v14(tvbuff_t *tvb, packet_info *pinfo _U_, p } } - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -3604,7 +3604,7 @@ static void dissect_batadv_roam_adv_v14(tvbuff_t *tvb, packet_info *pinfo, proto tap_queue_packet(batadv_tap, pinfo, roam_adv_packeth); - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_reported_length_remaining(tvb, offset); if (length_remaining > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); -- cgit v1.2.3