asn2wrs: autodetect if 64 bits variant is required for constrained integers

It does not work with defines, but is already a great step forward

Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e
Reviewed-on: https://code.wireshark.org/review/6617
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

7 files changed, 6 insertions, 74 deletions

diff --git a/asn1/lpp/lpp.cnf b/asn1/lpp/lpp.cnf
index b495ad9cc8..6a111685a0 100644
--- a/asn1/lpp/lpp.cnf
+++ b/asn1/lpp/lpp.cnf
@@ -682,7 +682,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNo DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDelta
 #.TYPE_ATTR
 NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDeltaNoDot_fmt
 
-#.FN_BODY NavModelCNAV-KeplerianSet/cnavMo VAL_PTR=&cnavMo FN_VARIANT=_64b
+#.FN_BODY NavModelCNAV-KeplerianSet/cnavMo VAL_PTR=&cnavMo
   gint64 cnavMo;
   int curr_offset = offset;
 %(DEFAULT_BODY)s
@@ -693,10 +693,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDe
                                                          cnavMo, "%e semi-circles (%"G_GINT64_MODIFIER"d)",
                                                          (double)cnavMo*pow(2, -32), cnavMo);
 
-#.TYPE_ATTR
-NavModelCNAV-KeplerianSet/cnavMo TYPE=FT_INT64
-
-#.FN_BODY NavModelCNAV-KeplerianSet/cnavE VAL_PTR=&cnavE FN_VARIANT=_64b
+#.FN_BODY NavModelCNAV-KeplerianSet/cnavE VAL_PTR=&cnavE
   guint64 cnavE;
   int curr_offset = offset;
 %(DEFAULT_BODY)s
@@ -707,10 +704,7 @@ NavModelCNAV-KeplerianSet/cnavMo TYPE=FT_INT64
                                                           cnavE, "%e (%"G_GINT64_MODIFIER"u)",
                                                           (double)cnavE*pow(2, -34), cnavE);
 
-#.TYPE_ATTR
-NavModelCNAV-KeplerianSet/cnavE TYPE=FT_UINT64
-
-#.FN_BODY NavModelCNAV-KeplerianSet/cnavOmega VAL_PTR=&cnavOmega FN_VARIANT=_64b
+#.FN_BODY NavModelCNAV-KeplerianSet/cnavOmega VAL_PTR=&cnavOmega
   gint64 cnavOmega;
   int curr_offset = offset;
 %(DEFAULT_BODY)s
@@ -721,10 +715,7 @@ NavModelCNAV-KeplerianSet/cnavE TYPE=FT_UINT64
                                                          cnavOmega, "%e semi-circles (%"G_GINT64_MODIFIER"d)",
                                                          (double)cnavOmega*pow(2, -32), cnavOmega);
 
-#.TYPE_ATTR
-NavModelCNAV-KeplerianSet/cnavOmega TYPE=FT_INT64
-
-#.FN_BODY NavModelCNAV-KeplerianSet/cnavOMEGA0 VAL_PTR=&cnavOMEGA0 FN_VARIANT=_64b
+#.FN_BODY NavModelCNAV-KeplerianSet/cnavOMEGA0 VAL_PTR=&cnavOMEGA0
   gint64 cnavOMEGA0;
   int curr_offset = offset;
 %(DEFAULT_BODY)s
@@ -736,12 +727,9 @@ NavModelCNAV-KeplerianSet/cnavOmega TYPE=FT_INT64
                                                          (double)cnavOMEGA0*pow(2, -32), cnavOMEGA0);
 
 #.TYPE_ATTR
-NavModelCNAV-KeplerianSet/cnavOMEGA0 TYPE=FT_INT64
-
-#.TYPE_ATTR
 NavModelCNAV-KeplerianSet/cnavDeltaOmegaDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDeltaOmegaDot_IoDot_fmt
 
