osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

XnAP: upgrade dissector to v15.2.0 

Change-Id: Ie26f8918aff20ade21eda611950795a320a417f2
Reviewed-on: https://code.wireshark.org/review/31483
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2019-01-11 12:16:01 +01:00
parent 5544d0a4da
commit d6b187e42f
26 changed files with 3440 additions and 2406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -37,7 +37,6 @@ WLAN-backhaulRate-r12
HandoverCommand_PDU
HandoverPreparationInformation_PDU
HandoverPreparationInformation-NB_PDU
MeasurementReport_PDU
RLF-Report-r9_PDU
RLF-Report-v9e0_PDU
RRCConnectionReconfigurationComplete_PDU
@ -54,7 +53,6 @@ VisitedCellInfoList-r12_PDU
HandoverCommand
HandoverPreparationInformation
HandoverPreparationInformation-NB
MeasurementReport
RLF-Report-r9
RLF-Report-v9e0
RRCConnectionReconfiguration @rrc_conn_reconf

23
epan/dissectors/asn1/ngap/ngap.cnf
View File

@ -14,15 +14,16 @@ ProtocolIE-ID
#.EXPORTS ONLY_VALS WS_DLL
#.EXPORTS
LastVisitedNGRANCellInformation_PDU
SourceNGRANNode-ToTargetNGRANNode-TransparentContainer_PDU
TargetNGRANNode-ToSourceNGRANNode-TransparentContainer_PDU
#.PDU
NGAP-PDU
LastVisitedNGRANCellInformation
SourceNGRANNode-ToTargetNGRANNode-TransparentContainer
TargetNGRANNode-ToSourceNGRANNode-TransparentContainer
#.MAKE_ENUM
GlobalRANNodeID
HandoverType
@ -623,7 +624,25 @@ ExpectedUEMovingTrajectoryItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRIN
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_LastVisitedEUTRANCellInformation);
dissect_lte_rrc_VisitedCellInfo_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_s1ap_LastVisitedEUTRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY LastVisitedUTRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_LastVisitedUTRANCellInformation);
dissect_ranap_LastVisitedUTRANCell_Item_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY LastVisitedGERANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_LastVisitedGERANCellInformation);
dissect_s1ap_LastVisitedGERANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.TYPE_ATTR

5
epan/dissectors/asn1/ngap/packet-ngap-template.c
View File

@ -27,6 +27,7 @@
#include "packet-per.h"
#include "packet-e212.h"
#include "packet-s1ap.h"
#include "packet-ranap.h"
#include "packet-lte-rrc.h"
#include "packet-nr-rrc.h"
#include "packet-gsm_map.h"
@ -108,6 +109,8 @@ static gint ett_ngap_UERadioCapabilityForPagingOfNR = -1;
static gint ett_ngap_UERadioCapabilityForPagingOfEUTRA = -1;
static gint ett_ngap_UERadioCapability = -1;
static gint ett_ngap_LastVisitedEUTRANCellInformation = -1;
static gint ett_ngap_LastVisitedUTRANCellInformation = -1;
static gint ett_ngap_LastVisitedGERANCellInformation = -1;
static gint ett_ngap_NASSecurityParametersFromNGRAN = -1;
#include "packet-ngap-ett.c"
@ -603,6 +606,8 @@ void proto_register_ngap(void) {
&ett_ngap_UERadioCapabilityForPagingOfEUTRA,
&ett_ngap_UERadioCapability,
&ett_ngap_LastVisitedEUTRANCellInformation,
&ett_ngap_LastVisitedUTRANCellInformation,
&ett_ngap_LastVisitedGERANCellInformation,
&ett_ngap_NASSecurityParametersFromNGRAN,
#include "packet-ngap-ettarr.c"
};

2
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -49,7 +49,6 @@ HandoverPreparationInformation_PDU
MeasConfig_PDU
MeasGapConfig_PDU
MeasResults_PDU
MeasurementReport_PDU
MeasurementTimingConfiguration_PDU
MIB_PDU
P-Max_PDU
@ -85,7 +84,6 @@ HandoverCommand
HandoverPreparationInformation
MeasConfig
MeasGapConfig
MeasurementReport
MeasResults
MeasurementTimingConfiguration
MIB

2
epan/dissectors/asn1/s1ap/packet-s1ap-template.c
View File

@ -132,6 +132,7 @@ static int ett_s1ap_E_UTRAN_Trace_ID = -1;
static int ett_s1ap_InterfacesToTrace = -1;
static int ett_s1ap_EncryptionAlgorithms = -1;
static int ett_s1ap_IntegrityProtectionAlgorithms = -1;
static int ett_s1ap_LastVisitedNGRANCellInformation = -1;
static int ett_s1ap_LastVisitedUTRANCellInformation = -1;
static int ett_s1ap_SerialNumber = -1;
static int ett_s1ap_WarningType = -1;
@ -698,6 +699,7 @@ void proto_register_s1ap(void) {
&ett_s1ap_InterfacesToTrace,
&ett_s1ap_EncryptionAlgorithms,
&ett_s1ap_IntegrityProtectionAlgorithms,
&ett_s1ap_LastVisitedNGRANCellInformation,
&ett_s1ap_LastVisitedUTRANCellInformation,
&ett_s1ap_SerialNumber,
&ett_s1ap_WarningType,

16
epan/dissectors/asn1/s1ap/s1ap.cnf
View File

@ -23,6 +23,8 @@ Cause
ENB-StatusTransfer-TransparentContainer_PDU
Global-ENB-ID_PDU
Global-ENB-ID
LastVisitedEUTRANCellInformation_PDU
LastVisitedGERANCellInformation_PDU
SourceeNB-ToTargeteNB-TransparentContainer_PDU
SONtransferApplicationIdentity_PDU
SONtransferRequestContainer_PDU
@ -35,6 +37,8 @@ UE-HistoryInformation_PDU
#.PDU
ENB-StatusTransfer-TransparentContainer
LastVisitedEUTRANCellInformation
LastVisitedGERANCellInformation
S1AP-PDU
SourceeNB-ToTargeteNB-TransparentContainer
SONtransferApplicationIdentity
@ -838,6 +842,18 @@ Time-UE-StayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
Time-UE-StayedInCell-EnhancedGranularity DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Time_UE_StayedInCell_EnhancedGranularity_fmt)
#.FN_BODY LastVisitedNGRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (!parameter_tvb)
return offset;
if (g_s1ap_dissect_container) {
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_LastVisitedNGRANCellInformation);
dissect_ngap_LastVisitedNGRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY LastVisitedUTRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
proto_tree *subtree;

6
epan/dissectors/asn1/x2ap/packet-x2ap-template.c
View File

@ -29,6 +29,8 @@
#include "packet-e212.h"
#include "packet-lte-rrc.h"
#include "packet-nr-rrc.h"
#include "packet-ngap.h"
#include "packet-ranap.h"
#include "packet-ntp.h"
#ifdef _MSC_VER
@ -140,6 +142,8 @@ static int ett_x2ap_RRCContainer = -1;
static int ett_x2ap_NRencryptionAlgorithms = -1;
static int ett_x2ap_NRintegrityProtectionAlgorithms = -1;
static int ett_x2ap_measurementTimingConfiguration = -1;
static int ett_x2ap_LastVisitedNGRANCellInformation = -1;
static int ett_x2ap_LastVisitedUTRANCellInformation = -1;
#include "packet-x2ap-ett.c"
typedef enum {
@ -589,6 +593,8 @@ void proto_register_x2ap(void) {
&ett_x2ap_NRencryptionAlgorithms,
&ett_x2ap_NRintegrityProtectionAlgorithms,
&ett_x2ap_measurementTimingConfiguration,
&ett_x2ap_LastVisitedNGRANCellInformation,
&ett_x2ap_LastVisitedUTRANCellInformation,
#include "packet-x2ap-ettarr.c"
};

18
epan/dissectors/asn1/x2ap/x2ap.cnf
View File

@ -631,6 +631,24 @@ ScheduledCommunicationTime/timeofDayStart DISPLAY=BASE_DEC|BASE_UNIT_STRING STRI
#.TYPE_ATTR
ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY LastVisitedNGRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_LastVisitedNGRANCellInformation);
dissect_ngap_LastVisitedNGRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY LastVisitedUTRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_LastVisitedUTRANCellInformation);
dissect_ranap_LastVisitedUTRANCell_Item_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.END
#.FN_HDR HandoverRequest

2
epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V15.1.0 (2018-09)
-- 3GPP TS 38.423 V15.2.0 (2018-12)
-- 9.3.6 Common definitions
-- **************************************************************
--

35
epan/dissectors/asn1/xnap/XnAP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V15.1.0 (2018-09)
-- 3GPP TS 38.423 V15.2.0 (2018-12)
-- 9.3.7 Constant definitions
-- **************************************************************
--
@ -30,7 +30,7 @@ id-sNStatusTransfer ProcedureCode ::= 1
id-handoverCancel ProcedureCode ::= 2
id-retrieveUEContext ProcedureCode ::= 3
id-rANPaging ProcedureCode ::= 4
id-dataForwardingAddressIndication ProcedureCode ::= 5
id-xnUAddressIndication ProcedureCode ::= 5
id-uEContextRelease ProcedureCode ::= 6
id-sNGRANnodeAdditionPreparation ProcedureCode ::= 7
id-sNGRANnodeReconfigurationCompletion ProcedureCode ::= 8
@ -63,13 +63,14 @@ id-e-UTRA-NR-CellResourceCoordination ProcedureCode ::= 25
maxEARFCN INTEGER ::= 262143
maxnoofAllowedAreas INTEGER ::= 16
maxnoofAMFSets INTEGER ::= 16
maxnoofAoIs INTEGER ::= 64
maxnoofBPLMNs INTEGER ::= 12
maxnoofBearerConfigs INTEGER ::= 2 -- This IE may need to be refined
maxnoofCellsinAoI INTEGER ::= 256
maxnoofCellsinUEHistoryInfo INTEGER ::= 16
maxnoofCellsinNG-RANnode INTEGER ::= 16384
maxnoofCellsinRNA INTEGER ::= 32
maxnoofCellsUEMovingTrajectory INTEGER ::= 16
maxnoofDRBs INTEGER ::= 32
maxnoofEUTRABands INTEGER ::= 16
maxnoofEPLMNs INTEGER ::= 15
@ -84,12 +85,15 @@ maxnoofQoSFlows INTEGER ::= 64
maxnoofRANAreaCodes INTEGER ::= 32
maxnoofRANAreasinRNA INTEGER ::= 16
maxnoofRANNodesinAoI INTEGER ::= 64
maxnoofSCellGroups INTEGER ::= 3
maxnoofSCellGroupsplus1 INTEGER ::= 4
maxnoofSliceItems INTEGER ::= 1024
maxnoofsupportedPLMNs INTEGER ::= 16 -- This IE may need to be refined.
maxnoofsupportedTACs INTEGER ::= 1024 -- This IE may need to be refined.
maxnoofsupportedPLMNs INTEGER ::= 12
maxnoofsupportedTACs INTEGER ::= 256
maxnoofTAI INTEGER ::= 16
maxnoofTAIsinAoI INTEGER ::= 16
maxnoofUEContexts INTEGER ::= 8292
maxnoofTNLAssociations INTEGER ::= 32
maxnoofUEContexts INTEGER ::= 8192
maxNRARFCN INTEGER ::= 3279165
maxNrOfErrors INTEGER ::= 256
@ -103,14 +107,14 @@ id-ActivatedServedCells ProtocolIE-ID ::= 0
id-ActivationIDforCellActivation ProtocolIE-ID ::= 1
id-admittedSplitSRB ProtocolIE-ID ::= 2
id-admittedSplitSRBrelease ProtocolIE-ID ::= 3
id-AMF-Pool-Information ProtocolIE-ID ::= 4
id-AMF-Set-Information ProtocolIE-ID ::= 4
id-AssistanceDataForRANPaging ProtocolIE-ID ::= 5
id-BearersSubjectToCounterCheck ProtocolIE-ID ::= 6
id-Cause ProtocolIE-ID ::= 7
id-cellAssistanceInfo-NR ProtocolIE-ID ::= 8
id-ConfigurationUpdateInitiatingNodeChoice ProtocolIE-ID ::= 9
id-CriticalityDiagnostics ProtocolIE-ID ::= 10
id-dataforwardingInfoperPDUSession ProtocolIE-ID ::= 11
id-XnUAddressInfoperPDUSession-List ProtocolIE-ID ::= 11
id-DRBsSubjectToStatusTransfer-List ProtocolIE-ID ::= 12
id-ExpectedUEBehaviour ProtocolIE-ID ::= 13
id-GlobalNG-RAN-node-ID ProtocolIE-ID ::= 14
@ -127,7 +131,7 @@ id-MN-to-SN-Container ProtocolIE-ID ::= 24
id-MobilityRestrictionList ProtocolIE-ID ::= 25
id-new-NG-RAN-Cell-Identity ProtocolIE-ID ::= 26
id-newNG-RANnodeUEXnAPID ProtocolIE-ID ::= 27
id-NRUEMeasurementReportRRCTransfer ProtocolIE-ID ::= 28
id-NRUEReportRRCTransfer ProtocolIE-ID ::= 28
id-oldNG-RANnodeUEXnAPID ProtocolIE-ID ::= 29
id-OldtoNewNG-RANnodeResumeContainer ProtocolIE-ID ::= 30
id-PagingDRX ProtocolIE-ID ::= 31
@ -193,5 +197,18 @@ id-UERANPagingIdentity ProtocolIE-ID ::= 90
id-UESecurityCapabilities ProtocolIE-ID ::= 91
id-UserPlaneTrafficActivityReport ProtocolIE-ID ::= 92
id-XnRemovalThreshold ProtocolIE-ID ::= 93
id-DesiredActNotificationLevel ProtocolIE-ID ::= 94
id-AvailableDRBIDs ProtocolIE-ID ::= 95
id-AdditionalDRBIDs ProtocolIE-ID ::= 96
id-SpareDRBIDs ProtocolIE-ID ::= 97
id-RequiredNumberOfDRBIDs ProtocolIE-ID ::= 98
id-TNLA-To-Add-List ProtocolIE-ID ::= 99
id-TNLA-To-Update-List ProtocolIE-ID ::= 100
id-TNLA-To-Remove-List ProtocolIE-ID ::= 101
id-TNLA-Setup-List ProtocolIE-ID ::= 102
id-TNLA-Failed-To-Setup-List ProtocolIE-ID ::= 103
id-PDUSessionToBeReleased-RelReqAck ProtocolIE-ID ::= 104
id-S-NG-RANnodeMaxIPDataRate ProtocolIE-ID ::= 105
id-PDUSession-List-withDataForwardingRequest ProtocolIE-ID ::= 106
END

