tvb_length -> tvb_reported_length

Change-Id: I48b618008c8c8accd6f161bdc42e02906a4765b7
Reviewed-on: https://code.wireshark.org/review/5085
Reviewed-by: Anders Broman <a.broman58@gmail.com>

11 files changed, 119 insertions, 119 deletions

diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index d923139a5b..7cc96c1f08 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -469,7 +469,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_item *ti, *addres_field_item;
 	proto_tree *llcgprs_tree=NULL , *ad_f_tree =NULL, *ctrl_f_tree=NULL, *ui_tree=NULL;
 	tvbuff_t *next_tvb;
-	guint length;
+	guint length, captured_length;
 	guint32 fcs=0;
 	guint32 fcs_calc=0;
 	fcs_status_t fcs_status;
@@ -509,12 +509,12 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		frame_format = (ctrl_fld_fb < 0xe0 )? UI_FORMAT : U_FORMAT;
 	}
 	length = tvb_reported_length(tvb);
-	llc_data_length = tvb_length(tvb);
+	captured_length = llc_data_length = tvb_captured_length(tvb);
 	if(llc_data_length==length){
 		llc_data_length = length - CRC_LENGTH;
 	}
 	llc_data_reported_length = length - CRC_LENGTH; /* llc_data_reported_length includes the header and the payload */