-#.FN_BODY NavModelCNAV-KeplerianSet/cnavIo VAL_PTR=&cnavIo FN_VARIANT=_64b
+#.FN_BODY NavModelCNAV-KeplerianSet/cnavIo VAL_PTR=&cnavIo
   gint64 cnavIo;
   int curr_offset = offset;
 %(DEFAULT_BODY)s
@@ -753,9 +741,6 @@ NavModelCNAV-KeplerianSet/cnavDeltaOmegaDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cna
                                                          (double)cnavIo*pow(2, -32), cnavIo);
 
 #.TYPE_ATTR
-NavModelCNAV-KeplerianSet/cnavIo TYPE=FT_INT64
-
-#.TYPE_ATTR
 NavModelCNAV-KeplerianSet/cnavIoDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDeltaOmegaDot_IoDot_fmt
 
 #.TYPE_ATTR
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf
index d218535bf7..97ec1bcc06 100644
--- a/asn1/lte-rrc/lte-rrc.cnf
+++ b/asn1/lte-rrc/lte-rrc.cnf
@@ -744,10 +744,7 @@ SystemInformationBlockType16-r11/timeInfo-r11/dayLightSavingTime-r11 TYPE=FT_UIN
 #.TYPE_ATTR
 SystemInformationBlockType16-r11/timeInfo-r11/localTimeOffset-r11 DISPLAY=BASE_CUSTOM STRINGS=&lte_rrc_localTimeOffset_fmt
 
-#.TYPE_ATTR
-SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 TYPE = FT_UINT64
-
-#.FN_BODY SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 VAL_PTR=&timeInfo FN_VARIANT = _64b
+#.FN_BODY SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 VAL_PTR=&timeInfo
   guint64 timeInfo;
   proto_tree *subtree;
   nstime_t ts;
diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf
index 4df0271636..6044163826 100644
--- a/asn1/m3ap/m3ap.cnf
+++ b/asn1/m3ap/m3ap.cnf
@@ -112,9 +112,6 @@ ProtocolIE-Field/value ie_field_value
 #  asn1_stack_frame_check(actx, "ProtocolIE-ContainerPairList", ProtocolIE_ContainerPairList_pars);
 # END
 
-# Handle 64 bit constraint
-#.FN_PARS BitRate FN_VARIANT = _64b
-
 # following construction is not supported by asn2wrs
 # PLMNidentity ::= TBCD-STRING (SIZE (3))
 
@@ -330,6 +327,4 @@ M3SetupRequest												N m3ap.proc.imsg id-m3Setup
 M3SetupResponse												N m3ap.proc.sout id-m3Setup
 M3SetupFailure												N m3ap.proc.uout id-m3Setup
 
-#.TYPE_ATTR
-BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
 #.END
diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf
index 1b8a1a43bc..78bc3ee70c 100644
--- a/asn1/pcap/pcap.cnf
+++ b/asn1/pcap/pcap.cnf
@@ -57,12 +57,6 @@ PrivateIE-Field/value private_value
 ProtocolIE-Field/value ie_field_value
 
 
