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 <a.broman58@gmail.com>

17 files changed, 93 insertions, 93 deletions

diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c
index bc5af4e6d8..c2497d26f1 100644
--- a/epan/dissectors/packet-at.c
+++ b/epan/dissectors/packet-at.c
@@ -44,7 +44,7 @@ static gboolean allowed_chars(tvbuff_t *tvb)
     gint offset, len;
     guint8 val;
 
-    len = tvb_length(tvb);
+    len = tvb_reported_length(tvb);
     for (offset = 0; offset < len; offset++) {
         val = tvb_get_guint8(tvb, offset);
         if (!(g_ascii_isprint(val) || (val == 0x0a) || (val == 0x0d)))
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index ee6522cd38..4beecae7ff 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -1230,7 +1230,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 
   aspinfo = get_transaction(tvb, pinfo, (struct aspinfo *)data);
   if (!aspinfo)
-     return tvb_length(tvb);
+     return tvb_reported_length(tvb);
 
   fn = (guint8) aspinfo->command;
 
@@ -1241,7 +1241,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
                  val_to_str(fn, zip_atp_function_vals, "Unknown (0x%01x)"), aspinfo->seq);
 
   if (!tree)
-    return tvb_length(tvb);
+    return tvb_reported_length(tvb);
 
   ti = proto_tree_add_item(tree, proto_zip, tvb, offset, -1, ENC_NA);
   zip_tree = proto_item_add_subtree(ti, ett_zip);
@@ -1285,7 +1285,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
     }
   }
 
-  return tvb_length(tvb);
+  return tvb_reported_length(tvb);
 }
 
 static void
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 50ac70f80a..d1cbedb12e 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -908,7 +908,7 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
      * succeeded.
      * Decode the trailer, if present, and then chop it off.
      */
-    length = tvb_length(tvb);
+    length = tvb_captured_length(tvb);
     reported_length = tvb_reported_length(tvb);
     if ((reported_length % 48) == 0) {
       /*
@@ -997,7 +997,7 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       }
       else
       {
-        if (tvb_length(next_tvb) > 7) /* sizeof(octet) */
+        if (tvb_reported_length(next_tvb) > 7) /* sizeof(octet) */
         {
             guint8 octet[8];
             tvb_memcpy(next_tvb, octet, 0, sizeof(octet));
@@ -1521,7 +1521,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     proto_tree_add_item(aal_tree, hf_atm_aal3_4_seq_num, tvb, offset, 2, ENC_BIG_ENDIAN);
     proto_tree_add_item(aal_tree, hf_atm_aal3_4_multiplex_id, tvb, offset, 2, ENC_BIG_ENDIAN);
 
-    length = tvb_length_remaining(tvb, offset);
+    length = tvb_reported_length_remaining(tvb, offset);
     crc10 = update_crc10_by_bytes_tvb(0, tvb, offset, length);
     offset += 2;
 
@@ -1567,7 +1567,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_type_ft, tvb, offset, 1, ENC_BIG_ENDIAN);
       break;
     }
-    length = tvb_length_remaining(tvb, offset);
+    length = tvb_reported_length_remaining(tvb, offset);
     crc10 = update_crc10_by_bytes_tvb(0, tvb, offset, length);
     offset += 1;
 
@@ -1666,7 +1666,7 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     dissect_reassembled_pdu(tvb, pinfo, tree, atm_tree, atm_ti, truncated, pwpd != NULL);
   }
 
-  return tvb_length(tvb);
+  return tvb_reported_length(tvb);
 }
 
 static int
@@ -1701,7 +1701,7 @@ dissect_atm_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
   }
 
   dissect_atm_cell(tvb, pinfo, tree, atm_tree, AAL_OAMCELL, FALSE, FALSE, pwpd);
-  return tvb_length(tvb);
+  return tvb_reported_length(tvb);
 }
 
 static void atm_prompt(packet_info *pinfo _U_, gchar* result)
diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c
index 26d28cbd8b..50dad15c19 100644
--- a/epan/dissectors/packet-ax25-nol3.c
+++ b/epan/dissectors/packet-ax25-nol3.c
@@ -88,7 +88,7 @@ dissect_dx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	int offset;
 
 	offset   = 0;
-	data_len = tvb_length_remaining( tvb, offset );
+	data_len = tvb_reported_length_remaining( tvb, offset );
 
 	col_set_str( pinfo->cinfo, COL_PROTOCOL, "DX" );
 
diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c
index b18acc0c05..cd1c1d9c42 100644
--- a/epan/dissectors/packet-babel.c
+++ b/epan/dissectors/packet-babel.c
@@ -207,7 +207,7 @@ dissect_babel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U
     guint8         version;
     guint16        bodylen;
 
-    if (tvb_length(tvb) < 4)
+    if (tvb_captured_length(tvb) < 4)
         return 0;
 
     if (tvb_get_guint8(tvb, 0) != 42)
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 1058edf70b..7104d635f1 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -39,8 +39,8 @@ static int bacapp_tap = -1;
 /* formerly bacapp.h  contains definitions and forward declarations */
 
 #ifndef FAULT
-#define FAULT           proto_tree_add_text(subtree, tvb, offset, tvb_length(tvb) - offset, "something is going wrong here !!"); \
-    offset = tvb_length(tvb);
+#define FAULT           proto_tree_add_text(subtree, tvb, offset, tvb_reported_length(tvb) - offset, "something is going wrong here !!"); \
+    offset = tvb_reported_length(tvb);
 #endif
 
 /* BACnet PDU Types */
@@ -5399,10 +5399,10 @@ fTagHeaderTree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                                 tvb, lvt_offset, lvt_len, *lvt);
     } /* if (tree) */
 
-    if (*lvt > tvb_length(tvb)) {
+    if (*lvt > tvb_reported_length(tvb)) {
         expert_add_info_format(pinfo, ti, &ei_bacapp_bad_length,
                                "LVT length too long: %d > %d", *lvt,
-                               tvb_length(tvb));
+                               tvb_reported_length(tvb));
         *lvt = 1;
     }
 
@@ -7039,14 +7039,14 @@ fPropertyValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset
         offset += fTagHeaderTree(tvb, pinfo, tree, offset,
                                  &tag_no, &tag_info, &lvt);
         offset  = fAbstractSyntaxNType(tvb, pinfo, tree, offset);
-        if (tvb_length_remaining(tvb, offset) > 0) {
+        if (tvb_reported_length_remaining(tvb, offset) > 0) {
             offset += fTagHeaderTree(tvb, pinfo, tree, offset,
                                      &tag_no, &tag_info, &lvt);
         }
     } else {
-        proto_tree_add_text(tree, tvb, offset, tvb_length(tvb) - offset,
+        proto_tree_add_text(tree, tvb, offset, tvb_reported_length(tvb) - offset,
                             "expected Opening Tag!");
-        offset = tvb_length(tvb);
+        offset = tvb_reported_length(tvb);
     }
 
     return offset;
@@ -7402,7 +7402,7 @@ fConfirmedPrivateTransferRequest(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
     if (dissector_try_uint(bacapp_dissector_table,
         vendor_identifier, next_tvb, pinfo, tree)) {
         /* we parsed it so skip over length and we are done */
-        offset += tvb_length(next_tvb);
+        offset += tvb_reported_length(next_tvb);
         return offset;
     }
 
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 15f9311947..6286332cf3 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -348,7 +348,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					vendor_id, next_tvb, pinfo, bacnet_tree)) {
 					/* we parsed it so skip over length and we are done */
 					/* Note: offset has now been bumped for message type and vendor id so we take that out of our next_tvb size */
-					offset += tvb_length(next_tvb) -3;
+					offset += tvb_reported_length(next_tvb) -3;
 			}
 		}
 		/* Performance Index (in I-Could-Be-Router-To-Network) */
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index 076a98a2b2..30e42434ba 100644
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -137,7 +137,7 @@ dissect_banana_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
     int i;
 
     /* Accumulate our value/length 'til we hit a valid type */