2
epan/dissectors/asn1/xnap/XnAP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V15.1.0 (2018-09)
-- 3GPP TS 38.423 V15.2.0 (2018-12)
-- 9.3.8 Container definitions
-- **************************************************************
--

546
epan/dissectors/asn1/xnap/XnAP-IEs.asn
View File

File diff suppressed because it is too large Load Diff

339
epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V15.1.0 (2018-09)
-- 3GPP TS 38.423 V15.2.0 (2018-12)
-- 9.3.4 PDU Definitions
-- **************************************************************
--
@ -24,18 +24,27 @@ IMPORTS
ActivationIDforCellActivation,
ActivationIDforCellActivation,
AMF-Pool-Information,
AMF-Set-Information,
AMF-UE-NGAP-ID,
AS-SecurityInformation,
AssistanceDataForRANPaging,
BitRate,
Cause,
CellAssistanceInfo-NR,
CPTransportLayerInformation,
TNLA-To-Add-List,
TNLA-To-Update-List,
TNLA-To-Remove-List,
TNLA-Setup-List,
TNLA-Failed-To-Setup-List,
CriticalityDiagnostics,
DataforwardingInfoperPDUSession,
XnUAddressInfoperPDUSession-List,
DataTrafficResourceIndication,
DeliveryStatus,
DesiredActNotificationLevel,
DRB-ID,
DRB-List,
DRB-Number,
DRBsSubjectToStatusTransfer-List,
DRBToQoSFlowMapping-List,
E-UTRA-CGI,
@ -85,7 +94,7 @@ IMPORTS
PDUSessionResourceModConfirmInfo-MNterminated,
PDUSessionResourceModRqdInfo-SNterminated,
PDUSessionType,
QoSFlowIndicator,
QoSFlowIdentifier,
QoSFlowNotificationControlIndicationInfo,
QoSFlows-List,
RANPagingArea,
@ -137,14 +146,17 @@ FROM XnAP-Containers
id-ActivatedServedCells,
id-ActivationIDforCellActivation,
id-AMF-Pool-Information,
id-AdditionalDRBIDs,
id-AMF-Set-Information,
id-AssistanceDataForRANPaging,
id-AvailableDRBIDs,
id-Cause,
id-cellAssistanceInfo-NR,
id-ConfigurationUpdateInitiatingNodeChoice,
id-UEContextID,
id-CriticalityDiagnostics,
id-dataforwardingInfoperPDUSession,
id-XnUAddressInfoperPDUSession-List,
id-DesiredActNotificationLevel,
id-DRBsSubjectToStatusTransfer-List,
id-ExpectedUEBehaviour,
id-GlobalNG-RAN-node-ID,
@ -170,8 +182,11 @@ FROM XnAP-Containers
id-PDUSessionResourcesNotAdmitted-List,
id-PDUSessionResourcesNotifyList,
id-PDUSessionToBeAddedAddReq,
id-PDUSessionToBeReleased-RelReqAck,
id-PDUSession-List-withDataForwardingRequest,
id-RANPagingArea,
id-requestedSplitSRB,
id-RequiredNumberOfDRBIDs,
id-ResetRequestTypeInfo,
id-ResetResponseTypeInfo,
id-RespondingNodeTypeConfigUpdateAck,
@ -182,12 +197,19 @@ FROM XnAP-Containers
id-ServedCellsToUpdateInitiatingNodeChoice,
id-servedCellsToUpdate-NR,
id-sourceNG-RANnodeUEXnAPID,
id-SpareDRBIDs,
id-S-NG-RANnodeMaxIPDataRate,
id-S-NG-RANnodeUEXnAPID,
id-TAISupport-list,
id-Target2SourceNG-RANnodeTranspContainer,
id-targetCellGlobalID,
id-targetNG-RANnodeUEXnAPID,
id-TimeToWait,
id-TNLA-To-Add-List,
id-TNLA-To-Update-List,
id-TNLA-To-Remove-List,
id-TNLA-Setup-List,
id-TNLA-Failed-To-Setup-List,
id-TraceActivation,
id-TraceActivation,
id-UEContextInfoHORequest,
@ -206,7 +228,7 @@ FROM XnAP-Containers
id-admittedSplitSRB,
id-RRCConfigIndication,
id-SplitSRB-RRCTransfer,
id-NRUEMeasurementReportRRCTransfer,
id-NRUEReportRRCTransfer,
id-PDUSessionReleasedList-RelConf,
id-BearersSubjectToCounterCheck,
id-PDUSessionReleasedList-RelConf,
@ -233,7 +255,6 @@ FROM XnAP-Containers
id-PDUSessionToBeReleasedSNModRequired,
id-target-S-NG-RANnodeID,
maxnoofBearerConfigs,
maxnoofCellsinNG-RANnode,
maxnoofDRBs,
maxnoofPDUSessions,
@ -474,26 +495,27 @@ RetrieveUEContextFailure-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-newNG-RANnodeUEXnAPID CRITICALITY ignore TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
-- WS modification: define a dedicated type
-- { ID id-OldtoNewNG-RANnodeResumeContainer CRITICALITY ignore TYPE OCTET STRING PRESENCE optional }|
{ ID id-OldtoNewNG-RANnodeResumeContainer CRITICALITY ignore TYPE OldtoNewNG-RANnodeResumeContainer PRESENCE optional }| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
{ ID id-OldtoNewNG-RANnodeResumeContainer CRITICALITY ignore TYPE OldtoNewNG-RANnodeResumeContainer PRESENCE optional }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
-- **************************************************************
--
-- DATA FORWARDING ADDRESS INDICATION
-- XN-U FORWARDING ADDRESS INDICATION
--
-- **************************************************************
DataForwardingAddressIndication ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ DataForwardingAddressIndication-IEs}},
XnUAddressIndication ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ XnUAddressIndication-IEs}},
...
}
DataForwardingAddressIndication-IEs XNAP-PROTOCOL-IES ::= {
XnUAddressIndication-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-newNG-RANnodeUEXnAPID CRITICALITY ignore TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
{ ID id-oldNG-RANnodeUEXnAPID CRITICALITY ignore TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
{ ID id-dataforwardingInfoperPDUSession CRITICALITY reject TYPE DataforwardingInfoperPDUSession PRESENCE mandatory},
{ ID id-XnUAddressInfoperPDUSession-List CRITICALITY reject TYPE XnUAddressInfoperPDUSession-List PRESENCE mandatory},
...
}
@ -502,7 +524,6 @@ DataForwardingAddressIndication-IEs XNAP-PROTOCOL-IES ::= {
-- S-NODE ADDITION REQUEST
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeAdditionRequest ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeAdditionRequest-IEs}},
@ -523,10 +544,15 @@ SNodeAdditionRequest-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-PDUSessionToBeAddedAddReq CRITICALITY reject TYPE PDUSessionToBeAddedAddReq PRESENCE mandatory}|
-- WS modification: define a dedicated type
-- { ID id-MN-to-SN-Container CRITICALITY reject TYPE OCTET STRING PRESENCE mandatory}|
{ ID id-MN-to-SN-Container CRITICALITY reject TYPE MN-to-SN-Container PRESENCE mandatory}| { ID id-S-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE optional }|
{ ID id-MN-to-SN-Container CRITICALITY reject TYPE MN-to-SN-Container PRESENCE mandatory}|
{ ID id-S-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE optional }|
{ ID id-ExpectedUEBehaviour CRITICALITY ignore TYPE ExpectedUEBehaviour PRESENCE optional }|
{ ID id-requestedSplitSRB CRITICALITY reject TYPE SplitSRBsTypes PRESENCE optional }|
{ ID id-PCellID CRITICALITY reject TYPE GlobalNG-RANCell-ID PRESENCE optional },
{ ID id-PCellID CRITICALITY reject TYPE GlobalNG-RANCell-ID PRESENCE optional }|
{ ID id-DesiredActNotificationLevel CRITICALITY ignore TYPE DesiredActNotificationLevel PRESENCE optional }|
{ ID id-AvailableDRBIDs CRITICALITY reject TYPE DRB-List PRESENCE conditional}
-- The IE shall be present if there is at least one PDUSessionResourceSetupInfo-SNterminated included --|
{ ID id-S-NG-RANnodeMaxIPDataRate CRITICALITY reject TYPE BitRate PRESENCE optional },
...
@ -538,7 +564,11 @@ PDUSessionToBeAddedAddReq-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
s-NSSAI S-NSSAI,
sN-PDUSessionAMBR PDUSessionAggregateMaximumBitRate OPTIONAL,
bearerConfigToBeAdded BearerConfigToBeAdded-AddReq,
sn-terminated PDUSessionResourceSetupInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceSetupInfo-MNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Setup Info – SN terminated IE
-- nor the PDU Session Resource Setup Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.1.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionToBeAddedAddReq-Item-ExtIEs} } OPTIONAL,
...
}
@ -547,17 +577,6 @@ PDUSessionToBeAddedAddReq-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfigToBeAdded-AddReq ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfigToBeAdded-AddReq-Item
BearerConfigToBeAdded-AddReq-Item ::= CHOICE {
sn-terminated PDUSessionResourceSetupInfo-SNterminated,
mn-terminated PDUSessionResourceSetupInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigToBeAdded-AddReq-Item-ExtIEs} }
}
BearerConfigToBeAdded-AddReq-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
@ -565,7 +584,6 @@ BearerConfigToBeAdded-AddReq-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
-- S-NODE ADDITION REQUEST ACKNOWLEDGE
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeAdditionRequestAcknowledge ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeAdditionRequestAcknowledge-IEs}},
@ -593,7 +611,11 @@ PDUSessionAdmittedAddedAddReqAck ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF P
PDUSessionAdmittedAddedAddReqAck-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
bearerConfigAdmittedToBeAdded BearerConfigAdmittedToBeAdded-AddReqAck,
sn-terminated PDUSessionResourceSetupResponseInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceSetupResponseInfo-MNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Setup Response Info – SN terminated IE
-- nor the PDU Session Resource Setup Response Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.1.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionAdmittedAddedAddReqAck-Item-ExtIEs} } OPTIONAL,
...
}
@ -602,18 +624,6 @@ PDUSessionAdmittedAddedAddReqAck-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfigAdmittedToBeAdded-AddReqAck ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfigAdmittedToBeAdded-AddReqAck-Item
BearerConfigAdmittedToBeAdded-AddReqAck-Item ::= CHOICE {
sn-terminated PDUSessionResourceSetupResponseInfo-SNterminated,
mn-terminated PDUSessionResourceSetupResponseInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigAdmittedToBeAdded-AddReqAck-Item-ExtIEs} }
}
BearerConfigAdmittedToBeAdded-AddReqAck-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
PDUSessionNotAdmittedAddReqAck ::= SEQUENCE {
pduSessionResourcesNotAdmitted-SNterminated PDUSessionResourcesNotAdmitted-List OPTIONAL,
pduSessionResourcesNotAdmitted-MNterminated PDUSessionResourcesNotAdmitted-List OPTIONAL,
@ -630,7 +640,6 @@ PDUSessionNotAdmittedAddReqAck-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE ADDITION REQUEST REJECT
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeAdditionRequestReject ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeAdditionRequestReject-IEs}},
@ -650,7 +659,6 @@ SNodeAdditionRequestReject-IEs XNAP-PROTOCOL-IES ::= {
-- S-NODE RECONFIGURATION COMPLETE
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeReconfigurationComplete ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeReconfigurationComplete-IEs}},
@ -711,7 +719,6 @@ Configuration-rejected-by-M-NG-RANNode-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE MODIFICATION REQUEST
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeModificationRequest ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeModificationRequest-IEs}},
@ -731,18 +738,22 @@ SNodeModificationRequest-IEs XNAP-PROTOCOL-IES ::= {
-- { ID id-MN-to-SN-Container CRITICALITY ignore TYPE OCTET STRING PRESENCE optional }|
{ ID id-MN-to-SN-Container CRITICALITY ignore TYPE MN-to-SN-Container PRESENCE optional }|
{ ID id-requestedSplitSRB CRITICALITY ignore TYPE SplitSRBsTypes PRESENCE optional }|
{ ID id-requestedSplitSRBrelease CRITICALITY ignore TYPE SplitSRBsTypes PRESENCE optional },
{ ID id-requestedSplitSRBrelease CRITICALITY ignore TYPE SplitSRBsTypes PRESENCE optional }|
{ ID id-DesiredActNotificationLevel CRITICALITY ignore TYPE DesiredActNotificationLevel PRESENCE optional }|
{ ID id-AdditionalDRBIDs CRITICALITY reject TYPE DRB-List PRESENCE optional }|
{ ID id-S-NG-RANnodeMaxIPDataRate CRITICALITY reject TYPE BitRate PRESENCE optional },
...
}
UEContextInfo-SNModRequest ::= SEQUENCE {
ueSecurityCapabilities UESecurityCapabilities OPTIONAL,
s-ng-RANnode-SecurityKey S-NG-RANnode-SecurityKey OPTIONAL,
s-ng-RANnodeUE-AMBR UEAggregateMaximumBitRate OPTIONAL,
indexToRatFrequencySelectionPriority RFSP-Index OPTIONAL,
lowerLayerPresenceStatusChange LowerLayerPresenceStatusChange OPTIONAL,
bearerConfigToBeAdded PDUSessionsToBeAdded-SNModRequest-List OPTIONAL,
bearerConfigToBeModified PDUSessionsToBeModified-SNModRequest-List OPTIONAL,
bearerConfigToBeReleased PDUSessionsToBeReleased-SNModRequest-List OPTIONAL,
pduSessionResourceToBeAdded PDUSessionsToBeAdded-SNModRequest-List OPTIONAL,
pduSessionResourceToBeModified PDUSessionsToBeModified-SNModRequest-List OPTIONAL,
pduSessionResourceToBeReleased PDUSessionsToBeReleased-SNModRequest-List OPTIONAL,
iE-Extension ProtocolExtensionContainer { {UEContextInfo-SNModRequest-ExtIEs} } OPTIONAL,
...
}
@ -757,7 +768,11 @@ PDUSessionsToBeAdded-SNModRequest-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
s-NSSAI S-NSSAI,
sN-PDUSessionAMBR PDUSessionAggregateMaximumBitRate OPTIONAL,
bearerConfigToBeAdded BearerConfigToBeAdded-SNModRequest,
sn-terminated PDUSessionResourceSetupInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceSetupInfo-MNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Setup Info – SN terminated IE
-- nor the PDU Session Resource Setup Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.3.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionsToBeAdded-SNModRequest-Item-ExtIEs} } OPTIONAL,
...
}
@ -766,24 +781,16 @@ PDUSessionsToBeAdded-SNModRequest-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfigToBeAdded-SNModRequest ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfigToBeAdded-SNModRequest-Item
BearerConfigToBeAdded-SNModRequest-Item ::= CHOICE {
sn-terminated PDUSessionResourceSetupInfo-SNterminated,
mn-terminated PDUSessionResourceSetupInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigToBeAdded-SNModRequest-Item-ExtIEs} }
}
BearerConfigToBeAdded-SNModRequest-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
PDUSessionsToBeModified-SNModRequest-List ::= SEQUENCE (SIZE(maxnoofPDUSessions)) OF PDUSessionsToBeModified-SNModRequest-Item
PDUSessionsToBeModified-SNModRequest-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
sN-PDUSessionAMBR PDUSessionAggregateMaximumBitRate OPTIONAL,
bearerConfigToBeModified BearerConfigToBeModified-SNModRequest,
sn-terminated PDUSessionResourceModificationInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceModificationInfo-MNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Modification Info – SN terminated IE
-- nor the PDU Session Resource Modification Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.3.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionsToBeModified-SNModRequest-Item-ExtIEs} } OPTIONAL,
...
}
@ -792,21 +799,8 @@ PDUSessionsToBeModified-SNModRequest-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfigToBeModified-SNModRequest ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfigToBeModified-SNModRequest-Item
BearerConfigToBeModified-SNModRequest-Item ::= CHOICE {
sn-terminated PDUSessionResourceModificationInfo-SNterminated,
mn-terminated PDUSessionResourceModificationInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigToBeModified-SNModRequest-Item-ExtIEs} }
}
BearerConfigToBeModified-SNModRequest-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
PDUSessionsToBeReleased-SNModRequest-List ::= SEQUENCE {
sn-terminated OCTET STRING OPTIONAL, -- This IE needs to be refined
mn-terminated OCTET STRING OPTIONAL, -- This IE needs to be refined
pdu-session-list PDUSession-List-withCause OPTIONAL,
iE-Extension ProtocolExtensionContainer { {PDUSessionsToBeReleased-SNModRequest-List-ExtIEs} } OPTIONAL,
...
}
@ -820,7 +814,6 @@ PDUSessionsToBeReleased-SNModRequest-List-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE MODIFICATION REQUEST ACKNOWLEDGE
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeModificationRequestAcknowledge ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeModificationRequestAcknowledge-IEs}},
@ -855,7 +848,11 @@ PDUSessionAdmitted-SNModResponse-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
PDUSessionAdmittedToBeAddedSNModResponse ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionAdmittedToBeAddedSNModResponse-Item
PDUSessionAdmittedToBeAddedSNModResponse-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
bearerConfigs BearerConfigToBeAdded-SNModResponse-List,
sn-terminated PDUSessionResourceSetupResponseInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceSetupResponseInfo-MNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Setup Response Info – SN terminated IE
-- nor the PDU Session Resource Setup Response Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.3.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionAdmittedToBeAddedSNModResponse-Item-ExtIEs} } OPTIONAL,
...
}
@ -864,22 +861,14 @@ PDUSessionAdmittedToBeAddedSNModResponse-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::=
...
}
BearerConfigToBeAdded-SNModResponse-List ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfigToBeAdded-SNModResponse-Item
BearerConfigToBeAdded-SNModResponse-Item ::= CHOICE {
sn-terminated PDUSessionResourceSetupResponseInfo-SNterminated,
mn-terminated PDUSessionResourceSetupResponseInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigToBeAdded-SNModResponse-Item-ExtIEs} }
}
BearerConfigToBeAdded-SNModResponse-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
PDUSessionAdmittedToBeModifiedSNModResponse::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PDUSessionAdmittedToBeModifiedSNModResponse-Item
PDUSessionAdmittedToBeModifiedSNModResponse-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
bearerConfigs BearerConfigToBeModified-SNModResponse-List,
sn-terminated PDUSessionResourceModificationResponseInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceModificationResponseInfo-MNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Modification Response Info – SN terminated IE
-- nor the PDU Session Resource Modification Response Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.3.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionAdmittedToBeModifiedSNModResponse-Item-ExtIEs} } OPTIONAL,
...
}
@ -888,22 +877,9 @@ PDUSessionAdmittedToBeModifiedSNModResponse-Item-ExtIEs XNAP-PROTOCOL-EXTENSION
...
}
BearerConfigToBeModified-SNModResponse-List ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF
BearerConfigToBeModified-SNModResponse-Item
BearerConfigToBeModified-SNModResponse-Item ::= CHOICE {
sn-terminated PDUSessionResourceModificationResponseInfo-SNterminated,
mn-terminated PDUSessionResourceModificationResponseInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigToBeModified-SNModResponse-Item-ExtIEs} }
}
BearerConfigToBeModified-SNModResponse-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
PDUSessionAdmittedToBeReleasedSNModResponse ::= SEQUENCE {
sn-terminated OCTET STRING OPTIONAL,-- This IE may need to be refined
mn-terminated OCTET STRING OPTIONAL,-- This IE may need to be refined
sn-terminated PDUSession-List-withDataForwardingRequest OPTIONAL,
mn-terminated PDUSession-List-withCause OPTIONAL,
iE-Extension ProtocolExtensionContainer { {PDUSessionAdmittedToBeReleasedSNModResponse-ExtIEs} } OPTIONAL,
...
}
@ -913,8 +889,7 @@ PDUSessionAdmittedToBeReleasedSNModResponse-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
}
PDUSessionNotAdmitted-SNModResponse ::= SEQUENCE {
pduSessionResourcesNotAdmitted-SNterminated PDUSessionResourcesNotAdmitted-List OPTIONAL,
pduSessionResourcesNotAdmitted-MNterminated PDUSessionResourcesNotAdmitted-List OPTIONAL,
pdu-Session-List PDUSession-List OPTIONAL,
iE-Extension ProtocolExtensionContainer { {PDUSessionNotAdmitted-SNModResponse-ExtIEs} } OPTIONAL,
...
}
@ -930,7 +905,6 @@ PDUSessionNotAdmitted-SNModResponse-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE MODIFICATION REQUEST REJECT
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeModificationRequestReject ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeModificationRequestReject-IEs}},
@ -950,7 +924,6 @@ SNodeModificationRequestReject-IEs XNAP-PROTOCOL-IES ::= {
-- S-NODE MODIFICATION REQUIRED
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeModificationRequired ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeModificationRequired-IEs}},
@ -965,15 +938,21 @@ SNodeModificationRequired-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-PDUSessionToBeModifiedSNModRequired CRITICALITY ignore TYPE PDUSessionToBeModifiedSNModRequired PRESENCE optional }|
{ ID id-PDUSessionToBeReleasedSNModRequired CRITICALITY ignore TYPE PDUSessionToBeReleasedSNModRequired PRESENCE optional }|
-- WS modification: define a dedicated type
-- { ID id-SN-to-MN-Container CRITICALITY ignore TYPE OCTET STRING PRESENCE optional },
{ ID id-SN-to-MN-Container CRITICALITY ignore TYPE SN-to-MN-Container PRESENCE optional },
-- { ID id-SN-to-MN-Container CRITICALITY ignore TYPE OCTET STRING PRESENCE optional }|
{ ID id-SN-to-MN-Container CRITICALITY ignore TYPE SN-to-MN-Container PRESENCE optional }|
{ ID id-SpareDRBIDs CRITICALITY ignore TYPE DRB-List PRESENCE optional }|
{ ID id-RequiredNumberOfDRBIDs CRITICALITY ignore TYPE DRB-Number PRESENCE optional },
...
}
PDUSessionToBeModifiedSNModRequired::= SEQUENCE (SIZE (1.. maxnoofPDUSessions)) OF PDUSessionToBeModifiedSNModRequired-Item
PDUSessionToBeModifiedSNModRequired-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
bearerConfigurations BearerConfigToBeModifiedSNModRequired-List,
sn-terminated PDUSessionResourceModRqdInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceModRqdInfo-SNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Modification Required Info – SN terminated IE
-- nor the PDU Session Resource Modification Required Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.4.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionToBeModifiedSNModRequired-Item-ExtIEs} } OPTIONAL,
...
}
@ -982,19 +961,6 @@ PDUSessionToBeModifiedSNModRequired-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfigToBeModifiedSNModRequired-List::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF
BearerConfigToBeModifiedSNModRequired-Item
BearerConfigToBeModifiedSNModRequired-Item ::= CHOICE {
sn-terminated PDUSessionResourceModRqdInfo-SNterminated,
mn-terminated PDUSessionResourceModRqdInfo-SNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigToBeModifiedSNModRequired-Item-ExtIEs} }
}
BearerConfigToBeModifiedSNModRequired-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
PDUSessionToBeReleasedSNModRequired ::= SEQUENCE {
sn-terminated PDUSession-List-withDataForwardingRequest OPTIONAL,
mn-terminated PDUSession-List-withCause OPTIONAL,
@ -1011,7 +977,6 @@ PDUSessionToBeReleasedSNModRequired-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE MODIFICATION CONFIRM
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeModificationConfirm ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeModificationConfirm-IEs}},
@ -1025,7 +990,9 @@ SNodeModificationConfirm-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-PDUSessionReleasedSNModConfirm CRITICALITY ignore TYPE PDUSessionReleasedSNModConfirm PRESENCE optional }|
-- WS modification: define a dedicated type
-- { ID id-MN-to-SN-Container CRITICALITY ignore TYPE OCTET STRING PRESENCE optional }|
{ ID id-MN-to-SN-Container CRITICALITY ignore TYPE MN-to-SN-Container PRESENCE optional }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ ID id-MN-to-SN-Container CRITICALITY ignore TYPE MN-to-SN-Container PRESENCE optional }|
{ ID id-AdditionalDRBIDs CRITICALITY reject TYPE DRB-List PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@ -1033,7 +1000,11 @@ PDUSessionAdmittedModSNModConfirm ::= SEQUENCE (SIZE(maxnoofPDUSessions)) OF PDU
PDUSessionAdmittedModSNModConfirm-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
bearerConfigurations BearerConfigAdmittedModSNModConfirm,
sn-terminated PDUSessionResourceModConfirmInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceModConfirmInfo-MNterminated OPTIONAL,
-- NOTE: If neither the PDU Session Resource Modification Confirm Info – SN terminated IE
-- nor the PDU Session Resource Modification Confirm Info – MN terminated IE is present,
-- abnormal conditions as specified in clause 8.3.4.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSessionAdmittedModSNModConfirm-Item-ExtIEs} } OPTIONAL,
...
}
@ -1042,19 +1013,6 @@ PDUSessionAdmittedModSNModConfirm-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfigAdmittedModSNModConfirm ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfigAdmittedModSNModConfirm-Item
BearerConfigAdmittedModSNModConfirm-Item ::= CHOICE {
sn-terminated PDUSessionResourceModConfirmInfo-SNterminated,
mn-terminated PDUSessionResourceModConfirmInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { {BearerConfigAdmittedModSNModConfirm-Item-Item-ExtIEs} }
}
BearerConfigAdmittedModSNModConfirm-Item-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
PDUSessionReleasedSNModConfirm ::= SEQUENCE {
sn-terminated PDUSession-List-withDataForwardingFromTarget OPTIONAL,
@ -1073,7 +1031,6 @@ PDUSessionAdmittedToBeReleasedSNModConfirm-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE MODIFICATION REFUSE
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeModificationRefuse ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeModificationRefuse-IEs}},
@ -1086,7 +1043,8 @@ SNodeModificationRefuse-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
-- WS modification: define a dedicated type
-- { ID id-MN-to-SN-Container CRITICALITY ignore TYPE OCTET STRING PRESENCE optional }|
{ ID id-MN-to-SN-Container CRITICALITY ignore TYPE MN-to-SN-Container PRESENCE optional }| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ ID id-MN-to-SN-Container CRITICALITY ignore TYPE MN-to-SN-Container PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@ -1095,28 +1053,22 @@ SNodeModificationRefuse-IEs XNAP-PROTOCOL-IES ::= {
-- S-NODE RELEASE REQUEST
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeReleaseRequest ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeReleaseRequest-IEs}},
...
}
-- WS modification: define a dedicated type
PDUSessionToBeReleased-RelReq ::= OCTET STRING
SNodeReleaseRequest-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-M-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
{ ID id-S-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE optional }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
-- WS modification: define a dedicated type
{ ID id-PDUSessionToBeReleased-RelReq CRITICALITY ignore TYPE OCTET STRING PRESENCE mandatory}|
-- { ID id-PDUSessionToBeReleased-RelReq CRITICALITY ignore TYPE PDUSessionToBeReleased-RelReq PRESENCE mandatory}|
-- Editor's Note: This IE needs to be refined --
{ ID id-PDUSessionToBeReleased-RelReq CRITICALITY ignore TYPE PDUSession-List-withCause PRESENCE mandatory}|
{ ID id-UEContextKeptIndicator CRITICALITY ignore TYPE UEContextKeptIndicator PRESENCE optional }|
-- WS modification: define a dedicated type
-- { ID id-MN-to-SN-Container CRITICALITY ignore TYPE OCTET STRING PRESENCE optional },
{ ID id-MN-to-SN-Container CRITICALITY ignore TYPE MN-to-SN-Container PRESENCE optional }, ...
{ ID id-MN-to-SN-Container CRITICALITY ignore TYPE MN-to-SN-Container PRESENCE optional },
...
}
-- **************************************************************
@ -1124,7 +1076,6 @@ SNodeReleaseRequest-IEs XNAP-PROTOCOL-IES ::= {
-- S-NODE RELEASE REQUEST ACKNOWLEDGE
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeReleaseRequestAcknowledge ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeReleaseRequestAcknowledge-IEs}},
@ -1134,16 +1085,27 @@ SNodeReleaseRequestAcknowledge ::= SEQUENCE {
SNodeReleaseRequestAcknowledge-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-M-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
{ ID id-S-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE optional }|
{ ID id-PDUSession-List-withDataForwardingRequest CRITICALITY ignore TYPE PDUSession-List-withDataForwardingRequest PRESENCE optional }|
{ ID id-PDUSessionToBeReleased-RelReqAck CRITICALITY ignore TYPE PDUSessionToBeReleasedList-RelReqAck PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
PDUSessionToBeReleasedList-RelReqAck ::= SEQUENCE {
pduSessionsToBeReleasedList-SNterminated PDUSession-List-withDataForwardingFromTarget OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {PDUSessionToBeReleasedList-RelReqAck-ExtIEs} } OPTIONAL,
...
}
PDUSessionToBeReleasedList-RelReqAck-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
-- **************************************************************
--
-- S-NODE RELEASE REJECT
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeReleaseReject ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeReleaseReject-IEs}},
@ -1163,7 +1125,6 @@ SNodeReleaseReject-IEs XNAP-PROTOCOL-IES ::= {
-- S-NODE RELEASE REQUIRED
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeReleaseRequired ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeReleaseRequired-IEs}},
@ -1194,7 +1155,6 @@ PDUSessionToBeReleasedList-RelRqd-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE RELEASE CONFIRM
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeReleaseConfirm ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeReleaseConfirm-IEs}},
@ -1226,8 +1186,6 @@ PDUSessionReleasedList-RelConf-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeCounterCheckRequest ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeCounterCheckRequest-IEs}},
...
@ -1260,7 +1218,6 @@ BearersSubjectToCounterCheck-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-- S-NODE CHANGE REQUIRED
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeChangeRequired ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeChangeRequired-IEs}},
@ -1283,7 +1240,10 @@ PDUSession-SNChangeRequired-List ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF P
PDUSession-SNChangeRequired-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
bearerConfigToBeAdded BearerConfigToBeAdded-ChangeRqd,
sn-terminated PDUSessionResourceChangeRequiredInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceChangeRequiredInfo-MNterminated OPTIONAL,
-- NOTE: If the PDU Session Resource Change Required Info – SN terminated IE is not present,
-- abnormal conditions as specified in clause 8.3.5.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSession-SNChangeRequired-Item-ExtIEs} } OPTIONAL,
...
}
@ -1292,25 +1252,12 @@ PDUSession-SNChangeRequired-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfigToBeAdded-ChangeRqd ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfigToBeAdded-ChangeRqd-Item
BearerConfigToBeAdded-ChangeRqd-Item ::= CHOICE {
sn-terminated PDUSessionResourceChangeRequiredInfo-SNterminated,
mn-terminated PDUSessionResourceChangeRequiredInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { { BearerConfigToBeAdded-ChangeRqd-Item-ExtIEs} }
}
BearerConfigToBeAdded-ChangeRqd-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- S-NODE CHANGE CONFIRM
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
SNodeChangeConfirm ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeChangeConfirm-IEs}},
@ -1328,7 +1275,10 @@ PDUSession-SNChangeConfirm-List ::= SEQUENCE (SIZE(1..maxnoofPDUSessions)) OF PD
PDUSession-SNChangeConfirm-Item ::= SEQUENCE {
pduSessionId PDUSession-ID,
bearerConfigToBeAdded BearerConfig-ChangeConfirm,
sn-terminated PDUSessionResourceChangeConfirmInfo-SNterminated OPTIONAL,
mn-terminated PDUSessionResourceChangeConfirmInfo-MNterminated OPTIONAL,
-- NOTE: If the PDU Session Resource Change Confirm Info – SN terminated IE is not present,
-- abnormal conditions as specified in clause 8.3.5.4 apply.
iE-Extension ProtocolExtensionContainer { {PDUSession-SNChangeConfirm-Item-ExtIEs} } OPTIONAL,
...
}
@ -1337,26 +1287,12 @@ PDUSession-SNChangeConfirm-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
BearerConfig-ChangeConfirm ::= SEQUENCE (SIZE(1..maxnoofBearerConfigs)) OF BearerConfig-ChangeConfirm-Item
BearerConfig-ChangeConfirm-Item ::= CHOICE {
sn-terminated PDUSessionResourceChangeConfirmInfo-SNterminated,
mn-terminated PDUSessionResourceChangeConfirmInfo-MNterminated,
choice-extension ProtocolIE-Single-Container { { BearerConfig-ChangeConfirm-Item-ExtIEs} }
}
BearerConfig-ChangeConfirm-Item-ExtIEs XNAP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- S-NODE CHANGE REFUSE
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
-- ASN.1 for this message is FFS.
SNodeChangeRefuse ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ SNodeChangeRefuse-IEs}},
@ -1376,7 +1312,6 @@ SNodeChangeRefuse-IEs XNAP-PROTOCOL-IES ::= {
-- RRC TRANSFER
--
-- **************************************************************
-- Editor’s Note: Dual Connectivity is not complete and is targeted for completion in December 2018.
RRCTransfer ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ RRCTransfer-IEs}},
@ -1387,7 +1322,7 @@ RRCTransfer-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-M-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
{ ID id-S-NG-RANnodeUEXnAPID CRITICALITY reject TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
{ ID id-SplitSRB-RRCTransfer CRITICALITY reject TYPE SplitSRB-RRCTransfer PRESENCE optional }|
{ ID id-NRUEMeasurementReportRRCTransfer CRITICALITY reject TYPE NRUEMeasurementReportRRCTransfer PRESENCE optional },
{ ID id-NRUEReportRRCTransfer CRITICALITY reject TYPE NRUEReportRRCTransfer PRESENCE optional },
...
}
@ -1403,13 +1338,13 @@ SplitSRB-RRCTransfer-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
NRUEMeasurementReportRRCTransfer::= SEQUENCE {
NRUEReportRRCTransfer::= SEQUENCE {
rrcContainer OCTET STRING,
iE-Extensions ProtocolExtensionContainer { {NRUEMeasurementReportRRCTransfer-ExtIEs} } OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {NRUEReportRRCTransfer-ExtIEs} } OPTIONAL,
...
}
NRUEMeasurementReportRRCTransfer-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
NRUEReportRRCTransfer-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
@ -1481,7 +1416,7 @@ PDUSessionResourcesActivityNotify-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
QoSFlowsActivityNotifyList ::= SEQUENCE (SIZE(1..maxnoofQoSFlows)) OF QoSFlowsActivityNotifyItem
QoSFlowsActivityNotifyItem ::= SEQUENCE {
qosFlowIndicator QoSFlowIndicator,
qosFlowIdentifier QoSFlowIdentifier,
pduSessionLevelUPactivityreport UserPlaneTrafficActivityReport,
iE-Extensions ProtocolExtensionContainer { {QoSFlowsActivityNotifyItem-ExtIEs} } OPTIONAL,
...
@ -1505,7 +1440,7 @@ XnSetupRequest ::= SEQUENCE {
XnSetupRequest-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-GlobalNG-RAN-node-ID CRITICALITY reject TYPE GlobalNG-RANNode-ID PRESENCE mandatory}|
{ ID id-TAISupport-list CRITICALITY reject TYPE TAISupport-List PRESENCE optional }|
{ ID id-AMF-Pool-Information CRITICALITY reject TYPE AMF-Pool-Information PRESENCE mandatory}|
{ ID id-AMF-Set-Information CRITICALITY reject TYPE AMF-Set-Information PRESENCE mandatory}|
{ ID id-List-of-served-cells-NR CRITICALITY reject TYPE ServedCells-NR PRESENCE optional }|
{ ID id-List-of-served-cells-E-UTRA CRITICALITY reject TYPE ServedCells-E-UTRA PRESENCE optional },
...
@ -1562,7 +1497,11 @@ NGRANNodeConfigurationUpdate ::= SEQUENCE {
NGRANNodeConfigurationUpdate-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-TAISupport-list CRITICALITY reject TYPE TAISupport-List PRESENCE optional }|
{ ID id-ConfigurationUpdateInitiatingNodeChoice CRITICALITY ignore TYPE ConfigurationUpdateInitiatingNodeChoice PRESENCE mandatory},
{ ID id-ConfigurationUpdateInitiatingNodeChoice CRITICALITY ignore TYPE ConfigurationUpdateInitiatingNodeChoice PRESENCE mandatory}|
{ ID id-TNLA-To-Add-List CRITICALITY ignore TYPE TNLA-To-Add-List PRESENCE optional }|
{ ID id-TNLA-To-Remove-List CRITICALITY ignore TYPE TNLA-To-Remove-List PRESENCE optional }|
{ ID id-TNLA-To-Update-List CRITICALITY ignore TYPE TNLA-To-Update-List PRESENCE optional }|
{ ID id-GlobalNG-RAN-node-ID CRITICALITY reject TYPE GlobalNG-RANNode-ID PRESENCE optional },
...
}
@ -1604,6 +1543,8 @@ NGRANNodeConfigurationUpdateAcknowledge ::= SEQUENCE {
NGRANNodeConfigurationUpdateAcknowledge-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-RespondingNodeTypeConfigUpdateAck CRITICALITY ignore TYPE RespondingNodeTypeConfigUpdateAck PRESENCE mandatory}|
{ ID id-TNLA-Setup-List CRITICALITY ignore TYPE TNLA-Setup-List PRESENCE optional }|
{ ID id-TNLA-Failed-To-Setup-List CRITICALITY ignore TYPE TNLA-Failed-To-Setup-List PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}

