From b9debc4467a447e66ba6a3a31af434be001361a8 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 13 Jun 2012 22:02:12 +0000 Subject: Use value_string_ext for arrays with more than 15 entries svn path=/trunk/; revision=43243 --- epan/dissectors/packet-rrc.c | 348 +++++++++++++++++++++++++------------------ 1 file changed, 203 insertions(+), 145 deletions(-) (limited to 'epan/dissectors/packet-rrc.c') diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 1d2261a89b..4713b4a7ed 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -15180,7 +15180,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 591 "../../asn1/rrc/rrc.cnf" +#line 622 "../../asn1/rrc/rrc.cnf" tvbuff_t *nas_sys_info_gsm_map_tvb = NULL; guint32 length; proto_item *item; @@ -15222,7 +15222,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 575 "../../asn1/rrc/rrc.cnf" +#line 606 "../../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); @@ -15242,7 +15242,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 572 "../../asn1/rrc/rrc.cnf" +#line 603 "../../asn1/rrc/rrc.cnf" offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, (guint32*)(&rrc_nas_sys_info_gsm_map_type), FALSE, 0, NULL); @@ -18453,6 +18453,8 @@ static const value_string rrc_SIB_TypeAndTag_vals[] = { { 0, NULL } }; +static value_string_ext rrc_SIB_TypeAndTag_vals_ext = VALUE_STRING_EXT_INIT(rrc_SIB_TypeAndTag_vals); + static const per_choice_t SIB_TypeAndTag_choice[] = { { 0, &hf_rrc_sysInfoType1_01 , ASN1_NO_EXTENSIONS , dissect_rrc_PLMN_ValueTag }, { 1, &hf_rrc_sysInfoType2 , ASN1_NO_EXTENSIONS , dissect_rrc_CellValueTag }, @@ -19125,7 +19127,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 579 "../../asn1/rrc/rrc.cnf" +#line 610 "../../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); @@ -20663,6 +20665,8 @@ static const value_string rrc_HARQMemorySize_vals[] = { { 0, NULL } }; +static value_string_ext rrc_HARQMemorySize_vals_ext = VALUE_STRING_EXT_INIT(rrc_HARQMemorySize_vals); + static int dissect_rrc_HARQMemorySize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -22154,6 +22158,8 @@ static const value_string rrc_DL_TS_ChannelisationCode_VHCR_vals[] = { { 0, NULL } }; +static value_string_ext rrc_DL_TS_ChannelisationCode_VHCR_vals_ext = VALUE_STRING_EXT_INIT(rrc_DL_TS_ChannelisationCode_VHCR_vals); + static int dissect_rrc_DL_TS_ChannelisationCode_VHCR(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -26173,7 +26179,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 131 "../../asn1/rrc/rrc.cnf" +#line 162 "../../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, @@ -27734,6 +27740,8 @@ static const value_string rrc_SFN_SFN_Drift_vals[] = { { 0, NULL } }; +static value_string_ext rrc_SFN_SFN_Drift_vals_ext = VALUE_STRING_EXT_INIT(rrc_SFN_SFN_Drift_vals); + static int dissect_rrc_SFN_SFN_Drift(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -30782,7 +30790,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 143 "../../asn1/rrc/rrc.cnf" +#line 174 "../../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, @@ -31180,7 +31188,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 147 "../../asn1/rrc/rrc.cnf" +#line 178 "../../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, @@ -31817,6 +31825,8 @@ static const value_string rrc_TimerPollProhibit_vals[] = { { 0, NULL } }; +static value_string_ext rrc_TimerPollProhibit_vals_ext = VALUE_STRING_EXT_INIT(rrc_TimerPollProhibit_vals); + static int dissect_rrc_TimerPollProhibit(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -31895,6 +31905,8 @@ static const value_string rrc_TimerPoll_vals[] = { { 0, NULL } }; +static value_string_ext rrc_TimerPoll_vals_ext = VALUE_STRING_EXT_INIT(rrc_TimerPoll_vals); + static int dissect_rrc_TimerPoll(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -32181,6 +32193,8 @@ static const value_string rrc_TimerStatusProhibit_vals[] = { { 0, NULL } }; +static value_string_ext rrc_TimerStatusProhibit_vals_ext = VALUE_STRING_EXT_INIT(rrc_TimerStatusProhibit_vals); + static int dissect_rrc_TimerStatusProhibit(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -33767,6 +33781,8 @@ static const value_string rrc_UL_TS_ChannelisationCode_vals[] = { { 0, NULL } }; +static value_string_ext rrc_UL_TS_ChannelisationCode_vals_ext = VALUE_STRING_EXT_INIT(rrc_UL_TS_ChannelisationCode_vals); + static int dissect_rrc_UL_TS_ChannelisationCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -41972,6 +41988,8 @@ static const value_string rrc_E_DCH_MAC_d_FlowRetransTimer_vals[] = { { 0, NULL } }; +static value_string_ext rrc_E_DCH_MAC_d_FlowRetransTimer_vals_ext = VALUE_STRING_EXT_INIT(rrc_E_DCH_MAC_d_FlowRetransTimer_vals); + static int dissect_rrc_E_DCH_MAC_d_FlowRetransTimer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -43139,6 +43157,8 @@ static const value_string rrc_UL_TS_ChannelisationCode_VHCR_vals[] = { { 0, NULL } }; +static value_string_ext rrc_UL_TS_ChannelisationCode_VHCR_vals_ext = VALUE_STRING_EXT_INIT(rrc_UL_TS_ChannelisationCode_VHCR_vals); + static int dissect_rrc_UL_TS_ChannelisationCode_VHCR(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -44466,6 +44486,8 @@ static const value_string rrc_TDD_PRACH_CCode_LCR_r4_vals[] = { { 0, NULL } }; +static value_string_ext rrc_TDD_PRACH_CCode_LCR_r4_vals_ext = VALUE_STRING_EXT_INIT(rrc_TDD_PRACH_CCode_LCR_r4_vals); + static int dissect_rrc_TDD_PRACH_CCode_LCR_r4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -45002,6 +45024,8 @@ static const value_string rrc_T_retransTimerForSchedInfo_vals[] = { { 0, NULL } }; +static value_string_ext rrc_T_retransTimerForSchedInfo_vals_ext = VALUE_STRING_EXT_INIT(rrc_T_retransTimerForSchedInfo_vals); + static int dissect_rrc_T_retransTimerForSchedInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -51081,7 +51105,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 163 "../../asn1/rrc/rrc.cnf" +#line 194 "../../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, @@ -51234,7 +51258,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 167 "../../asn1/rrc/rrc.cnf" +#line 198 "../../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, @@ -51250,7 +51274,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 113 "../../asn1/rrc/rrc.cnf" +#line 144 "../../asn1/rrc/rrc.cnf" tvbuff_t *nas_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -51367,7 +51391,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 175 "../../asn1/rrc/rrc.cnf" +#line 206 "../../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, @@ -51386,7 +51410,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 479 "../../asn1/rrc/rrc.cnf" +#line 510 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -51412,7 +51436,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 471 "../../asn1/rrc/rrc.cnf" +#line 502 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_messagelist_tvb=NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, @@ -51672,7 +51696,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 494 "../../asn1/rrc/rrc.cnf" +#line 525 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -51879,7 +51903,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 199 "../../asn1/rrc/rrc.cnf" +#line 230 "../../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, @@ -52033,7 +52057,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 203 "../../asn1/rrc/rrc.cnf" +#line 234 "../../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, @@ -55249,6 +55273,8 @@ static const value_string rrc_TrafficVolumeThreshold_vals[] = { { 0, NULL } }; +static value_string_ext rrc_TrafficVolumeThreshold_vals_ext = VALUE_STRING_EXT_INIT(rrc_TrafficVolumeThreshold_vals); + static int dissect_rrc_TrafficVolumeThreshold(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -62781,7 +62807,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 251 "../../asn1/rrc/rrc.cnf" +#line 282 "../../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, @@ -62873,7 +62899,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 267 "../../asn1/rrc/rrc.cnf" +#line 298 "../../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); @@ -64471,7 +64497,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 271 "../../asn1/rrc/rrc.cnf" +#line 302 "../../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, @@ -65775,7 +65801,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 283 "../../asn1/rrc/rrc.cnf" +#line 314 "../../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, @@ -68300,7 +68326,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 291 "../../asn1/rrc/rrc.cnf" +#line 322 "../../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, @@ -69956,7 +69982,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 303 "../../asn1/rrc/rrc.cnf" +#line 334 "../../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, @@ -72335,7 +72361,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 315 "../../asn1/rrc/rrc.cnf" +#line 346 "../../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, @@ -73039,7 +73065,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 331 "../../asn1/rrc/rrc.cnf" +#line 362 "../../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, @@ -73318,7 +73344,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 359 "../../asn1/rrc/rrc.cnf" +#line 390 "../../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, @@ -73460,7 +73486,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 371 "../../asn1/rrc/rrc.cnf" +#line 402 "../../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, @@ -75099,7 +75125,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 391 "../../asn1/rrc/rrc.cnf" +#line 422 "../../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, @@ -75244,7 +75270,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 403 "../../asn1/rrc/rrc.cnf" +#line 434 "../../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); @@ -75610,7 +75636,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 411 "../../asn1/rrc/rrc.cnf" +#line 442 "../../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, @@ -75768,7 +75794,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 419 "../../asn1/rrc/rrc.cnf" +#line 450 "../../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, @@ -76532,7 +76558,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 435 "../../asn1/rrc/rrc.cnf" +#line 466 "../../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, @@ -76875,7 +76901,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 443 "../../asn1/rrc/rrc.cnf" +#line 474 "../../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, @@ -77338,7 +77364,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 583 "../../asn1/rrc/rrc.cnf" +#line 614 "../../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); @@ -78342,7 +78368,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 451 "../../asn1/rrc/rrc.cnf" +#line 482 "../../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, @@ -78529,7 +78555,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 195 "../../asn1/rrc/rrc.cnf" +#line 226 "../../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); @@ -78967,7 +78993,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 235 "../../asn1/rrc/rrc.cnf" +#line 266 "../../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); @@ -79047,7 +79073,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 179 "../../asn1/rrc/rrc.cnf" +#line 210 "../../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); @@ -79062,7 +79088,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 539 "../../asn1/rrc/rrc.cnf" +#line 570 "../../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); @@ -79164,7 +79190,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 191 "../../asn1/rrc/rrc.cnf" +#line 222 "../../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); @@ -79293,7 +79319,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 423 "../../asn1/rrc/rrc.cnf" +#line 454 "../../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); @@ -79786,7 +79812,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 211 "../../asn1/rrc/rrc.cnf" +#line 242 "../../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); @@ -79834,6 +79860,8 @@ static const value_string rrc_DL_DCCH_MessageType_vals[] = { { 0, NULL } }; +static value_string_ext rrc_DL_DCCH_MessageType_vals_ext = VALUE_STRING_EXT_INIT(rrc_DL_DCCH_MessageType_vals); + static const per_choice_t DL_DCCH_MessageType_choice[] = { { 0, &hf_rrc_activeSetUpdate , ASN1_NO_EXTENSIONS , dissect_rrc_ActiveSetUpdate }, { 1, &hf_rrc_assistanceDataDelivery, ASN1_NO_EXTENSIONS , dissect_rrc_AssistanceDataDelivery }, @@ -79988,7 +80016,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 135 "../../asn1/rrc/rrc.cnf" +#line 166 "../../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); @@ -80159,7 +80187,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 139 "../../asn1/rrc/rrc.cnf" +#line 170 "../../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); @@ -80306,7 +80334,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 151 "../../asn1/rrc/rrc.cnf" +#line 182 "../../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, @@ -80396,7 +80424,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 171 "../../asn1/rrc/rrc.cnf" +#line 202 "../../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); @@ -80489,7 +80517,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 183 "../../asn1/rrc/rrc.cnf" +#line 214 "../../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); @@ -81147,6 +81175,8 @@ static const value_string rrc_EstablishmentCause_vals[] = { { 0, NULL } }; +static value_string_ext rrc_EstablishmentCause_vals_ext = VALUE_STRING_EXT_INIT(rrc_EstablishmentCause_vals); + static int dissect_rrc_EstablishmentCause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -81416,7 +81446,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 187 "../../asn1/rrc/rrc.cnf" +#line 218 "../../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); @@ -81545,7 +81575,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 545 "../../asn1/rrc/rrc.cnf" +#line 576 "../../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); @@ -81641,7 +81671,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 207 "../../asn1/rrc/rrc.cnf" +#line 238 "../../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); @@ -81719,7 +81749,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 255 "../../asn1/rrc/rrc.cnf" +#line 286 "../../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); @@ -82118,6 +82148,8 @@ static const value_string rrc_RLC_BuffersPayload_vals[] = { { 0, NULL } }; +static value_string_ext rrc_RLC_BuffersPayload_vals_ext = VALUE_STRING_EXT_INIT(rrc_RLC_BuffersPayload_vals); + static int dissect_rrc_RLC_BuffersPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -82164,6 +82196,8 @@ static const value_string rrc_AverageRLC_BufferPayload_vals[] = { { 0, NULL } }; +static value_string_ext rrc_AverageRLC_BufferPayload_vals_ext = VALUE_STRING_EXT_INIT(rrc_AverageRLC_BufferPayload_vals); + static int dissect_rrc_AverageRLC_BufferPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -86354,7 +86388,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 259 "../../asn1/rrc/rrc.cnf" +#line 290 "../../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); @@ -86452,7 +86486,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 275 "../../asn1/rrc/rrc.cnf" +#line 306 "../../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); @@ -86501,7 +86535,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 279 "../../asn1/rrc/rrc.cnf" +#line 310 "../../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); @@ -86599,7 +86633,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 295 "../../asn1/rrc/rrc.cnf" +#line 326 "../../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); @@ -86663,7 +86697,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 299 "../../asn1/rrc/rrc.cnf" +#line 330 "../../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); @@ -86761,7 +86795,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 307 "../../asn1/rrc/rrc.cnf" +#line 338 "../../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); @@ -86811,7 +86845,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 311 "../../asn1/rrc/rrc.cnf" +#line 342 "../../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); @@ -86910,7 +86944,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 319 "../../asn1/rrc/rrc.cnf" +#line 350 "../../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); @@ -86960,7 +86994,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 323 "../../asn1/rrc/rrc.cnf" +#line 354 "../../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); @@ -87009,7 +87043,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 339 "../../asn1/rrc/rrc.cnf" +#line 370 "../../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); @@ -88024,7 +88058,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 509 "../../asn1/rrc/rrc.cnf" +#line 540 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -88043,7 +88077,7 @@ tvbuff_t *parameter_tvb=NULL; 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 517 "../../asn1/rrc/rrc.cnf" +#line 548 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -89513,7 +89547,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 351 "../../asn1/rrc/rrc.cnf" +#line 382 "../../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); @@ -89561,6 +89595,8 @@ static const value_string rrc_ReceivedMessageType_vals[] = { { 0, NULL } }; +static value_string_ext rrc_ReceivedMessageType_vals_ext = VALUE_STRING_EXT_INIT(rrc_ReceivedMessageType_vals); + static int dissect_rrc_ReceivedMessageType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -89692,7 +89728,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 355 "../../asn1/rrc/rrc.cnf" +#line 386 "../../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); @@ -89742,7 +89778,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 363 "../../asn1/rrc/rrc.cnf" +#line 394 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeComplete, SecurityModeComplete_sequence); @@ -89791,7 +89827,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 367 "../../asn1/rrc/rrc.cnf" +#line 398 "../../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); @@ -89884,7 +89920,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 375 "../../asn1/rrc/rrc.cnf" +#line 406 "../../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); @@ -89982,7 +90018,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 395 "../../asn1/rrc/rrc.cnf" +#line 426 "../../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); @@ -90031,7 +90067,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 399 "../../asn1/rrc/rrc.cnf" +#line 430 "../../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); @@ -90080,7 +90116,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 407 "../../asn1/rrc/rrc.cnf" +#line 438 "../../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); @@ -90356,7 +90392,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 415 "../../asn1/rrc/rrc.cnf" +#line 446 "../../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); @@ -90493,7 +90529,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 431 "../../asn1/rrc/rrc.cnf" +#line 462 "../../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); @@ -90633,7 +90669,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 455 "../../asn1/rrc/rrc.cnf" +#line 486 "../../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); @@ -90682,7 +90718,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 459 "../../asn1/rrc/rrc.cnf" +#line 490 "../../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); @@ -90839,7 +90875,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 231 "../../asn1/rrc/rrc.cnf" +#line 262 "../../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); @@ -91460,7 +91496,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 427 "../../asn1/rrc/rrc.cnf" +#line 458 "../../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); @@ -91558,6 +91594,8 @@ static const value_string rrc_UL_DCCH_MessageType_vals[] = { { 0, NULL } }; +static value_string_ext rrc_UL_DCCH_MessageType_vals_ext = VALUE_STRING_EXT_INIT(rrc_UL_DCCH_MessageType_vals); + static const per_choice_t UL_DCCH_MessageType_choice[] = { { 0, &hf_rrc_activeSetUpdateComplete, ASN1_NO_EXTENSIONS , dissect_rrc_ActiveSetUpdateComplete }, { 1, &hf_rrc_activeSetUpdateFailure, ASN1_NO_EXTENSIONS , dissect_rrc_ActiveSetUpdateFailure }, @@ -92342,7 +92380,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 159 "../../asn1/rrc/rrc.cnf" +#line 190 "../../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, @@ -92785,7 +92823,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 327 "../../asn1/rrc/rrc.cnf" +#line 358 "../../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, @@ -93067,6 +93105,8 @@ static const value_string rrc_U_RNTI_Group_vals[] = { { 0, NULL } }; +static value_string_ext rrc_U_RNTI_Group_vals_ext = VALUE_STRING_EXT_INIT(rrc_U_RNTI_Group_vals); + static const per_choice_t U_RNTI_Group_choice[] = { { 0, &hf_rrc_all , ASN1_NO_EXTENSIONS , dissect_rrc_NULL }, { 1, &hf_rrc_u_RNTI_BitMaskIndex_b1, ASN1_NO_EXTENSIONS , dissect_rrc_BIT_STRING_SIZE_31 }, @@ -93326,7 +93366,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 335 "../../asn1/rrc/rrc.cnf" +#line 366 "../../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, @@ -95174,7 +95214,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 347 "../../asn1/rrc/rrc.cnf" +#line 378 "../../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, @@ -95318,7 +95358,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 447 "../../asn1/rrc/rrc.cnf" +#line 478 "../../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, @@ -95927,7 +95967,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 155 "../../asn1/rrc/rrc.cnf" +#line 186 "../../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); @@ -96717,7 +96757,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 343 "../../asn1/rrc/rrc.cnf" +#line 374 "../../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); @@ -97028,7 +97068,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 439 "../../asn1/rrc/rrc.cnf" +#line 470 "../../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); @@ -97451,7 +97491,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 263 "../../asn1/rrc/rrc.cnf" +#line 294 "../../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); @@ -97656,7 +97696,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 287 "../../asn1/rrc/rrc.cnf" +#line 318 "../../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); @@ -97740,6 +97780,8 @@ static const value_string rrc_SIB_Type_vals[] = { { 0, NULL } }; +static value_string_ext rrc_SIB_Type_vals_ext = VALUE_STRING_EXT_INIT(rrc_SIB_Type_vals); + static int dissect_rrc_SIB_Type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -98032,7 +98074,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 383 "../../asn1/rrc/rrc.cnf" +#line 414 "../../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); @@ -98109,7 +98151,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 387 "../../asn1/rrc/rrc.cnf" +#line 418 "../../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); @@ -98290,7 +98332,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 379 "../../asn1/rrc/rrc.cnf" +#line 410 "../../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); @@ -98352,6 +98394,8 @@ static const value_string rrc_MBMS_AccessProbabilityFactor_vals[] = { { 0, NULL } }; +static value_string_ext rrc_MBMS_AccessProbabilityFactor_vals_ext = VALUE_STRING_EXT_INIT(rrc_MBMS_AccessProbabilityFactor_vals); + static int dissect_rrc_MBMS_AccessProbabilityFactor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -98430,7 +98474,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 215 "../../asn1/rrc/rrc.cnf" +#line 246 "../../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); @@ -99299,7 +99343,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 219 "../../asn1/rrc/rrc.cnf" +#line 250 "../../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); @@ -99687,7 +99731,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 223 "../../asn1/rrc/rrc.cnf" +#line 254 "../../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); @@ -100460,7 +100504,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 227 "../../asn1/rrc/rrc.cnf" +#line 258 "../../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); @@ -101134,7 +101178,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 239 "../../asn1/rrc/rrc.cnf" +#line 270 "../../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); @@ -101271,7 +101315,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 247 "../../asn1/rrc/rrc.cnf" +#line 278 "../../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); @@ -101427,7 +101471,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 243 "../../asn1/rrc/rrc.cnf" +#line 274 "../../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); @@ -104751,7 +104795,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 121 "../../asn1/rrc/rrc.cnf" +#line 152 "../../asn1/rrc/rrc.cnf" tvbuff_t *ue_radio_access_cap_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -106481,6 +106525,8 @@ static const value_string rrc_RadioFrequencyBandFDD3_vals[] = { { 0, NULL } }; +static value_string_ext rrc_RadioFrequencyBandFDD3_vals_ext = VALUE_STRING_EXT_INIT(rrc_RadioFrequencyBandFDD3_vals); + static int dissect_rrc_RadioFrequencyBandFDD3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -110504,7 +110550,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 551 "../../asn1/rrc/rrc.cnf" +#line 582 "../../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); @@ -111186,6 +111232,8 @@ static const value_string rrc_T_numberOfRepetitionsPerSFNPeriod_vals[] = { { 0, NULL } }; +static value_string_ext rrc_T_numberOfRepetitionsPerSFNPeriod_vals_ext = VALUE_STRING_EXT_INIT(rrc_T_numberOfRepetitionsPerSFNPeriod_vals); + static int dissect_rrc_T_numberOfRepetitionsPerSFNPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -111730,7 +111778,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 533 "../../asn1/rrc/rrc.cnf" +#line 564 "../../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); @@ -113701,6 +113749,8 @@ static const value_string rrc_T_retransTimerForSchedInfo_01_vals[] = { { 0, NULL } }; +static value_string_ext rrc_T_retransTimerForSchedInfo_01_vals_ext = VALUE_STRING_EXT_INIT(rrc_T_retransTimerForSchedInfo_01_vals); + static int dissect_rrc_T_retransTimerForSchedInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -113780,6 +113830,8 @@ static const value_string rrc_T_harq_retransmission_timer_vals[] = { { 0, NULL } }; +static value_string_ext rrc_T_harq_retransmission_timer_vals_ext = VALUE_STRING_EXT_INIT(rrc_T_harq_retransmission_timer_vals); + static int dissect_rrc_T_harq_retransmission_timer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -115215,6 +115267,8 @@ static const value_string rrc_TDD768_PICH_CCode_vals[] = { { 0, NULL } }; +static value_string_ext rrc_TDD768_PICH_CCode_vals_ext = VALUE_STRING_EXT_INIT(rrc_TDD768_PICH_CCode_vals); + static int dissect_rrc_TDD768_PICH_CCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -116209,6 +116263,8 @@ static const value_string rrc_SCCPCH_ChannelisationCode_VHCR_vals[] = { { 0, NULL } }; +static value_string_ext rrc_SCCPCH_ChannelisationCode_VHCR_vals_ext = VALUE_STRING_EXT_INIT(rrc_SCCPCH_ChannelisationCode_VHCR_vals); + static int dissect_rrc_SCCPCH_ChannelisationCode_VHCR(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -121000,6 +121056,8 @@ static const value_string rrc_SIBSb_TypeAndTag_vals[] = { { 0, NULL } }; +static value_string_ext rrc_SIBSb_TypeAndTag_vals_ext = VALUE_STRING_EXT_INIT(rrc_SIBSb_TypeAndTag_vals); + static const per_choice_t SIBSb_TypeAndTag_choice[] = { { 0, &hf_rrc_sysInfoType1_01 , ASN1_NO_EXTENSIONS , dissect_rrc_PLMN_ValueTag }, { 1, &hf_rrc_sysInfoType2 , ASN1_NO_EXTENSIONS , dissect_rrc_CellValueTag }, @@ -121226,7 +121284,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 587 "../../asn1/rrc/rrc.cnf" +#line 618 "../../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); @@ -125339,7 +125397,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 525 "../../asn1/rrc/rrc.cnf" +#line 556 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -130008,7 +130066,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 463 "../../asn1/rrc/rrc.cnf" +#line 494 "../../asn1/rrc/rrc.cnf" tvbuff_t *dl_dcch_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -131113,7 +131171,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_message, { "message", "rrc.message", - FT_UINT32, BASE_DEC, VALS(rrc_DL_DCCH_MessageType_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_DL_DCCH_MessageType_vals_ext, 0, "DL_DCCH_MessageType", HFILL }}, { &hf_rrc_activeSetUpdate, { "activeSetUpdate", "rrc.activeSetUpdate", @@ -131245,7 +131303,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_message_01, { "message", "rrc.message", - FT_UINT32, BASE_DEC, VALS(rrc_UL_DCCH_MessageType_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_DCCH_MessageType_vals_ext, 0, "UL_DCCH_MessageType", HFILL }}, { &hf_rrc_activeSetUpdateComplete, { "activeSetUpdateComplete", "rrc.activeSetUpdateComplete", @@ -132357,7 +132415,7 @@ void proto_register_rrc(void) { "T_nonCriticalExtensions_12", HFILL }}, { &hf_rrc_establishmentCause, { "establishmentCause", "rrc.establishmentCause", - FT_UINT32, BASE_DEC, VALS(rrc_EstablishmentCause_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_EstablishmentCause_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_cellUpdateCause_ext, { "cellUpdateCause-ext", "rrc.cellUpdateCause_ext", @@ -139105,7 +139163,7 @@ void proto_register_rrc(void) { "T_completeAndFirst_01", HFILL }}, { &hf_rrc_sib_Type, { "sib-Type", "rrc.sib_Type", - FT_UINT32, BASE_DEC, VALS(rrc_SIB_Type_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_SIB_Type_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_seg_Count, { "seg-Count", "rrc.seg_Count", @@ -141713,7 +141771,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_radioFrequencyBandFDD3, { "radioFrequencyBandFDD3", "rrc.radioFrequencyBandFDD3", - FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandFDD3_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_RadioFrequencyBandFDD3_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_CompressedModeMeasCapabTDDList_item, { "CompressedModeMeasCapabTDD", "rrc.CompressedModeMeasCapabTDD", @@ -142093,7 +142151,7 @@ void proto_register_rrc(void) { "RadioFrequencyBandFDD2", HFILL }}, { &hf_rrc_frequencyBandsIndicator3, { "frequencyBandsIndicator3", "rrc.frequencyBandsIndicator3", - FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandFDD3_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_RadioFrequencyBandFDD3_vals_ext, 0, "RadioFrequencyBandFDD3", HFILL }}, { &hf_rrc_rrc_ConnectionReleaseInformation, { "rrc-ConnectionReleaseInformation", "rrc.rrc_ConnectionReleaseInformation", @@ -142105,7 +142163,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_uRNTI_Group, { "uRNTI-Group", "rrc.uRNTI_Group", - FT_UINT32, BASE_DEC, VALS(rrc_U_RNTI_Group_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_U_RNTI_Group_vals_ext, 0, "U_RNTI_Group", HFILL }}, { &hf_rrc_gsm900, { "gsm900", "rrc.gsm900", @@ -142641,7 +142699,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_numberOfRepetitionsPerSFNPeriod, { "numberOfRepetitionsPerSFNPeriod", "rrc.numberOfRepetitionsPerSFNPeriod", - FT_UINT32, BASE_DEC, VALS(rrc_T_numberOfRepetitionsPerSFNPeriod_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_T_numberOfRepetitionsPerSFNPeriod_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_supportEUTRA_FDD, { "supportEUTRA-FDD", "rrc.supportEUTRA_FDD", @@ -144265,7 +144323,7 @@ void proto_register_rrc(void) { "DL_AM_RLC_Mode_r7", HFILL }}, { &hf_rrc_timerStatusProhibit, { "timerStatusProhibit", "rrc.timerStatusProhibit", - FT_UINT32, BASE_DEC, VALS(rrc_TimerStatusProhibit_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_TimerStatusProhibit_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_dummy_30, { "dummy", "rrc.dummy", @@ -144405,11 +144463,11 @@ void proto_register_rrc(void) { "PDCP_Info_r4", HFILL }}, { &hf_rrc_timerPollProhibit, { "timerPollProhibit", "rrc.timerPollProhibit", - FT_UINT32, BASE_DEC, VALS(rrc_TimerPollProhibit_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_TimerPollProhibit_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_timerPoll, { "timerPoll", "rrc.timerPoll", - FT_UINT32, BASE_DEC, VALS(rrc_TimerPoll_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_TimerPoll_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_poll_PDU, { "poll-PDU", "rrc.poll_PDU", @@ -145353,7 +145411,7 @@ void proto_register_rrc(void) { "E_DCH_MAC_d_FlowMultiplexingList", HFILL }}, { &hf_rrc_e_dch_mac_d_flow_retransmission_timer, { "e-dch-mac-d-flow-retransmission-timer", "rrc.e_dch_mac_d_flow_retransmission_timer", - FT_UINT32, BASE_DEC, VALS(rrc_E_DCH_MAC_d_FlowRetransTimer_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_E_DCH_MAC_d_FlowRetransTimer_vals_ext, 0, "E_DCH_MAC_d_FlowRetransTimer", HFILL }}, { &hf_rrc_Common_E_DCH_MAC_d_FlowList_item, { "Common-E-DCH-MAC-d-Flow", "rrc.Common_E_DCH_MAC_d_Flow", @@ -145737,7 +145795,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_mac_d_FlowRetransTimer, { "mac-d-FlowRetransTimer", "rrc.mac_d_FlowRetransTimer", - FT_UINT32, BASE_DEC, VALS(rrc_E_DCH_MAC_d_FlowRetransTimer_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_E_DCH_MAC_d_FlowRetransTimer_vals_ext, 0, "E_DCH_MAC_d_FlowRetransTimer", HFILL }}, { &hf_rrc_transmissionGrantType_01, { "transmissionGrantType", "rrc.transmissionGrantType", @@ -145837,7 +145895,7 @@ void proto_register_rrc(void) { "SEQUENCE_SIZE_1_maxHProcesses_OF_HARQMemorySize", HFILL }}, { &hf_rrc_explicit_item, { "HARQMemorySize", "rrc.HARQMemorySize", - FT_UINT32, BASE_DEC, VALS(rrc_HARQMemorySize_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_HARQMemorySize_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_numberOfProcesses_01, { "numberOfProcesses", "rrc.numberOfProcesses", @@ -145857,7 +145915,7 @@ void proto_register_rrc(void) { "SEQUENCE_SIZE_1_maxHProcesses_OF_HARQMemorySize", HFILL }}, { &hf_rrc_memorySize_item, { "HARQMemorySize", "rrc.HARQMemorySize", - FT_UINT32, BASE_DEC, VALS(rrc_HARQMemorySize_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_HARQMemorySize_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_additionalMemorySizesForMIMO, { "additionalMemorySizesForMIMO", "rrc.additionalMemorySizesForMIMO", @@ -145865,7 +145923,7 @@ void proto_register_rrc(void) { "SEQUENCE_SIZE_1_maxHProcesses_OF_HARQMemorySize", HFILL }}, { &hf_rrc_additionalMemorySizesForMIMO_item, { "HARQMemorySize", "rrc.HARQMemorySize", - FT_UINT32, BASE_DEC, VALS(rrc_HARQMemorySize_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_HARQMemorySize_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_dl_TFCS_Identity, { "dl-TFCS-Identity", "rrc.dl_TFCS_Identity", @@ -146917,7 +146975,7 @@ void proto_register_rrc(void) { "INTEGER_0_7", HFILL }}, { &hf_rrc_harq_retransmission_timer, { "harq-retransmission-timer", "rrc.harq_retransmission_timer", - FT_UINT32, BASE_DEC, VALS(rrc_T_harq_retransmission_timer_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_T_harq_retransmission_timer_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_harq_power_offset, { "harq-power-offset", "rrc.harq_power_offset", @@ -148293,11 +148351,11 @@ void proto_register_rrc(void) { "T_consecutive_01", HFILL }}, { &hf_rrc_firstChannelisationCode_01, { "firstChannelisationCode", "rrc.firstChannelisationCode", - FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_VHCR_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_DL_TS_ChannelisationCode_VHCR_vals_ext, 0, "DL_TS_ChannelisationCode_VHCR", HFILL }}, { &hf_rrc_lastChannelisationCode_01, { "lastChannelisationCode", "rrc.lastChannelisationCode", - FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_VHCR_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_DL_TS_ChannelisationCode_VHCR_vals_ext, 0, "DL_TS_ChannelisationCode_VHCR", HFILL }}, { &hf_rrc_bitmap_01, { "bitmap", "rrc.bitmap", @@ -148685,7 +148743,7 @@ void proto_register_rrc(void) { "MidambleShiftAndBurstType_EDCH", HFILL }}, { &hf_rrc_channelisation_code_01, { "channelisation-code", "rrc.channelisation_code", - FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_VHCR_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_DL_TS_ChannelisationCode_VHCR_vals_ext, 0, "DL_TS_ChannelisationCode_VHCR", HFILL }}, { &hf_rrc_firstChannelisationCode_03, { "firstChannelisationCode", "rrc.firstChannelisationCode", @@ -148933,7 +148991,7 @@ void proto_register_rrc(void) { "INTEGER_1_8", HFILL }}, { &hf_rrc_codeResourceInfo, { "codeResourceInfo", "rrc.codeResourceInfo", - FT_UINT32, BASE_DEC, VALS(rrc_UL_TS_ChannelisationCode_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_TS_ChannelisationCode_vals_ext, 0, "UL_TS_ChannelisationCode", HFILL }}, { &hf_rrc_timeslotResourceRelatedInfo, { "timeslotResourceRelatedInfo", "rrc.timeslotResourceRelatedInfo", @@ -149045,7 +149103,7 @@ void proto_register_rrc(void) { "DL_TS_ChannelisationCode", HFILL }}, { &hf_rrc_tdd768_12, { "tdd768", "rrc.tdd768", - FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_VHCR_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_DL_TS_ChannelisationCode_VHCR_vals_ext, 0, "DL_TS_ChannelisationCode_VHCR", HFILL }}, { &hf_rrc_burst_Type, { "burst-Type", "rrc.burst_Type", @@ -149177,7 +149235,7 @@ void proto_register_rrc(void) { "INTEGER_0_15", HFILL }}, { &hf_rrc_retransTimerForSchedInfo, { "retransTimerForSchedInfo", "rrc.retransTimerForSchedInfo", - FT_UINT32, BASE_DEC, VALS(rrc_T_retransTimerForSchedInfo_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_T_retransTimerForSchedInfo_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_snpl_ReportType_01, { "snpl-ReportType", "rrc.snpl_ReportType", @@ -149189,7 +149247,7 @@ void proto_register_rrc(void) { "INTEGER_1_255", HFILL }}, { &hf_rrc_retransTimerForSchedInfo_01, { "retransTimerForSchedInfo", "rrc.retransTimerForSchedInfo", - FT_UINT32, BASE_DEC, VALS(rrc_T_retransTimerForSchedInfo_01_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_T_retransTimerForSchedInfo_01_vals_ext, 0, "T_retransTimerForSchedInfo_01", HFILL }}, { &hf_rrc_dummy_43, { "dummy", "rrc.dummy", @@ -149573,7 +149631,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_memorySize_01, { "memorySize", "rrc.memorySize", - FT_UINT32, BASE_DEC, VALS(rrc_HARQMemorySize_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_HARQMemorySize_vals_ext, 0, "HARQMemorySize", HFILL }}, { &hf_rrc_hs_sich_List, { "hs-sich-List", "rrc.hs_sich_List", @@ -149969,7 +150027,7 @@ void proto_register_rrc(void) { "T_ueSpecificMidamble_03", HFILL }}, { &hf_rrc_channelisationCode_04, { "channelisationCode", "rrc.channelisationCode", - FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_VHCR_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_DL_TS_ChannelisationCode_VHCR_vals_ext, 0, "DL_TS_ChannelisationCode_VHCR", HFILL }}, { &hf_rrc_midambleAllocationMode_12, { "midambleAllocationMode", "rrc.midambleAllocationMode", @@ -150829,7 +150887,7 @@ void proto_register_rrc(void) { "TDD_PICH_CCode", HFILL }}, { &hf_rrc_tdd768_18, { "tdd768", "rrc.tdd768", - FT_UINT32, BASE_DEC, VALS(rrc_TDD768_PICH_CCode_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_TDD768_PICH_CCode_vals_ext, 0, "TDD768_PICH_CCode", HFILL }}, { &hf_rrc_pichChannelisationCodeList_LCR_r4, { "pichChannelisationCodeList-LCR-r4", "rrc.pichChannelisationCodeList_LCR_r4", @@ -150853,11 +150911,11 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_PRACH_ChanCodes_LCR_r4_item, { "TDD-PRACH-CCode-LCR-r4", "rrc.TDD_PRACH_CCode_LCR_r4", - FT_UINT32, BASE_DEC, VALS(rrc_TDD_PRACH_CCode_LCR_r4_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_TDD_PRACH_CCode_LCR_r4_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_PRACH_ChanCodes_List_LCR_item, { "TDD-PRACH-CCode-LCR-r4", "rrc.TDD_PRACH_CCode_LCR_r4", - FT_UINT32, BASE_DEC, VALS(rrc_TDD_PRACH_CCode_LCR_r4_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_TDD_PRACH_CCode_LCR_r4_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_timeslot_02, { "timeslot", "rrc.timeslot", @@ -151649,7 +151707,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_SCCPCH_ChannelisationCodeList_VHCR_item, { "SCCPCH-ChannelisationCode-VHCR", "rrc.SCCPCH_ChannelisationCode_VHCR", - FT_UINT32, BASE_DEC, VALS(rrc_SCCPCH_ChannelisationCode_VHCR_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_SCCPCH_ChannelisationCode_VHCR_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_secondaryCCPCH_Info, { "secondaryCCPCH-Info", "rrc.secondaryCCPCH_Info", @@ -153009,7 +153067,7 @@ void proto_register_rrc(void) { "T_enabled_03", HFILL }}, { &hf_rrc_UL_TS_ChannelisationCodeList_item, { "UL-TS-ChannelisationCode", "rrc.UL_TS_ChannelisationCode", - FT_UINT32, BASE_DEC, VALS(rrc_UL_TS_ChannelisationCode_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_TS_ChannelisationCode_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_UL_TS_ChannelisationCodeList_r7_item, { "UL-TS-ChannelisationCodeList-r7 item", "rrc.UL_TS_ChannelisationCodeList_r7_item", @@ -153017,7 +153075,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_ul_TS_Channelisation_Code, { "ul-TS-Channelisation-Code", "rrc.ul_TS_Channelisation_Code", - FT_UINT32, BASE_DEC, VALS(rrc_UL_TS_ChannelisationCode_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_TS_ChannelisationCode_vals_ext, 0, "UL_TS_ChannelisationCode", HFILL }}, { &hf_rrc_plcch_info, { "plcch-info", "rrc.plcch_info", @@ -153025,7 +153083,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_UL_TS_ChannelisationCodeList_VHCR_item, { "UL-TS-ChannelisationCode-VHCR", "rrc.UL_TS_ChannelisationCode_VHCR", - FT_UINT32, BASE_DEC, VALS(rrc_UL_TS_ChannelisationCode_VHCR_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_TS_ChannelisationCode_VHCR_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_parameters_04, { "parameters", "rrc.parameters", @@ -159053,7 +159111,7 @@ void proto_register_rrc(void) { "TrafficVolumeEventType", HFILL }}, { &hf_rrc_reportingThreshold, { "reportingThreshold", "rrc.reportingThreshold", - FT_UINT32, BASE_DEC, VALS(rrc_TrafficVolumeThreshold_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_TrafficVolumeThreshold_vals_ext, 0, "TrafficVolumeThreshold", HFILL }}, { &hf_rrc_pendingTimeAfterTrigger, { "pendingTimeAfterTrigger", "rrc.pendingTimeAfterTrigger", @@ -159109,11 +159167,11 @@ void proto_register_rrc(void) { "TrafficVolumeReportCriteriaSysInfo", HFILL }}, { &hf_rrc_rlc_BuffersPayload, { "rlc-BuffersPayload", "rrc.rlc_BuffersPayload", - FT_UINT32, BASE_DEC, VALS(rrc_RLC_BuffersPayload_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_RLC_BuffersPayload_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_averageRLC_BufferPayload_01, { "averageRLC-BufferPayload", "rrc.averageRLC_BufferPayload", - FT_UINT32, BASE_DEC, VALS(rrc_AverageRLC_BufferPayload_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_AverageRLC_BufferPayload_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_varianceOfRLC_BufferPayload_01, { "varianceOfRLC-BufferPayload", "rrc.varianceOfRLC_BufferPayload", @@ -160553,7 +160611,7 @@ void proto_register_rrc(void) { "SFN_SFN_RelTimeDifference1", HFILL }}, { &hf_rrc_sfn_SFN_Drift, { "sfn-SFN-Drift", "rrc.sfn_SFN_Drift", - FT_UINT32, BASE_DEC, VALS(rrc_SFN_SFN_Drift_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_SFN_SFN_Drift_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_searchWindowSize, { "searchWindowSize", "rrc.searchWindowSize", @@ -161321,7 +161379,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_receivedMessageType, { "receivedMessageType", "rrc.receivedMessageType", - FT_UINT32, BASE_DEC, VALS(rrc_ReceivedMessageType_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_ReceivedMessageType_vals_ext, 0, NULL, HFILL }}, { &hf_rrc_configurationUnacceptable, { "configurationUnacceptable", "rrc.configurationUnacceptable", @@ -161545,7 +161603,7 @@ void proto_register_rrc(void) { "SibOFF_List", HFILL }}, { &hf_rrc_sib_Type_01, { "sib-Type", "rrc.sib_Type", - FT_UINT32, BASE_DEC, VALS(rrc_SIB_TypeAndTag_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_SIB_TypeAndTag_vals_ext, 0, "SIB_TypeAndTag", HFILL }}, { &hf_rrc_scheduling_01, { "scheduling", "rrc.scheduling", @@ -161553,7 +161611,7 @@ void proto_register_rrc(void) { "SchedulingInformation", HFILL }}, { &hf_rrc_sibSb_Type, { "sibSb-Type", "rrc.sibSb_Type", - FT_UINT32, BASE_DEC, VALS(rrc_SIBSb_TypeAndTag_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_SIBSb_TypeAndTag_vals_ext, 0, "SIBSb_TypeAndTag", HFILL }}, { &hf_rrc_sibOccurIdentity, { "sibOccurIdentity", "rrc.sibOccurIdentity", @@ -162297,7 +162355,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_frequencyBandIndicator3, { "frequencyBandIndicator3", "rrc.frequencyBandIndicator3", - FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandFDD3_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_RadioFrequencyBandFDD3_vals_ext, 0, "RadioFrequencyBandFDD3", HFILL }}, { &hf_rrc_modeSpecificInfo_144, { "modeSpecificInfo", "rrc.modeSpecificInfo", @@ -163793,11 +163851,11 @@ void proto_register_rrc(void) { "INTEGER_0_1", HFILL }}, { &hf_rrc_accessprobabilityFactor_Idle, { "accessprobabilityFactor-Idle", "rrc.accessprobabilityFactor_Idle", - FT_UINT32, BASE_DEC, VALS(rrc_MBMS_AccessProbabilityFactor_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_MBMS_AccessProbabilityFactor_vals_ext, 0, "MBMS_AccessProbabilityFactor", HFILL }}, { &hf_rrc_accessprobabilityFactor_Connected, { "accessprobabilityFactor-Connected", "rrc.accessprobabilityFactor_Connected", - FT_UINT32, BASE_DEC, VALS(rrc_MBMS_AccessProbabilityFactor_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_MBMS_AccessProbabilityFactor_vals_ext, 0, "MBMS_AccessProbabilityFactor", HFILL }}, { &hf_rrc_mbms_ConnectedModeCountingScope, { "mbms-ConnectedModeCountingScope", "rrc.mbms_ConnectedModeCountingScope", -- cgit v1.2.3