diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-04-16 19:01:31 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-04-16 19:01:31 +0000 |
commit | 6f74922803083d933eba4a846b38f8ad9447ad2e (patch) | |
tree | c9a3e925a6b8e225e4b2cb8465cc09acbd72a587 /epan/dissectors/packet-rrc.c | |
parent | c0ebf76780417a82404f5c87e179fc6c1dd12271 (diff) |
From Vincent Helfre and Me:
- Dissect GSM messages.
- Add functions to libwireshark needed by plugins.
svn path=/trunk/; revision=28068
Diffstat (limited to 'epan/dissectors/packet-rrc.c')
-rw-r--r-- | epan/dissectors/packet-rrc.c | 293 |
1 files changed, 165 insertions, 128 deletions
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 14c2e17b96..22d642f4dd 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -194,7 +194,7 @@ static dissector_handle_t rrc_dl_dcch_handle=NULL; /* Initialize the protocol and registered fields */ static int proto_rrc = -1; - +static int hf_test; /*--- Included file: packet-rrc-hf.c ---*/ #line 1 "packet-rrc-hf.c" @@ -874,13 +874,13 @@ static int hf_rrc_criticalExtensions_27 = -1; /* T_criticalExtensions_27 */ static int hf_rrc_toHandoverRAB_Info = -1; /* RAB_Info */ static int hf_rrc_frequency_band = -1; /* Frequency_Band */ static int hf_rrc_gsm_message = -1; /* T_gsm_message */ -static int hf_rrc_single_GSM_Message = -1; /* T_single_GSM_Message */ -static int hf_rrc_gsm_MessageList = -1; /* T_gsm_MessageList */ +static int hf_rrc_single_GSM_Message_r3 = -1; /* T_single_GSM_Message_r3 */ +static int hf_rrc_gsm_MessageList_r3 = -1; /* T_gsm_MessageList_r3 */ static int hf_rrc_gsm_Messages = -1; /* GSM_MessageList */ static int hf_rrc_toHandoverRAB_Info_01 = -1; /* RAB_InformationList_r6 */ static int hf_rrc_gsm_message_01 = -1; /* T_gsm_message_01 */ -static int hf_rrc_single_GSM_Message_01 = -1; /* T_single_GSM_Message_01 */ -static int hf_rrc_gsm_MessageList_01 = -1; /* T_gsm_MessageList_01 */ +static int hf_rrc_single_GSM_Message_r6 = -1; /* T_single_GSM_Message_r6 */ +static int hf_rrc_gsm_MessageList_r6 = -1; /* T_gsm_MessageList_r6 */ static int hf_rrc_geran_SystemInfoType_01 = -1; /* T_geran_SystemInfoType_01 */ static int hf_rrc_geran_SystemInfoType_02 = -1; /* T_geran_SystemInfoType_02 */ static int hf_rrc_handoverFromUTRANCommand_GERANIu_01 = -1; /* T_handoverFromUTRANCommand_GERANIu */ @@ -905,7 +905,7 @@ static int hf_rrc_cdma2000_MessageList = -1; /* CDMA2000_MessageList */ static int hf_rrc_interRAT_HO_FailureCause = -1; /* InterRAT_HO_FailureCause */ static int hf_rrc_interRATMessage = -1; /* T_interRATMessage */ static int hf_rrc_gsm = -1; /* T_gsm */ -static int hf_rrc_gsm_MessageList_02 = -1; /* GSM_MessageList */ +static int hf_rrc_gsm_MessageList_gsm = -1; /* GSM_MessageList */ static int hf_rrc_cdma2000 = -1; /* T_cdma2000 */ static int hf_rrc_laterNonCriticalExtensions_16 = -1; /* T_laterNonCriticalExtensions_16 */ static int hf_rrc_handoverFromUTRANFailure_r3_add_ext = -1; /* BIT_STRING */ @@ -5936,7 +5936,7 @@ static int hf_rrc_GERAN_SystemInformation_item = -1; /* GERAN_SystemInfoBlock * static int hf_rrc_gsmLowRangeUARFCN = -1; /* UARFCN */ static int hf_rrc_gsmUpRangeUARFCN = -1; /* UARFCN */ static int hf_rrc_GSM_BA_Range_List_item = -1; /* GSM_BA_Range */ -static int hf_rrc_GSM_MessageList_item = -1; /* BIT_STRING_SIZE_1_512 */ +static int hf_rrc_GSM_MessageList_item = -1; /* GSM_MessageList_item */ static int hf_rrc_GSM_TargetCellInfoList_item = -1; /* GSM_TargetCellInfo */ static int hf_rrc_receivedMessageType = -1; /* ReceivedMessageType */ static int hf_rrc_configurationUnacceptable = -1; /* NULL */ @@ -7335,12 +7335,12 @@ static gint ett_rrc_T_nonCriticalExtensions_33 = -1; static gint ett_rrc_T_criticalExtensions_27 = -1; static gint ett_rrc_HandoverFromUTRANCommand_GSM_r3_IEs = -1; static gint ett_rrc_T_gsm_message = -1; -static gint ett_rrc_T_single_GSM_Message = -1; -static gint ett_rrc_T_gsm_MessageList = -1; +static gint ett_rrc_T_single_GSM_Message_r3 = -1; +static gint ett_rrc_T_gsm_MessageList_r3 = -1; static gint ett_rrc_HandoverFromUTRANCommand_GSM_r6_IEs = -1; static gint ett_rrc_T_gsm_message_01 = -1; -static gint ett_rrc_T_single_GSM_Message_01 = -1; -static gint ett_rrc_T_gsm_MessageList_01 = -1; +static gint ett_rrc_T_single_GSM_Message_r6 = -1; +static gint ett_rrc_T_gsm_MessageList_r6 = -1; static gint ett_rrc_T_geran_SystemInfoType_01 = -1; static gint ett_rrc_HandoverFromUTRANCommand_GSM_v690ext_IEs = -1; static gint ett_rrc_T_geran_SystemInfoType_02 = -1; @@ -18806,7 +18806,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 98 "rrc.cnf" +#line 106 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate"); } @@ -21973,7 +21973,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 116 "rrc.cnf" +#line 124 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery"); } @@ -22373,7 +22373,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 122 "rrc.cnf" +#line 130 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN"); } @@ -39597,7 +39597,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 146 "rrc.cnf" +#line 154 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm"); } @@ -39752,7 +39752,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 152 "rrc.cnf" +#line 160 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck"); } @@ -39770,7 +39770,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 80 "rrc.cnf" +#line 88 "rrc.cnf" tvbuff_t *nas_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -39887,7 +39887,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 164 "rrc.cnf" +#line 172 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer"); } @@ -39902,14 +39902,20 @@ dissect_rrc_DownlinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const per_sequence_t T_single_GSM_Message_sequence[] = { +static const per_sequence_t T_single_GSM_Message_r3_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_rrc_T_single_GSM_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +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 596 "rrc.cnf" + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_rrc_T_single_GSM_Message, T_single_GSM_Message_sequence); + ett_rrc_T_single_GSM_Message_r3, T_single_GSM_Message_r3_sequence); + +proto_tree_add_bits_item(tree, hf_test, tvb, offset,8, FALSE); + + return offset; } @@ -39917,16 +39923,25 @@ dissect_rrc_T_single_GSM_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int -dissect_rrc_BIT_STRING_SIZE_1_512(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +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 588 "rrc.cnf" + tvbuff_t *gsm_messagelist_tvb=NULL; + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, - 1, 512, FALSE, NULL); + 1, 512, FALSE, &gsm_messagelist_tvb); + + + if (gsm_messagelist_tvb) + call_dissector(gsm_a_dtap_handle,gsm_messagelist_tvb,actx->pinfo, tree); + + return offset; } static const per_sequence_t GSM_MessageList_sequence_of[1] = { - { &hf_rrc_GSM_MessageList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_BIT_STRING_SIZE_1_512 }, + { &hf_rrc_GSM_MessageList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_GSM_MessageList_item }, }; static int @@ -39939,15 +39954,15 @@ dissect_rrc_GSM_MessageList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const per_sequence_t T_gsm_MessageList_sequence[] = { +static const per_sequence_t T_gsm_MessageList_r3_sequence[] = { { &hf_rrc_gsm_Messages , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_GSM_MessageList }, { NULL, 0, 0, NULL } }; static int -dissect_rrc_T_gsm_MessageList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_rrc_T_gsm_MessageList_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_rrc_T_gsm_MessageList, T_gsm_MessageList_sequence); + ett_rrc_T_gsm_MessageList_r3, T_gsm_MessageList_r3_sequence); return offset; } @@ -39960,8 +39975,8 @@ static const value_string rrc_T_gsm_message_vals[] = { }; static const per_choice_t T_gsm_message_choice[] = { - { 0, &hf_rrc_single_GSM_Message, ASN1_NO_EXTENSIONS , dissect_rrc_T_single_GSM_Message }, - { 1, &hf_rrc_gsm_MessageList , ASN1_NO_EXTENSIONS , dissect_rrc_T_gsm_MessageList }, + { 0, &hf_rrc_single_GSM_Message_r3, ASN1_NO_EXTENSIONS , dissect_rrc_T_single_GSM_Message_r3 }, + { 1, &hf_rrc_gsm_MessageList_r3, ASN1_NO_EXTENSIONS , dissect_rrc_T_gsm_MessageList_r3 }, { 0, NULL, 0, NULL } }; @@ -40129,28 +40144,35 @@ dissect_rrc_RAB_InformationList_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const per_sequence_t T_single_GSM_Message_01_sequence[] = { +static const per_sequence_t T_single_GSM_Message_r6_sequence[] = { { NULL, 0, 0, NULL } }; static int -dissect_rrc_T_single_GSM_Message_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +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 601 "rrc.cnf" + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_rrc_T_single_GSM_Message_01, T_single_GSM_Message_01_sequence); + ett_rrc_T_single_GSM_Message_r6, T_single_GSM_Message_r6_sequence); + + +proto_tree_add_bits_item(tree, hf_test, tvb, offset,8, FALSE); + + return offset; } -static const per_sequence_t T_gsm_MessageList_01_sequence[] = { +static const per_sequence_t T_gsm_MessageList_r6_sequence[] = { { &hf_rrc_gsm_Messages , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_GSM_MessageList }, { NULL, 0, 0, NULL } }; static int -dissect_rrc_T_gsm_MessageList_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_rrc_T_gsm_MessageList_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_rrc_T_gsm_MessageList_01, T_gsm_MessageList_01_sequence); + ett_rrc_T_gsm_MessageList_r6, T_gsm_MessageList_r6_sequence); return offset; } @@ -40163,8 +40185,8 @@ static const value_string rrc_T_gsm_message_01_vals[] = { }; static const per_choice_t T_gsm_message_01_choice[] = { - { 0, &hf_rrc_single_GSM_Message_01, ASN1_NO_EXTENSIONS , dissect_rrc_T_single_GSM_Message_01 }, - { 1, &hf_rrc_gsm_MessageList_01, ASN1_NO_EXTENSIONS , dissect_rrc_T_gsm_MessageList_01 }, + { 0, &hf_rrc_single_GSM_Message_r6, ASN1_NO_EXTENSIONS , dissect_rrc_T_single_GSM_Message_r6 }, + { 1, &hf_rrc_gsm_MessageList_r6, ASN1_NO_EXTENSIONS , dissect_rrc_T_gsm_MessageList_r6 }, { 0, NULL, 0, NULL } }; @@ -40311,7 +40333,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 182 "rrc.cnf" +#line 190 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM"); } @@ -40326,6 +40348,16 @@ dissect_rrc_HandoverFromUTRANCommand_GSM(tvbuff_t *tvb _U_, int offset _U_, asn1 } + +static int +dissect_rrc_BIT_STRING_SIZE_1_512(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 1, 512, FALSE, NULL); + + return offset; +} + + static const per_sequence_t CDMA2000_Message_sequence[] = { { &hf_rrc_msg_Type , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_BIT_STRING_SIZE_8 }, { &hf_rrc_payload_02 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_BIT_STRING_SIZE_1_512 }, @@ -40457,7 +40489,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 188 "rrc.cnf" +#line 196 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000"); } @@ -47617,7 +47649,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 266 "rrc.cnf" +#line 274 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl"); } @@ -47711,7 +47743,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 290 "rrc.cnf" +#line 298 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2"); } @@ -48742,7 +48774,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 296 "rrc.cnf" +#line 304 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration"); } @@ -50048,7 +50080,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 "rrc.cnf" +#line 322 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation"); } @@ -51918,7 +51950,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 326 "rrc.cnf" +#line 334 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration"); } @@ -53102,7 +53134,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 344 "rrc.cnf" +#line 352 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease"); } @@ -55309,7 +55341,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 362 "rrc.cnf" +#line 370 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup"); } @@ -55830,7 +55862,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 386 "rrc.cnf" +#line 394 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); } @@ -56111,7 +56143,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 428 "rrc.cnf" +#line 436 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); } @@ -56226,7 +56258,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 446 "rrc.cnf" +#line 454 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease"); } @@ -57403,7 +57435,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 476 "rrc.cnf" +#line 484 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration"); } @@ -57550,7 +57582,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 494 "rrc.cnf" +#line 502 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl"); } @@ -57839,7 +57871,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 506 "rrc.cnf" +#line 514 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); } @@ -57999,7 +58031,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 518 "rrc.cnf" +#line 526 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm"); } @@ -58765,7 +58797,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 530 "rrc.cnf" +#line 538 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl"); } @@ -59079,7 +59111,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 542 "rrc.cnf" +#line 550 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm"); } @@ -60075,7 +60107,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 554 "rrc.cnf" +#line 562 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation"); } @@ -60264,7 +60296,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 176 "rrc.cnf" +#line 184 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu"); } @@ -60635,7 +60667,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 242 "rrc.cnf" +#line 250 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation"); } @@ -60839,7 +60871,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 104 "rrc.cnf" +#line 112 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete"); } @@ -61012,7 +61044,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 110 "rrc.cnf" +#line 118 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure"); } @@ -61161,7 +61193,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 128 "rrc.cnf" +#line 136 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure"); } @@ -61253,7 +61285,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 158 "rrc.cnf" +#line 166 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse"); } @@ -61304,7 +61336,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 170 "rrc.cnf" +#line 178 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete"); } @@ -62189,7 +62221,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 200 "rrc.cnf" +#line 208 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer"); } @@ -62254,7 +62286,7 @@ dissect_rrc_InterRAT_HO_FailureCause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static const per_sequence_t T_gsm_sequence[] = { - { &hf_rrc_gsm_MessageList_02, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_GSM_MessageList }, + { &hf_rrc_gsm_MessageList_gsm, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_GSM_MessageList }, { NULL, 0, 0, NULL } }; @@ -62370,7 +62402,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 194 "rrc.cnf" +#line 202 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure"); } @@ -62450,7 +62482,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 272 "rrc.cnf" +#line 280 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure"); } @@ -65801,7 +65833,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 278 "rrc.cnf" +#line 286 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); } @@ -65901,7 +65933,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 302 "rrc.cnf" +#line 310 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete"); } @@ -65952,7 +65984,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 308 "rrc.cnf" +#line 316 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure"); } @@ -66052,7 +66084,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 332 "rrc.cnf" +#line 340 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete"); } @@ -66118,7 +66150,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 338 "rrc.cnf" +#line 346 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure"); } @@ -66218,7 +66250,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 350 "rrc.cnf" +#line 358 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete"); } @@ -66270,7 +66302,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 356 "rrc.cnf" +#line 364 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure"); } @@ -66371,7 +66403,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 368 "rrc.cnf" +#line 376 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete"); } @@ -66423,7 +66455,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 374 "rrc.cnf" +#line 382 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure"); } @@ -66474,7 +66506,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 398 "rrc.cnf" +#line 406 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete"); } @@ -68902,7 +68934,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 416 "rrc.cnf" +#line 424 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); } @@ -69083,7 +69115,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 422 "rrc.cnf" +#line 430 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); } @@ -69135,7 +69167,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 434 "rrc.cnf" +#line 442 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); } @@ -69186,7 +69218,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 440 "rrc.cnf" +#line 448 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); } @@ -69236,7 +69268,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 452 "rrc.cnf" +#line 460 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication"); } @@ -69336,7 +69368,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 482 "rrc.cnf" +#line 490 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete"); } @@ -69387,7 +69419,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 488 "rrc.cnf" +#line 496 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure"); } @@ -69438,7 +69470,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 500 "rrc.cnf" +#line 508 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure"); } @@ -69716,7 +69748,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 512 "rrc.cnf" +#line 520 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); } @@ -69797,7 +69829,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 524 "rrc.cnf" +#line 532 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer"); } @@ -69895,7 +69927,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 560 "rrc.cnf" +#line 568 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm"); } @@ -69946,7 +69978,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 566 "rrc.cnf" +#line 574 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure"); } @@ -70105,7 +70137,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 236 "rrc.cnf" +#line 244 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest"); } @@ -70751,7 +70783,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 140 "rrc.cnf" +#line 148 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH"); } @@ -71178,7 +71210,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 380 "rrc.cnf" +#line 388 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); } @@ -71722,7 +71754,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 392 "rrc.cnf" +#line 400 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH"); } @@ -73057,7 +73089,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 410 "rrc.cnf" +#line 418 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); } @@ -73188,7 +73220,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 548 "rrc.cnf" +#line 556 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH"); } @@ -73604,7 +73636,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 134 "rrc.cnf" +#line 142 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate"); } @@ -74006,7 +74038,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 404 "rrc.cnf" +#line 412 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); } @@ -74173,7 +74205,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 536 "rrc.cnf" +#line 544 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate"); } @@ -74569,7 +74601,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 284 "rrc.cnf" +#line 292 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1"); } @@ -74776,7 +74808,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 320 "rrc.cnf" +#line 328 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest"); } @@ -75154,7 +75186,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 464 "rrc.cnf" +#line 472 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH"); } @@ -75204,7 +75236,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 470 "rrc.cnf" +#line 478 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication"); } @@ -75387,7 +75419,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 458 "rrc.cnf" +#line 466 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH"); } @@ -75529,7 +75561,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 206 "rrc.cnf" +#line 214 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation"); } @@ -76265,7 +76297,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 212 "rrc.cnf" +#line 220 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation"); } @@ -76655,7 +76687,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 218 "rrc.cnf" +#line 226 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); } @@ -77243,7 +77275,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 230 "rrc.cnf" +#line 238 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation"); } @@ -77919,7 +77951,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 248 "rrc.cnf" +#line 256 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation"); } @@ -78058,7 +78090,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 260 "rrc.cnf" +#line 268 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation"); } @@ -78216,7 +78248,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 254 "rrc.cnf" +#line 262 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation"); } @@ -80641,7 +80673,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 88 "rrc.cnf" +#line 96 "rrc.cnf" tvbuff_t *ue_radio_access_cap_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -98871,7 +98903,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 572 "rrc.cnf" +#line 580 "rrc.cnf" tvbuff_t *dl_dcch_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -102035,14 +102067,14 @@ void proto_register_rrc(void) { { "gsm-message", "rrc.gsm_message", FT_UINT32, BASE_DEC, VALS(rrc_T_gsm_message_vals), 0, "rrc.T_gsm_message", HFILL }}, - { &hf_rrc_single_GSM_Message, + { &hf_rrc_single_GSM_Message_r3, { "single-GSM-Message", "rrc.single_GSM_Message", FT_NONE, BASE_NONE, NULL, 0, - "rrc.T_single_GSM_Message", HFILL }}, - { &hf_rrc_gsm_MessageList, + "rrc.T_single_GSM_Message_r3", HFILL }}, + { &hf_rrc_gsm_MessageList_r3, { "gsm-MessageList", "rrc.gsm_MessageList", FT_NONE, BASE_NONE, NULL, 0, - "rrc.T_gsm_MessageList", HFILL }}, + "rrc.T_gsm_MessageList_r3", HFILL }}, { &hf_rrc_gsm_Messages, { "gsm-Messages", "rrc.gsm_Messages", FT_UINT32, BASE_DEC, NULL, 0, @@ -102055,14 +102087,14 @@ void proto_register_rrc(void) { { "gsm-message", "rrc.gsm_message", FT_UINT32, BASE_DEC, VALS(rrc_T_gsm_message_01_vals), 0, "rrc.T_gsm_message_01", HFILL }}, - { &hf_rrc_single_GSM_Message_01, + { &hf_rrc_single_GSM_Message_r6, { "single-GSM-Message", "rrc.single_GSM_Message", FT_NONE, BASE_NONE, NULL, 0, - "rrc.T_single_GSM_Message_01", HFILL }}, - { &hf_rrc_gsm_MessageList_01, + "rrc.T_single_GSM_Message_r6", HFILL }}, + { &hf_rrc_gsm_MessageList_r6, { "gsm-MessageList", "rrc.gsm_MessageList", FT_NONE, BASE_NONE, NULL, 0, - "rrc.T_gsm_MessageList_01", HFILL }}, + "rrc.T_gsm_MessageList_r6", HFILL }}, { &hf_rrc_geran_SystemInfoType_01, { "geran-SystemInfoType", "rrc.geran_SystemInfoType", FT_UINT32, BASE_DEC, VALS(rrc_T_geran_SystemInfoType_01_vals), 0, @@ -102159,7 +102191,7 @@ void proto_register_rrc(void) { { "gsm", "rrc.gsm", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_gsm", HFILL }}, - { &hf_rrc_gsm_MessageList_02, + { &hf_rrc_gsm_MessageList_gsm, { "gsm-MessageList", "rrc.gsm_MessageList", FT_UINT32, BASE_DEC, NULL, 0, "rrc.GSM_MessageList", HFILL }}, @@ -122286,7 +122318,7 @@ void proto_register_rrc(void) { { &hf_rrc_GSM_MessageList_item, { "GSM-MessageList", "rrc.GSM_MessageList_item", FT_BYTES, BASE_HEX, NULL, 0, - "rrc.BIT_STRING_SIZE_1_512", HFILL }}, + "rrc.GSM_MessageList_item", HFILL }}, { &hf_rrc_GSM_TargetCellInfoList_item, { "GSM-TargetCellInfoList", "rrc.GSM_TargetCellInfoList_item", FT_NONE, BASE_NONE, NULL, 0, @@ -126534,6 +126566,11 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-hfarr.c ---*/ #line 128 "packet-rrc-template.c" + { &hf_test, + { "RAB Test", "rrc.RAB.test", + FT_UINT8, BASE_DEC, NULL, 0, + "rrc.RAB_Info_r6", HFILL }}, + }; /* List of subtrees */ @@ -126868,12 +126905,12 @@ void proto_register_rrc(void) { &ett_rrc_T_criticalExtensions_27, &ett_rrc_HandoverFromUTRANCommand_GSM_r3_IEs, &ett_rrc_T_gsm_message, - &ett_rrc_T_single_GSM_Message, - &ett_rrc_T_gsm_MessageList, + &ett_rrc_T_single_GSM_Message_r3, + &ett_rrc_T_gsm_MessageList_r3, &ett_rrc_HandoverFromUTRANCommand_GSM_r6_IEs, &ett_rrc_T_gsm_message_01, - &ett_rrc_T_single_GSM_Message_01, - &ett_rrc_T_gsm_MessageList_01, + &ett_rrc_T_single_GSM_Message_r6, + &ett_rrc_T_gsm_MessageList_r6, &ett_rrc_T_geran_SystemInfoType_01, &ett_rrc_HandoverFromUTRANCommand_GSM_v690ext_IEs, &ett_rrc_T_geran_SystemInfoType_02, @@ -130793,7 +130830,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 134 "packet-rrc-template.c" +#line 139 "packet-rrc-template.c" }; @@ -130866,7 +130903,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 146 "packet-rrc-template.c" +#line 151 "packet-rrc-template.c" } |