16
epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V15.1.0 (2018-09)
-- 3GPP TS 38.423 V15.2.0 (2018-12)
-- 9.3.3 Elementary Procedure Definitions
-- **************************************************************
--
@ -37,7 +37,7 @@ FROM XnAP-CommonDataTypes
RetrieveUEContextRequest,
RetrieveUEContextResponse,
RetrieveUEContextFailure,
DataForwardingAddressIndication,
XnUAddressIndication,
SNodeAdditionRequest,
SNodeAdditionRequestAcknowledge,
SNodeAdditionRequestReject,
@ -86,7 +86,7 @@ FROM XnAP-PDU-Contents
id-notificationControl,
id-retrieveUEContext,
id-rANPaging,
id-dataForwardingAddressIndication,
id-xnUAddressIndication,
id-uEContextRelease,
id-sNGRANnodeAdditionPreparation,
id-sNGRANnodeReconfigurationCompletion,
@ -195,7 +195,7 @@ XNAP-ELEMENTARY-PROCEDURES-CLASS-2 XNAP-ELEMENTARY-PROCEDURE ::= {
sNStatusTransfer |
handoverCancel |
rANPaging |
dataForwardingAddressIndication |
xnUAddressIndication |
uEContextRelease |
sNGRANnodeReconfigurationCompletion |
sNGRANnodeCounterCheck |
@ -253,9 +253,9 @@ rANPaging XNAP-ELEMENTARY-PROCEDURE ::= {
}
dataForwardingAddressIndication XNAP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE DataForwardingAddressIndication
PROCEDURE CODE id-dataForwardingAddressIndication
xnUAddressIndication XNAP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE XnUAddressIndication
PROCEDURE CODE id-xnUAddressIndication
CRITICALITY reject
}
@ -337,7 +337,7 @@ sNGRANnodeChange XNAP-ELEMENTARY-PROCEDURE ::= {
rRCTransfer XNAP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE RRCTransfer
PROCEDURE CODE id-rRCTransfer
CRITICALITY ignore
CRITICALITY reject
}