-    while (tvb_length_remaining(tvb, offset) > 0) {
+    while (tvb_reported_length_remaining(tvb, offset) > 0) {
         byte = tvb_get_guint8(tvb, offset);
         offset++;
 
@@ -226,13 +226,13 @@ dissect_banana(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
     proto_tree *banana_tree;
 
     /* Check that there's enough data */
-    if (tvb_length(tvb) < 2)
+    if (tvb_reported_length(tvb) < 2)
         return 0;
 
     /* Fill in our protocol and info columns */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Banana");
 
-    while (tvb_length_remaining(tvb, offset) > 0 && offset < MAX_ELEMENT_VAL_LEN) {
+    while (tvb_reported_length_remaining(tvb, offset) > 0 && offset < MAX_ELEMENT_VAL_LEN) {
         byte = tvb_get_guint8(tvb, offset);
         if (is_element(byte))
             break;
@@ -253,7 +253,7 @@ dissect_banana(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
     }
 
     /* Return the amount of data this dissector was able to dissect */
-    return tvb_length(tvb);
+    return tvb_reported_length(tvb);
 }
 
 static void
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);
 
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index 8aa2682416..29223d3c96 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -525,9 +525,9 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
       set_mime_hdr_flags(more, request_val, beep_frame_data, pinfo);
     }
     else {  /* Protocol violation, so dissect rest as undisectable */
-      if (tree && (tvb_length_remaining(tvb, offset) > 0)) {
+      if (tree && (tvb_reported_length_remaining(tvb, offset) > 0)) {
         proto_tree_add_item(tree, hf_beep_payload_undissected, tvb, offset,
-                            tvb_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
+                            tvb_reported_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
       }
       return -1;
     }
@@ -557,9 +557,9 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
       /* We dissect the rest as data and bail ... */
 
-      if (tree && (tvb_length_remaining(tvb, offset) > 0)) {
+      if (tree && (tvb_reported_length_remaining(tvb, offset) > 0)) {
         proto_tree_add_item(tree, hf_beep_payload_undissected, tvb, offset,
-                            tvb_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
+                            tvb_reported_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
       }
 
       return -1;
@@ -575,9 +575,9 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
     /* Now for the payload, if any */
 
-    if (tvb_length_remaining(tvb, offset) > 0) { /* Dissect what is left as payload */
+    if (tvb_reported_length_remaining(tvb, offset) > 0) { /* Dissect what is left as payload */
 
-      int pl_size = MIN(size, tvb_length_remaining(tvb, offset));
+      int pl_size = MIN(size, tvb_reported_length_remaining(tvb, offset));
 
       /* Except, check the payload length, and only dissect that much */
 
@@ -604,7 +604,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
     /* If anything else left, dissect it ... */
 
-    if (tvb_length_remaining(tvb, offset) > 0)
+    if (tvb_reported_length_remaining(tvb, offset) > 0)
       offset += dissect_beep_tree(tvb, offset, pinfo, tree, request_val, beep_frame_data);
 
   } else if (tvb_strneql(tvb, offset, "SEQ ", 4) == 0) {
@@ -639,9 +639,9 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
       /* We dissect the rest as data and bail ... */
 
-      if (tree && (tvb_length_remaining(tvb, offset) > 0)) {
+      if (tree && (tvb_reported_length_remaining(tvb, offset) > 0)) {
         proto_tree_add_item(tree, hf_beep_payload_undissected, tvb, offset,
-                            tvb_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
+                            tvb_reported_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
       }
 
       return -1;
@@ -655,7 +655,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
     proto_tree *tr = NULL;
 
     if (tree) {
-      tr = proto_tree_add_subtree(tree, tvb, offset, MIN(5, MAX(0, tvb_length_remaining(tvb, offset))),
+      tr = proto_tree_add_subtree(tree, tvb, offset, MIN(5, MAX(0, tvb_reported_length_remaining(tvb, offset))),
                                     ett_trailer, NULL, "Trailer");
 
       proto_tree_add_item(hdr, hf_beep_cmd, tvb, offset, 3, ENC_NA|ENC_ASCII);
@@ -667,9 +667,9 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
       /* We dissect the rest as data and bail ... */
 
-      if (tree && (tvb_length_remaining(tvb, offset) > 0)) {
+      if (tree && (tvb_reported_length_remaining(tvb, offset) > 0)) {
         proto_tree_add_item(tree, hf_beep_payload_undissected, tvb, offset,
-                            tvb_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
+                            tvb_reported_length_remaining(tvb, offset), ENC_NA|ENC_ASCII);
       }
 
       return -1;
@@ -680,24 +680,24 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
   }
 
-  if (tvb_length_remaining(tvb, offset) > 0) { /* Dissect anything left over */
+  if (tvb_reported_length_remaining(tvb, offset) > 0) { /* Dissect anything left over */
 
     int pl_size = 0;
 
     if (request_val) {
 
-      pl_size = MIN(request_val->size, tvb_length_remaining(tvb, offset));
+      pl_size = MIN(request_val->size, tvb_reported_length_remaining(tvb, offset));
 
       if (pl_size == 0) { /* The whole of the rest must be payload */
 
-        pl_size = tvb_length_remaining(tvb, offset); /* Right place ? */
+        pl_size = tvb_reported_length_remaining(tvb, offset); /* Right place ? */
 
       }
 
     } else if (beep_frame_data) {
-      pl_size = MIN(beep_frame_data->pl_size, tvb_length_remaining(tvb, offset));
+      pl_size = MIN(beep_frame_data->pl_size, tvb_reported_length_remaining(tvb, offset));
     } else { /* Just in case */
-      pl_size = tvb_length_remaining(tvb, offset);
+      pl_size = tvb_reported_length_remaining(tvb, offset);
     }
 
     /* Take care here to handle the payload correctly, and if there is
@@ -710,7 +710,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
      */
 
     if (pl_size == 0 && offset == st_offset)
-      pl_size = tvb_length_remaining(tvb, offset);
+      pl_size = tvb_reported_length_remaining(tvb, offset);
 
     if (pl_size > 0) {
 
@@ -730,7 +730,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
       }
     }
 
-    if (tvb_length_remaining(tvb, offset) > 0) {
+    if (tvb_reported_length_remaining(tvb, offset) > 0) {
       offset += dissect_beep_tree(tvb, offset, pinfo, tree, request_val, beep_frame_data);
     }
   }
@@ -806,8 +806,8 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   /* "tvb_format_text()" is passed a value that won't go past the end
    * of the packet, so it won't throw an exception.
    */
-  if (tvb_length_remaining(tvb, offset) > 0)
-    col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(tvb, offset, tvb_length_remaining(tvb, offset)));
+  if (tvb_reported_length_remaining(tvb, offset) > 0)
+    col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(tvb, offset, tvb_reported_length_remaining(tvb, offset)));
 
   /* Here, we parse the message so we can retrieve the info we need, which
    * is that there is some payload left from a previous segment on the
@@ -843,7 +843,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     int pl_left = beep_frame_data->pl_left;
 
-    pl_left = MIN(pl_left, MAX(0, tvb_length_remaining(tvb, offset)));
+    pl_left = MIN(pl_left, MAX(0, tvb_reported_length_remaining(tvb, offset)));
 
     /* Add the payload bit, only if we have a tree */
     if (tree && (pl_left > 0)) {
@@ -887,7 +887,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   }
 
-  if (tvb_length_remaining(tvb, offset) > 0) {
+  if (tvb_reported_length_remaining(tvb, offset) > 0) {
 
     /*offset += */dissect_beep_tree(tvb, offset, pinfo, beep_tree, request_val, beep_frame_data);
 
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 7869e00d03..f4f53c5914 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -1176,7 +1176,7 @@ call_ber_syntax_callback(const char *syntax, tvbuff_t *tvb, int offset, packet_i
 
         if (syntax == NULL) {
             item = proto_tree_add_expert_format(
-                    tree, pinfo, &ei_ber_no_oid, next_tvb, 0, tvb_length_remaining(tvb, offset),
+                    tree, pinfo, &ei_ber_no_oid, next_tvb, 0, tvb_reported_length_remaining(tvb, offset),
                     "BER: No syntax supplied to call_ber_syntax_callback");
         } else {
             item = proto_tree_add_expert_format(
diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c
index 8ef8bcdd27..2fb242a959 100644
--- a/epan/dissectors/packet-bfcp.c
+++ b/epan/dissectors/packet-bfcp.c
@@ -460,7 +460,7 @@ dissect_bfcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
 
 
 	/* Size of smallest BFCP packet: 12 octets */
-	if (tvb_length(tvb) < 12)
+	if (tvb_captured_length(tvb) < 12)
 		return FALSE;
 
 	/* Check version and reserved bits in first byte */
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 26dfc07972..6b0c7e9a5b 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -6692,7 +6692,7 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
          * That's what we want.  (See "tcp_dissect_pdus()", which is
          * similar.)
          */
-        length_remaining = tvb_ensure_length_remaining(tvb, offset);
+        length_remaining = tvb_ensure_captured_length_remaining(tvb, offset);
 
         /*
          * Can we do reassembly?
diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c
index a25f87cfe0..9addb07683 100644
--- a/epan/dissectors/packet-bitcoin.c
+++ b/epan/dissectors/packet-bitcoin.c
@@ -1417,9 +1417,9 @@ dissect_bitcoin_msg_reject(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 
   create_string_tree(tree, &hfi_msg_reject_reason, tvb, &offset);
 
-  if ((tvb_length(tvb) - offset) > 0)
+  if ((tvb_reported_length(tvb) - offset) > 0)
   {
-    proto_tree_add_item(tree, &hfi_msg_reject_data,  tvb, offset, tvb_length(tvb) - offset, ENC_NA);
+    proto_tree_add_item(tree, &hfi_msg_reject_data,  tvb, offset, tvb_reported_length(tvb) - offset, ENC_NA);
   }
 }
 
@@ -1615,7 +1615,7 @@ static int dissect_bitcoin_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
       tvb_sub = tvb_new_subset_remaining(tvb, offset);
       msg_dissectors[i].function(tvb_sub, pinfo, tree);
-      return tvb_length(tvb);
+      return tvb_reported_length(tvb);
     }
   }
 
@@ -1623,7 +1623,7 @@ static int dissect_bitcoin_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree
   col_append_sep_str(pinfo->cinfo, COL_INFO, ", ", "[unknown command]");
 
   expert_add_info(pinfo, ti, &ei_bitcoin_command_unknown);
-  return tvb_length(tvb);
+  return tvb_reported_length(tvb);
 }
 
 static int
@@ -1642,7 +1642,7 @@ dissect_bitcoin_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
   guint32 magic_number;
   conversation_t *conversation;
 
-  if (tvb_length(tvb) < 4)
+  if (tvb_captured_length(tvb) < 4)
       return FALSE;
 
   magic_number = tvb_get_letohl(tvb, 0);
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 0cdb7688cc..3019312124 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -291,7 +291,7 @@ get_bittorrent_pdu_length(packet_info *pinfo _U_, tvbuff_t *tvb,
                data from the middle of a message, and just return the
                remaining length in the tvbuff so the rest of the tvbuff
                is displayed as continuation data. */
-            return tvb_length_remaining(tvb, offset);
+            return tvb_reported_length_remaining(tvb, offset);
          }
       } else {
          /* We don't have the type field, so we can't determine
@@ -300,7 +300,7 @@ get_bittorrent_pdu_length(packet_info *pinfo _U_, tvbuff_t *tvb,
             and just return the remaining length in the tvbuff so
             the rest of the tvbuff is displayed as continuation
             data. */
-         return tvb_length_remaining(tvb, offset);
+         return tvb_reported_length_remaining(tvb, offset);
       }
    }
 }
@@ -547,7 +547,7 @@ int dissect_bittorrent_tcp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
     col_append_str(pinfo->cinfo, COL_INFO, "  ");
     col_set_fence(pinfo->cinfo, COL_INFO);
 
-    return tvb_length(tvb);
+    return tvb_reported_length(tvb);
 }
 
 static
@@ -555,7 +555,7 @@ int dissect_bittorrent (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
 {
    tcp_dissect_pdus(tvb, pinfo, tree, bittorrent_desegment, BITTORRENT_HEADER_LENGTH,
                     get_bittorrent_pdu_length, dissect_bittorrent_tcp_pdu, data);
-   return tvb_length(tvb);
+   return tvb_reported_length(tvb);
 }
 
 static
@@ -564,7 +564,7 @@ gboolean test_bittorrent_packet (tvbuff_t *tvb, packet_info *pinfo,
 {
    conversation_t *conversation;
 
-   if (tvb_length(tvb) >= 20 &&
+   if (tvb_captured_length(tvb) >= 20 &&
        tvb_get_guint8(tvb, 0) == 19 &&
        tvb_memeql(tvb, 1, "BitTorrent protocol", 19) == 0) {
       conversation = find_or_create_conversation(pinfo);
diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c
index 5fb5c7d03d..f77fbb2329 100644
--- a/epan/dissectors/packet-bmc.c
+++ b/epan/dissectors/packet-bmc.c
@@ -98,7 +98,7 @@ dissect_bmc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
     bmc_tree = proto_item_add_subtree(ti, ett_bmc);
 
     /* Needs bit-reversing. Create a new buffer, copy the message to it and bit-reverse */
-    len = tvb_length(tvb);
+    len = tvb_reported_length(tvb);
     reversing_buffer = (guint8 *)tvb_memdup(NULL, tvb, offset, len);
     bitswap_buf_inplace(reversing_buffer, len);
 
@@ -149,7 +149,7 @@ dissect_bmc_cbs_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 
     cell_broadcast_tvb = tvb_new_subset_remaining(tvb, offset);
     dissect_umts_cell_broadcast_message(cell_broadcast_tvb, pinfo, tree);
-    offset = tvb_length(cell_broadcast_tvb);
+    offset = tvb_reported_length(cell_broadcast_tvb);
 
     return offset;
 }
@@ -211,7 +211,7 @@ dissect_bmc_schedule_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     }
     proto_item_set_len(ti, offset-saved_offset);
 
-    if (tvb_length_remaining(tvb,offset)) {
+    if (tvb_reported_length_remaining(tvb,offset)) {
         future_extension_bitmap = tvb_get_guint8(tvb,offset);
         proto_tree_add_item(tree, hf_bmc_future_extension_bitmap, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset += 1;
@@ -241,8 +241,8 @@ dissect_bmc_cbs41_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
     proto_tree_add_item(tree, hf_bmc_broadcast_address, tvb, offset, 5, ENC_NA);
     offset += 5;
 
-    proto_tree_add_item(tree, hf_bmc_cb_data41, tvb, offset, tvb_length_remaining(tvb,offset), ENC_NA);
-    offset = tvb_length(tvb);
+    proto_tree_add_item(tree, hf_bmc_cb_data41, tvb, offset, tvb_reported_length_remaining(tvb,offset), ENC_NA);
+    offset = tvb_reported_length(tvb);
 
     return offset;
 }
diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index f8bf497f1b..e7175e54a4 100644
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -241,7 +241,7 @@ dissect_brdwlk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_tree_add_item(brdwlk_tree, hf_brdwlk_vsan, tvb, offset, 2, ENC_BIG_ENDIAN);
 
     /* Locate EOF which is the last 4 bytes of the frame */
-    len = tvb_length_remaining(tvb, hdrlen);
+    len = tvb_captured_length_remaining(tvb, hdrlen);
     reported_len = tvb_reported_length_remaining(tvb, hdrlen);
     if (reported_len < 4) {
         /*