Fix some headers fields that were wrongly marked as 64 bits instead of 32 bits

svn path=/trunk/; revision=44533

1 files changed, 32 insertions, 137 deletions

diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index 620b4b348d..a697a43c4f 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -429,15 +429,15 @@ static int hf_rrlp_cnavKeplerianSet = -1;         /* NavModel_CNAVKeplerianSet *
 static int hf_rrlp_glonassECEF = -1;              /* NavModel_GLONASSecef */
 static int hf_rrlp_sbasECEF = -1;                 /* NavModel_SBASecef */
 static int hf_rrlp_keplerToe = -1;                /* INTEGER_0_16383 */
-static int hf_rrlp_keplerW = -1;                  /* T_keplerW */
+static int hf_rrlp_keplerW = -1;                  /* INTEGER_M2147483648_2147483647 */
 static int hf_rrlp_keplerDeltaN = -1;             /* INTEGER_M32768_32767 */
-static int hf_rrlp_keplerM0 = -1;                 /* T_keplerM0 */
+static int hf_rrlp_keplerM0 = -1;                 /* INTEGER_M2147483648_2147483647 */
 static int hf_rrlp_keplerOmegaDot = -1;           /* INTEGER_M8388608_8388607 */
 static int hf_rrlp_keplerE = -1;                  /* INTEGER_0_4294967295 */
 static int hf_rrlp_keplerIDot = -1;               /* INTEGER_M8192_8191 */
 static int hf_rrlp_keplerAPowerHalf = -1;         /* INTEGER_0_4294967295 */
-static int hf_rrlp_keplerI0 = -1;                 /* T_keplerI0 */
-static int hf_rrlp_keplerOmega0 = -1;             /* T_keplerOmega0 */
+static int hf_rrlp_keplerI0 = -1;                 /* INTEGER_M2147483648_2147483647 */
+static int hf_rrlp_keplerOmega0 = -1;             /* INTEGER_M2147483648_2147483647 */
 static int hf_rrlp_keplerCrs = -1;                /* INTEGER_M32768_32767 */
 static int hf_rrlp_keplerCis = -1;                /* INTEGER_M32768_32767 */
 static int hf_rrlp_keplerCus = -1;                /* INTEGER_M32768_32767 */
@@ -648,10 +648,7 @@ static int hf_rrlp_ephemerisExtensionDuration = -1;  /* INTEGER_1_512 */
 static int hf_rrlp_ganssEphExtDay = -1;           /* INTEGER_0_8191 */
 static int hf_rrlp_ganssEphExtTOD = -1;           /* GANSSTOD */
 static int hf_rrlp_keplerToe_01 = -1;             /* INTEGER_0_37799 */
-static int hf_rrlp_keplerW_01 = -1;               /* T_keplerW_01 */
-static int hf_rrlp_keplerM0_01 = -1;              /* T_keplerM0_01 */
-static int hf_rrlp_keplerI0_01 = -1;              /* T_keplerI0_01 */
-static int hf_rrlp_keplerOmega0_01 = -1;          /* T_keplerOmega0_01 */
+static int hf_rrlp_keplerW_01 = -1;               /* T_keplerW */
 static int hf_rrlp_SeqOfGANSSRefOrbit_item = -1;  /* GANSSReferenceOrbit */
 static int hf_rrlp_ganssOrbitModel_01 = -1;       /* ReferenceNavModel */
 static int hf_rrlp_GANSSEphemerisDeltaMatrix_item = -1;  /* GANSSEphemerisDeltaEpoch */
@@ -709,12 +706,12 @@ static int hf_rrlp_utcTot_01 = -1;                /* INTEGER_0_65535 */
 static int hf_rrlp_utcWNot = -1;                  /* INTEGER_0_8191 */
 static int hf_rrlp_utcDN_01 = -1;                 /* BIT_STRING_SIZE_4 */
 static int hf_rrlp_nA = -1;                       /* INTEGER_1_1461 */
-static int hf_rrlp_tauC = -1;                     /* T_tauC */
+static int hf_rrlp_tauC = -1;                     /* INTEGER_M2147483648_2147483647 */
 static int hf_rrlp_b1 = -1;                       /* INTEGER_M1024_1023 */
 static int hf_rrlp_b2 = -1;                       /* INTEGER_M512_511 */
 static int hf_rrlp_kp = -1;                       /* BIT_STRING_SIZE_2 */
 static int hf_rrlp_utcA1wnt = -1;                 /* INTEGER_M8388608_8388607 */
