Revert "Update ASN.1 source files with the API changes done in g021e7af"

This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b.

Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

2 files changed, 15 insertions, 15 deletions

diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 4e01141fe8..3ddb488ea1 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -131,38 +131,38 @@ static int dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU(tvbuff_t *tvb,
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-  return (dissector_try_uint(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 /* Currently not used
 static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_uint(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_uint(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 */
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-  return (dissector_try_uint(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-  return (dissector_try_uint(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-  return (dissector_try_uint(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-  return (dissector_try_uint(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 86945349ea..cccdc9a38b 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -194,7 +194,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        3, 3, FALSE, &parameter_tvb);
-	if(tvb_captured_length(tvb)==0)
+	if(tvb_length(tvb)==0)
 		return offset;
 
 	if (!parameter_tvb)
@@ -213,7 +213,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   if (!parameter_tvb)
     return offset;
 
-  length = tvb_captured_length(parameter_tvb);
+  length = tvb_length(parameter_tvb);
 
   is_ascii = TRUE;
   for (p_offset=0; p_offset < length; p_offset++){
@@ -234,7 +234,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
 %(DEFAULT_BODY)s
 
-  if ((tvb_captured_length(parameter_tvb)>0)&&(nas_eps_handle))
+  if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle))
     call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, tree);
 
 #.FN_BODY LPPa-PDU VAL_PTR = &parameter_tvb
@@ -243,7 +243,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
 %(DEFAULT_BODY)s
 
-  if ((tvb_captured_length(parameter_tvb)>0)&&(lppa_handle))
+  if ((tvb_length(parameter_tvb)>0)&&(lppa_handle))
     call_dissector(lppa_handle, parameter_tvb, %(ACTX)s->pinfo, tree);
 
 #.FN_BODY TransportLayerAddress VAL_PTR = &parameter_tvb
@@ -259,7 +259,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 # a)	32 bits in case of IPv4 address according to [6]; and
 # b)	128 bits in case of IPv6 address according to [5].
 	/* Get the length */
-	tvb_len = tvb_captured_length(parameter_tvb);
+	tvb_len = tvb_length(parameter_tvb);
 	subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_TransportLayerAddress);
 	if (tvb_len==4){
 		/* IPv4 */
@@ -338,7 +338,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 				Source BSS to Target BSS
 				Transparent Container 48.018
 			*/
-			de_bssgp_source_BSS_to_target_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_captured_length(parameter_tvb), NULL, 0);
+			de_bssgp_source_BSS_to_target_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
 			break;
 			case 3:
 			/* utrantolte */
@@ -392,7 +392,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 				Target BSS to Source BSS
 				Transparent Container 48.018
 			*/
-			de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_captured_length(parameter_tvb), NULL, 0);
+			de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
 
 			break;
 			case 3:
@@ -496,7 +496,7 @@ if (g_s1ap_dissect_container) {
     return offset;
 
    subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_RIMInformation);
-   if ((tvb_captured_length(parameter_tvb)>0)&&(bssgp_handle)){
+   if ((tvb_length(parameter_tvb)>0)&&(bssgp_handle)){
     col_set_fence(%(ACTX)s->pinfo->cinfo, COL_INFO);
     call_dissector(bssgp_handle,parameter_tvb,%(ACTX)s->pinfo, subtree);
    }