-# Handle 64 bit constraint
-#.FN_PARS UTRAN-GPSReferenceTimeResult/ue-GPSTimingOfCell FN_VARIANT = _64b
-#.FN_PARS UTRAN-GANSSReferenceTimeUL/ue-GANSSTimingOfCellFrames FN_VARIANT = _64b
-#.FN_PARS UTRAN-GPSReferenceTime/utran-GPSTimingOfCell FN_VARIANT = _64b
-#.FN_PARS UTRAN-GANSSReferenceTimeResult/ue-GANSSTimingOfCell FN_VARIANT = _64b
-
 #.FN_PARS ProtocolIE-ID  VAL_PTR=&ProtocolIE_ID
 #.FN_FTR ProtocolIE-ID
   if (tree) {
@@ -433,11 +427,4 @@ PositionPeriodicResult							N pcap.proc.imsg id-PositionPeriodicResult
 
 PositionPeriodicTermination						N pcap.proc.imsg id-PositionPeriodicTermination
 
-#.TYPE_ATTR
-# Handle 64 bit constraint
-UTRAN-GPSReferenceTimeResult/ue-GPSTimingOfCell TYPE = FT_UINT64  DISPLAY = BASE_DEC  STRINGS = NULL
-UTRAN-GANSSReferenceTimeUL/ue-GANSSTimingOfCellFrames  TYPE = FT_UINT64  DISPLAY = BASE_DEC  STRINGS = NULL
-UTRAN-GPSReferenceTime/utran-GPSTimingOfCell  TYPE = FT_UINT64  DISPLAY = BASE_DEC  STRINGS = NULL
-UTRAN-GANSSReferenceTimeResult/ue-GANSSTimingOfCell TYPE = FT_UINT64  DISPLAY = BASE_DEC  STRINGS = NULL
-
 #.END
\ No newline at end of file
diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf
index 31774b19f9..8cdebf1fec 100644
--- a/asn1/rrlp/rrlp.cnf
+++ b/asn1/rrlp/rrlp.cnf
@@ -38,22 +38,3 @@ tvbuff_t *parameter_tvb = NULL;
   if(parameter_tvb)
 	dissect_geographical_description(parameter_tvb, %(ACTX)s->pinfo, tree);
 #.END
-
-# Handle 64 bit constraint
-#.FN_PARS NavModel-CNAVKeplerianSet/cnavMo FN_VARIANT = _64b
-#.TYPE_ATTR
-NavModel-CNAVKeplerianSet/cnavMo TYPE = FT_INT64
-#.FN_PARS NavModel-CNAVKeplerianSet/cnavOmega FN_VARIANT = _64b
-#.TYPE_ATTR
-NavModel-CNAVKeplerianSet/cnavOmega TYPE = FT_INT64
-#.FN_PARS NavModel-CNAVKeplerianSet/cnavOMEGA0 FN_VARIANT = _64b
-#.TYPE_ATTR
-NavModel-CNAVKeplerianSet/cnavOMEGA0 TYPE = FT_INT64
-#.FN_PARS NavModel-CNAVKeplerianSet/cnavIo FN_VARIANT = _64b
-#.TYPE_ATTR
-NavModel-CNAVKeplerianSet/cnavIo TYPE = FT_INT64
-#.FN_PARS NavModel-CNAVKeplerianSet/cnavE FN_VARIANT = _64b
-#.TYPE_ATTR
-NavModel-CNAVKeplerianSet/cnavE TYPE = FT_UINT64
-#.FN_PARS ReferenceNavModel/keplerW FN_VARIANT = _64b
-
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index e4a45d1d92..c009f9c7ea 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -182,9 +182,6 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 #  asn1_stack_frame_pop(%(ACTX)s, "ProtocolIE-ContainerList");
 # END
 
-# Handle 64 bit constraint
-#.FN_PARS BitRate FN_VARIANT = _64b
-
 #.FN_HDR PrivateIE-ID
 obj_id = NULL;
 
@@ -1225,10 +1222,5 @@ PWSRestartIndication					N s1ap.proc.imsg id-PWSRestartIndication
   guint32 value;
 %(DEFAULT_BODY)s
   col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Misc-cause=%%s]", val_to_str_const(value, s1ap_CauseMisc_vals, "Unknown"));
-     
 
-#.TYPE_ATTR
-BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
 #.END
-
-
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index bedc2b538f..133081146c 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -99,9 +99,6 @@ ProtocolIE-ContainerPairList
 ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(x2ap_ProtocolIE_ID_vals)
 #.END
 
-# Handle 64 bit constraint
-#.FN_PARS BitRate FN_VARIANT = _64b
-
 #.FN_BODY TransportLayerAddress VAL_PTR = &parameter_tvb
 # For details on the Transport Layer Address, see
 # ref. [8], [19]
@@ -424,6 +421,4 @@ X2Release							N x2ap.proc.imsg id-x2Release
 
 X2MessageTransfer					N x2ap.proc.imsg id-x2MessageTransfer
 
-#.TYPE_ATTR
-BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
 #.END