diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-08-15 13:42:46 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-08-15 13:42:46 +0000 |
commit | 870b536e6ce93c8a0a160e574f82148f23346b8a (patch) | |
tree | 048a2ca3fd4a5ed85cd8bf97d71b79228ae263d5 | |
parent | bb1e018dc72677aeea596d7bf1baf3eea81f33d8 (diff) | |
download | wireshark-870b536e6ce93c8a0a160e574f82148f23346b8a.tar.gz |
Fix field type for some 64 bits header fields
svn path=/trunk/; revision=44513
-rw-r--r-- | asn1/lpp/lpp.cnf | 10 | ||||
-rw-r--r-- | asn1/pcap/pcap.cnf | 1 | ||||
-rw-r--r-- | asn1/ranap/ranap.cnf | 4 | ||||
-rw-r--r-- | asn1/rrc/rrc.cnf | 1 | ||||
-rw-r--r-- | asn1/rrlp/rrlp.cnf | 34 | ||||
-rw-r--r-- | epan/dissectors/packet-lpp.c | 30 | ||||
-rw-r--r-- | epan/dissectors/packet-pcap.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ranap.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-rrc.c | 224 | ||||
-rw-r--r-- | epan/dissectors/packet-rrlp.c | 126 |
10 files changed, 258 insertions, 178 deletions
diff --git a/asn1/lpp/lpp.cnf b/asn1/lpp/lpp.cnf index e72c554144..87f83e38b7 100644 --- a/asn1/lpp/lpp.cnf +++ b/asn1/lpp/lpp.cnf @@ -47,10 +47,20 @@ HorizontalVelocity # Handle 64 bit constraint #.FN_PARS NavModelCNAV-KeplerianSet/cnavMo FN_VARIANT = _64b +#.TYPE_ATTR +NavModelCNAV-KeplerianSet/cnavMo TYPE = FT_INT64 #.FN_PARS NavModelCNAV-KeplerianSet/cnavE FN_VARIANT = _64b +#.TYPE_ATTR +NavModelCNAV-KeplerianSet/cnavE TYPE = FT_UINT64 #.FN_PARS NavModelCNAV-KeplerianSet/cnavOmega FN_VARIANT = _64b +#.TYPE_ATTR +NavModelCNAV-KeplerianSet/cnavOmega TYPE = FT_INT64 #.FN_PARS NavModelCNAV-KeplerianSet/cnavOMEGA0 FN_VARIANT = _64b +#.TYPE_ATTR +NavModelCNAV-KeplerianSet/cnavOMEGA0 TYPE = FT_INT64 #.FN_PARS NavModelCNAV-KeplerianSet/cnavIo FN_VARIANT = _64b +#.TYPE_ATTR +NavModelCNAV-KeplerianSet/cnavIo TYPE = FT_INT64 #.FN_HDR RequestCapabilities diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf index 5721b172cf..f390abb411 100644 --- a/asn1/pcap/pcap.cnf +++ b/asn1/pcap/pcap.cnf @@ -415,5 +415,6 @@ PositionPeriodicTermination N pcap.proc.imsg id-PositionPeriodicTermination 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/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 294791a6e3..25f8e9096e 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -368,10 +368,6 @@ dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvb , offset, actx ,tre dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU ); -# Handle 64 bit constraint -#.FN_PARS UE-AggregateMaximumBitRateDownlink FN_VARIANT = _64b -#.FN_PARS UE-AggregateMaximumBitRateUplink FN_VARIANT = _64b - #.TYPE_ATTR ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &ranap_ProtocolIE_ID_vals_ext GTP-TEI TYPE = FT_UINT32 DISPLAY = BASE_HEX_DEC STRINGS = NULL diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 4369e99759..bc89582ce0 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -138,7 +138,6 @@ HandoverFromUTRANCommand-GSM-r3-IEs/gsm-message/single-GSM-Message single-GSM-Me HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Message-r6 #.END -#.FN_PARS UTRAN-GANSSReferenceTime/ue-GANSSTimingOfCellFrames FN_VARIANT = _64b #.FN_BODY NAS-Message VAL_PTR = &nas_message_tvb tvbuff_t *nas_message_tvb=NULL; diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf index 28239a6247..8a54331e3b 100644 --- a/asn1/rrlp/rrlp.cnf +++ b/asn1/rrlp/rrlp.cnf @@ -42,13 +42,47 @@ tvbuff_t *parameter_tvb = NULL; # Handle 64 bit constraint #.FN_PARS UTCmodelSet3/tauC FN_VARIANT = _64b +#.TYPE_ATTR +UTCmodelSet3/tauC TYPE = FT_INT64 #.FN_PARS UTCmodelSet4/utcA0wnt FN_VARIANT = _64b +#.TYPE_ATTR +UTCmodelSet4/utcA0wnt TYPE = FT_INT64 #.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 NavModel-KeplerianSet/keplerW FN_VARIANT = _64b +#.TYPE_ATTR +NavModel-KeplerianSet/keplerW TYPE = FT_INT64 +#.FN_PARS NavModel-KeplerianSet/keplerM0 FN_VARIANT = _64b +#.TYPE_ATTR +NavModel-KeplerianSet/keplerM0 TYPE = FT_INT64 +#.FN_PARS NavModel-KeplerianSet/keplerI0 FN_VARIANT = _64b +#.TYPE_ATTR +NavModel-KeplerianSet/keplerI0 TYPE = FT_INT64 +#.FN_PARS NavModel-KeplerianSet/keplerOmega0 FN_VARIANT = _64b +#.TYPE_ATTR +NavModel-KeplerianSet/keplerOmega0 TYPE = FT_INT64 #.FN_PARS ReferenceNavModel/keplerW FN_VARIANT = _64b +#.TYPE_ATTR +ReferenceNavModel/keplerW TYPE = FT_INT64 #.FN_PARS ReferenceNavModel/keplerM0 FN_VARIANT = _64b +#.TYPE_ATTR +ReferenceNavModel/keplerM0 TYPE = FT_INT64 #.FN_PARS ReferenceNavModel/keplerI0 FN_VARIANT = _64b +#.TYPE_ATTR +ReferenceNavModel/keplerI0 TYPE = FT_INT64 #.FN_PARS ReferenceNavModel/keplerOmega0 FN_VARIANT = _64b +#.TYPE_ATTR +ReferenceNavModel/keplerOmega0 TYPE = FT_INT64 diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 14d21cccfa..bc5f03a746 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -1343,7 +1343,7 @@ dissect_lpp_ECID_RequestCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_lpp_EPDU_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 88 "../../asn1/lpp/lpp.cnf" +#line 98 "../../asn1/lpp/lpp.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 256U, &lpp_epdu_id, FALSE); @@ -1382,7 +1382,7 @@ dissect_lpp_EPDU_Identifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_lpp_EPDU_Body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 94 "../../asn1/lpp/lpp.cnf" +#line 104 "../../asn1/lpp/lpp.cnf" tvbuff_t *lppe_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, &lppe_tvb); @@ -1528,7 +1528,7 @@ static const per_sequence_t RequestCapabilities_sequence[] = { static int dissect_lpp_RequestCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 56 "../../asn1/lpp/lpp.cnf" +#line 66 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Request Capabilities"); @@ -2312,7 +2312,7 @@ static const per_sequence_t ProvideCapabilities_sequence[] = { static int dissect_lpp_ProvideCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 60 "../../asn1/lpp/lpp.cnf" +#line 70 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Provide Capabilities"); @@ -3073,7 +3073,7 @@ static const per_sequence_t RequestAssistanceData_sequence[] = { static int dissect_lpp_RequestAssistanceData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 64 "../../asn1/lpp/lpp.cnf" +#line 74 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Request Assistance Data"); @@ -5985,7 +5985,7 @@ static const per_sequence_t ProvideAssistanceData_sequence[] = { static int dissect_lpp_ProvideAssistanceData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 68 "../../asn1/lpp/lpp.cnf" +#line 78 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Provide Assistance Data"); @@ -6383,7 +6383,7 @@ static const per_sequence_t RequestLocationInformation_sequence[] = { static int dissect_lpp_RequestLocationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 72 "../../asn1/lpp/lpp.cnf" +#line 82 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Request Location Information"); @@ -7567,7 +7567,7 @@ static const per_sequence_t ProvideLocationInformation_sequence[] = { static int dissect_lpp_ProvideLocationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 76 "../../asn1/lpp/lpp.cnf" +#line 86 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Provide Location Information"); @@ -7694,7 +7694,7 @@ static const per_sequence_t Abort_sequence[] = { static int dissect_lpp_Abort(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 80 "../../asn1/lpp/lpp.cnf" +#line 90 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Abort"); @@ -7781,7 +7781,7 @@ static const per_choice_t Error_choice[] = { static int dissect_lpp_Error(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 84 "../../asn1/lpp/lpp.cnf" +#line 94 "../../asn1/lpp/lpp.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Error"); @@ -9737,19 +9737,19 @@ void proto_register_lpp(void) { "INTEGER_M4194304_4194303", HFILL }}, { &hf_lpp_cnavMo, { "cnavMo", "lpp.cnavMo", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lpp_cnavE, { "cnavE", "lpp.cnavE", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lpp_cnavOmega, { "cnavOmega", "lpp.cnavOmega", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lpp_cnavOMEGA0, { "cnavOMEGA0", "lpp.cnavOMEGA0", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lpp_cnavDeltaOmegaDot, { "cnavDeltaOmegaDot", "lpp.cnavDeltaOmegaDot", @@ -9757,7 +9757,7 @@ void proto_register_lpp(void) { "INTEGER_M65536_65535", HFILL }}, { &hf_lpp_cnavIo, { "cnavIo", "lpp.cnavIo", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lpp_cnavIoDot, { "cnavIoDot", "lpp.cnavIoDot", diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index e315514ec0..f354385e40 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -17656,7 +17656,7 @@ void proto_register_pcap(void) { NULL, HFILL }}, { &hf_pcap_ue_GANSSTimingOfCell, { "ue-GANSSTimingOfCell", "pcap.ue_GANSSTimingOfCell", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_pcap_ganss_Time_ID, { "ganss-Time-ID", "pcap.ganss_Time_ID", diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 5bb77137b6..403052cda8 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -7948,7 +7948,7 @@ dissect_ranap_TypeOfError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_ranap_UE_AggregateMaximumBitRateDownlink(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, + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 1000000000U, NULL, FALSE); return offset; @@ -7958,7 +7958,7 @@ dissect_ranap_UE_AggregateMaximumBitRateDownlink(tvbuff_t *tvb _U_, int offset _ static int dissect_ranap_UE_AggregateMaximumBitRateUplink(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, + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 1000000000U, NULL, FALSE); return offset; diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 08117b0127..741adc35d3 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -15088,7 +15088,7 @@ dissect_rrc_ActivationTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_rrc_RB_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 830 "../../asn1/rrc/rrc.cnf" +#line 829 "../../asn1/rrc/rrc.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 32U, &rbid, FALSE); @@ -15105,7 +15105,7 @@ dissect_rrc_RB_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_rrc_RLC_SequenceNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 836 "../../asn1/rrc/rrc.cnf" +#line 835 "../../asn1/rrc/rrc.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 4095U, &activation_frame, FALSE); @@ -15125,7 +15125,7 @@ static const per_sequence_t RB_ActivationTimeInfo_sequence[] = { static int dissect_rrc_RB_ActivationTimeInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 809 "../../asn1/rrc/rrc.cnf" +#line 808 "../../asn1/rrc/rrc.cnf" fp_info *fpinf; rrc_ciphering_info * c_inf; @@ -15275,7 +15275,7 @@ dissect_rrc_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 639 "../../asn1/rrc/rrc.cnf" +#line 638 "../../asn1/rrc/rrc.cnf" tvbuff_t *nas_sys_info_gsm_map_tvb = NULL; guint32 length; proto_item *item; @@ -15318,7 +15318,7 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 623 "../../asn1/rrc/rrc.cnf" +#line 622 "../../asn1/rrc/rrc.cnf" rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -15338,7 +15338,7 @@ static const value_string rrc_CN_DomainIdentity_vals[] = { static int dissect_rrc_CN_DomainIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 620 "../../asn1/rrc/rrc.cnf" +#line 619 "../../asn1/rrc/rrc.cnf" offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, &rrc_nas_sys_info_gsm_map_type, FALSE, 0, NULL); @@ -19203,7 +19203,7 @@ dissect_rrc_T_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_ static int dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 751 "../../asn1/rrc/rrc.cnf" +#line 750 "../../asn1/rrc/rrc.cnf" offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 16, 16, FALSE, &hrnti); @@ -19227,7 +19227,7 @@ dissect_rrc_E_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 627 "../../asn1/rrc/rrc.cnf" +#line 626 "../../asn1/rrc/rrc.cnf" rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -26279,7 +26279,7 @@ static const per_choice_t ActiveSetUpdate_choice[] = { static int dissect_rrc_ActiveSetUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 162 "../../asn1/rrc/rrc.cnf" +#line 161 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdate, ActiveSetUpdate_choice, @@ -30890,7 +30890,7 @@ static const per_choice_t AssistanceDataDelivery_choice[] = { static int dissect_rrc_AssistanceDataDelivery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 174 "../../asn1/rrc/rrc.cnf" +#line 173 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_AssistanceDataDelivery, AssistanceDataDelivery_choice, @@ -31288,7 +31288,7 @@ static const per_choice_t CellChangeOrderFromUTRAN_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 178 "../../asn1/rrc/rrc.cnf" +#line 177 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRAN, CellChangeOrderFromUTRAN_choice, @@ -38376,7 +38376,7 @@ dissect_rrc_RLC_Info_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_rrc_MAC_d_FlowIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 748 "../../asn1/rrc/rrc.cnf" +#line 747 "../../asn1/rrc/rrc.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 7U, &flowd, FALSE); @@ -38424,7 +38424,7 @@ static const per_choice_t DL_TransportChannelType_r5_choice[] = { static int dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 671 "../../asn1/rrc/rrc.cnf" +#line 670 "../../asn1/rrc/rrc.cnf" gint *flowd_p; gint *cur_val=NULL; @@ -41901,7 +41901,7 @@ static const per_choice_t DL_TransportChannelType_r7_choice[] = { static int dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 709 "../../asn1/rrc/rrc.cnf" +#line 708 "../../asn1/rrc/rrc.cnf" gint *flowd_p; gint *cur_val=NULL; @@ -51288,7 +51288,7 @@ static const per_choice_t CellUpdateConfirm_choice[] = { static int dissect_rrc_CellUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 194 "../../asn1/rrc/rrc.cnf" +#line 193 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm, CellUpdateConfirm_choice, @@ -51441,7 +51441,7 @@ static const per_choice_t CounterCheck_choice[] = { static int dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 198 "../../asn1/rrc/rrc.cnf" +#line 197 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheck, CounterCheck_choice, @@ -51457,7 +51457,7 @@ dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_rrc_NAS_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 144 "../../asn1/rrc/rrc.cnf" +#line 143 "../../asn1/rrc/rrc.cnf" tvbuff_t *nas_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -51574,7 +51574,7 @@ static const per_choice_t DownlinkDirectTransfer_choice[] = { static int dissect_rrc_DownlinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 206 "../../asn1/rrc/rrc.cnf" +#line 205 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_DownlinkDirectTransfer, DownlinkDirectTransfer_choice, @@ -51593,7 +51593,7 @@ static const per_sequence_t T_single_GSM_Message_r3_sequence[] = { static int dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 520 "../../asn1/rrc/rrc.cnf" +#line 519 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -51619,7 +51619,7 @@ dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_rrc_GSM_MessageList_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 512 "../../asn1/rrc/rrc.cnf" +#line 511 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_messagelist_tvb=NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, @@ -51879,7 +51879,7 @@ static const per_sequence_t T_single_GSM_Message_r6_sequence[] = { static int dissect_rrc_T_single_GSM_Message_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 535 "../../asn1/rrc/rrc.cnf" +#line 534 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -52086,7 +52086,7 @@ static const per_choice_t HandoverFromUTRANCommand_GSM_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_GSM(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 230 "../../asn1/rrc/rrc.cnf" +#line 229 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GSM, HandoverFromUTRANCommand_GSM_choice, @@ -52240,7 +52240,7 @@ static const per_choice_t HandoverFromUTRANCommand_CDMA2000_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_CDMA2000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 234 "../../asn1/rrc/rrc.cnf" +#line 233 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_CDMA2000, HandoverFromUTRANCommand_CDMA2000_choice, @@ -62990,7 +62990,7 @@ static const per_choice_t MeasurementControl_choice[] = { static int dissect_rrc_MeasurementControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 282 "../../asn1/rrc/rrc.cnf" +#line 281 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControl, MeasurementControl_choice, @@ -63082,7 +63082,7 @@ static const per_sequence_t PagingType2_sequence[] = { static int dissect_rrc_PagingType2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 298 "../../asn1/rrc/rrc.cnf" +#line 297 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType2, PagingType2_sequence); @@ -64680,7 +64680,7 @@ static const per_choice_t PhysicalChannelReconfiguration_choice[] = { static int dissect_rrc_PhysicalChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 302 "../../asn1/rrc/rrc.cnf" +#line 301 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfiguration, PhysicalChannelReconfiguration_choice, @@ -65984,7 +65984,7 @@ static const per_choice_t PhysicalSharedChannelAllocation_choice[] = { static int dissect_rrc_PhysicalSharedChannelAllocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 314 "../../asn1/rrc/rrc.cnf" +#line 313 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalSharedChannelAllocation, PhysicalSharedChannelAllocation_choice, @@ -68509,7 +68509,7 @@ static const per_choice_t RadioBearerReconfiguration_choice[] = { static int dissect_rrc_RadioBearerReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 322 "../../asn1/rrc/rrc.cnf" +#line 321 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfiguration, RadioBearerReconfiguration_choice, @@ -70165,7 +70165,7 @@ static const per_choice_t RadioBearerRelease_choice[] = { static int dissect_rrc_RadioBearerRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 334 "../../asn1/rrc/rrc.cnf" +#line 333 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerRelease, RadioBearerRelease_choice, @@ -72544,7 +72544,7 @@ static const per_choice_t RadioBearerSetup_choice[] = { static int dissect_rrc_RadioBearerSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 346 "../../asn1/rrc/rrc.cnf" +#line 345 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetup, RadioBearerSetup_choice, @@ -73248,7 +73248,7 @@ static const per_choice_t RRCConnectionRelease_choice[] = { static int dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 362 "../../asn1/rrc/rrc.cnf" +#line 361 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease, RRCConnectionRelease_choice, @@ -73527,7 +73527,7 @@ static const per_choice_t SecurityModeCommand_choice[] = { static int dissect_rrc_SecurityModeCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 390 "../../asn1/rrc/rrc.cnf" +#line 389 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeCommand, SecurityModeCommand_choice, @@ -73669,7 +73669,7 @@ static const per_choice_t SignallingConnectionRelease_choice[] = { static int dissect_rrc_SignallingConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 412 "../../asn1/rrc/rrc.cnf" +#line 411 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionRelease, SignallingConnectionRelease_choice, @@ -75308,7 +75308,7 @@ static const per_choice_t TransportChannelReconfiguration_choice[] = { static int dissect_rrc_TransportChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 432 "../../asn1/rrc/rrc.cnf" +#line 431 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfiguration, TransportChannelReconfiguration_choice, @@ -75453,7 +75453,7 @@ static const per_sequence_t TransportFormatCombinationControl_sequence[] = { static int dissect_rrc_TransportFormatCombinationControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 444 "../../asn1/rrc/rrc.cnf" +#line 443 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControl, TransportFormatCombinationControl_sequence); @@ -75819,7 +75819,7 @@ static const per_choice_t UECapabilityEnquiry_choice[] = { static int dissect_rrc_UECapabilityEnquiry(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 452 "../../asn1/rrc/rrc.cnf" +#line 451 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityEnquiry, UECapabilityEnquiry_choice, @@ -75977,7 +75977,7 @@ static const per_choice_t UECapabilityInformationConfirm_choice[] = { static int dissect_rrc_UECapabilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 460 "../../asn1/rrc/rrc.cnf" +#line 459 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformationConfirm, UECapabilityInformationConfirm_choice, @@ -76741,7 +76741,7 @@ static const per_choice_t UplinkPhysicalChannelControl_choice[] = { static int dissect_rrc_UplinkPhysicalChannelControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 476 "../../asn1/rrc/rrc.cnf" +#line 475 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkPhysicalChannelControl, UplinkPhysicalChannelControl_choice, @@ -77084,7 +77084,7 @@ static const per_choice_t URAUpdateConfirm_choice[] = { static int dissect_rrc_URAUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 484 "../../asn1/rrc/rrc.cnf" +#line 483 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm, URAUpdateConfirm_choice, @@ -77547,7 +77547,7 @@ dissect_rrc_UE_ConnTimersAndConstants(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 631 "../../asn1/rrc/rrc.cnf" +#line 630 "../../asn1/rrc/rrc.cnf" rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -78551,7 +78551,7 @@ static const per_choice_t UTRANMobilityInformation_choice[] = { static int dissect_rrc_UTRANMobilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 492 "../../asn1/rrc/rrc.cnf" +#line 491 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformation, UTRANMobilityInformation_choice, @@ -78738,7 +78738,7 @@ static const per_sequence_t HandoverFromUTRANCommand_GERANIu_sequence[] = { static int dissect_rrc_HandoverFromUTRANCommand_GERANIu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 226 "../../asn1/rrc/rrc.cnf" +#line 225 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GERANIu, HandoverFromUTRANCommand_GERANIu_sequence); @@ -79176,7 +79176,7 @@ static const per_sequence_t MBMSModifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSModifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 266 "../../asn1/rrc/rrc.cnf" +#line 265 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModifiedServicesInformation, MBMSModifiedServicesInformation_sequence); @@ -79256,7 +79256,7 @@ static const per_sequence_t ETWSPrimaryNotificationWithSecurity_sequence[] = { static int dissect_rrc_ETWSPrimaryNotificationWithSecurity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 210 "../../asn1/rrc/rrc.cnf" +#line 209 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ETWSPrimaryNotificationWithSecurity"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ETWSPrimaryNotificationWithSecurity, ETWSPrimaryNotificationWithSecurity_sequence); @@ -79271,7 +79271,7 @@ dissect_rrc_ETWSPrimaryNotificationWithSecurity(tvbuff_t *tvb _U_, int offset _U static int dissect_rrc_T_eutra_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 580 "../../asn1/rrc/rrc.cnf" +#line 579 "../../asn1/rrc/rrc.cnf" tvbuff_t *eutra_message_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, &eutra_message_tvb); @@ -79373,7 +79373,7 @@ static const per_sequence_t HandoverFromUTRANCommand_EUTRA_sequence[] = { static int dissect_rrc_HandoverFromUTRANCommand_EUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 222 "../../asn1/rrc/rrc.cnf" +#line 221 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-EUTRA"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_EUTRA, HandoverFromUTRANCommand_EUTRA_sequence); @@ -79502,7 +79502,7 @@ static const per_sequence_t UEInformationRequest_sequence[] = { static int dissect_rrc_UEInformationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 464 "../../asn1/rrc/rrc.cnf" +#line 463 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UEInformationRequest, UEInformationRequest_sequence); @@ -79995,7 +79995,7 @@ static const per_sequence_t LoggingMeasurementConfiguration_sequence[] = { static int dissect_rrc_LoggingMeasurementConfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 242 "../../asn1/rrc/rrc.cnf" +#line 241 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "LoggingMeasurementConfiguration"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_LoggingMeasurementConfiguration, LoggingMeasurementConfiguration_sequence); @@ -80083,7 +80083,7 @@ static const per_choice_t DL_DCCH_MessageType_choice[] = { static int dissect_rrc_DL_DCCH_MessageType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 840 "../../asn1/rrc/rrc.cnf" +#line 839 "../../asn1/rrc/rrc.cnf" offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_DL_DCCH_MessageType, DL_DCCH_MessageType_choice, &msg_type); @@ -80113,7 +80113,7 @@ dissect_rrc_DL_DCCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 754 "../../asn1/rrc/rrc.cnf" +#line 753 "../../asn1/rrc/rrc.cnf" fp_info *fpinf; rrc_ciphering_info * c_inf; int i; @@ -80259,7 +80259,7 @@ static const per_sequence_t ActiveSetUpdateComplete_sequence[] = { static int dissect_rrc_ActiveSetUpdateComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 166 "../../asn1/rrc/rrc.cnf" +#line 165 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateComplete, ActiveSetUpdateComplete_sequence); @@ -80430,7 +80430,7 @@ static const per_sequence_t ActiveSetUpdateFailure_sequence[] = { static int dissect_rrc_ActiveSetUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 170 "../../asn1/rrc/rrc.cnf" +#line 169 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateFailure, ActiveSetUpdateFailure_sequence); @@ -80577,7 +80577,7 @@ static const per_choice_t CellChangeOrderFromUTRANFailure_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 182 "../../asn1/rrc/rrc.cnf" +#line 181 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRANFailure, CellChangeOrderFromUTRANFailure_choice, @@ -80667,7 +80667,7 @@ static const per_sequence_t CounterCheckResponse_sequence[] = { static int dissect_rrc_CounterCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 202 "../../asn1/rrc/rrc.cnf" +#line 201 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheckResponse, CounterCheckResponse_sequence); @@ -80760,7 +80760,7 @@ static const per_sequence_t HandoverToUTRANComplete_sequence[] = { static int dissect_rrc_HandoverToUTRANComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 214 "../../asn1/rrc/rrc.cnf" +#line 213 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverToUTRANComplete, HandoverToUTRANComplete_sequence); @@ -81689,7 +81689,7 @@ static const per_sequence_t InitialDirectTransfer_sequence[] = { static int dissect_rrc_InitialDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 218 "../../asn1/rrc/rrc.cnf" +#line 217 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_InitialDirectTransfer, InitialDirectTransfer_sequence); @@ -81818,7 +81818,7 @@ dissect_rrc_HandoverFromUtranFailure_v590ext_IEs(tvbuff_t *tvb _U_, int offset _ static int dissect_rrc_T_eutra_Message_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 586 "../../asn1/rrc/rrc.cnf" +#line 585 "../../asn1/rrc/rrc.cnf" tvbuff_t *eutra_message_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, &eutra_message_tvb); @@ -81914,7 +81914,7 @@ static const per_sequence_t HandoverFromUTRANFailure_sequence[] = { static int dissect_rrc_HandoverFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 238 "../../asn1/rrc/rrc.cnf" +#line 237 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANFailure, HandoverFromUTRANFailure_sequence); @@ -81992,7 +81992,7 @@ static const per_sequence_t MeasurementControlFailure_sequence[] = { static int dissect_rrc_MeasurementControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 286 "../../asn1/rrc/rrc.cnf" +#line 285 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControlFailure, MeasurementControlFailure_sequence); @@ -86631,7 +86631,7 @@ static const per_sequence_t MeasurementReport_sequence[] = { static int dissect_rrc_MeasurementReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 290 "../../asn1/rrc/rrc.cnf" +#line 289 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementReport, MeasurementReport_sequence); @@ -86729,7 +86729,7 @@ static const per_sequence_t PhysicalChannelReconfigurationComplete_sequence[] = static int dissect_rrc_PhysicalChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 306 "../../asn1/rrc/rrc.cnf" +#line 305 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationComplete, PhysicalChannelReconfigurationComplete_sequence); @@ -86778,7 +86778,7 @@ static const per_sequence_t PhysicalChannelReconfigurationFailure_sequence[] = { static int dissect_rrc_PhysicalChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 310 "../../asn1/rrc/rrc.cnf" +#line 309 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationFailure, PhysicalChannelReconfigurationFailure_sequence); @@ -86876,7 +86876,7 @@ static const per_sequence_t RadioBearerReconfigurationComplete_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 326 "../../asn1/rrc/rrc.cnf" +#line 325 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationComplete, RadioBearerReconfigurationComplete_sequence); @@ -86940,7 +86940,7 @@ static const per_sequence_t RadioBearerReconfigurationFailure_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 330 "../../asn1/rrc/rrc.cnf" +#line 329 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationFailure, RadioBearerReconfigurationFailure_sequence); @@ -87038,7 +87038,7 @@ static const per_sequence_t RadioBearerReleaseComplete_sequence[] = { static int dissect_rrc_RadioBearerReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 338 "../../asn1/rrc/rrc.cnf" +#line 337 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseComplete, RadioBearerReleaseComplete_sequence); @@ -87088,7 +87088,7 @@ static const per_sequence_t RadioBearerReleaseFailure_sequence[] = { static int dissect_rrc_RadioBearerReleaseFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 342 "../../asn1/rrc/rrc.cnf" +#line 341 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseFailure, RadioBearerReleaseFailure_sequence); @@ -87187,7 +87187,7 @@ static const per_sequence_t RadioBearerSetupComplete_sequence[] = { static int dissect_rrc_RadioBearerSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 350 "../../asn1/rrc/rrc.cnf" +#line 349 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupComplete, RadioBearerSetupComplete_sequence); @@ -87237,7 +87237,7 @@ static const per_sequence_t RadioBearerSetupFailure_sequence[] = { static int dissect_rrc_RadioBearerSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 354 "../../asn1/rrc/rrc.cnf" +#line 353 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupFailure, RadioBearerSetupFailure_sequence); @@ -87286,7 +87286,7 @@ static const per_sequence_t RRCConnectionReleaseComplete_sequence[] = { static int dissect_rrc_RRCConnectionReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 370 "../../asn1/rrc/rrc.cnf" +#line 369 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReleaseComplete, RRCConnectionReleaseComplete_sequence); @@ -88301,7 +88301,7 @@ dissect_rrc_UE_RadioAccessCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 550 "../../asn1/rrc/rrc.cnf" +#line 549 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -88320,7 +88320,7 @@ dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_rrc_GSM_Classmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 558 "../../asn1/rrc/rrc.cnf" +#line 557 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -89790,7 +89790,7 @@ static const per_sequence_t RRCConnectionSetupComplete_sequence[] = { static int dissect_rrc_RRCConnectionSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 382 "../../asn1/rrc/rrc.cnf" +#line 381 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetupComplete, RRCConnectionSetupComplete_sequence); @@ -89971,7 +89971,7 @@ static const per_sequence_t RRCStatus_sequence[] = { static int dissect_rrc_RRCStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 386 "../../asn1/rrc/rrc.cnf" +#line 385 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCStatus, RRCStatus_sequence); @@ -90021,7 +90021,7 @@ static const per_sequence_t SecurityModeComplete_sequence[] = { static int dissect_rrc_SecurityModeComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 394 "../../asn1/rrc/rrc.cnf" +#line 393 "../../asn1/rrc/rrc.cnf" rrc_ciphering_info * c_inf ; fp_info *fpinf ; @@ -90080,7 +90080,7 @@ static const per_sequence_t SecurityModeFailure_sequence[] = { static int dissect_rrc_SecurityModeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 408 "../../asn1/rrc/rrc.cnf" +#line 407 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeFailure, SecurityModeFailure_sequence); @@ -90173,7 +90173,7 @@ static const per_sequence_t SignallingConnectionReleaseIndication_sequence[] = { static int dissect_rrc_SignallingConnectionReleaseIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 416 "../../asn1/rrc/rrc.cnf" +#line 415 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionReleaseIndication, SignallingConnectionReleaseIndication_sequence); @@ -90271,7 +90271,7 @@ static const per_sequence_t TransportChannelReconfigurationComplete_sequence[] = static int dissect_rrc_TransportChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 436 "../../asn1/rrc/rrc.cnf" +#line 435 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationComplete, TransportChannelReconfigurationComplete_sequence); @@ -90320,7 +90320,7 @@ static const per_sequence_t TransportChannelReconfigurationFailure_sequence[] = static int dissect_rrc_TransportChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 440 "../../asn1/rrc/rrc.cnf" +#line 439 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationFailure, TransportChannelReconfigurationFailure_sequence); @@ -90369,7 +90369,7 @@ static const per_sequence_t TransportFormatCombinationControlFailure_sequence[] static int dissect_rrc_TransportFormatCombinationControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 448 "../../asn1/rrc/rrc.cnf" +#line 447 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControlFailure, TransportFormatCombinationControlFailure_sequence); @@ -90645,7 +90645,7 @@ static const per_sequence_t UECapabilityInformation_sequence[] = { static int dissect_rrc_UECapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 456 "../../asn1/rrc/rrc.cnf" +#line 455 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformation, UECapabilityInformation_sequence); @@ -90782,7 +90782,7 @@ static const per_sequence_t UplinkDirectTransfer_sequence[] = { static int dissect_rrc_UplinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 472 "../../asn1/rrc/rrc.cnf" +#line 471 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkDirectTransfer, UplinkDirectTransfer_sequence); @@ -90922,7 +90922,7 @@ static const per_sequence_t UTRANMobilityInformationConfirm_sequence[] = { static int dissect_rrc_UTRANMobilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 496 "../../asn1/rrc/rrc.cnf" +#line 495 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationConfirm, UTRANMobilityInformationConfirm_sequence); @@ -90971,7 +90971,7 @@ static const per_sequence_t UTRANMobilityInformationFailure_sequence[] = { static int dissect_rrc_UTRANMobilityInformationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 500 "../../asn1/rrc/rrc.cnf" +#line 499 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationFailure, UTRANMobilityInformationFailure_sequence); @@ -91128,7 +91128,7 @@ static const per_sequence_t MBMSModificationRequest_sequence[] = { static int dissect_rrc_MBMSModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 262 "../../asn1/rrc/rrc.cnf" +#line 261 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModificationRequest, MBMSModificationRequest_sequence); @@ -91749,7 +91749,7 @@ static const per_sequence_t UEInformationResponse_sequence[] = { static int dissect_rrc_UEInformationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 468 "../../asn1/rrc/rrc.cnf" +#line 467 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UEInformationResponse, UEInformationResponse_sequence); @@ -92633,7 +92633,7 @@ static const per_choice_t CellUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_CellUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 190 "../../asn1/rrc/rrc.cnf" +#line 189 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm_CCCH, CellUpdateConfirm_CCCH_choice, @@ -93076,7 +93076,7 @@ static const per_choice_t RRCConnectionReject_choice[] = { static int dissect_rrc_RRCConnectionReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 358 "../../asn1/rrc/rrc.cnf" +#line 357 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReject, RRCConnectionReject_choice, @@ -93619,7 +93619,7 @@ static const per_choice_t RRCConnectionRelease_CCCH_choice[] = { static int dissect_rrc_RRCConnectionRelease_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 366 "../../asn1/rrc/rrc.cnf" +#line 365 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease_CCCH, RRCConnectionRelease_CCCH_choice, @@ -95467,7 +95467,7 @@ static const per_choice_t RRCConnectionSetup_choice[] = { static int dissect_rrc_RRCConnectionSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 378 "../../asn1/rrc/rrc.cnf" +#line 377 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetup, RRCConnectionSetup_choice, @@ -95611,7 +95611,7 @@ static const per_choice_t URAUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_URAUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 488 "../../asn1/rrc/rrc.cnf" +#line 487 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm_CCCH, URAUpdateConfirm_CCCH_choice, @@ -96220,7 +96220,7 @@ static const per_sequence_t CellUpdate_sequence[] = { static int dissect_rrc_CellUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 186 "../../asn1/rrc/rrc.cnf" +#line 185 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdate, CellUpdate_sequence); @@ -97010,7 +97010,7 @@ static const per_sequence_t RRCConnectionRequest_sequence[] = { static int dissect_rrc_RRCConnectionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 374 "../../asn1/rrc/rrc.cnf" +#line 373 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRequest, RRCConnectionRequest_sequence); @@ -97321,7 +97321,7 @@ static const per_sequence_t URAUpdate_sequence[] = { static int dissect_rrc_URAUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 480 "../../asn1/rrc/rrc.cnf" +#line 479 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdate, URAUpdate_sequence); @@ -97744,7 +97744,7 @@ static const per_sequence_t PagingType1_sequence[] = { static int dissect_rrc_PagingType1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 294 "../../asn1/rrc/rrc.cnf" +#line 293 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType1, PagingType1_sequence); @@ -97949,7 +97949,7 @@ static const per_sequence_t PUSCHCapacityRequest_sequence[] = { static int dissect_rrc_PUSCHCapacityRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 318 "../../asn1/rrc/rrc.cnf" +#line 317 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PUSCHCapacityRequest, PUSCHCapacityRequest_sequence); @@ -98327,7 +98327,7 @@ static const per_sequence_t SystemInformation_FACH_sequence[] = { static int dissect_rrc_SystemInformation_FACH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 424 "../../asn1/rrc/rrc.cnf" +#line 423 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_FACH, SystemInformation_FACH_sequence); @@ -98404,7 +98404,7 @@ static const per_sequence_t SystemInformationChangeIndication_sequence[] = { static int dissect_rrc_SystemInformationChangeIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 428 "../../asn1/rrc/rrc.cnf" +#line 427 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformationChangeIndication, SystemInformationChangeIndication_sequence); @@ -98585,7 +98585,7 @@ static const per_sequence_t SystemInformation_BCH_sequence[] = { static int dissect_rrc_SystemInformation_BCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 420 "../../asn1/rrc/rrc.cnf" +#line 419 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_BCH, SystemInformation_BCH_sequence); @@ -98727,7 +98727,7 @@ static const per_sequence_t MBMSAccessInformation_sequence[] = { static int dissect_rrc_MBMSAccessInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 246 "../../asn1/rrc/rrc.cnf" +#line 245 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSAccessInformation, MBMSAccessInformation_sequence); @@ -99596,7 +99596,7 @@ static const per_sequence_t MBMSCommonPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCommonPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 250 "../../asn1/rrc/rrc.cnf" +#line 249 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCommonPTMRBInformation, MBMSCommonPTMRBInformation_sequence); @@ -99984,7 +99984,7 @@ static const per_sequence_t MBMSCurrentCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCurrentCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 254 "../../asn1/rrc/rrc.cnf" +#line 253 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCurrentCellPTMRBInformation, MBMSCurrentCellPTMRBInformation_sequence); @@ -100757,7 +100757,7 @@ static const per_sequence_t MBMSGeneralInformation_sequence[] = { static int dissect_rrc_MBMSGeneralInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 258 "../../asn1/rrc/rrc.cnf" +#line 257 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSGeneralInformation, MBMSGeneralInformation_sequence); @@ -101431,7 +101431,7 @@ static const per_sequence_t MBMSNeighbouringCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSNeighbouringCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 270 "../../asn1/rrc/rrc.cnf" +#line 269 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSNeighbouringCellPTMRBInformation, MBMSNeighbouringCellPTMRBInformation_sequence); @@ -101568,7 +101568,7 @@ static const per_sequence_t MBMSUnmodifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSUnmodifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 278 "../../asn1/rrc/rrc.cnf" +#line 277 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSUnmodifiedServicesInformation, MBMSUnmodifiedServicesInformation_sequence); @@ -101724,7 +101724,7 @@ static const per_sequence_t MBMSSchedulingInformation_sequence[] = { static int dissect_rrc_MBMSSchedulingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 274 "../../asn1/rrc/rrc.cnf" +#line 273 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSSchedulingInformation, MBMSSchedulingInformation_sequence); @@ -105048,7 +105048,7 @@ dissect_rrc_T_uE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_rrc_T_present(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 152 "../../asn1/rrc/rrc.cnf" +#line 151 "../../asn1/rrc/rrc.cnf" tvbuff_t *ue_radio_access_cap_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -110803,7 +110803,7 @@ dissect_rrc_T_supportOfInterRATHOToEUTRATDD(tvbuff_t *tvb _U_, int offset _U_, a static int dissect_rrc_T_eutraFeatureGroupIndicators(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 592 "../../asn1/rrc/rrc.cnf" +#line 591 "../../asn1/rrc/rrc.cnf" tvbuff_t *eutraFeatureGroupIndicators_tvb=NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 4, 4, FALSE, &eutraFeatureGroupIndicators_tvb); @@ -112031,7 +112031,7 @@ dissect_rrc_UE_RadioAccessCapability_v860ext_IEs(tvbuff_t *tvb _U_, int offset _ static int dissect_rrc_T_ue_EUTRA_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 574 "../../asn1/rrc/rrc.cnf" +#line 573 "../../asn1/rrc/rrc.cnf" tvbuff_t *ue_eutra_cap_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, &ue_eutra_cap_tvb); @@ -121266,7 +121266,7 @@ dissect_rrc_ExtSIBTypeInfoSchedulingInfo_List2(tvbuff_t *tvb _U_, int offset _U_ static int dissect_rrc_HNBName(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 613 "../../asn1/rrc/rrc.cnf" +#line 612 "../../asn1/rrc/rrc.cnf" tvbuff_t *hnbname_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, @@ -121545,7 +121545,7 @@ dissect_rrc_SIB_ReferenceList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 635 "../../asn1/rrc/rrc.cnf" +#line 634 "../../asn1/rrc/rrc.cnf" rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -125658,7 +125658,7 @@ dissect_rrc_UE_HistoryInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_rrc_T_interRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 566 "../../asn1/rrc/rrc.cnf" +#line 565 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -130327,7 +130327,7 @@ dissect_rrc_ToTargetRNC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_rrc_T_dL_DCCHmessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 504 "../../asn1/rrc/rrc.cnf" +#line 503 "../../asn1/rrc/rrc.cnf" tvbuff_t *dl_dcch_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 4e1e316774..620b4b348d 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; /* INTEGER_M2147483648_2147483647 */ +static int hf_rrlp_keplerW = -1; /* T_keplerW */ static int hf_rrlp_keplerDeltaN = -1; /* INTEGER_M32768_32767 */ -static int hf_rrlp_keplerM0 = -1; /* INTEGER_M2147483648_2147483647 */ +static int hf_rrlp_keplerM0 = -1; /* T_keplerM0 */ 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; /* INTEGER_M2147483648_2147483647 */ -static int hf_rrlp_keplerOmega0 = -1; /* INTEGER_M2147483648_2147483647 */ +static int hf_rrlp_keplerI0 = -1; /* T_keplerI0 */ +static int hf_rrlp_keplerOmega0 = -1; /* T_keplerOmega0 */ 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,10 @@ 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 */ -static int hf_rrlp_keplerM0_01 = -1; /* T_keplerM0 */ -static int hf_rrlp_keplerI0_01 = -1; /* T_keplerI0 */ -static int hf_rrlp_keplerOmega0_01 = -1; /* T_keplerOmega0 */ +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_SeqOfGANSSRefOrbit_item = -1; /* GANSSReferenceOrbit */ static int hf_rrlp_ganssOrbitModel_01 = -1; /* ReferenceNavModel */ static int hf_rrlp_GANSSEphemerisDeltaMatrix_item = -1; /* GANSSEphemerisDeltaEpoch */ @@ -3442,17 +3442,57 @@ 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_INTEGER_M2147483648_2147483647 }, + { &hf_rrlp_keplerW , 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 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 }, + { &hf_rrlp_keplerM0 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerM0 }, { &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_INTEGER_M2147483648_2147483647 }, - { &hf_rrlp_keplerOmega0 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrlp_INTEGER_M2147483648_2147483647 }, + { &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_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 }, @@ -4422,7 +4462,7 @@ dissect_rrlp_GANSSEphemerisExtensionHeader(tvbuff_t *tvb _U_, int offset _U_, as 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_) { +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); @@ -4432,7 +4472,7 @@ dissect_rrlp_T_keplerW(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, 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_) { +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); @@ -4442,7 +4482,7 @@ dissect_rrlp_T_keplerM0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, 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_) { +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); @@ -4452,7 +4492,7 @@ dissect_rrlp_T_keplerI0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, 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_) { +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_) { offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index, G_MININT32, 2147483647U, NULL, FALSE); @@ -4462,15 +4502,15 @@ dissect_rrlp_T_keplerOmega0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx 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 }, + { &hf_rrlp_keplerW_01 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerW_01 }, { &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 }, + { &hf_rrlp_keplerM0_01 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerM0_01 }, { &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 }, - { &hf_rrlp_keplerOmega0_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrlp_T_keplerOmega0 }, + { &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_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 }, @@ -8499,16 +8539,16 @@ void proto_register_rrlp(void) { "INTEGER_0_16383", HFILL }}, { &hf_rrlp_keplerW, { "keplerW", "rrlp.keplerW", - FT_INT32, BASE_DEC, NULL, 0, - "INTEGER_M2147483648_2147483647", HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_rrlp_keplerDeltaN, { "keplerDeltaN", "rrlp.keplerDeltaN", FT_INT32, BASE_DEC, NULL, 0, "INTEGER_M32768_32767", HFILL }}, { &hf_rrlp_keplerM0, { "keplerM0", "rrlp.keplerM0", - FT_INT32, BASE_DEC, NULL, 0, - "INTEGER_M2147483648_2147483647", HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_rrlp_keplerOmegaDot, { "keplerOmegaDot", "rrlp.keplerOmegaDot", FT_INT32, BASE_DEC, NULL, 0, @@ -8527,12 +8567,12 @@ void proto_register_rrlp(void) { "INTEGER_0_4294967295", HFILL }}, { &hf_rrlp_keplerI0, { "keplerI0", "rrlp.keplerI0", - FT_INT32, BASE_DEC, NULL, 0, - "INTEGER_M2147483648_2147483647", HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_rrlp_keplerOmega0, { "keplerOmega0", "rrlp.keplerOmega0", - FT_INT32, BASE_DEC, NULL, 0, - "INTEGER_M2147483648_2147483647", HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_rrlp_keplerCrs, { "keplerCrs", "rrlp.keplerCrs", FT_INT32, BASE_DEC, NULL, 0, @@ -8655,19 +8695,19 @@ void proto_register_rrlp(void) { "INTEGER_M4194304_4194303", HFILL }}, { &hf_rrlp_cnavMo, { "cnavMo", "rrlp.cnavMo", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rrlp_cnavE, { "cnavE", "rrlp.cnavE", - FT_UINT32, BASE_DEC, NULL, 0, + FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rrlp_cnavOmega, { "cnavOmega", "rrlp.cnavOmega", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rrlp_cnavOMEGA0, { "cnavOMEGA0", "rrlp.cnavOMEGA0", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rrlp_cnavDeltaOmegaDot, { "cnavDeltaOmegaDot", "rrlp.cnavDeltaOmegaDot", @@ -8675,7 +8715,7 @@ void proto_register_rrlp(void) { "INTEGER_M65536_65535", HFILL }}, { &hf_rrlp_cnavIo, { "cnavIo", "rrlp.cnavIo", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rrlp_cnavIoDot, { "cnavIoDot", "rrlp.cnavIoDot", @@ -9375,20 +9415,20 @@ void proto_register_rrlp(void) { "INTEGER_0_37799", HFILL }}, { &hf_rrlp_keplerW_01, { "keplerW", "rrlp.keplerW", - FT_INT32, BASE_DEC, NULL, 0, - NULL, HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + "T_keplerW_01", HFILL }}, { &hf_rrlp_keplerM0_01, { "keplerM0", "rrlp.keplerM0", - FT_INT32, BASE_DEC, NULL, 0, - NULL, HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + "T_keplerM0_01", HFILL }}, { &hf_rrlp_keplerI0_01, { "keplerI0", "rrlp.keplerI0", - FT_INT32, BASE_DEC, NULL, 0, - NULL, HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + "T_keplerI0_01", HFILL }}, { &hf_rrlp_keplerOmega0_01, { "keplerOmega0", "rrlp.keplerOmega0", - FT_INT32, BASE_DEC, NULL, 0, - NULL, HFILL }}, + FT_INT64, BASE_DEC, NULL, 0, + "T_keplerOmega0_01", HFILL }}, { &hf_rrlp_SeqOfGANSSRefOrbit_item, { "GANSSReferenceOrbit", "rrlp.GANSSReferenceOrbit", FT_NONE, BASE_NONE, NULL, 0, @@ -9619,7 +9659,7 @@ void proto_register_rrlp(void) { "INTEGER_1_1461", HFILL }}, { &hf_rrlp_tauC, { "tauC", "rrlp.tauC", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rrlp_b1, { "b1", "rrlp.b1", @@ -9639,7 +9679,7 @@ void proto_register_rrlp(void) { "INTEGER_M8388608_8388607", HFILL }}, { &hf_rrlp_utcA0wnt, { "utcA0wnt", "rrlp.utcA0wnt", - FT_INT32, BASE_DEC, NULL, 0, + FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rrlp_utcStandardID, { "utcStandardID", "rrlp.utcStandardID", |