13
epan/dissectors/asn1/xnap/packet-xnap-template.c
View File

@ -1,7 +1,7 @@
/* packet-xnap.c
* Routines for dissecting NG-RAN Xn application protocol (XnAP)
* 3GPP TS 38.423 packet dissection
* Copyright 2018, Pascal Quantin <pascal.quantin@gmail.com>
* Copyright 2018-2019, Pascal Quantin <pascal.quantin@gmail.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -10,7 +10,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref:
* 3GPP TS 38.423 V15.1.0 (2018-09)
* 3GPP TS 38.423 V15.2.0 (2018-12)
*/
#include "config.h"
@ -26,6 +26,9 @@
#include "packet-lte-rrc.h"
#include "packet-nr-rrc.h"
#include "packet-e212.h"
#include "packet-ngap.h"
#include "packet-s1ap.h"
#include "packet-ranap.h"
#ifdef _MSC_VER
/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
@ -63,6 +66,9 @@ static gint ett_xnap_e_utra_IntegrityProtectionAlgorithms = -1;
static gint ett_xnap_ng_ran_TraceID = -1;
static gint ett_xnap_interfaces_to_trace = -1;
static gint ett_xnap_LastVisitedEUTRANCellInformation = -1;
static gint ett_xnap_LastVisitedNGRANCellInformation = -1;
static gint ett_xnap_LastVisitedUTRANCellInformation = -1;
static gint ett_xnap_LastVisitedGERANCellInformation = -1;
#include "packet-xnap-ett.c"
enum {
@ -269,6 +275,9 @@ void proto_register_xnap(void) {
&ett_xnap_ng_ran_TraceID,
&ett_xnap_interfaces_to_trace,
&ett_xnap_LastVisitedEUTRANCellInformation,
&ett_xnap_LastVisitedNGRANCellInformation,
&ett_xnap_LastVisitedUTRANCellInformation,
&ett_xnap_LastVisitedGERANCellInformation,
#include "packet-xnap-ettarr.c"
};

122
epan/dissectors/asn1/xnap/xnap.cnf
View File

@ -1,6 +1,6 @@
# xnap.cnf
# xnap conformation file
# Copyright 2018 Pascal Quantin
# Copyright 2018-2019 Pascal Quantin
#.OPT
PER
@ -13,6 +13,8 @@ ProtocolIE-ID
ProcedureCode
#.USE_VALS_EXT
CauseRadioNetworkLayer
NRNRB
ProcedureCode
ProtocolIE-ID
@ -38,6 +40,9 @@ SuccessfulOutcome/value successfulOutcome_value
PrivateIE-Field/value privateIE_Field_value
#.OMIT_ASSIGNMENT
DataForwardingAccepted
DRBsToBeModified-List-ModRqd-MNterminated
DRBsToBeModified-List-ModRqd-MNterminated-Item
PDUSessionResourceModRqdInfo-MNterminated
Presence
ProtocolIE-FieldPair
@ -218,26 +223,6 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS =
}
}
#.FN_BODY NRUEMeasurementReportRRCTransfer/rrcContainer VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if (parameter_tvb) {
proto_tree *subtree;
GlobalNG_RANNode_ID_enum source_ranmode_id = xnap_get_ranmode_id(&actx->pinfo->dst, actx->pinfo->destport, actx->pinfo);
subtree = proto_item_add_subtree(actx->created_item, ett_nxap_container);
if ((xnap_dissect_target_ng_ran_container_as == XNAP_NG_RAN_CONTAINER_AUTOMATIC &&
source_ranmode_id == GlobalNG_RANNode_ID_gNB) ||
(xnap_dissect_target_ng_ran_container_as == XNAP_NG_RAN_CONTAINER_GNB)) {
dissect_nr_rrc_MeasurementReport_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
} else if ((xnap_dissect_target_ng_ran_container_as == XNAP_NG_RAN_CONTAINER_AUTOMATIC &&
source_ranmode_id == GlobalNG_RANNode_ID_ng_eNB) ||
(xnap_dissect_target_ng_ran_container_as == XNAP_NG_RAN_CONTAINER_NG_ENB)) {
dissect_lte_rrc_MeasurementReport_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
}
#.FN_BODY UEContextInfoRetrUECtxtResp/rrc-Context VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
@ -313,6 +298,14 @@ NG-RAN-Cell-Identity/e-utra ABBREV=E-UTRA-Cell-Identity TYPE=FT_UINT32 DISPLAY=B
dissect_nr_rrc_MeasurementTimingConfiguration_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY NeighbourInformation-NR-Item/measurementTimingConfiguration VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_measurementTimingConfiguration);
dissect_nr_rrc_MeasurementTimingConfiguration_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.TYPE_ATTR
BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
@ -447,15 +440,51 @@ MaximumDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_byte_byt
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN);
}
#.FN_BODY LastVisitedNGRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_xnap_LastVisitedNGRANCellInformation);
dissect_ngap_LastVisitedNGRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY LastVisitedEUTRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_xnap_LastVisitedEUTRANCellInformation);
dissect_lte_rrc_VisitedCellInfo_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
dissect_s1ap_LastVisitedEUTRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY LastVisitedUTRANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_xnap_LastVisitedUTRANCellInformation);
dissect_ranap_LastVisitedUTRANCell_Item_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY LastVisitedGERANCellInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_xnap_LastVisitedGERANCellInformation);
dissect_s1ap_LastVisitedGERANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.TYPE_ATTR
ExpectedUEMovingTrajectoryItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
ExpectedActivityPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
ExpectedIdlePeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.END
#.FN_HDR HandoverRequest
@ -476,8 +505,8 @@ MaximumDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_byte_byt
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextFailure");
#.FN_HDR RANPaging
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANPaging");
#.FN_HDR DataForwardingAddressIndication
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DataForwardingAddressIndication");
#.FN_HDR XnUAddressIndication
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnUAddressIndication");
#.FN_HDR UEContextRelease
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextRelease");
#.FN_HDR SNodeAdditionRequest
@ -568,7 +597,7 @@ id-sNStatusTransfer ProcedureCode
id-handoverCancel ProcedureCode
id-retrieveUEContext ProcedureCode
id-rANPaging ProcedureCode
id-dataForwardingAddressIndication ProcedureCode
id-xnUAddressIndication ProcedureCode
id-uEContextRelease ProcedureCode
id-sNGRANnodeAdditionPreparation ProcedureCode
id-sNGRANnodeReconfigurationCompletion ProcedureCode
@ -596,14 +625,14 @@ id-ActivatedServedCells ProtocolIE-ID
id-ActivationIDforCellActivation ProtocolIE-ID
id-admittedSplitSRB ProtocolIE-ID
id-admittedSplitSRBrelease ProtocolIE-ID
id-AMF-Pool-Information ProtocolIE-ID
id-AMF-Set-Information ProtocolIE-ID
id-AssistanceDataForRANPaging ProtocolIE-ID
id-BearersSubjectToCounterCheck ProtocolIE-ID
id-Cause ProtocolIE-ID
id-cellAssistanceInfo-NR ProtocolIE-ID
id-ConfigurationUpdateInitiatingNodeChoice ProtocolIE-ID
id-CriticalityDiagnostics ProtocolIE-ID
id-dataforwardingInfoperPDUSession ProtocolIE-ID
id-XnUAddressInfoperPDUSession-List ProtocolIE-ID
id-DRBsSubjectToStatusTransfer-List ProtocolIE-ID
id-ExpectedUEBehaviour ProtocolIE-ID
id-GlobalNG-RAN-node-ID ProtocolIE-ID
@ -620,7 +649,7 @@ id-MN-to-SN-Container ProtocolIE-ID
id-MobilityRestrictionList ProtocolIE-ID
id-new-NG-RAN-Cell-Identity ProtocolIE-ID
id-newNG-RANnodeUEXnAPID ProtocolIE-ID
id-NRUEMeasurementReportRRCTransfer ProtocolIE-ID
id-NRUEReportRRCTransfer ProtocolIE-ID
id-oldNG-RANnodeUEXnAPID ProtocolIE-ID
id-OldtoNewNG-RANnodeResumeContainer ProtocolIE-ID
id-PagingDRX ProtocolIE-ID
@ -686,6 +715,20 @@ id-UERANPagingIdentity ProtocolIE-ID
id-UESecurityCapabilities ProtocolIE-ID
id-UserPlaneTrafficActivityReport ProtocolIE-ID
id-XnRemovalThreshold ProtocolIE-ID
id-DesiredActNotificationLevel ProtocolIE-ID
id-AvailableDRBIDs ProtocolIE-ID
id-AdditionalDRBIDs ProtocolIE-ID
id-SpareDRBIDs ProtocolIE-ID
id-RequiredNumberOfDRBIDs ProtocolIE-ID
id-TNLA-To-Add-List ProtocolIE-ID
id-TNLA-To-Update-List ProtocolIE-ID
id-TNLA-To-Remove-List ProtocolIE-ID
id-TNLA-Setup-List ProtocolIE-ID
id-TNLA-Failed-To-Setup-List ProtocolIE-ID
id-PDUSessionToBeReleased-RelReqAck ProtocolIE-ID
id-S-NG-RANnodeMaxIPDataRate ProtocolIE-ID
id-PDUSession-List-withDataForwardingRequest ProtocolIE-ID
#.REGISTER
#XNAP-PROTOCOL-IES
@ -693,14 +736,14 @@ ActivatedServedCells N xnap.ies id-ActivatedServedC
ActivationIDforCellActivation N xnap.ies id-ActivationIDforCellActivation
SplitSRBsTypes N xnap.ies id-admittedSplitSRB
SplitSRBsTypes N xnap.ies id-admittedSplitSRBrelease
AMF-Pool-Information N xnap.ies id-AMF-Pool-Information
AMF-Set-Information N xnap.ies id-AMF-Set-Information
AssistanceDataForRANPaging N xnap.ies id-AssistanceDataForRANPaging
BearersSubjectToCounterCheck-List N xnap.ies id-BearersSubjectToCounterCheck
Cause N xnap.ies id-Cause
CellAssistanceInfo-NR N xnap.ies id-cellAssistanceInfo-NR
ConfigurationUpdateInitiatingNodeChoice N xnap.ies id-ConfigurationUpdateInitiatingNodeChoice
CriticalityDiagnostics N xnap.ies id-CriticalityDiagnostics
DataforwardingInfoperPDUSession N xnap.ies id-dataforwardingInfoperPDUSession
XnUAddressInfoperPDUSession-List N xnap.ies id-XnUAddressInfoperPDUSession-List
DRBsSubjectToStatusTransfer-List N xnap.ies id-DRBsSubjectToStatusTransfer-List
ExpectedUEBehaviour N xnap.ies id-ExpectedUEBehaviour
GlobalNG-RANNode-ID N xnap.ies id-GlobalNG-RAN-node-ID
@ -717,7 +760,7 @@ MN-to-SN-Container N xnap.ies id-MN-to-SN-Contain
MobilityRestrictionList N xnap.ies id-MobilityRestrictionList
NG-RAN-Cell-Identity N xnap.ies id-new-NG-RAN-Cell-Identity
NG-RANnodeUEXnAPID N xnap.ies id-newNG-RANnodeUEXnAPID
NRUEMeasurementReportRRCTransfer N xnap.ies id-NRUEMeasurementReportRRCTransfer
NRUEReportRRCTransfer N xnap.ies id-NRUEReportRRCTransfer
NG-RANnodeUEXnAPID N xnap.ies id-oldNG-RANnodeUEXnAPID
OldtoNewNG-RANnodeResumeContainer N xnap.ies id-OldtoNewNG-RANnodeResumeContainer
PagingDRX N xnap.ies id-PagingDRX
@ -739,7 +782,7 @@ PDUSession-SNChangeRequired-List N xnap.ies id-PDUSession-SNCha
PDUSessionToBeAddedAddReq N xnap.ies id-PDUSessionToBeAddedAddReq
PDUSessionToBeModifiedSNModRequired N xnap.ies id-PDUSessionToBeModifiedSNModRequired
PDUSessionToBeReleasedList-RelRqd N xnap.ies id-PDUSessionToBeReleasedList-RelRqd
PDUSessionToBeReleased-RelReq N xnap.ies id-PDUSessionToBeReleased-RelReq
PDUSession-List-withCause N xnap.ies id-PDUSessionToBeReleased-RelReq
PDUSessionToBeReleasedSNModRequired N xnap.ies id-PDUSessionToBeReleasedSNModRequired
RANPagingArea N xnap.ies id-RANPagingArea
PagingPriority N xnap.ies id-PagingPriority
@ -783,6 +826,19 @@ UERANPagingIdentity N xnap.ies id-UERANPagingIdent
UESecurityCapabilities N xnap.ies id-UESecurityCapabilities
UserPlaneTrafficActivityReport N xnap.ies id-UserPlaneTrafficActivityReport
XnBenefitValue N xnap.ies id-XnRemovalThreshold
DesiredActNotificationLevel N xnap.ies id-DesiredActNotificationLevel
DRB-List N xnap.ies id-AvailableDRBIDs
DRB-List N xnap.ies id-AdditionalDRBIDs
DRB-List N xnap.ies id-SpareDRBIDs
DRB-Number N xnap.ies id-RequiredNumberOfDRBIDs
TNLA-To-Add-List N xnap.ies id-TNLA-To-Add-List
TNLA-To-Update-List N xnap.ies id-TNLA-To-Update-List
TNLA-To-Remove-List N xnap.ies id-TNLA-To-Remove-List
TNLA-Setup-List N xnap.ies id-TNLA-Setup-List
TNLA-Failed-To-Setup-List N xnap.ies id-TNLA-Failed-To-Setup-List
PDUSessionToBeReleasedList-RelReqAck N xnap.ies id-PDUSessionToBeReleased-RelReqAck
BitRate N xnap.ies id-S-NG-RANnodeMaxIPDataRate
PDUSession-List-withDataForwardingRequest N xnap.ies id-PDUSession-List-withDataForwardingRequest
#XNAP-PROTOCOL-EXTENSION
@ -801,7 +857,7 @@ RetrieveUEContextFailure N xnap.proc.uout id-retrieveUEContext
RANPaging N xnap.proc.imsg id-rANPaging
DataForwardingAddressIndication N xnap.proc.imsg id-dataForwardingAddressIndication
XnUAddressIndication N xnap.proc.imsg id-xnUAddressIndication
UEContextRelease N xnap.proc.imsg id-uEContextRelease