-static int hf_rrlp_utcA0wnt = -1;                 /* T_utcA0wnt */
+static int hf_rrlp_utcA0wnt = -1;                 /* INTEGER_M2147483648_2147483647 */
 static int hf_rrlp_utcStandardID = -1;            /* INTEGER_0_7 */
 static int hf_rrlp_ganssID1 = -1;                 /* GANSS_ID1 */
 static int hf_rrlp_ganssID3 = -1;                 /* GANSS_ID3 */
@@ -3442,57 +3439,17 @@ dissect_rrlp_GANSSClockModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-
-static int
-dissect_rrlp_T_keplerW(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
-
-static int
-dissect_rrlp_T_keplerM0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
-
-static int
-dissect_rrlp_T_keplerI0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
-
-static int
-dissect_rrlp_T_keplerOmega0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
 static const per_sequence_t NavModel_KeplerianSet_sequence[] = {
   { &hf_rrlp_keplerToe      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_16383 },
-  { &hf_rrlp_keplerW        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerW },
+  { &hf_rrlp_keplerW        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
   { &hf_rrlp_keplerDeltaN   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
-  { &hf_rrlp_keplerM0       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerM0 },
+  { &hf_rrlp_keplerM0       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
   { &hf_rrlp_keplerOmegaDot , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M8388608_8388607 },
   { &hf_rrlp_keplerE        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_4294967295 },
   { &hf_rrlp_keplerIDot     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M8192_8191 },
   { &hf_rrlp_keplerAPowerHalf, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_4294967295 },
-  { &hf_rrlp_keplerI0       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerI0 },
-  { &hf_rrlp_keplerOmega0   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerOmega0 },
+  { &hf_rrlp_keplerI0       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
+  { &hf_rrlp_keplerOmega0   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
   { &hf_rrlp_keplerCrs      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
   { &hf_rrlp_keplerCis      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
   { &hf_rrlp_keplerCus      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
@@ -4462,37 +4419,7 @@ dissect_rrlp_GANSSEphemerisExtensionHeader(tvbuff_t *tvb _U_, int offset _U_, as
 
 
 static int
-dissect_rrlp_T_keplerW_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
-
-static int
-dissect_rrlp_T_keplerM0_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
-
-static int
-dissect_rrlp_T_keplerI0_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
-
-static int
-dissect_rrlp_T_keplerOmega0_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_rrlp_T_keplerW(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
                                                             G_MININT32, 2147483647U, NULL, FALSE);
 
@@ -4502,15 +4429,15 @@ dissect_rrlp_T_keplerOmega0_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 static const per_sequence_t ReferenceNavModel_sequence[] = {
   { &hf_rrlp_keplerToe_01   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_37799 },
-  { &hf_rrlp_keplerW_01     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerW_01 },
+  { &hf_rrlp_keplerW_01     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerW },
   { &hf_rrlp_keplerDeltaN   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
-  { &hf_rrlp_keplerM0_01    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerM0_01 },
+  { &hf_rrlp_keplerM0       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
   { &hf_rrlp_keplerOmegaDot , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M8388608_8388607 },
   { &hf_rrlp_keplerE        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_4294967295 },
   { &hf_rrlp_keplerIDot     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M8192_8191 },
   { &hf_rrlp_keplerAPowerHalf, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_4294967295 },
-  { &hf_rrlp_keplerI0_01    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerI0_01 },
-  { &hf_rrlp_keplerOmega0_01, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerOmega0_01 },
+  { &hf_rrlp_keplerI0       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
+  { &hf_rrlp_keplerOmega0   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
   { &hf_rrlp_keplerCrs      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
   { &hf_rrlp_keplerCis      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
   { &hf_rrlp_keplerCus      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M32768_32767 },
@@ -4807,19 +4734,9 @@ dissect_rrlp_UTCmodelSet2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 }
 
 
-
-static int
-dissect_rrlp_T_tauC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
 static const per_sequence_t UTCmodelSet3_sequence[] = {
   { &hf_rrlp_nA             , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_1_1461 },
-  { &hf_rrlp_tauC           , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_tauC },
+  { &hf_rrlp_tauC           , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
   { &hf_rrlp_b1             , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_rrlp_INTEGER_M1024_1023 },
   { &hf_rrlp_b2             , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_rrlp_INTEGER_M512_511 },
   { &hf_rrlp_kp             , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_rrlp_BIT_STRING_SIZE_2 },
@@ -4835,19 +4752,9 @@ dissect_rrlp_UTCmodelSet3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 }
 
 
-
-static int
-dissect_rrlp_T_utcA0wnt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            G_MININT32, 2147483647U, NULL, FALSE);
-
-  return offset;
-}
-
-
 static const per_sequence_t UTCmodelSet4_sequence[] = {
   { &hf_rrlp_utcA1wnt       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M8388608_8388607 },
-  { &hf_rrlp_utcA0wnt       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_T_utcA0wnt },
+  { &hf_rrlp_utcA0wnt       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 },
   { &hf_rrlp_utcTot         , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_255 },
   { &hf_rrlp_utcWNt         , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_0_255 },
   { &hf_rrlp_utcDeltaTls    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M128_127 },
@@ -8539,16 +8446,16 @@ void proto_register_rrlp(void) {
         "INTEGER_0_16383", HFILL }},
     { &hf_rrlp_keplerW,
       { "keplerW", "rrlp.keplerW",
-        FT_INT64, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
+        FT_INT32, BASE_DEC, NULL, 0,
+        "INTEGER_M2147483648_2147483647", HFILL }},
     { &hf_rrlp_keplerDeltaN,
       { "keplerDeltaN", "rrlp.keplerDeltaN",
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M32768_32767", HFILL }},
     { &hf_rrlp_keplerM0,
       { "keplerM0", "rrlp.keplerM0",
-        FT_INT64, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
+        FT_INT32, BASE_DEC, NULL, 0,
+        "INTEGER_M2147483648_2147483647", HFILL }},
     { &hf_rrlp_keplerOmegaDot,
       { "keplerOmegaDot", "rrlp.keplerOmegaDot",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -8567,12 +8474,12 @@ void proto_register_rrlp(void) {
         "INTEGER_0_4294967295", HFILL }},
     { &hf_rrlp_keplerI0,
       { "keplerI0", "rrlp.keplerI0",
-        FT_INT64, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
+        FT_INT32, BASE_DEC, NULL, 0,
+        "INTEGER_M2147483648_2147483647", HFILL }},
     { &hf_rrlp_keplerOmega0,
       { "keplerOmega0", "rrlp.keplerOmega0",
-        FT_INT64, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
+        FT_INT32, BASE_DEC, NULL, 0,
+        "INTEGER_M2147483648_2147483647", HFILL }},
     { &hf_rrlp_keplerCrs,
       { "keplerCrs", "rrlp.keplerCrs",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -9415,20 +9322,8 @@ void proto_register_rrlp(void) {
         "INTEGER_0_37799", HFILL }},
     { &hf_rrlp_keplerW_01,
       { "keplerW", "rrlp.keplerW",
-        FT_INT64, BASE_DEC, NULL, 0,
-        "T_keplerW_01", HFILL }},
-    { &hf_rrlp_keplerM0_01,
-      { "keplerM0", "rrlp.keplerM0",
-        FT_INT64, BASE_DEC, NULL, 0,
-        "T_keplerM0_01", HFILL }},
-    { &hf_rrlp_keplerI0_01,
-      { "keplerI0", "rrlp.keplerI0",
-        FT_INT64, BASE_DEC, NULL, 0,
-        "T_keplerI0_01", HFILL }},
-    { &hf_rrlp_keplerOmega0_01,
-      { "keplerOmega0", "rrlp.keplerOmega0",
-        FT_INT64, BASE_DEC, NULL, 0,
-        "T_keplerOmega0_01", HFILL }},
+        FT_INT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_rrlp_SeqOfGANSSRefOrbit_item,
       { "GANSSReferenceOrbit", "rrlp.GANSSReferenceOrbit",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -9659,8 +9554,8 @@ void proto_register_rrlp(void) {
         "INTEGER_1_1461", HFILL }},
     { &hf_rrlp_tauC,
       { "tauC", "rrlp.tauC",
-        FT_INT64, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
+        FT_INT32, BASE_DEC, NULL, 0,
+        "INTEGER_M2147483648_2147483647", HFILL }},
     { &hf_rrlp_b1,
       { "b1", "rrlp.b1",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -9679,8 +9574,8 @@ void proto_register_rrlp(void) {
         "INTEGER_M8388608_8388607", HFILL }},
     { &hf_rrlp_utcA0wnt,
       { "utcA0wnt", "rrlp.utcA0wnt",
-        FT_INT64, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
+        FT_INT32, BASE_DEC, NULL, 0,
+        "INTEGER_M2147483648_2147483647", HFILL }},
     { &hf_rrlp_utcStandardID,
       { "utcStandardID", "rrlp.utcStandardID",
         FT_UINT32, BASE_DEC, NULL, 0,