diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-06-25 15:53:32 -0700 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-06-25 23:49:51 +0000 |
commit | 5736125e3ba6af94b4aec27cf64c8ea1b79bf1cd (patch) | |
tree | 7ac7c2163ff96c4242b9db4cff684094523c8fae /epan/dissectors/packet-f1ap.c | |
parent | c6fc452c95eec93c17250dfbaf2db8c19a7aa90b (diff) |
F1AP: dissect more OCTET STRING from X2AP ASN.1 description
Change-Id: If438ebe1053ed5f64763f079c17e293589944dde
Reviewed-on: https://code.wireshark.org/review/28439
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-f1ap.c')
-rw-r--r-- | epan/dissectors/packet-f1ap.c | 127 |
1 files changed, 80 insertions, 47 deletions
diff --git a/epan/dissectors/packet-f1ap.c b/epan/dissectors/packet-f1ap.c index 3c29943eb6..04c061cfca 100644 --- a/epan/dissectors/packet-f1ap.c +++ b/epan/dissectors/packet-f1ap.c @@ -699,6 +699,9 @@ static gint ett_f1ap_requestedP_MaxFR1 = -1; static gint ett_f1ap_HandoverPreparationInformation = -1; static gint ett_f1ap_MeasConfig = -1; static gint ett_f1ap_MeasGapConfig = -1; +static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container = -1; +static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container = -1; +static gint ett_f1ap_ProtectedEUTRAResourceIndication = -1; /*--- Included file: packet-f1ap-ett.c ---*/ #line 1 "./asn1/f1ap/packet-f1ap-ett.c" @@ -916,7 +919,7 @@ static gint ett_f1ap_SuccessfulOutcome = -1; static gint ett_f1ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-f1ap-ett.c ---*/ -#line 62 "./asn1/f1ap/packet-f1ap-template.c" +#line 65 "./asn1/f1ap/packet-f1ap-template.c" enum{ INITIATING_MESSAGE, @@ -3361,8 +3364,17 @@ dissect_f1ap_EUTRA_Mode_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 680 "./asn1/f1ap/f1ap.cnf" + tvbuff_t *param_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + NO_BOUND, NO_BOUND, FALSE, ¶m_tvb); + + if (param_tvb) { + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container); + dissect_x2ap_EUTRANRCellResourceCoordinationRequest_PDU(param_tvb, actx->pinfo, subtree, NULL); + } + + return offset; } @@ -3371,8 +3383,17 @@ dissect_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container(tvbuff_t *tvb _U_, i static int dissect_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 688 "./asn1/f1ap/f1ap.cnf" + tvbuff_t *param_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + NO_BOUND, NO_BOUND, FALSE, ¶m_tvb); + + if (param_tvb) { + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container); + dissect_x2ap_EUTRANRCellResourceCoordinationResponse_PDU(param_tvb, actx->pinfo, subtree, NULL); + } + + return offset; } @@ -3994,8 +4015,17 @@ dissect_f1ap_InactivityMonitoringResponse(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_f1ap_ProtectedEUTRAResourceIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 696 "./asn1/f1ap/f1ap.cnf" + tvbuff_t *param_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + NO_BOUND, NO_BOUND, FALSE, ¶m_tvb); + + if (param_tvb) { + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_ProtectedEUTRAResourceIndication); + dissect_x2ap_ProtectedEUTRAResourceIndication_PDU(param_tvb, actx->pinfo, subtree, NULL); + } + + return offset; } @@ -4770,7 +4800,7 @@ static const per_sequence_t Reset_sequence[] = { static int dissect_f1ap_Reset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 680 "./asn1/f1ap/f1ap.cnf" +#line 704 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4838,7 +4868,7 @@ static const per_sequence_t ResetAcknowledge_sequence[] = { static int dissect_f1ap_ResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 682 "./asn1/f1ap/f1ap.cnf" +#line 706 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetAcknowledge"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4869,7 +4899,7 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_f1ap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 730 "./asn1/f1ap/f1ap.cnf" +#line 754 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4886,7 +4916,7 @@ static const per_sequence_t F1SetupRequest_sequence[] = { static int dissect_f1ap_F1SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 684 "./asn1/f1ap/f1ap.cnf" +#line 708 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4917,7 +4947,7 @@ static const per_sequence_t F1SetupResponse_sequence[] = { static int dissect_f1ap_F1SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 686 "./asn1/f1ap/f1ap.cnf" +#line 710 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4948,7 +4978,7 @@ static const per_sequence_t F1SetupFailure_sequence[] = { static int dissect_f1ap_F1SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 688 "./asn1/f1ap/f1ap.cnf" +#line 712 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4965,7 +4995,7 @@ static const per_sequence_t GNBDUConfigurationUpdate_sequence[] = { static int dissect_f1ap_GNBDUConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 690 "./asn1/f1ap/f1ap.cnf" +#line 714 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5038,7 +5068,7 @@ static const per_sequence_t GNBDUConfigurationUpdateAcknowledge_sequence[] = { static int dissect_f1ap_GNBDUConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 692 "./asn1/f1ap/f1ap.cnf" +#line 716 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdateAcknowledge"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5055,7 +5085,7 @@ static const per_sequence_t GNBDUConfigurationUpdateFailure_sequence[] = { static int dissect_f1ap_GNBDUConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 694 "./asn1/f1ap/f1ap.cnf" +#line 718 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdateFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5072,7 +5102,7 @@ static const per_sequence_t GNBCUConfigurationUpdate_sequence[] = { static int dissect_f1ap_GNBCUConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 696 "./asn1/f1ap/f1ap.cnf" +#line 720 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5173,7 +5203,7 @@ static const per_sequence_t GNBCUConfigurationUpdateAcknowledge_sequence[] = { static int dissect_f1ap_GNBCUConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 698 "./asn1/f1ap/f1ap.cnf" +#line 722 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdateAcknowledge"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5232,7 +5262,7 @@ static const per_sequence_t GNBCUConfigurationUpdateFailure_sequence[] = { static int dissect_f1ap_GNBCUConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 700 "./asn1/f1ap/f1ap.cnf" +#line 724 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdateFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5249,7 +5279,7 @@ static const per_sequence_t GNBDUResourceCoordinationRequest_sequence[] = { static int dissect_f1ap_GNBDUResourceCoordinationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 742 "./asn1/f1ap/f1ap.cnf" +#line 766 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUResourceCoordinationRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5266,7 +5296,7 @@ static const per_sequence_t GNBDUResourceCoordinationResponse_sequence[] = { static int dissect_f1ap_GNBDUResourceCoordinationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 744 "./asn1/f1ap/f1ap.cnf" +#line 768 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUResourceCoordinationResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5283,7 +5313,7 @@ static const per_sequence_t UEContextSetupRequest_sequence[] = { static int dissect_f1ap_UEContextSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 702 "./asn1/f1ap/f1ap.cnf" +#line 726 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5356,7 +5386,7 @@ static const per_sequence_t UEContextSetupResponse_sequence[] = { static int dissect_f1ap_UEContextSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 704 "./asn1/f1ap/f1ap.cnf" +#line 728 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5429,7 +5459,7 @@ static const per_sequence_t UEContextSetupFailure_sequence[] = { static int dissect_f1ap_UEContextSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 706 "./asn1/f1ap/f1ap.cnf" +#line 730 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5460,7 +5490,7 @@ static const per_sequence_t UEContextReleaseRequest_sequence[] = { static int dissect_f1ap_UEContextReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 732 "./asn1/f1ap/f1ap.cnf" +#line 756 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5477,7 +5507,7 @@ static const per_sequence_t UEContextReleaseCommand_sequence[] = { static int dissect_f1ap_UEContextReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 708 "./asn1/f1ap/f1ap.cnf" +#line 732 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseCommand"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5494,7 +5524,7 @@ static const per_sequence_t UEContextReleaseComplete_sequence[] = { static int dissect_f1ap_UEContextReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 710 "./asn1/f1ap/f1ap.cnf" +#line 734 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5511,7 +5541,7 @@ static const per_sequence_t UEContextModificationRequest_sequence[] = { static int dissect_f1ap_UEContextModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 712 "./asn1/f1ap/f1ap.cnf" +#line 736 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5626,7 +5656,7 @@ static const per_sequence_t UEContextModificationResponse_sequence[] = { static int dissect_f1ap_UEContextModificationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 714 "./asn1/f1ap/f1ap.cnf" +#line 738 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5727,7 +5757,7 @@ static const per_sequence_t UEContextModificationFailure_sequence[] = { static int dissect_f1ap_UEContextModificationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 716 "./asn1/f1ap/f1ap.cnf" +#line 740 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5744,7 +5774,7 @@ static const per_sequence_t UEContextModificationRequired_sequence[] = { static int dissect_f1ap_UEContextModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 718 "./asn1/f1ap/f1ap.cnf" +#line 742 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequired"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5803,7 +5833,7 @@ static const per_sequence_t UEContextModificationConfirm_sequence[] = { static int dissect_f1ap_UEContextModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 720 "./asn1/f1ap/f1ap.cnf" +#line 744 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationConfirm"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5834,7 +5864,7 @@ static const per_sequence_t WriteReplaceWarningRequest_sequence[] = { static int dissect_f1ap_WriteReplaceWarningRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 722 "./asn1/f1ap/f1ap.cnf" +#line 746 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5865,7 +5895,7 @@ static const per_sequence_t WriteReplaceWarningResponse_sequence[] = { static int dissect_f1ap_WriteReplaceWarningResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 724 "./asn1/f1ap/f1ap.cnf" +#line 748 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5896,7 +5926,7 @@ static const per_sequence_t PWSCancelRequest_sequence[] = { static int dissect_f1ap_PWSCancelRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 726 "./asn1/f1ap/f1ap.cnf" +#line 750 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5927,7 +5957,7 @@ static const per_sequence_t PWSCancelResponse_sequence[] = { static int dissect_f1ap_PWSCancelResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 728 "./asn1/f1ap/f1ap.cnf" +#line 752 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5958,7 +5988,7 @@ static const per_sequence_t UEInactivityNotification_sequence[] = { static int dissect_f1ap_UEInactivityNotification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 740 "./asn1/f1ap/f1ap.cnf" +#line 764 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEInactivityNotification"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5989,7 +6019,7 @@ static const per_sequence_t InitialULRRCMessageTransfer_sequence[] = { static int dissect_f1ap_InitialULRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 734 "./asn1/f1ap/f1ap.cnf" +#line 758 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialULRRCMessageTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6006,7 +6036,7 @@ static const per_sequence_t DLRRCMessageTransfer_sequence[] = { static int dissect_f1ap_DLRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 736 "./asn1/f1ap/f1ap.cnf" +#line 760 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DLRRCMessageTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6023,7 +6053,7 @@ static const per_sequence_t ULRRCMessageTransfer_sequence[] = { static int dissect_f1ap_ULRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 738 "./asn1/f1ap/f1ap.cnf" +#line 762 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ULRRCMessageTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6040,7 +6070,7 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_f1ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 746 "./asn1/f1ap/f1ap.cnf" +#line 770 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6057,7 +6087,7 @@ static const per_sequence_t SystemInformationDeliveryCommand_sequence[] = { static int dissect_f1ap_SystemInformationDeliveryCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 748 "./asn1/f1ap/f1ap.cnf" +#line 772 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformationDeliveryCommand"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6074,7 +6104,7 @@ static const per_sequence_t Paging_sequence[] = { static int dissect_f1ap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 750 "./asn1/f1ap/f1ap.cnf" +#line 774 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Paging"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6105,7 +6135,7 @@ static const per_sequence_t Notify_sequence[] = { static int dissect_f1ap_Notify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 752 "./asn1/f1ap/f1ap.cnf" +#line 776 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Notify"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6136,7 +6166,7 @@ static const per_sequence_t PWSRestartIndication_sequence[] = { static int dissect_f1ap_PWSRestartIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 754 "./asn1/f1ap/f1ap.cnf" +#line 778 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSRestartIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6167,7 +6197,7 @@ static const per_sequence_t PWSFailureIndication_sequence[] = { static int dissect_f1ap_PWSFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 756 "./asn1/f1ap/f1ap.cnf" +#line 780 "./asn1/f1ap/f1ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSFailureIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -7818,7 +7848,7 @@ static int dissect_F1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-f1ap-fn.c ---*/ -#line 118 "./asn1/f1ap/packet-f1ap-template.c" +#line 121 "./asn1/f1ap/packet-f1ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -9560,7 +9590,7 @@ void proto_register_f1ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-f1ap-hfarr.c ---*/ -#line 199 "./asn1/f1ap/packet-f1ap-template.c" +#line 202 "./asn1/f1ap/packet-f1ap-template.c" }; /* List of subtrees */ @@ -9580,6 +9610,9 @@ void proto_register_f1ap(void) { &ett_f1ap_HandoverPreparationInformation, &ett_f1ap_MeasConfig, &ett_f1ap_MeasGapConfig, + &ett_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container, + &ett_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container, + &ett_f1ap_ProtectedEUTRAResourceIndication, /*--- Included file: packet-f1ap-ettarr.c ---*/ #line 1 "./asn1/f1ap/packet-f1ap-ettarr.c" @@ -9797,7 +9830,7 @@ void proto_register_f1ap(void) { &ett_f1ap_UnsuccessfulOutcome, /*--- End of included file: packet-f1ap-ettarr.c ---*/ -#line 219 "./asn1/f1ap/packet-f1ap-template.c" +#line 225 "./asn1/f1ap/packet-f1ap-template.c" }; /* Register protocol */ @@ -10019,7 +10052,7 @@ proto_reg_handoff_f1ap(void) /*--- End of included file: packet-f1ap-dis-tab.c ---*/ -#line 244 "./asn1/f1ap/packet-f1ap-template.c" +#line 250 "./asn1/f1ap/packet-f1ap-template.c" } /* |