-	if (tvb_length(tvb) >= length && length >= CRC_LENGTH)
+	if (captured_length >= length && length >= CRC_LENGTH)
 	{
 		/*
 		 * We have all the packet data, including the full FCS,
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index d54ec0f8d4..d87e8eb232 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -2768,7 +2768,7 @@ bssmap_old_bss_to_new_bss_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pin
 
     g_tree = tree;
 
-    len = tvb_length(tvb);
+    len = tvb_reported_length(tvb);
     be_field_element_dissect(tvb, tree, pinfo, 0, len, NULL, 0);
 
     g_tree = NULL;
@@ -3191,7 +3191,7 @@ bssmap_new_bss_to_old_bss_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pin
 
     g_tree = tree;
 
-    len = tvb_length(tvb);
+    len = tvb_reported_length(tvb);
     be_field_element_dissect(tvb, tree, pinfo, 0, len, NULL, 0);
 
     g_tree = NULL;
@@ -7082,7 +7082,7 @@ dissect_bssmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     g_tree = tree;
 
-    len = tvb_length(tvb);
+    len = tvb_reported_length(tvb);
 
     /*
      * add BSSMAP message name
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index fc47e79043..9b116942b6 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -438,7 +438,7 @@ dissect_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	g_tree = tree;
 
-	len = tvb_length(tvb);
+	len = tvb_reported_length(tvb);
 
 	/*
 	 * add RP message name
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index d048a2fd6c..81b5cdd612 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -944,7 +944,7 @@ dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	g_tree = tree;
 
-	len = tvb_length(tvb);
+	len = tvb_reported_length(tvb);
 
 	/*
 	 * add BSSMAP message name
diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c
index be64b3e4b6..d7daae719e 100644
--- a/epan/dissectors/packet-gsm_um.c
+++ b/epan/dissectors/packet-gsm_um.c
@@ -201,7 +201,7 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				tvbuff_t *next_tvb;
 				guint8 pseudo_len, len_left, len_byte;
 
-				len_left = tvb_length(tvb);
+				len_left = tvb_reported_length(tvb);
 				len_byte = tvb_get_guint8(tvb, 0);
 				pseudo_len = len_byte >> 2;
 				next_tvb = tvb_new_subset(tvb, 1, MIN(len_left, pseudo_len), -1);
@@ -212,7 +212,7 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				}
 
 				/* Only dissect non-empty frames */
-				if( tvb_length(next_tvb) ) {
+				if( tvb_reported_length(next_tvb) ) {
 					call_dissector(dtap_handle, next_tvb, pinfo, tree);
 				}
 			}
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index b48692abee..ade1cf565c 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -167,7 +167,7 @@ static void dissect_3gcsd_plmnbc(proto_tree* tree, tvbuff_t* tvb, packet_info* p
 
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 	dissect_ber_octet_string(implicit_param ? *((gboolean*)implicit_param) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, NULL);
-	de_bearer_cap(tvb, tree, pinfo, 4, tvb_length(tvb)-4, NULL, 0);
+	de_bearer_cap(tvb, tree, pinfo, 4, tvb_reported_length(tvb)-4, NULL, 0);
 }
 
 static const value_string h248_3GCSD_properties_vals[] = {
@@ -310,7 +310,7 @@ static void dissect_3GTFO_codec_mode(proto_tree* tree, tvbuff_t* tvb, packet_inf
 
 		if (sub_tvb) {
 			proto_tree* pt = proto_item_add_subtree(asn1_ctx.created_item, ett_h248_3GTFO_codec);
-			dissect_codec_mode(pt, sub_tvb, 0, tvb_length(tvb));
+			dissect_codec_mode(pt, sub_tvb, 0, tvb_reported_length(tvb));
 		}
 	} else {
 		proto_tree_add_item(tree,hfid,tvb,0,-1,ENC_NA);
@@ -334,7 +334,7 @@ static void dissect_3GTFO_codec_list(proto_tree* tree, tvbuff_t* tvb, packet_inf
 
 		if (sub_tvb) {
 			proto_tree* pt = proto_item_add_subtree(asn1_ctx.created_item,ett_h248_3GTFO_codec_list);
-			int len = tvb_length(sub_tvb);
+			int len = tvb_reported_length(sub_tvb);
 			int offset = 0;
 			do {
 				offset = dissect_codec_mode(pt, sub_tvb, offset, len);
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index 7c3d130697..e6faeaf6ea 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -749,7 +749,7 @@ static void dissect_h248_annexc_acodec(proto_tree* tree,
 	dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
 
 	tree = proto_item_add_subtree(asn1_ctx.created_item,ett_codec);
-	len = tvb_length(new_tvb);
+	len = tvb_reported_length(new_tvb);
 	dissect_codec_mode(tree,new_tvb,0,len);
 }
 
@@ -766,7 +766,7 @@ static void dissect_h248_annexc_BIR(proto_tree* tree,
 	dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
 
 	if ( new_tvb && h248_info->term && ! h248_info->term->bir ) {
-		h248_info->term->bir = wmem_strdup(wmem_file_scope(), tvb_bytes_to_ep_str(new_tvb,0,tvb_length(new_tvb)));
+		h248_info->term->bir = wmem_strdup(wmem_file_scope(), tvb_bytes_to_ep_str(new_tvb,0,tvb_reported_length(new_tvb)));
 	}
 }
 
@@ -782,9 +782,9 @@ static void dissect_h248_annexc_NSAP(proto_tree* tree,
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 	dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
 	if (new_tvb) {
-		dissect_nsap(new_tvb, 0,tvb_length(new_tvb), tree);
+		dissect_nsap(new_tvb, 0,tvb_reported_length(new_tvb), tree);
 		if ( h248_info->term && ! h248_info->term->nsap) {
-			h248_info->term->nsap = wmem_strdup(wmem_file_scope(), tvb_bytes_to_ep_str(new_tvb,0,tvb_length(new_tvb)));
+			h248_info->term->nsap = wmem_strdup(wmem_file_scope(), tvb_bytes_to_ep_str(new_tvb,0,tvb_reported_length(new_tvb)));
 		}
 	}
 }
@@ -803,7 +803,7 @@ static void dissect_h248_annexc_USI(proto_tree* tree, tvbuff_t* tvb, packet_info
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 	dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
 	if (new_tvb)
-		dissect_q931_bearer_capability_ie(new_tvb, 0, tvb_length(new_tvb), tree);
+		dissect_q931_bearer_capability_ie(new_tvb, 0, tvb_reported_length(new_tvb), tree);
 }
 
 static void dissect_h248_annexc_SDP(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* h248_info _U_, void* implicit_p _U_) {
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index 6b6b52d00b..ea38a2ed59 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -832,13 +832,13 @@ more_rbsp_data(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo _U_, gint
 
     /* Set offset to the byte we are treating */
     offset = bit_offset>>3;
-    remaining_length = tvb_length_remaining(tvb, offset);
+    remaining_length = tvb_reported_length_remaining(tvb, offset);
     /* If there is more then 2 bytes left there *should* be more data */
     if (remaining_length>2) {
         return TRUE;
     }
     /* Start from last bit */
-    last_one_bit = (tvb_length(tvb) << 3);
+    last_one_bit = (tvb_reported_length(tvb) << 3);
 
     for (b = 0; !b; ) {
         last_one_bit--;
@@ -1225,7 +1225,7 @@ static tvbuff_t *
 dissect_h265_unescap_nal_unit(tvbuff_t *tvb, packet_info *pinfo, int offset)
 {
     tvbuff_t *tvb_rbsp;
-    int       length         = tvb_length_remaining(tvb, offset);
+    int       length         = tvb_reported_length_remaining(tvb, offset);
     int       NumBytesInRBSP = 0;
     int       i;
     gchar    *buff;
@@ -2357,7 +2357,7 @@ startover:
     case H264_SEQ_PAR_SET:  /* 7 Sequence parameter set*/
         offset = dissect_h264_seq_parameter_set_rbsp(h264_nal_tree, tvb, pinfo, offset);
         /* A bit ugly */
-        if ((offset != -1) && (tvb_length_remaining(tvb, offset) > 0)) {
+        if ((offset != -1) && (tvb_reported_length_remaining(tvb, offset) > 0)) {
             /* In this case length = offset as we start from zero */
             proto_item_set_len(item, offset/*Length */);
             item = proto_tree_add_item(tree, hf_h264_nal_unit, tvb, offset, -1, ENC_NA);
@@ -2644,7 +2644,7 @@ dissect_h264_par_DecoderConfigurationInformation(tvbuff_t *tvb, packet_info *pin
 
     dissect_h264_nal_unit(tvb, pinfo, tree);
 
-    return tvb_length(tvb);
+    return tvb_reported_length(tvb);
 }
 
 typedef struct _h264_capability_t {
@@ -2708,7 +2708,7 @@ dissect_h264_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree, void*
         }
     }
 
-    return tvb_length(tvb);
+    return tvb_reported_length(tvb);
 }
 
 
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 957b0355a0..a12b1cb06d 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -3378,7 +3378,7 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree *
     }
     offset += 1;
   }
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid */
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid */
     proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
     called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -3444,7 +3444,7 @@ dissect_isup_subsequent_number_parameter(tvbuff_t *parameter_tvb, proto_tree *pa
     offset += 1;
   }
 
-  if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -4849,7 +4849,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa
 
         sdp_length = (length_indicator) - 3;
 
-        if (sdp_length > tvb_length_remaining(parameter_tvb, offset)) {
+        if (sdp_length > tvb_reported_length_remaining(parameter_tvb, offset)) {
           /* If this is a segmented message we may not have all the data */
           next_tvb = tvb_new_subset_remaining(parameter_tvb, offset);
         } else {
@@ -5093,7 +5093,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf
                                        pinfo,
                                        (apm_Segmentation_local_ref & 0x7f),         /* ID for fragments belonging together */
                                        NULL,
-                                       tvb_length_remaining(parameter_tvb, offset), /* fragment length - to the end */
+                                       tvb_reported_length_remaining(parameter_tvb, offset), /* fragment length - to the end */
                                        more_frag);                                  /* More fragments? */
 
       if ((si_and_apm_seg_ind & 0x3f) !=0 && (si_and_apm_seg_ind &0x40) !=0) {
@@ -5200,7 +5200,7 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   if (length == 0) {
     proto_tree_add_string_format_value(parameter_tree, hf_isup_calling, parameter_tvb, offset, 0, "", "(empty)");
     proto_item_set_text(parameter_item, "Calling Number: (empty)");
@@ -5226,10 +5226,10 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5279,7 +5279,7 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_in
   proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   if (length == 0) {
     expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
@@ -5291,7 +5291,7 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_in
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Original Called Number");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -5307,10 +5307,10 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_in
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5347,7 +5347,7 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
   proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   if (length == 0) {
     proto_tree_add_string_format_value(parameter_tree, hf_isup_redirecting, parameter_tvb, offset, 0, "", "(empty)");
@@ -5359,7 +5359,7 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Redirecting Number");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -5375,10 +5375,10 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5419,7 +5419,7 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Redirection Number");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_called_party_odd_address_signal_digit,
@@ -5435,10 +5435,10 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5483,7 +5483,7 @@ dissect_isup_connection_request_parameter(tvbuff_t *parameter_tvb, proto_tree *p
 void
 dissect_isup_redirection_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  if (tvb_length(parameter_tvb) == 2) {
+  if (tvb_reported_length(parameter_tvb) == 2) {
     guint16 indicators;
     indicators = tvb_get_ntohs(parameter_tvb, 0);
     proto_tree_add_uint(parameter_tree, hf_isup_redirecting_ind, parameter_tvb, 0, REDIRECTION_INFO_LENGTH, indicators);
@@ -5527,7 +5527,7 @@ dissect_isup_closed_user_group_interlock_code_parameter(tvbuff_t *parameter_tvb,
  */
 static void
 dissect_isup_user_service_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_user_service_information, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "User service information, (%u byte%s length)",
                       length , plurality(length, "", "s"));
@@ -5572,7 +5572,7 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   if (length == 0)
     return; /* empty connected number */
   address_digits_tree = proto_tree_add_subtree(parameter_tree, parameter_tvb,
@@ -5594,10 +5594,10 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5636,7 +5636,7 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Network identification");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -5652,10 +5652,10 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+  if  (((indicators & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
       proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                           parameter_tvb, offset - 1, 1, address_digit_pair);
       network_id[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -5903,7 +5903,7 @@ dissect_isup_access_delivery_information_parameter(tvbuff_t *parameter_tvb, prot
  */
 static void
 dissect_isup_network_specific_facility_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_network_specific_facility, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "Network specific facility (%u byte%s length)", length , plurality(length, "", "s"));
 }
@@ -5912,7 +5912,7 @@ dissect_isup_network_specific_facility_parameter(tvbuff_t *parameter_tvb, proto_
  */
 static void
 dissect_isup_user_service_information_prime_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_user_service_information_prime, parameter_tvb, 0, length, ENC_NA);
   dissect_q931_bearer_capability_ie(parameter_tvb,
                                     0, length,
@@ -5938,7 +5938,7 @@ dissect_isup_propagation_delay_counter_parameter(tvbuff_t *parameter_tvb, proto_
  */
 static void
 dissect_isup_remote_operations_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_remote_operations, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "Remote operations (%u byte%s length)", length , plurality(length, "", "s"));
 }
@@ -5950,7 +5950,7 @@ dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_tree *p
 {
   guint  i;
   guint8 feature_code;
-  guint  length = tvb_length(parameter_tvb);
+  guint  length = tvb_reported_length(parameter_tvb);
 
   for (i=0; i<length; i++) {
     feature_code = tvb_get_guint8(parameter_tvb, i);
@@ -5964,7 +5964,7 @@ dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_tree *p
 static void
 dissect_isup_user_teleservice_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint length = tvb_length(parameter_tvb);
+  guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_user_teleservice_information, parameter_tvb, 0, length, ENC_NA);
 
   dissect_q931_high_layer_compat_ie(parameter_tvb, 0, length, parameter_tree);
@@ -6065,7 +6065,7 @@ static const true_false_string isup_pass_on_not_possible_indicator_value = {
 static void
 dissect_isup_message_compatibility_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint length = tvb_length(parameter_tvb);
+  guint length = tvb_reported_length(parameter_tvb);
   gint  offset = 0;
 
   static const int * params[] = {
@@ -6121,7 +6121,7 @@ static const value_string ISUP_Broadband_narrowband_interworking_indicator_vals[
 static void
 dissect_isup_parameter_compatibility_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint  length = tvb_length(parameter_tvb);
+  guint  length = tvb_reported_length(parameter_tvb);
   guint  len    = length;
   guint8 upgraded_parameter, upgraded_parameter_no;
   guint8 offset;
@@ -6326,7 +6326,7 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para
     * (network provided).
     * BUG 938 - Just check if there is someting more to dissect.
     */
-  if (tvb_length_remaining(parameter_tvb, offset) < 3) {
+  if (tvb_reported_length_remaining(parameter_tvb, offset) < 3) {
     proto_item_set_text(parameter_item, "Location number: address not available");
     return;
   }
@@ -6337,7 +6337,7 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Location number");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -6353,10 +6353,10 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -6453,7 +6453,7 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Call transfer number");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -6469,10 +6469,10 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
       proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset - 1, 1, address_digit_pair);
       calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
       if (i > MAXDIGITS)
@@ -6508,7 +6508,7 @@ dissect_isup_ccss_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree,
  */
 static void
 dissect_isup_forward_gvns_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_forward_gvns, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "Forward GVNS (%u Byte%s)", length , plurality(length, "", "s"));
 }
@@ -6531,7 +6531,7 @@ static const value_string isup_jpn_redirect_capabilit_vals[] = {
 static void
 dissect_isup_redirect_capability_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item, guint8 itu_isup_variant)
 {
-  guint length = tvb_length(parameter_tvb);
+  guint length = tvb_reported_length(parameter_tvb);
 
   switch (itu_isup_variant) {
     case ISUP_JAPAN_VARIANT:
@@ -6578,7 +6578,7 @@ dissect_isup_network_management_controls_parameter(tvbuff_t *parameter_tvb, prot
  */
 static void
 dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_correlation_id, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "Correlation ID, see Q.1281 (%u Byte%s)", length , plurality(length, "", "s"));
 }
@@ -6587,7 +6587,7 @@ dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree *param
  */
 static void
 dissect_isup_scf_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_scf_id, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "SCF ID, see Q.1281 (%u Byte%s)", length , plurality(length, "", "s"));
 }
@@ -6630,7 +6630,7 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Called IN Number");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -6646,10 +6646,10 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
       proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset - 1, 1, address_digit_pair);
       calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
       if (i > MAXDIGITS)
@@ -6678,7 +6678,7 @@ dissect_isup_call_offering_treatment_indicators_parameter(tvbuff_t *parameter_tv
  */
 static void
 dissect_isup_charged_party_identification_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_charged_party_identification, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "Charged party identification (%u Byte%s)", length , plurality(length, "", "s"));
 }
@@ -6712,7 +6712,7 @@ dissect_isup_conference_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
  */
 static void
 dissect_isup_display_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_display_information, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "Display information (%u Byte%s)",
                       length , plurality(length, "", "s"));
@@ -6747,7 +6747,7 @@ dissect_isup_uid_capability_indicators_parameter(tvbuff_t *parameter_tvb, proto_
 static void
 dissect_isup_redirect_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item, guint8 itu_isup_variant)
 {
-  guint length = tvb_length(parameter_tvb);
+  guint length = tvb_reported_length(parameter_tvb);
 
   switch (itu_isup_variant) {
     case ISUP_JAPAN_VARIANT:
@@ -6786,7 +6786,7 @@ dissect_isup_collect_call_request_parameter(tvbuff_t *parameter_tvb, proto_tree
 static void
 dissect_isup_calling_geodetic_location_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint  length = tvb_length(parameter_tvb);
+  guint  length = tvb_reported_length(parameter_tvb);
   guint8 oct, lpri;
 
   oct = tvb_get_guint8(parameter_tvb, 0);
@@ -6848,7 +6848,7 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinf
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator_enhanced, parameter_tvb, 2, 1, indicators2);
   offset = 3;
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   if (length == 0) {
     expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
     proto_item_set_text(parameter_item, "Generic Number: (empty)");
@@ -6873,10 +6873,10 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinf
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
     /* Even Indicator set -> last even digit is valid & has be displayed */
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                         parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -6936,7 +6936,7 @@ dissect_isup_jurisdiction_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
     offset += 1;
   }
 
-  if (tvb_length(parameter_tvb) > 0) {
+  if (tvb_reported_length(parameter_tvb) > 0) {
       proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
                           parameter_tvb, offset - 1, 1, address_digit_pair);
       called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -6960,7 +6960,7 @@ dissect_isup_generic_name_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
 
   gen_name = (char *)wmem_alloc(wmem_packet_scope(), MAXGNAME + 1);
   gen_name[0] = '\0';
-  gen_name_length = tvb_length(parameter_tvb) - 1;
+  gen_name_length = tvb_reported_length(parameter_tvb) - 1;
   indicator = tvb_get_guint8(parameter_tvb, 0);
   proto_tree_add_uint(parameter_tree, hf_isup_generic_name_presentation, parameter_tvb, 1, 1, indicator);
   proto_tree_add_boolean(parameter_tree, hf_isup_generic_name_availability, parameter_tvb, 1, 1, indicator);
@@ -6977,7 +6977,7 @@ dissect_isup_generic_name_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
  */
 static void
 dissect_isup_generic_digits_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_tree_add_item(parameter_tree, hf_isup_generic_digits, parameter_tvb, 0, length, ENC_NA);
   proto_item_set_text(parameter_item, "Generic digits (%u Byte%s)", length , plurality(length, "", "s"));
 }
@@ -7008,7 +7008,7 @@ dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
                                             offset, -1, ett_isup_address_digits, &address_digits_item,
                                             "Charge Number");
 
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
   while (length > 0) {
     address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
     proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -7024,10 +7024,10 @@ dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
         THROW(ReportedBoundsError);
     }
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
-  if  (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+  if  (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
       proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
                           parameter_tvb, offset - 1, 1, address_digit_pair);
       calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -7043,7 +7043,7 @@ dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
 /* ------------------------------------------------------------------ */
 static void
 dissect_isup_unknown_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
   proto_item_set_text(parameter_item, "Parameter Type unknown/reserved (%u Byte%s)", length , plurality(length, "", "s"));
 }
 /* ------------------------------------------------------------------ */
@@ -7064,7 +7064,7 @@ dissect_japan_isup_called_dir_num(tvbuff_t *parameter_tvb, packet_info *pinfo, p
   int offset = 0;
   int parameter_length;
 
-  parameter_length = tvb_length_remaining(parameter_tvb, offset);
+  parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   proto_tree_add_item(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
   proto_tree_add_item(parameter_tree, hf_isup_called_party_nature_of_address_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -7231,7 +7231,7 @@ dissect_japan_isup_redirect_fwd_inf(tvbuff_t *parameter_tvb, packet_info *pinfo,
   guint8 tag, tag_len, ext_ind;
   int    parameter_length;
 
-  parameter_length = tvb_length_remaining(parameter_tvb, offset);
+  parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   while (offset < parameter_length) {
     /* Information Type Tag */
@@ -7294,7 +7294,7 @@ dissect_japan_isup_redirect_backw_inf(tvbuff_t *parameter_tvb, packet_info *pinf
   guint8 tag, tag_len, ext_ind;
   int    parameter_length;
 
-  parameter_length = tvb_length_remaining(parameter_tvb, offset);
+  parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   while (offset < parameter_length) {
     /* Information Type Tag */
@@ -7489,7 +7489,7 @@ dissect_japan_isup_additonal_user_cat(tvbuff_t *parameter_tvb, packet_info *pinf
   guint8 type;
   int    parameter_length;
 
-  parameter_length = tvb_length_remaining(parameter_tvb, offset);
+  parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   while (offset < parameter_length) {
     /* Type of Additional User/Service Information */
@@ -7555,7 +7555,7 @@ dissect_japan_isup_contractor_number(tvbuff_t *parameter_tvb, proto_tree *parame
   int         parameter_length;
   const char *digit_str;
 
-  parameter_length = tvb_length_remaining(parameter_tvb, offset);
+  parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   proto_tree_add_item(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
   proto_tree_add_item(parameter_tree, hf_isup_called_party_nature_of_address_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -7629,7 +7629,7 @@ dissect_japan_isup_carrier_information(tvbuff_t *parameter_tvb, packet_info *pin
   proto_tree_add_uint(parameter_tree, hf_isup_carrier_info_iec, parameter_tvb, 0, 1, octet);
 
 
-  length = tvb_length_remaining(parameter_tvb, 2);
+  length = tvb_reported_length_remaining(parameter_tvb, 2);
   if (length == 0) {
     expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
     proto_item_set_text(parameter_item, "Carrier Information (empty)");
@@ -7804,7 +7804,7 @@ dissect_japan_isup_carrier_information(tvbuff_t *parameter_tvb, packet_info *pin
     }
 
     offset += 1;
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
   }
 
   /* Write to top of tree */
@@ -7829,7 +7829,7 @@ dissect_japan_isup_charge_inf_delay(tvbuff_t *parameter_tvb, proto_tree *paramet
   int offset = 0;
   int parameter_length;
 
-  parameter_length = tvb_length_remaining(parameter_tvb, offset);
+  parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   while (offset < parameter_length) {
     proto_tree_add_item(parameter_tree, hf_japan_isup_charge_delay_type, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -7915,7 +7915,7 @@ dissect_japan_isup_charge_area_info(tvbuff_t *parameter_tvb, proto_tree *paramet
   proto_tree_add_uint(parameter_tree, hf_japan_isup_charge_area_nat_of_info_value, parameter_tvb, 0, 1, octet);
 
   offset = 1;
-  length = tvb_length_remaining(parameter_tvb, offset);
+  length = tvb_reported_length_remaining(parameter_tvb, offset);
 
   /*Only CA code digits.*/
   if (nat_of_info_indic == CHARGE_AREA_NAT_INFO_CA) {
@@ -7959,7 +7959,7 @@ dissect_japan_isup_charge_area_info(tvbuff_t *parameter_tvb, proto_tree *paramet
     octet++;
 
     /* Now loop through MA/CA digits.*/
-    length = tvb_length_remaining(parameter_tvb, offset);
+    length = tvb_reported_length_remaining(parameter_tvb, offset);
 
     while (length > 0) {
       octet = tvb_get_guint8(parameter_tvb, offset);
@@ -8103,7 +8103,7 @@ dissect_japan_chg_inf_type_crt(tvbuff_t *parameter_tvb, proto_tree *parameter_tr
   guint8 len;
   int    parameter_length;
 
-  parameter_length = tvb_length_remaining(parameter_tvb, offset);
+  parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
 
 
   /* Unit per Time Period (UTP) */
@@ -8218,7 +8218,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
   /* Dissect all optional parameters while end of message isn't reached */
   parameter_type = 0xFF; /* Start-initializiation since parameter_type is used for while-condition */
 
-  while ((tvb_length_remaining(optional_parameters_tvb, offset)  >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
+  while ((tvb_reported_length_remaining(optional_parameters_tvb, offset)  >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
     parameter_type = tvb_get_guint8(optional_parameters_tvb, offset);
 
     if (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS) {
@@ -8256,7 +8256,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
       if (octet == 0)
         continue;
 
-      actual_length = tvb_length_remaining(optional_parameters_tvb, offset);
+      actual_length = tvb_reported_length_remaining(optional_parameters_tvb, offset);
       if (actual_length > 0) {
         parameter_tvb = tvb_new_subset(optional_parameters_tvb, offset, MIN(parameter_length, actual_length), parameter_length);
         switch (parameter_type) {
@@ -8589,7 +8589,7 @@ dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_i
   /* Dissect all optional parameters while end of message isn't reached */
   parameter_type = 0xFF; /* Start-initializiation since parameter_type is used for while-condition */
 
-  while ((tvb_length_remaining(optional_parameters_tvb, offset)  >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
+  while ((tvb_reported_length_remaining(optional_parameters_tvb, offset)  >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
     parameter_type = tvb_get_guint8(optional_parameters_tvb, offset);
 
     if (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS) {
@@ -8611,7 +8611,7 @@ dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_i
       if (octet == 0)
         continue;
 
-      actual_length = tvb_length_remaining(optional_parameters_tvb, offset);
+      actual_length = tvb_reported_length_remaining(optional_parameters_tvb, offset);
       if (actual_length > 0) {
         parameter_tvb = tvb_new_subset(optional_parameters_tvb, offset, MIN(parameter_length, actual_length), parameter_length);
         switch (parameter_type) {
@@ -10047,7 +10047,7 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
       break;
     case MESSAGE_TYPE_CHARGE_INFO:
       /* do nothing since format is a national matter */
-      bufferlength = tvb_length_remaining(message_tvb, offset);
+      bufferlength = tvb_reported_length_remaining(message_tvb, offset);
       if (bufferlength != 0)
         proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
       break;
@@ -10093,7 +10093,7 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
       break;
     case MESSAGE_TYPE_SUBSEQUENT_DIR_NUM:
       /* do nothing since format is a national matter */
-      bufferlength = tvb_length_remaining(message_tvb, offset);
+      bufferlength = tvb_reported_length_remaining(message_tvb, offset);
       if (bufferlength != 0)
         proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
       break;
@@ -10111,7 +10111,7 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
       /* no dissector necessary since no mandatory parameters included */
       break;
     default:
-      bufferlength = tvb_length_remaining(message_tvb, offset);
+      bufferlength = tvb_reported_length_remaining(message_tvb, offset);
       if (bufferlength != 0)
         expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
       break;
@@ -10350,7 +10350,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
       break;
     case MESSAGE_TYPE_CHARGE_INFO:
       /* do nothing since format is a national matter */
-      bufferlength = tvb_length_remaining(message_tvb, offset);
+      bufferlength = tvb_reported_length_remaining(message_tvb, offset);
       if (bufferlength != 0) {
         switch (itu_isup_variant) {
           case ISUP_RUSSIAN_VARIANT:
@@ -10404,7 +10404,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
       break;
     case MESSAGE_TYPE_SUBSEQUENT_DIR_NUM:
       /* do nothing since format is a national matter */
-      bufferlength = tvb_length_remaining(message_tvb, offset);
+      bufferlength = tvb_reported_length_remaining(message_tvb, offset);
       if (bufferlength != 0)
          proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
       break;
@@ -10412,7 +10412,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
       /* Handle national extensions here */
       switch (itu_isup_variant) {
         case ISUP_ITU_STANDARD_VARIANT:
-          bufferlength = tvb_length_remaining(message_tvb, offset);
+          bufferlength = tvb_reported_length_remaining(message_tvb, offset);
           if (bufferlength != 0)
             expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
           break;
@@ -10426,7 +10426,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
               opt_part_possible = TRUE;
               break;
             default:
-              bufferlength = tvb_length_remaining(message_tvb, offset);
+              bufferlength = tvb_reported_length_remaining(message_tvb, offset);
               if (bufferlength != 0)
                 expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
               break;
@@ -10444,7 +10444,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
               /* No parameters */
               break;
             default:
-              bufferlength = tvb_length_remaining(message_tvb, offset);
+              bufferlength = tvb_reported_length_remaining(message_tvb, offset);
               if (bufferlength != 0)
                 expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
               break;
@@ -10460,7 +10460,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
               opt_part_possible = TRUE;
               break;
             default:
-              bufferlength = tvb_length_remaining(message_tvb, offset);
+              bufferlength = tvb_reported_length_remaining(message_tvb, offset);
               if (bufferlength != 0)
                 expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
               break;
@@ -10475,7 +10475,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
               opt_part_possible = TRUE;
               break;
             default:
-              bufferlength = tvb_length_remaining(message_tvb, offset);
+              bufferlength = tvb_reported_length_remaining(message_tvb, offset);
               if (bufferlength != 0)
                 expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
               break;
@@ -10711,7 +10711,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
 
       message_tvb = tvb_new_subset_remaining(tvb, 0);
       dissect_ansi_isup_message(message_tvb, pinfo, isup_tree, ISUP_ITU_STANDARD_VARIANT, 0);
-      return tvb_length(tvb);
+      return tvb_reported_length(tvb);
     } else if (strstr(content_type_parameter_str, "spirou")) {
       isup_standard    = ITU_STANDARD;
       itu_isup_variant = ISUP_FRENCH_VARIANT;
@@ -10773,7 +10773,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
 
   message_tvb = tvb_new_subset_remaining(tvb, 0);
   dissect_isup_message(message_tvb, pinfo, isup_tree, itu_isup_variant, 0);
-  return tvb_length(tvb);
+  return tvb_reported_length(tvb);
 }
 /* ---------------------------------------------------- stats tree
 */
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index de0ae1ff04..0131a78ee8 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -574,7 +574,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree,
   /* extract tag and length from the parameter */
   tag            = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET);
   length         = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-  padding_length = tvb_length(parameter_tvb) - length;
+  padding_length = tvb_reported_length(parameter_tvb) - length;
 
   /* create proto_tree stuff */
   parameter_tree   = proto_tree_add_subtree_format(iua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, -1, ett_iua_parameter, &parameter_item,
@@ -652,7 +652,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tre
   tvbuff_t *parameter_tvb;
 
   offset = 0;
-  while((remaining_length = tvb_length_remaining(parameters_tvb, offset))) {
+  while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset))) {
     length       = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET);
     total_length = ADD_PADDING(length);
     if (remaining_length >= length)
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index cf2887f325..bc8992cf98 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -356,7 +356,7 @@ iuup_proto_tree_add_bits(proto_tree* tree, int hf, tvbuff_t* tvb, int offset, in
 static void dissect_iuup_payload(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint rfci_id _U_, int offset) {
     iuup_circuit_t* iuup_circuit;
     iuup_rfci_t *rfci;
-    int last_offset = tvb_length(tvb) - 1;
+    int last_offset = tvb_reported_length(tvb) - 1;
     guint bit_offset = 0;
     proto_item* pi;
 
@@ -593,7 +593,7 @@ update_crc10_by_bytes_iuup(tvbuff_t *tvb, int offset, int length)
 static void add_payload_crc(tvbuff_t* tvb, packet_info* pinfo, proto_item* iuup_tree)
 {
     proto_item *crc_item;
-    int length = tvb_length(tvb);
+    int length = tvb_reported_length(tvb);
     guint16 crccheck = update_crc10_by_bytes_iuup(tvb, 2, length - 4);
 
     crc_item = proto_tree_add_item(iuup_tree,hf_iuup_payload_crc,tvb,2,2,ENC_BIG_ENDIAN);
@@ -625,7 +625,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "IuUP");
 
     if (two_byte_pseudoheader) {
-        int len = tvb_length(tvb_in) - 2;
+        int len = tvb_reported_length(tvb_in) - 2;
 
         phdr = tvb_get_ntohs(tvb,0);
 
@@ -793,7 +793,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
 
 
 static gboolean dissect_iuup_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-    int len = tvb_length(tvb);
+    int len = tvb_captured_length(tvb);
 
     guint8 first_octet =  tvb_get_guint8(tvb,0);
     guint8 second_octet =  tvb_get_guint8(tvb,1);
@@ -825,7 +825,7 @@ static gboolean dissect_iuup_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
 
 static void find_iuup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-    int len = tvb_length(tvb);
+    int len = tvb_captured_length(tvb);
     int offset = 0;
 
     while (len > 3) {