diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-03-04 19:59:56 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-04 19:59:56 +0000 |
commit | 254ba09e7a549a946883118b6478d64b9a414ad5 (patch) | |
tree | dcf4fb1cfd854b182f7c4c3c3e9629a686162970 /epan/dissectors/packet-rrc.c | |
parent | 2db386dfd4880a58cf45493ba9367967921241a0 (diff) | |
download | wireshark-254ba09e7a549a946883118b6478d64b9a414ad5.tar.gz wireshark-254ba09e7a549a946883118b6478d64b9a414ad5.tar.bz2 wireshark-254ba09e7a549a946883118b6478d64b9a414ad5.zip |
From Neil Piercy:
Embedded RRC messages not dissected.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3300
svn path=/trunk/; revision=27606
Diffstat (limited to 'epan/dissectors/packet-rrc.c')
-rw-r--r-- | epan/dissectors/packet-rrc.c | 217 |
1 files changed, 125 insertions, 92 deletions
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 78a4c93bdb..c4df0a8ab6 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -62,6 +62,7 @@ static dissector_handle_t gsm_a_dtap_handle; static dissector_handle_t rrc_ue_radio_access_cap_info_handle=NULL; +static dissector_handle_t rrc_dl_dcch_handle=NULL; /* Include constants */ @@ -189,7 +190,7 @@ static dissector_handle_t rrc_ue_radio_access_cap_info_handle=NULL; #define maxURNTI_Group 8 /*--- End of included file: packet-rrc-val.h ---*/ -#line 60 "packet-rrc-template.c" +#line 61 "packet-rrc-template.c" /* Initialize the protocol and registered fields */ static int proto_rrc = -1; @@ -250,6 +251,8 @@ static int hf_rrc_SysInfoType17_PDU = -1; /* SysInfoType17 */ static int hf_rrc_SysInfoType18_PDU = -1; /* SysInfoType18 */ static int hf_rrc_SysInfoTypeSB1_PDU = -1; /* SysInfoTypeSB1 */ static int hf_rrc_SysInfoTypeSB2_PDU = -1; /* SysInfoTypeSB2 */ +static int hf_rrc_ToTargetRNC_Container_PDU = -1; /* ToTargetRNC_Container */ +static int hf_rrc_TargetRNC_ToSourceRNC_Container_PDU = -1; /* TargetRNC_ToSourceRNC_Container */ static int hf_rrc_InterRATHandoverInfo_r3_add_ext_IEs_PDU = -1; /* InterRATHandoverInfo_r3_add_ext_IEs */ static int hf_rrc_RRCConnectionSetupComplete_r3_add_ext_IEs_PDU = -1; /* RRCConnectionSetupComplete_r3_add_ext_IEs */ static int hf_rrc_UE_CapabilityContainer_IEs_PDU = -1; /* UE_CapabilityContainer_IEs */ @@ -6502,7 +6505,7 @@ static int hf_rrc_srncRelocation = -1; /* SRNC_RelocationInfo_r3 */ static int hf_rrc_rfc3095_ContextInfo = -1; /* RFC3095_ContextInfo_r5 */ static int hf_rrc_extension = -1; /* NULL */ static int hf_rrc_rrc_FailureInfo = -1; /* RRC_FailureInfo */ -static int hf_rrc_dL_DCCHmessage = -1; /* OCTET_STRING */ +static int hf_rrc_dL_DCCHmessage = -1; /* T_dL_DCCHmessage */ static int hf_rrc_r3_31 = -1; /* T_r3_31 */ static int hf_rrc_interRATHandoverInfo_r3 = -1; /* InterRATHandoverInfoWithInterRATCapabilities_r3_IEs */ static int hf_rrc_v390NonCriticalExtensions_01 = -1; /* T_v390NonCriticalExtensions_01 */ @@ -6998,7 +7001,7 @@ static int hf_rrc_GsmSecurityCapability_a5_2 = -1; static int hf_rrc_GsmSecurityCapability_a5_1 = -1; /*--- End of included file: packet-rrc-hf.c ---*/ -#line 65 "packet-rrc-template.c" +#line 66 "packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -11257,7 +11260,7 @@ static gint ett_rrc_UE_RadioAccessCapability_r6 = -1; static gint ett_rrc_UL_RFC3095_Context = -1; /*--- End of included file: packet-rrc-ett.c ---*/ -#line 70 "packet-rrc-template.c" +#line 71 "packet-rrc-template.c" /* Global variables */ static proto_tree *top_tree; @@ -18803,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 96 "rrc.cnf" +#line 98 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate"); } @@ -21970,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 114 "rrc.cnf" +#line 116 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery"); } @@ -22370,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 120 "rrc.cnf" +#line 122 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN"); } @@ -39594,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 144 "rrc.cnf" +#line 146 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm"); } @@ -39749,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 150 "rrc.cnf" +#line 152 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck"); } @@ -39767,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 78 "rrc.cnf" +#line 80 "rrc.cnf" tvbuff_t *nas_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -39884,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 162 "rrc.cnf" +#line 164 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer"); } @@ -40308,7 +40311,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 180 "rrc.cnf" +#line 182 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM"); } @@ -40454,7 +40457,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 186 "rrc.cnf" +#line 188 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000"); } @@ -47614,7 +47617,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 264 "rrc.cnf" +#line 266 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl"); } @@ -47708,7 +47711,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 288 "rrc.cnf" +#line 290 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2"); } @@ -48739,7 +48742,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 294 "rrc.cnf" +#line 296 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration"); } @@ -50045,7 +50048,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 312 "rrc.cnf" +#line 314 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation"); } @@ -51915,7 +51918,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 324 "rrc.cnf" +#line 326 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration"); } @@ -53099,7 +53102,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 342 "rrc.cnf" +#line 344 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease"); } @@ -55306,7 +55309,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 360 "rrc.cnf" +#line 362 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup"); } @@ -55827,7 +55830,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 384 "rrc.cnf" +#line 386 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); } @@ -56108,7 +56111,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 426 "rrc.cnf" +#line 428 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); } @@ -56223,7 +56226,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 444 "rrc.cnf" +#line 446 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease"); } @@ -57400,7 +57403,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 474 "rrc.cnf" +#line 476 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration"); } @@ -57547,7 +57550,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 492 "rrc.cnf" +#line 494 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl"); } @@ -57836,7 +57839,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 504 "rrc.cnf" +#line 506 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); } @@ -57996,7 +57999,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 516 "rrc.cnf" +#line 518 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm"); } @@ -58762,7 +58765,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 528 "rrc.cnf" +#line 530 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl"); } @@ -59076,7 +59079,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 540 "rrc.cnf" +#line 542 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm"); } @@ -60072,7 +60075,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 552 "rrc.cnf" +#line 554 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation"); } @@ -60261,7 +60264,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 174 "rrc.cnf" +#line 176 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu"); } @@ -60632,7 +60635,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 240 "rrc.cnf" +#line 242 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation"); } @@ -60836,7 +60839,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 102 "rrc.cnf" +#line 104 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete"); } @@ -61009,7 +61012,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 108 "rrc.cnf" +#line 110 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure"); } @@ -61158,7 +61161,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 126 "rrc.cnf" +#line 128 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure"); } @@ -61250,7 +61253,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 156 "rrc.cnf" +#line 158 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse"); } @@ -61301,7 +61304,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 168 "rrc.cnf" +#line 170 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete"); } @@ -62186,7 +62189,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 198 "rrc.cnf" +#line 200 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer"); } @@ -62367,7 +62370,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 192 "rrc.cnf" +#line 194 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure"); } @@ -62447,7 +62450,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 270 "rrc.cnf" +#line 272 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure"); } @@ -65798,7 +65801,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 276 "rrc.cnf" +#line 278 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); } @@ -65898,7 +65901,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 300 "rrc.cnf" +#line 302 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete"); } @@ -65949,7 +65952,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 306 "rrc.cnf" +#line 308 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure"); } @@ -66049,7 +66052,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 330 "rrc.cnf" +#line 332 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete"); } @@ -66115,7 +66118,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 336 "rrc.cnf" +#line 338 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure"); } @@ -66215,7 +66218,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 348 "rrc.cnf" +#line 350 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete"); } @@ -66267,7 +66270,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 354 "rrc.cnf" +#line 356 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure"); } @@ -66368,7 +66371,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 366 "rrc.cnf" +#line 368 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete"); } @@ -66420,7 +66423,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 372 "rrc.cnf" +#line 374 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure"); } @@ -66471,7 +66474,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 396 "rrc.cnf" +#line 398 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete"); } @@ -68899,7 +68902,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 414 "rrc.cnf" +#line 416 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); } @@ -69080,7 +69083,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 420 "rrc.cnf" +#line 422 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); } @@ -69132,7 +69135,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 432 "rrc.cnf" +#line 434 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); } @@ -69183,7 +69186,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 438 "rrc.cnf" +#line 440 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); } @@ -69233,7 +69236,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 450 "rrc.cnf" +#line 452 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication"); } @@ -69333,7 +69336,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 480 "rrc.cnf" +#line 482 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete"); } @@ -69384,7 +69387,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 486 "rrc.cnf" +#line 488 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure"); } @@ -69435,7 +69438,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 498 "rrc.cnf" +#line 500 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure"); } @@ -69713,7 +69716,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 510 "rrc.cnf" +#line 512 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); } @@ -69794,7 +69797,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 522 "rrc.cnf" +#line 524 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer"); } @@ -69892,7 +69895,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 558 "rrc.cnf" +#line 560 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm"); } @@ -69943,7 +69946,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 564 "rrc.cnf" +#line 566 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure"); } @@ -70102,7 +70105,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 234 "rrc.cnf" +#line 236 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest"); } @@ -70748,7 +70751,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 138 "rrc.cnf" +#line 140 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH"); } @@ -71175,7 +71178,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 378 "rrc.cnf" +#line 380 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); } @@ -71719,7 +71722,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 390 "rrc.cnf" +#line 392 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH"); } @@ -73054,7 +73057,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 408 "rrc.cnf" +#line 410 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); } @@ -73185,7 +73188,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 546 "rrc.cnf" +#line 548 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH"); } @@ -73601,7 +73604,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 132 "rrc.cnf" +#line 134 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate"); } @@ -74003,7 +74006,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 402 "rrc.cnf" +#line 404 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); } @@ -74170,7 +74173,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 534 "rrc.cnf" +#line 536 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate"); } @@ -74566,7 +74569,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 282 "rrc.cnf" +#line 284 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1"); } @@ -74773,7 +74776,7 @@ static const per_sequence_t PUSCHCapacityRequest_sequence[] = { static int dissect_rrc_PUSCHCapacityRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 318 "rrc.cnf" +#line 320 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest"); } @@ -75151,7 +75154,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 462 "rrc.cnf" +#line 464 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH"); } @@ -75201,7 +75204,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 468 "rrc.cnf" +#line 470 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication"); } @@ -75384,7 +75387,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 456 "rrc.cnf" +#line 458 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH"); } @@ -75526,7 +75529,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 204 "rrc.cnf" +#line 206 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation"); } @@ -76262,7 +76265,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 210 "rrc.cnf" +#line 212 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation"); } @@ -76652,7 +76655,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 216 "rrc.cnf" +#line 218 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); } @@ -77240,7 +77243,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 228 "rrc.cnf" +#line 230 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation"); } @@ -77916,7 +77919,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 246 "rrc.cnf" +#line 248 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation"); } @@ -78055,7 +78058,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 258 "rrc.cnf" +#line 260 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation"); } @@ -78213,7 +78216,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 252 "rrc.cnf" +#line 254 "rrc.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)){ col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation"); } @@ -80638,7 +80641,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 86 "rrc.cnf" +#line 88 "rrc.cnf" tvbuff_t *ue_radio_access_cap_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -98867,9 +98870,18 @@ dissect_rrc_ToTargetRNC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int -dissect_rrc_OCTET_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +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" + tvbuff_t *dl_dcch_message_tvb=NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + NO_BOUND, NO_BOUND, FALSE, &dl_dcch_message_tvb); + + + if (dl_dcch_message_tvb) + call_dissector(rrc_dl_dcch_handle,dl_dcch_message_tvb,actx->pinfo, proto_tree_get_root(tree)); + + return offset; } @@ -98894,7 +98906,7 @@ static const per_choice_t TargetRNC_ToSourceRNC_Container_choice[] = { { 3, &hf_rrc_transportChannelReconfiguration, ASN1_NO_EXTENSIONS , dissect_rrc_TransportChannelReconfiguration }, { 4, &hf_rrc_physicalChannelReconfiguration, ASN1_NO_EXTENSIONS , dissect_rrc_PhysicalChannelReconfiguration }, { 5, &hf_rrc_rrc_FailureInfo , ASN1_NO_EXTENSIONS , dissect_rrc_RRC_FailureInfo }, - { 6, &hf_rrc_dL_DCCHmessage , ASN1_NO_EXTENSIONS , dissect_rrc_OCTET_STRING }, + { 6, &hf_rrc_dL_DCCHmessage , ASN1_NO_EXTENSIONS , dissect_rrc_T_dL_DCCHmessage }, { 7, &hf_rrc_extension , ASN1_NO_EXTENSIONS , dissect_rrc_NULL }, { 0, NULL, 0, NULL } }; @@ -99203,6 +99215,16 @@ static void dissect_SysInfoTypeSB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); dissect_rrc_SysInfoTypeSB2(tvb, 0, &asn1_ctx, tree, hf_rrc_SysInfoTypeSB2_PDU); } +static void dissect_ToTargetRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + dissect_rrc_ToTargetRNC_Container(tvb, 0, &asn1_ctx, tree, hf_rrc_ToTargetRNC_Container_PDU); +} +static void dissect_TargetRNC_ToSourceRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + dissect_rrc_TargetRNC_ToSourceRNC_Container(tvb, 0, &asn1_ctx, tree, hf_rrc_TargetRNC_ToSourceRNC_Container_PDU); +} static int dissect_InterRATHandoverInfo_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -99254,7 +99276,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 75 "packet-rrc-template.c" +#line 76 "packet-rrc-template.c" /* TODO: Remove the dummy function when these functions are taken into use @@ -99521,6 +99543,14 @@ void proto_register_rrc(void) { { "SysInfoTypeSB2", "rrc.SysInfoTypeSB2", FT_NONE, BASE_NONE, NULL, 0, "rrc.SysInfoTypeSB2", HFILL }}, + { &hf_rrc_ToTargetRNC_Container_PDU, + { "ToTargetRNC-Container", "rrc.ToTargetRNC_Container", + FT_UINT32, BASE_DEC, VALS(rrc_ToTargetRNC_Container_vals), 0, + "rrc.ToTargetRNC_Container", HFILL }}, + { &hf_rrc_TargetRNC_ToSourceRNC_Container_PDU, + { "TargetRNC-ToSourceRNC-Container", "rrc.TargetRNC_ToSourceRNC_Container", + FT_UINT32, BASE_DEC, VALS(rrc_TargetRNC_ToSourceRNC_Container_vals), 0, + "rrc.TargetRNC_ToSourceRNC_Container", HFILL }}, { &hf_rrc_InterRATHandoverInfo_r3_add_ext_IEs_PDU, { "InterRATHandoverInfo-r3-add-ext-IEs", "rrc.InterRATHandoverInfo_r3_add_ext_IEs", FT_NONE, BASE_NONE, NULL, 0, @@ -124532,7 +124562,7 @@ void proto_register_rrc(void) { { &hf_rrc_dL_DCCHmessage, { "dL-DCCHmessage", "rrc.dL_DCCHmessage", FT_BYTES, BASE_HEX, NULL, 0, - "rrc.OCTET_STRING", HFILL }}, + "rrc.T_dL_DCCHmessage", HFILL }}, { &hf_rrc_r3_31, { "r3", "rrc.r3", FT_NONE, BASE_NONE, NULL, 0, @@ -126503,7 +126533,7 @@ void proto_register_rrc(void) { "", HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 127 "packet-rrc-template.c" +#line 128 "packet-rrc-template.c" }; /* List of subtrees */ @@ -130763,7 +130793,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 133 "packet-rrc-template.c" +#line 134 "packet-rrc-template.c" }; @@ -130831,10 +130861,12 @@ void proto_register_rrc(void) { register_dissector("rrc.si.sib18", dissect_SysInfoType18_PDU, proto_rrc); register_dissector("rrc.si.sb1", dissect_SysInfoTypeSB1_PDU, proto_rrc); register_dissector("rrc.si.sb2", dissect_SysInfoTypeSB2_PDU, proto_rrc); + register_dissector("rrc.s_to_trnc_cont", dissect_ToTargetRNC_Container_PDU, proto_rrc); + register_dissector("rrc.t_to_srnc_cont", dissect_TargetRNC_ToSourceRNC_Container_PDU, proto_rrc); /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 145 "packet-rrc-template.c" +#line 146 "packet-rrc-template.c" } @@ -130846,6 +130878,7 @@ proto_reg_handoff_rrc(void) gsm_a_dtap_handle = find_dissector("gsm_a_dtap"); rrc_ue_radio_access_cap_info_handle = find_dissector("rrc.ue_radio_access_cap_info"); + rrc_dl_dcch_handle = find_dissector("rrc.dl.dcch"); } |