13
epan/dissectors/packet-lte-rrc.c
View File

@ -319,7 +319,6 @@ static int hf_lte_rrc_DL_DCCH_Message_PDU = -1; /* DL_DCCH_Message */
static int hf_lte_rrc_UL_CCCH_Message_PDU = -1; /* UL_CCCH_Message */
static int hf_lte_rrc_UL_DCCH_Message_PDU = -1; /* UL_DCCH_Message */
static int hf_lte_rrc_SC_MCCH_Message_r13_PDU = -1; /* SC_MCCH_Message_r13 */
static int hf_lte_rrc_lte_rrc_MeasurementReport_PDU = -1; /* MeasurementReport */
static int hf_lte_rrc_RRCConnectionReconfiguration_PDU = -1; /* RRCConnectionReconfiguration */
static int hf_lte_rrc_lte_rrc_RRCConnectionReconfigurationComplete_PDU = -1; /* RRCConnectionReconfigurationComplete */
static int hf_lte_rrc_UECapabilityInformation_PDU = -1; /* UECapabilityInformation */
@ -107519,14 +107518,6 @@ static int dissect_SC_MCCH_Message_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
offset += 7; offset >>= 3;
return offset;
}
int dissect_lte_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_lte_rrc_MeasurementReport(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_MeasurementReport_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_RRCConnectionReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -108376,10 +108367,6 @@ void proto_register_lte_rrc(void) {
{ "SC-MCCH-Message-r13", "lte-rrc.SC_MCCH_Message_r13_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_lte_rrc_MeasurementReport_PDU,
{ "MeasurementReport", "lte-rrc.MeasurementReport_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_RRCConnectionReconfiguration_PDU,
{ "RRCConnectionReconfiguration", "lte-rrc.RRCConnectionReconfiguration_element",
FT_NONE, BASE_NONE, NULL, 0,

1
epan/dissectors/packet-lte-rrc.h
View File

@ -29,7 +29,6 @@ int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet
int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RRCConnectionReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

294
epan/dissectors/packet-ngap.c
View File

File diff suppressed because it is too large Load Diff

1
epan/dissectors/packet-ngap.h
View File

@ -22,6 +22,7 @@
/*--- Included file: packet-ngap-exp.h ---*/
#line 1 "./asn1/ngap/packet-ngap-exp.h"
int dissect_ngap_LastVisitedNGRANCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_ngap_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_ngap_TargetNGRANNode_ToSourceNGRANNode_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

13
epan/dissectors/packet-nr-rrc.c
View File

@ -262,7 +262,6 @@ static int hf_nr_rrc_UL_CCCH_Message_PDU = -1; /* UL_CCCH_Message */
static int hf_nr_rrc_UL_CCCH1_Message_PDU = -1; /* UL_CCCH1_Message */
static int hf_nr_rrc_nr_rrc_UL_DCCH_Message_PDU = -1; /* UL_DCCH_Message */
static int hf_nr_rrc_nr_rrc_MIB_PDU = -1; /* MIB */
static int hf_nr_rrc_nr_rrc_MeasurementReport_PDU = -1; /* MeasurementReport */
static int hf_nr_rrc_nr_rrc_RRCReconfiguration_PDU = -1; /* RRCReconfiguration */
static int hf_nr_rrc_nr_rrc_RRCReconfigurationComplete_PDU = -1; /* RRCReconfigurationComplete */
static int hf_nr_rrc_nr_rrc_SIB1_PDU = -1; /* SIB1 */
@ -37577,14 +37576,6 @@ int dissect_nr_rrc_MIB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_nr_rrc_MeasurementReport(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_MeasurementReport_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -37875,10 +37866,6 @@ proto_register_nr_rrc(void) {
{ "MIB", "nr-rrc.MIB_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_MeasurementReport_PDU,
{ "MeasurementReport", "nr-rrc.MeasurementReport_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_RRCReconfiguration_PDU,
{ "RRCReconfiguration", "nr-rrc.RRCReconfiguration_element",
FT_NONE, BASE_NONE, NULL, 0,

1
epan/dissectors/packet-nr-rrc.h
View File

@ -30,7 +30,6 @@ int dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pin
int dissect_nr_rrc_MeasurementTimingConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MIB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RRCReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

395
epan/dissectors/packet-s1ap.c
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-s1ap.h
View File

@ -47,6 +47,8 @@ int dissect_s1ap_SONtransferRequestContainer(tvbuff_t *tvb _U_, int offset _U_,
int dissect_s1ap_SONtransferResponseContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_s1ap_Global_ENB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_ENB_StatusTransfer_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_LastVisitedEUTRANCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_LastVisitedGERANCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_SourceeNB_ToTargeteNB_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_TargeteNB_ToSourceeNB_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_UE_HistoryInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

224
epan/dissectors/packet-x2ap.c
View File

@ -37,6 +37,8 @@
#include "packet-e212.h"
#include "packet-lte-rrc.h"
#include "packet-nr-rrc.h"
#include "packet-ngap.h"
#include "packet-ranap.h"
#include "packet-ntp.h"
#ifdef _MSC_VER
@ -466,7 +468,7 @@ typedef enum _ProtocolIE_ID_enum {
} ProtocolIE_ID_enum;
/*--- End of included file: packet-x2ap-val.h ---*/
#line 49 "./asn1/x2ap/packet-x2ap-template.c"
#line 51 "./asn1/x2ap/packet-x2ap-template.c"
/* Initialize the protocol and registered fields */
static int proto_x2ap = -1;
@ -1506,7 +1508,7 @@ static int hf_x2ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */
static int hf_x2ap_value = -1; /* UnsuccessfulOutcome_value */
/*--- End of included file: packet-x2ap-hf.c ---*/
#line 114 "./asn1/x2ap/packet-x2ap-template.c"
#line 116 "./asn1/x2ap/packet-x2ap-template.c"
/* Initialize the subtree pointers */
static int ett_x2ap = -1;
@ -1536,6 +1538,8 @@ static int ett_x2ap_RRCContainer = -1;
static int ett_x2ap_NRencryptionAlgorithms = -1;
static int ett_x2ap_NRintegrityProtectionAlgorithms = -1;
static int ett_x2ap_measurementTimingConfiguration = -1;
static int ett_x2ap_LastVisitedNGRANCellInformation = -1;
static int ett_x2ap_LastVisitedUTRANCellInformation = -1;
/*--- Included file: packet-x2ap-ett.c ---*/
#line 1 "./asn1/x2ap/packet-x2ap-ett.c"
@ -2029,7 +2033,7 @@ static gint ett_x2ap_SuccessfulOutcome = -1;
static gint ett_x2ap_UnsuccessfulOutcome = -1;
/*--- End of included file: packet-x2ap-ett.c ---*/
#line 144 "./asn1/x2ap/packet-x2ap-template.c"
#line 148 "./asn1/x2ap/packet-x2ap-template.c"
typedef enum {
RRC_CONTAINER_TYPE_UNKNOWN,
@ -6543,8 +6547,18 @@ dissect_x2ap_LastVisitedEUTRANCellInformation(tvbuff_t *tvb _U_, int offset _U_,
static int
dissect_x2ap_LastVisitedUTRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 644 "./asn1/x2ap/x2ap.cnf"
tvbuff_t *parameter_tvb;
proto_tree *subtree;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_LastVisitedUTRANCellInformation);
dissect_ranap_LastVisitedUTRANCell_Item_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
return offset;
}
@ -6573,8 +6587,18 @@ dissect_x2ap_LastVisitedGERANCellInformation(tvbuff_t *tvb _U_, int offset _U_,
static int
dissect_x2ap_LastVisitedNGRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 635 "./asn1/x2ap/x2ap.cnf"
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_LastVisitedNGRANCellInformation);
dissect_ngap_LastVisitedNGRANCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
return offset;
}
@ -9841,7 +9865,7 @@ static const per_sequence_t HandoverRequest_sequence[] = {
static int
dissect_x2ap_HandoverRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 637 "./asn1/x2ap/x2ap.cnf"
#line 655 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -9972,7 +9996,7 @@ static const per_sequence_t HandoverRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 639 "./asn1/x2ap/x2ap.cnf"
#line 657 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10020,7 +10044,7 @@ static const per_sequence_t HandoverPreparationFailure_sequence[] = {
static int
dissect_x2ap_HandoverPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 641 "./asn1/x2ap/x2ap.cnf"
#line 659 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverPreparationFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10037,7 +10061,7 @@ static const per_sequence_t HandoverReport_sequence[] = {
static int
dissect_x2ap_HandoverReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 679 "./asn1/x2ap/x2ap.cnf"
#line 697 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverReport");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10054,7 +10078,7 @@ static const per_sequence_t SNStatusTransfer_sequence[] = {
static int
dissect_x2ap_SNStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 643 "./asn1/x2ap/x2ap.cnf"
#line 661 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNStatusTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10103,7 +10127,7 @@ static const per_sequence_t UEContextRelease_sequence[] = {
static int
dissect_x2ap_UEContextRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 645 "./asn1/x2ap/x2ap.cnf"
#line 663 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextRelease");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10120,7 +10144,7 @@ static const per_sequence_t HandoverCancel_sequence[] = {
static int
dissect_x2ap_HandoverCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 647 "./asn1/x2ap/x2ap.cnf"
#line 665 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancel");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10137,7 +10161,7 @@ static const per_sequence_t ErrorIndication_sequence[] = {
static int
dissect_x2ap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 649 "./asn1/x2ap/x2ap.cnf"
#line 667 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10154,7 +10178,7 @@ static const per_sequence_t ResetRequest_sequence[] = {
static int
dissect_x2ap_ResetRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 651 "./asn1/x2ap/x2ap.cnf"
#line 669 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10171,7 +10195,7 @@ static const per_sequence_t ResetResponse_sequence[] = {
static int
dissect_x2ap_ResetResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 653 "./asn1/x2ap/x2ap.cnf"
#line 671 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10188,7 +10212,7 @@ static const per_sequence_t X2SetupRequest_sequence[] = {
static int
dissect_x2ap_X2SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 655 "./asn1/x2ap/x2ap.cnf"
#line 673 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2SetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10205,7 +10229,7 @@ static const per_sequence_t X2SetupResponse_sequence[] = {
static int
dissect_x2ap_X2SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 657 "./asn1/x2ap/x2ap.cnf"
#line 675 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2SetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10222,7 +10246,7 @@ static const per_sequence_t X2SetupFailure_sequence[] = {
static int
dissect_x2ap_X2SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 659 "./asn1/x2ap/x2ap.cnf"
#line 677 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2SetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10239,7 +10263,7 @@ static const per_sequence_t LoadInformation_sequence[] = {
static int
dissect_x2ap_LoadInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 661 "./asn1/x2ap/x2ap.cnf"
#line 679 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LoadInformation");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10288,7 +10312,7 @@ static const per_sequence_t ENBConfigurationUpdate_sequence[] = {
static int
dissect_x2ap_ENBConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 663 "./asn1/x2ap/x2ap.cnf"
#line 681 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10350,7 +10374,7 @@ static const per_sequence_t ENBConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_x2ap_ENBConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 665 "./asn1/x2ap/x2ap.cnf"
#line 683 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10367,7 +10391,7 @@ static const per_sequence_t ENBConfigurationUpdateFailure_sequence[] = {
static int
dissect_x2ap_ENBConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 667 "./asn1/x2ap/x2ap.cnf"
#line 685 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10384,7 +10408,7 @@ static const per_sequence_t ResourceStatusRequest_sequence[] = {
static int
dissect_x2ap_ResourceStatusRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 669 "./asn1/x2ap/x2ap.cnf"
#line 687 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10463,7 +10487,7 @@ static const per_sequence_t ResourceStatusResponse_sequence[] = {
static int
dissect_x2ap_ResourceStatusResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 671 "./asn1/x2ap/x2ap.cnf"
#line 689 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10571,7 +10595,7 @@ static const per_sequence_t ResourceStatusFailure_sequence[] = {
static int
dissect_x2ap_ResourceStatusFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 673 "./asn1/x2ap/x2ap.cnf"
#line 691 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10618,7 +10642,7 @@ static const per_sequence_t ResourceStatusUpdate_sequence[] = {
static int
dissect_x2ap_ResourceStatusUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 675 "./asn1/x2ap/x2ap.cnf"
#line 693 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10667,7 +10691,7 @@ static const per_sequence_t PrivateMessage_sequence[] = {
static int
dissect_x2ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 677 "./asn1/x2ap/x2ap.cnf"
#line 695 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10684,7 +10708,7 @@ static const per_sequence_t MobilityChangeRequest_sequence[] = {
static int
dissect_x2ap_MobilityChangeRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 683 "./asn1/x2ap/x2ap.cnf"
#line 701 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MobilityChangeRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10701,7 +10725,7 @@ static const per_sequence_t MobilityChangeAcknowledge_sequence[] = {
static int
dissect_x2ap_MobilityChangeAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 685 "./asn1/x2ap/x2ap.cnf"
#line 703 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MobilityChangeAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10718,7 +10742,7 @@ static const per_sequence_t MobilityChangeFailure_sequence[] = {
static int
dissect_x2ap_MobilityChangeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 687 "./asn1/x2ap/x2ap.cnf"
#line 705 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MobilityChangeFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10735,7 +10759,7 @@ static const per_sequence_t RLFIndication_sequence[] = {
static int
dissect_x2ap_RLFIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 681 "./asn1/x2ap/x2ap.cnf"
#line 699 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RLFIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10752,7 +10776,7 @@ static const per_sequence_t CellActivationRequest_sequence[] = {
static int
dissect_x2ap_CellActivationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 689 "./asn1/x2ap/x2ap.cnf"
#line 707 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10798,7 +10822,7 @@ static const per_sequence_t CellActivationResponse_sequence[] = {
static int
dissect_x2ap_CellActivationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 691 "./asn1/x2ap/x2ap.cnf"
#line 709 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10844,7 +10868,7 @@ static const per_sequence_t CellActivationFailure_sequence[] = {
static int
dissect_x2ap_CellActivationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 693 "./asn1/x2ap/x2ap.cnf"
#line 711 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10861,7 +10885,7 @@ static const per_sequence_t X2Release_sequence[] = {
static int
dissect_x2ap_X2Release(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 695 "./asn1/x2ap/x2ap.cnf"
#line 713 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2Release");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10878,7 +10902,7 @@ static const per_sequence_t X2APMessageTransfer_sequence[] = {
static int
dissect_x2ap_X2APMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 697 "./asn1/x2ap/x2ap.cnf"
#line 715 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2APMessageTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -10930,7 +10954,7 @@ static const per_sequence_t SeNBAdditionRequest_sequence[] = {
static int
dissect_x2ap_SeNBAdditionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 705 "./asn1/x2ap/x2ap.cnf"
#line 723 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBAdditionRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11018,7 +11042,7 @@ static const per_sequence_t SeNBAdditionRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SeNBAdditionRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 707 "./asn1/x2ap/x2ap.cnf"
#line 725 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBAdditionRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11105,7 +11129,7 @@ static const per_sequence_t SeNBAdditionRequestReject_sequence[] = {
static int
dissect_x2ap_SeNBAdditionRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 709 "./asn1/x2ap/x2ap.cnf"
#line 727 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBAdditionRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11122,7 +11146,7 @@ static const per_sequence_t SeNBReconfigurationComplete_sequence[] = {
static int
dissect_x2ap_SeNBReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 711 "./asn1/x2ap/x2ap.cnf"
#line 729 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReconfigurationComplete");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11192,7 +11216,7 @@ static const per_sequence_t SeNBModificationRequest_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 713 "./asn1/x2ap/x2ap.cnf"
#line 731 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11439,7 +11463,7 @@ static const per_sequence_t SeNBModificationRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 715 "./asn1/x2ap/x2ap.cnf"
#line 733 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11660,7 +11684,7 @@ static const per_sequence_t SeNBModificationRequestReject_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 717 "./asn1/x2ap/x2ap.cnf"
#line 735 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11677,7 +11701,7 @@ static const per_sequence_t SeNBModificationRequired_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 719 "./asn1/x2ap/x2ap.cnf"
#line 737 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11724,7 +11748,7 @@ static const per_sequence_t SeNBModificationConfirm_sequence[] = {
static int
dissect_x2ap_SeNBModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 721 "./asn1/x2ap/x2ap.cnf"
#line 739 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11741,7 +11765,7 @@ static const per_sequence_t SeNBModificationRefuse_sequence[] = {
static int
dissect_x2ap_SeNBModificationRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 723 "./asn1/x2ap/x2ap.cnf"
#line 741 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRefuse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11758,7 +11782,7 @@ static const per_sequence_t SeNBReleaseRequest_sequence[] = {
static int
dissect_x2ap_SeNBReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 725 "./asn1/x2ap/x2ap.cnf"
#line 743 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReleaseRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11844,7 +11868,7 @@ static const per_sequence_t SeNBReleaseRequired_sequence[] = {
static int
dissect_x2ap_SeNBReleaseRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 727 "./asn1/x2ap/x2ap.cnf"
#line 745 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReleaseRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11861,7 +11885,7 @@ static const per_sequence_t SeNBReleaseConfirm_sequence[] = {
static int
dissect_x2ap_SeNBReleaseConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 729 "./asn1/x2ap/x2ap.cnf"
#line 747 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReleaseConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -11947,7 +11971,7 @@ static const per_sequence_t SeNBCounterCheckRequest_sequence[] = {
static int
dissect_x2ap_SeNBCounterCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 731 "./asn1/x2ap/x2ap.cnf"
#line 749 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBCounterCheckRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12005,7 +12029,7 @@ static const per_sequence_t X2RemovalRequest_sequence[] = {
static int
dissect_x2ap_X2RemovalRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 699 "./asn1/x2ap/x2ap.cnf"
#line 717 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2RemovalRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12022,7 +12046,7 @@ static const per_sequence_t X2RemovalResponse_sequence[] = {
static int
dissect_x2ap_X2RemovalResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 701 "./asn1/x2ap/x2ap.cnf"
#line 719 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2RemovalResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12039,7 +12063,7 @@ static const per_sequence_t X2RemovalFailure_sequence[] = {
static int
dissect_x2ap_X2RemovalFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 703 "./asn1/x2ap/x2ap.cnf"
#line 721 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2RemovalFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12056,7 +12080,7 @@ static const per_sequence_t RetrieveUEContextRequest_sequence[] = {
static int
dissect_x2ap_RetrieveUEContextRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 733 "./asn1/x2ap/x2ap.cnf"
#line 751 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12073,7 +12097,7 @@ static const per_sequence_t RetrieveUEContextResponse_sequence[] = {
static int
dissect_x2ap_RetrieveUEContextResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 735 "./asn1/x2ap/x2ap.cnf"
#line 753 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12146,7 +12170,7 @@ static const per_sequence_t RetrieveUEContextFailure_sequence[] = {
static int
dissect_x2ap_RetrieveUEContextFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 737 "./asn1/x2ap/x2ap.cnf"
#line 755 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12163,7 +12187,7 @@ static const per_sequence_t SgNBAdditionRequest_sequence[] = {
static int
dissect_x2ap_SgNBAdditionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 739 "./asn1/x2ap/x2ap.cnf"
#line 757 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBAdditionRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12272,7 +12296,7 @@ static const per_sequence_t SgNBAdditionRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SgNBAdditionRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 741 "./asn1/x2ap/x2ap.cnf"
#line 759 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBAdditionRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12379,7 +12403,7 @@ static const per_sequence_t SgNBAdditionRequestReject_sequence[] = {
static int
dissect_x2ap_SgNBAdditionRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 743 "./asn1/x2ap/x2ap.cnf"
#line 761 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBAdditionRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12396,7 +12420,7 @@ static const per_sequence_t SgNBReconfigurationComplete_sequence[] = {
static int
dissect_x2ap_SgNBReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 745 "./asn1/x2ap/x2ap.cnf"
#line 763 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReconfigurationComplete");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12465,7 +12489,7 @@ static const per_sequence_t SgNBModificationRequest_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 747 "./asn1/x2ap/x2ap.cnf"
#line 765 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -12765,7 +12789,7 @@ static const per_sequence_t SgNBModificationRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 749 "./asn1/x2ap/x2ap.cnf"
#line 767 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13039,7 +13063,7 @@ static const per_sequence_t SgNBModificationRequestReject_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 751 "./asn1/x2ap/x2ap.cnf"
#line 769 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13056,7 +13080,7 @@ static const per_sequence_t SgNBModificationRequired_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 753 "./asn1/x2ap/x2ap.cnf"
#line 771 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13190,7 +13214,7 @@ static const per_sequence_t SgNBModificationConfirm_sequence[] = {
static int
dissect_x2ap_SgNBModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 755 "./asn1/x2ap/x2ap.cnf"
#line 773 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13289,7 +13313,7 @@ static const per_sequence_t SgNBModificationRefuse_sequence[] = {
static int
dissect_x2ap_SgNBModificationRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 757 "./asn1/x2ap/x2ap.cnf"
#line 775 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRefuse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13306,7 +13330,7 @@ static const per_sequence_t SgNBReleaseRequest_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 759 "./asn1/x2ap/x2ap.cnf"
#line 777 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13406,7 +13430,7 @@ static const per_sequence_t SgNBReleaseRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 761 "./asn1/x2ap/x2ap.cnf"
#line 779 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13423,7 +13447,7 @@ static const per_sequence_t SgNBReleaseRequestReject_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 763 "./asn1/x2ap/x2ap.cnf"
#line 781 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13440,7 +13464,7 @@ static const per_sequence_t SgNBReleaseRequired_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 765 "./asn1/x2ap/x2ap.cnf"
#line 783 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13457,7 +13481,7 @@ static const per_sequence_t SgNBReleaseConfirm_sequence[] = {
static int
dissect_x2ap_SgNBReleaseConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 767 "./asn1/x2ap/x2ap.cnf"
#line 785 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13557,7 +13581,7 @@ static const per_sequence_t SgNBCounterCheckRequest_sequence[] = {
static int
dissect_x2ap_SgNBCounterCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 769 "./asn1/x2ap/x2ap.cnf"
#line 787 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBCounterCheckRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13605,7 +13629,7 @@ static const per_sequence_t SgNBChangeRequired_sequence[] = {
static int
dissect_x2ap_SgNBChangeRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 771 "./asn1/x2ap/x2ap.cnf"
#line 789 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBChangeRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13622,7 +13646,7 @@ static const per_sequence_t SgNBChangeConfirm_sequence[] = {
static int
dissect_x2ap_SgNBChangeConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 773 "./asn1/x2ap/x2ap.cnf"
#line 791 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBChangeConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13722,7 +13746,7 @@ static const per_sequence_t RRCTransfer_sequence[] = {
static int
dissect_x2ap_RRCTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 777 "./asn1/x2ap/x2ap.cnf"
#line 795 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13739,7 +13763,7 @@ static const per_sequence_t SgNBChangeRefuse_sequence[] = {
static int
dissect_x2ap_SgNBChangeRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 775 "./asn1/x2ap/x2ap.cnf"
#line 793 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBChangeRefuse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -13756,7 +13780,7 @@ static const per_sequence_t ENDCX2SetupRequest_sequence[] = {
static int
dissect_x2ap_ENDCX2SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 779 "./asn1/x2ap/x2ap.cnf"
#line 797 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2SetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14115,7 +14139,7 @@ static const per_sequence_t ENDCX2SetupResponse_sequence[] = {
static int
dissect_x2ap_ENDCX2SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 781 "./asn1/x2ap/x2ap.cnf"
#line 799 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2SetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14154,7 +14178,7 @@ static const per_sequence_t ENDCX2SetupFailure_sequence[] = {
static int
dissect_x2ap_ENDCX2SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 783 "./asn1/x2ap/x2ap.cnf"
#line 801 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2SetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14171,7 +14195,7 @@ static const per_sequence_t ENDCConfigurationUpdate_sequence[] = {
static int
dissect_x2ap_ENDCConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 785 "./asn1/x2ap/x2ap.cnf"
#line 803 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14301,7 +14325,7 @@ static const per_sequence_t ENDCConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_x2ap_ENDCConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 787 "./asn1/x2ap/x2ap.cnf"
#line 805 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14340,7 +14364,7 @@ static const per_sequence_t ENDCConfigurationUpdateFailure_sequence[] = {
static int
dissect_x2ap_ENDCConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 789 "./asn1/x2ap/x2ap.cnf"
#line 807 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14357,7 +14381,7 @@ static const per_sequence_t ENDCCellActivationRequest_sequence[] = {
static int
dissect_x2ap_ENDCCellActivationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 793 "./asn1/x2ap/x2ap.cnf"
#line 811 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14403,7 +14427,7 @@ static const per_sequence_t ENDCCellActivationResponse_sequence[] = {
static int
dissect_x2ap_ENDCCellActivationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 795 "./asn1/x2ap/x2ap.cnf"
#line 813 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14449,7 +14473,7 @@ static const per_sequence_t ENDCCellActivationFailure_sequence[] = {
static int
dissect_x2ap_ENDCCellActivationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 797 "./asn1/x2ap/x2ap.cnf"
#line 815 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14466,7 +14490,7 @@ static const per_sequence_t SecondaryRATDataUsageReport_sequence[] = {
static int
dissect_x2ap_SecondaryRATDataUsageReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 791 "./asn1/x2ap/x2ap.cnf"
#line 809 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATDataUsageReport");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14483,7 +14507,7 @@ static const per_sequence_t SgNBActivityNotification_sequence[] = {
static int
dissect_x2ap_SgNBActivityNotification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 807 "./asn1/x2ap/x2ap.cnf"
#line 825 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBActivityNotification");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14500,7 +14524,7 @@ static const per_sequence_t ENDCPartialResetRequired_sequence[] = {
static int
dissect_x2ap_ENDCPartialResetRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 799 "./asn1/x2ap/x2ap.cnf"
#line 817 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCPartialResetRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14517,7 +14541,7 @@ static const per_sequence_t ENDCPartialResetConfirm_sequence[] = {
static int
dissect_x2ap_ENDCPartialResetConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 801 "./asn1/x2ap/x2ap.cnf"
#line 819 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCPartialResetConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14534,7 +14558,7 @@ static const per_sequence_t EUTRANRCellResourceCoordinationRequest_sequence[] =
static int
dissect_x2ap_EUTRANRCellResourceCoordinationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 803 "./asn1/x2ap/x2ap.cnf"
#line 821 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EUTRANRCellResourceCoordinationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14615,7 +14639,7 @@ static const per_sequence_t EUTRANRCellResourceCoordinationResponse_sequence[] =
static int
dissect_x2ap_EUTRANRCellResourceCoordinationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 805 "./asn1/x2ap/x2ap.cnf"
#line 823 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EUTRANRCellResourceCoordinationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14682,7 +14706,7 @@ static const per_sequence_t ENDCX2RemovalRequest_sequence[] = {
static int
dissect_x2ap_ENDCX2RemovalRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 809 "./asn1/x2ap/x2ap.cnf"
#line 827 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14721,7 +14745,7 @@ static const per_sequence_t ENDCX2RemovalResponse_sequence[] = {
static int
dissect_x2ap_ENDCX2RemovalResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 811 "./asn1/x2ap/x2ap.cnf"
#line 829 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14760,7 +14784,7 @@ static const per_sequence_t ENDCX2RemovalFailure_sequence[] = {
static int
dissect_x2ap_ENDCX2RemovalFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 813 "./asn1/x2ap/x2ap.cnf"
#line 831 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -14777,7 +14801,7 @@ static const per_sequence_t DataForwardingAddressIndication_sequence[] = {
static int
dissect_x2ap_DataForwardingAddressIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 815 "./asn1/x2ap/x2ap.cnf"
#line 833 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DataForwardingAddressIndication");
@ -17681,7 +17705,7 @@ static int dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
/*--- End of included file: packet-x2ap-fn.c ---*/
#line 253 "./asn1/x2ap/packet-x2ap-template.c"
#line 257 "./asn1/x2ap/packet-x2ap-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
@ -21874,7 +21898,7 @@ void proto_register_x2ap(void) {
"UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-x2ap-hfarr.c ---*/
#line 561 "./asn1/x2ap/packet-x2ap-template.c"
#line 565 "./asn1/x2ap/packet-x2ap-template.c"
};
/* List of subtrees */
@ -21906,6 +21930,8 @@ void proto_register_x2ap(void) {
&ett_x2ap_NRencryptionAlgorithms,
&ett_x2ap_NRintegrityProtectionAlgorithms,
&ett_x2ap_measurementTimingConfiguration,
&ett_x2ap_LastVisitedNGRANCellInformation,
&ett_x2ap_LastVisitedUTRANCellInformation,
/*--- Included file: packet-x2ap-ettarr.c ---*/
#line 1 "./asn1/x2ap/packet-x2ap-ettarr.c"
@ -22399,7 +22425,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_UnsuccessfulOutcome,
/*--- End of included file: packet-x2ap-ettarr.c ---*/
#line 593 "./asn1/x2ap/packet-x2ap-template.c"
#line 599 "./asn1/x2ap/packet-x2ap-template.c"
};
module_t *x2ap_module;
@ -22838,7 +22864,7 @@ proto_reg_handoff_x2ap(void)
/*--- End of included file: packet-x2ap-dis-tab.c ---*/
#line 639 "./asn1/x2ap/packet-x2ap-template.c"
#line 645 "./asn1/x2ap/packet-x2ap-template.c"
} else {
if (SctpPort != 0) {
dissector_delete_uint("sctp.port", SctpPort, x2ap_handle);

3189
epan/dissectors/packet-xnap.c
View File

File diff suppressed because it is too large Load Diff