S1AP: upgrade dissector to v15.2.0

Change-Id: I53feb77f91ac72f4e5f18c56453f2974b8b426be
Reviewed-on: https://code.wireshark.org/review/28376
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-06-22 09:52:40 +02:00
parent 23bef01ad3
commit 3909f8a8b9
16 changed files with 1649 additions and 484 deletions

View File

@ -441,6 +441,7 @@ set(DISSECTOR_PUBLIC_HEADERS
packet-netbios.h
packet-netlink.h
packet-nfs.h
packet-ngap.h
packet-nisplus.h
packet-nlm.h
packet-nr-rrc.h

View File

@ -13,9 +13,14 @@ ProtocolIE-ID
#.EXPORTS ONLY_VALS WS_DLL
#.EXPORTS
SourceNGRANNode-ToTargetNGRANNode-TransparentContainer_PDU
TargetNGRANNode-ToSourceNGRANNode-TransparentContainer_PDU
#.PDU
NGAP-PDU
SourceNGRANNode-ToTargetNGRANNode-TransparentContainer
TargetNGRANNode-ToSourceNGRANNode-TransparentContainer
#.MAKE_ENUM
ProcedureCode
@ -31,22 +36,7 @@ ProtocolIE-ContainerPair
ProtocolIE-ContainerPairList
Presence
ReferenceID
SourceNGRANNode-ToTargetNGRANNode-TransparentContainer
TargetNGRANNode-ToSourceNGRANNode-TransparentContainer
AMFStatusIndication
E-RABInformationList
E-RABInformationItem
PDUSessionResourceInformationList
PDUSessionResourceInformationItem
QosFlowInformationList
QosFlowInformationItem
DLForwarding
DRBsToQosFlowsMappingList
DRBsToQosFlowsMappingItem
QosFlowMappingList
QosFlowMappingItem
RRCContainer
#.END

View File

@ -23,6 +23,7 @@
#include <epan/conversation.h>
#include <epan/proto_data.h>
#include "packet-ngap.h"
#include "packet-ber.h"
#include "packet-per.h"
#include "packet-e212.h"

View File

@ -0,0 +1,29 @@
/* packet-s1ap.h
* Routines for E-UTRAN NG Application Protocol (NGAP) packet dissection
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_NGAP_H
#define PACKET_NGAP_H
#include "packet-ngap-exp.h"
#endif /* PACKET_NGAP_H */
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 9.3.5 Common Definitions
-- **************************************************************
--
@ -7,10 +7,10 @@
-- **************************************************************
S1AP-CommonDataTypes {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-CommonDataTypes (3) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 9.3.6 Constant Definitions
-- **************************************************************
--
@ -6,11 +6,11 @@
--
-- **************************************************************
S1AP-Constants {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-Constants (4) }
S1AP-Constants {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-Constants (4) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -126,12 +126,12 @@ maxnoofForbTACs INTEGER ::= 4096
maxnoofIndividualS1ConnectionsToReset INTEGER ::= 256
maxnoofCells INTEGER ::= 16
maxnoofCellsineNB INTEGER ::= 256
maxnoofTAIforWarning INTEGER ::= 65535
maxnoofCellID INTEGER ::= 65535
maxnoofDCNs INTEGER ::= 32
maxnoofEmergencyAreaID INTEGER ::= 65535
maxnoofCellinTAI INTEGER ::= 65535
maxnoofCellinEAI INTEGER ::= 65535
maxnoofTAIforWarning INTEGER ::= 65535
maxnoofCellID INTEGER ::= 65535
maxnoofDCNs INTEGER ::= 32
maxnoofEmergencyAreaID INTEGER ::= 65535
maxnoofCellinTAI INTEGER ::= 65535
maxnoofCellinEAI INTEGER ::= 65535
maxnoofeNBX2TLAs INTEGER ::= 2
maxnoofeNBX2ExtTLAs INTEGER ::= 16
maxnoofeNBX2GTPTLAs INTEGER ::= 16
@ -148,7 +148,7 @@ maxEARFCN INTEGER ::= 262143
maxnoofMBSFNAreaMDT INTEGER ::= 8
maxnoofRecommendedCells INTEGER ::= 16
maxnoofRecommendedENBs INTEGER ::= 16
maxnooftimeperiods INTEGER ::= 2
maxnooftimeperiods INTEGER ::= 2
maxnoofCellIDforQMC INTEGER ::= 32
maxnoofTAforQMC INTEGER ::= 8
maxnoofPLMNforQMC INTEGER ::= 16
@ -445,5 +445,17 @@ id-SecondaryRATDataUsageRequest ProtocolIE-ID ::= 268
id-NRUESecurityCapabilities ProtocolIE-ID ::= 269
id-UnlicensedSpectrumRestriction ProtocolIE-ID ::= 270
id-CE-ModeBRestricted ProtocolIE-ID ::= 271
id-LTE-M-Indication ProtocolIE-ID ::= 272
id-DownlinkPacketLossRate ProtocolIE-ID ::= 273
id-UplinkPacketLossRate ProtocolIE-ID ::= 274
id-UECapabilityInfoRequest ProtocolIE-ID ::= 275
id-serviceType ProtocolIE-ID ::= 276
id-AerialUEsubscriptionInformation ProtocolIE-ID ::= 277
--WS extension
id-Unknown-278 ProtocolIE-ID ::= 278
id-Unknown-279 ProtocolIE-ID ::= 279
id-EndIndication ProtocolIE-ID ::= 280
id-EDT-Session ProtocolIE-ID ::= 281
id-CNTypeRestrictions ProtocolIE-ID ::= 282
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 9.3.7 Container Definitions
-- **************************************************************
--
@ -7,10 +7,10 @@
-- **************************************************************
S1AP-Containers {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-Containers (5) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -119,11 +119,11 @@ WITH SYNTAX {
--
-- **************************************************************
ProtocolIE-Container {S1AP-PROTOCOL-IES : IEsSetParam} ::=
ProtocolIE-Container {S1AP-PROTOCOL-IES : IEsSetParam} ::=
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
ProtocolIE-Field {{IEsSetParam}}
ProtocolIE-SingleContainer {S1AP-PROTOCOL-IES : IEsSetParam} ::=
ProtocolIE-SingleContainer {S1AP-PROTOCOL-IES : IEsSetParam} ::=
ProtocolIE-Field {{IEsSetParam}}
ProtocolIE-Field {S1AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
@ -138,7 +138,7 @@ ProtocolIE-Field {S1AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
--
-- **************************************************************
ProtocolIE-ContainerPair {S1AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
ProtocolIE-ContainerPair {S1AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
ProtocolIE-FieldPair {{IEsSetParam}}
@ -170,7 +170,7 @@ ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, S1AP-P
--
-- **************************************************************
ProtocolExtensionContainer {S1AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
ProtocolExtensionContainer {S1AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
SEQUENCE (SIZE (1..maxProtocolExtensions)) OF
ProtocolExtensionField {{ExtensionSetParam}}
@ -186,7 +186,7 @@ ProtocolExtensionField {S1AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENC
--
-- **************************************************************
PrivateIE-Container {S1AP-PRIVATE-IES : IEsSetParam } ::=
PrivateIE-Container {S1AP-PRIVATE-IES : IEsSetParam } ::=
SEQUENCE (SIZE (1.. maxPrivateIEs)) OF
PrivateIE-Field {{IEsSetParam}}

View File

@ -7,10 +7,10 @@
-- **************************************************************
S1AP-IEs {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-IEs (2) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -59,7 +59,10 @@ IMPORTS
id-SecondaryRATDataUsageReportItem,
id-E-RABUsageReportItem,
id-UEAppLayerMeasConfig,
id-UnlicensedSpectrumRestriction,
id-serviceType,
id-UnlicensedSpectrumRestriction,
id-CNTypeRestrictions, id-DownlinkPacketLossRate,
id-UplinkPacketLossRate,
maxnoofCSGs,
maxnoofE-RABs,
maxnoofErrors,
@ -114,7 +117,7 @@ FROM S1AP-CommonDataTypes
ProtocolIE-SingleContainer{},
S1AP-PROTOCOL-IES
FROM S1AP-Containers;
FROM S1AP-Containers;
-- A
@ -129,7 +132,13 @@ Additional-GUTI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
AreaScopeOfMDT ::= CHOICE {
AerialUEsubscriptionInformation ::= ENUMERATED {
allowed,
not-allowed,
...
}
AreaScopeOfMDT ::= CHOICE {
cellBased CellBasedMDT,
tABased TABasedMDT,
pLMNWide NULL,
@ -138,7 +147,7 @@ AreaScopeOfMDT ::= CHOICE {
}
AreaScopeOfQMC ::= CHOICE {
AreaScopeOfQMC ::= CHOICE {
cellBased CellBasedQMC,
tABased TABasedQMC,
tAIBased TAIBasedQMC,
@ -181,7 +190,7 @@ AssistanceDataForPaging-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
}
AssistanceDataForRecommendedCells ::= SEQUENCE {
recommendedCellsForPaging RecommendedCellsForPaging,
recommendedCellsForPaging RecommendedCellsForPaging,
iE-Extensions ProtocolExtensionContainer { { AssistanceDataForRecommendedCells-ExtIEs} } OPTIONAL,
...
}
@ -223,7 +232,7 @@ BearerType ::= ENUMERATED {
...
}
BitRate ::= INTEGER (0..10000000000)
BitRate ::= INTEGER (0..10000000000)
BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
@ -305,8 +314,8 @@ CauseRadioNetwork ::= ENUMERATED {
tx2relocoverall-expiry,
successful-handover,
release-due-to-eutran-generated-reason,
handover-cancelled,
partial-handover,
handover-cancelled,
partial-handover,
ho-failure-in-target-EPC-eNB-or-target-system,
ho-target-not-allowed,
tS1relocoverall-expiry,
@ -361,7 +370,7 @@ CauseNas ::= ENUMERATED {
}
CellAccessMode ::= ENUMERATED {
hybrid,
hybrid,
...
}
@ -505,8 +514,26 @@ CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
CI ::= OCTET STRING (SIZE (2))
CNDomain ::= ENUMERATED {
ps,
cs
ps,
cs
}
CNTypeRestrictions::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF CNTypeRestrictions-Item
CNTypeRestrictions-Item ::= SEQUENCE {
pLMN-Identity PLMNidentity,
cNType CNType,
iE-Extensions ProtocolExtensionContainer { { CNTypeRestrictions-Item-ExtIEs} } OPTIONAL,
...
}
CNTypeRestrictions-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
CNType ::= ENUMERATED {
fiveGCForbiddden,
...
}
ConcurrentWarningMessageIndicator ::= ENUMERATED {
@ -515,13 +542,13 @@ ConcurrentWarningMessageIndicator ::= ENUMERATED {
Correlation-ID ::= OCTET STRING (SIZE (4))
CSFallbackIndicator ::= ENUMERATED {
CSFallbackIndicator ::= ENUMERATED {
cs-fallback-required,
...,
cs-fallback-high-priority
cs-fallback-high-priority
}
AdditionalCSFallbackIndicator ::= ENUMERATED {
AdditionalCSFallbackIndicator ::= ENUMERATED {
no-restriction,
restriction,
...
@ -542,8 +569,8 @@ CSG-IdList-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
CSGMembershipStatus ::= ENUMERATED {
member,
CSGMembershipStatus ::= ENUMERATED {
member,
not-member
}
@ -672,6 +699,11 @@ ECGIList ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF EUTRAN-CGI
PWSfailedECGIList ::= SEQUENCE (SIZE(1..maxnoofCellsineNB)) OF EUTRAN-CGI
EDT-Session ::= ENUMERATED {
true,
...
}
EmergencyAreaIDList ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID
EmergencyAreaID ::= OCTET STRING (SIZE (3))
@ -728,7 +760,7 @@ ENB-ID ::= CHOICE {
GERAN-Cell-ID ::= SEQUENCE {
lAI LAI,
rAC RAC,
rAC RAC,
cI CI,
iE-Extensions ProtocolExtensionContainer { { GERAN-Cell-ID-ExtIEs} } OPTIONAL,
...
@ -769,6 +801,12 @@ ENBX2TLAs ::= SEQUENCE (SIZE(1.. maxnoofeNBX2TLAs)) OF TransportLayerAddress
EncryptionAlgorithms ::= BIT STRING (SIZE (16,...))
EndIndication ::= ENUMERATED {
no-further-data,
further-data-exists,
...
}
EnhancedCoverageRestricted ::= ENUMERATED {
restricted,
...
@ -856,6 +894,9 @@ E-RABUsageReportItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
}
E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- Extended for introduction of downlink and uplink packet loss rate for enhanced Voice performance -
{ ID id-DownlinkPacketLossRate CRITICALITY ignore EXTENSION Packet-LossRate PRESENCE optional}|
{ ID id-UplinkPacketLossRate CRITICALITY ignore EXTENSION Packet-LossRate PRESENCE optional},
...
}
@ -911,16 +952,29 @@ ExpectedHOInterval ::= ENUMERATED {
...
}
ExtendedBitRate ::= INTEGER (10000000001..4000000000000, ...)
ExtendedBitRate ::= INTEGER (10000000001..4000000000000, ...)
ExtendedRNC-ID ::= INTEGER (4096..65535)
ExtendedRepetitionPeriod ::= INTEGER (4096..131071)
ExtendedRepetitionPeriod ::= INTEGER (4096..131071)
Extended-UEIdentityIndexValue ::= BIT STRING (SIZE (14))
-- F
FiveGSTAC ::= OCTET STRING (SIZE (3))
FiveGSTAI ::= SEQUENCE {
pLMNidentity PLMNidentity,
fiveGSTAC FiveGSTAC,
iE-Extensions ProtocolExtensionContainer { {FiveGSTAI-ExtIEs} } OPTIONAL,
...
}
FiveGSTAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
ForbiddenInterRATs ::= ENUMERATED {
all,
geran,
@ -974,7 +1028,7 @@ GBR-QosInformation ::= SEQUENCE {
}
GBR-QosInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- Extension for maximum bitrate > 10G bps --
-- Extension for maximum bitrate > 10G bps --
{ ID id-extended-e-RAB-MaximumBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-MaximumBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-GuaranteedBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
@ -1020,14 +1074,15 @@ HandoverRestrictionList ::= SEQUENCE {
equivalentPLMNs EPLMNs OPTIONAL,
forbiddenTAs ForbiddenTAs OPTIONAL,
forbiddenLAs ForbiddenLAs OPTIONAL,
forbiddenInterRATs ForbiddenInterRATs OPTIONAL,
forbiddenInterRATs ForbiddenInterRATs OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {HandoverRestrictionList-ExtIEs} } OPTIONAL,
...
}
HandoverRestrictionList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRrestriction CRITICALITY ignore EXTENSION NRrestriction PRESENCE optional}|
{ ID id-UnlicensedSpectrumRestriction CRITICALITY ignore EXTENSION UnlicensedSpectrumRestriction PRESENCE optional},
{ ID id-UnlicensedSpectrumRestriction CRITICALITY ignore EXTENSION UnlicensedSpectrumRestriction PRESENCE optional}|
{ ID id-CNTypeRestrictions CRITICALITY ignore EXTENSION CNTypeRestrictions PRESENCE optional},
...
}
@ -1036,8 +1091,9 @@ HandoverType ::= ENUMERATED {
ltetoutran,
ltetogeran,
utrantolte,
gerantolte,
...
gerantolte, ...,
ltetonr,
nrtolte
}
HFN ::= INTEGER (0..1048575)
@ -1050,7 +1106,7 @@ HFNforPDCP-SNlength18 ::= INTEGER (0..16383)
Masked-IMEISV ::= BIT STRING (SIZE (64))
ImmediateMDT ::= SEQUENCE {
ImmediateMDT ::= SEQUENCE {
measurementsToActivate MeasurementsToActivate,
m1reportingTrigger M1ReportingTrigger,
m1thresholdeventA2 M1ThresholdEventA2 OPTIONAL,
@ -1146,7 +1202,7 @@ LPPa-PDU ::= OCTET STRING
LHN-ID ::= OCTET STRING(SIZE (32..256))
Links-to-log ::= ENUMERATED {uplink, downlink, both-uplink-and-downlink, ...}
Links-to-log ::= ENUMERATED {uplink, downlink, both-uplink-and-downlink, ...}
ListeningSubframePattern ::= SEQUENCE {
pattern-period ENUMERATED {ms1280, ms2560, ms5120, ms10240, ...},
@ -1186,6 +1242,8 @@ LoggedMBSFNMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
LTE-M-Indication ::= ENUMERATED {lte-m, ... }
-- M
M3Configuration ::= SEQUENCE {
@ -1198,7 +1256,7 @@ M3Configuration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
M3period ::= ENUMERATED {ms100, ms1000, ms10000, ...,ms1024, ms1280, ms2048, ms2560, ms5120, ms10240, min1 }
M3period ::= ENUMERATED {ms100, ms1000, ms10000, ...,ms1024, ms1280, ms2048, ms2560, ms5120, ms10240, min1 }
M4Configuration ::= SEQUENCE {
m4period M4period,
@ -1211,7 +1269,7 @@ M4Configuration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
M4period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... }
M4period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... }
M5Configuration ::= SEQUENCE {
m5period M5period,
@ -1224,12 +1282,12 @@ M5Configuration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
M5period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... }
M5period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... }
M6Configuration ::= SEQUENCE {
m6report-Interval M6report-Interval,
m6delay-threshold M6delay-threshold OPTIONAL,
-- This IE shall be present if the M6 Links to log IE is set to "uplink" or to "both-uplink-and-downlink" --
-- This IE shall be present if the M6 Links to log IE is set to “uplink” or to “both-uplink-and-downlink” --
m6-links-to-log Links-to-log,
iE-Extensions ProtocolExtensionContainer { { M6Configuration-ExtIEs} } OPTIONAL,
...
@ -1256,7 +1314,7 @@ M7Configuration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
M7period ::= INTEGER(1..60, ...)
MDT-Activation ::= ENUMERATED {
MDT-Activation ::= ENUMERATED {
immediate-MDT-only,
immediate-MDT-and-Trace,
logged-MDT-only,
@ -1284,7 +1342,7 @@ MBSFN-ResultToLog ::= SEQUENCE (SIZE(1..maxnoofMBSFNAreaMDT)) OF MBSFN-ResultToL
MBSFN-ResultToLogInfo ::= SEQUENCE {
mBSFN-AreaId INTEGER (0..255) OPTIONAL,
carrierFreq EARFCN,
carrierFreq EARFCN,
iE-Extensions ProtocolExtensionContainer { { MBSFN-ResultToLogInfo-ExtIEs} } OPTIONAL,
...
}
@ -1316,7 +1374,7 @@ MDTMode-ExtensionIE S1AP-PROTOCOL-IES ::= {
MeasurementsToActivate ::= BIT STRING (SIZE (8))
MeasurementThresholdA2 ::= CHOICE {
MeasurementThresholdA2 ::= CHOICE {
threshold-RSRP Threshold-RSRP,
threshold-RSRQ Threshold-RSRQ,
...
@ -1380,7 +1438,7 @@ NB-IoT-DefaultPagingDRX ::= ENUMERATED {
...
}
NB-IoT-Paging-eDRXInformation ::= SEQUENCE {
NB-IoT-Paging-eDRXInformation ::= SEQUENCE {
nB-IoT-paging-eDRX-Cycle NB-IoT-Paging-eDRX-Cycle,
nB-IoT-pagingTimeWindow NB-IoT-PagingTimeWindow OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { NB-IoT-Paging-eDRXInformation-ExtIEs} } OPTIONAL,
@ -1450,6 +1508,8 @@ OverloadResponse ::= CHOICE {
-- P
Packet-LossRate ::= INTEGER(0..1000)
PagingAttemptInformation ::= SEQUENCE {
pagingAttemptCount PagingAttemptCount,
intendedNumberOfPagingAttempts IntendedNumberOfPagingAttempts,
@ -1464,7 +1524,7 @@ PagingAttemptInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
PagingAttemptCount ::= INTEGER (1..16, ...)
Paging-eDRXInformation ::= SEQUENCE {
Paging-eDRXInformation ::= SEQUENCE {
paging-eDRX-Cycle Paging-eDRX-Cycle,
pagingTimeWindow PagingTimeWindow OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { Paging-eDRXInformation-ExtIEs} } OPTIONAL,
@ -1505,7 +1565,7 @@ PDCP-SNExtended ::= INTEGER (0..32767)
PDCP-SNlength18 ::= INTEGER (0..262143)
M1PeriodicReporting ::= SEQUENCE {
M1PeriodicReporting ::= SEQUENCE {
reportInterval ReportIntervalMDT,
reportAmount ReportAmountMDT,
iE-Extensions ProtocolExtensionContainer { { M1PeriodicReporting-ExtIEs} } OPTIONAL,
@ -1516,7 +1576,7 @@ M1PeriodicReporting-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
PLMNidentity ::= TBCD-STRING
PLMNidentity ::= TBCD-STRING
PLMNAreaBasedQMC ::= SEQUENCE {
plmnListforQMC PLMNListforQMC,
@ -1556,7 +1616,7 @@ ProSeAuthorized-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
ProSeDirectDiscovery ::= ENUMERATED {
ProSeDirectDiscovery ::= ENUMERATED {
authorized,
not-authorized,
...
@ -1568,7 +1628,7 @@ ProSeUEtoNetworkRelaying ::= ENUMERATED {
...
}
ProSeDirectCommunication ::= ENUMERATED {
ProSeDirectCommunication ::= ENUMERATED {
authorized,
not-authorized,
...
@ -1662,7 +1722,7 @@ RAT-Type ::= ENUMERATED {
ReportAmountMDT ::= ENUMERATED{r1, r2, r4, r8, r16, r32, r64, rinfinity}
ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, min60}
ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, min60}
M1ReportingTrigger ::= ENUMERATED{
periodic,
@ -1793,6 +1853,12 @@ SecondaryRATDataUsageReportItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
SerialNumber ::= BIT STRING (SIZE (16))
ServiceType ::= ENUMERATED{
qMC-for-streaming-service,
qMC-for-MTSI-service,
...
}
SONInformation ::= CHOICE{
sONInformationRequest SONInformationRequest,
sONInformationReply SONInformationReply,
@ -1806,7 +1872,7 @@ SONInformation-ExtensionIE S1AP-PROTOCOL-IES ::= {
{ ID id-SON-Information-Report CRITICALITY ignore TYPE SONInformationReport PRESENCE mandatory}
}
SONInformationRequest ::= ENUMERATED {
SONInformationRequest ::= ENUMERATED {
x2TNL-Configuration-Info,
...,
time-Synchronisation-Info,
@ -1842,10 +1908,10 @@ SONConfigurationTransfer ::= SEQUENCE {
SONConfigurationTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- Extension for Release 10 to transfer the IP addresses of the eNB initiating the ANR action --
{ID id-x2TNLConfigurationInfo CRITICALITY ignore EXTENSION X2TNLConfigurationInfo PRESENCE conditional
-- This IE shall be present if the SON Information IE contains the SON Information Request IE and the SON Information Request IE is set to "X2TNL Configuration Info" --}|
-- This IE shall be present if the SON Information IE contains the SON Information Request IE and the SON Information Request IE is set to “X2TNL Configuration Info” --}|
-- Extension for Release 12 to transfer information concerning the source cell of synchronisation and the aggressor cell --
{ID id-Synchronisation-Information CRITICALITY ignore EXTENSION SynchronisationInformation PRESENCE conditional
-- This IE shall be present if the SON Information IE contains the SON Information Request IE set to " Activate Muting " --},
-- This IE shall be present if the SON Information IE contains the SON Information Request IE set to “ Activate Muting ” --},
...
}
@ -1864,7 +1930,7 @@ SynchronisationInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
Source-ToTarget-TransparentContainer ::= OCTET STRING
-- This IE includes a transparent container from the source RAN node to the target RAN node.
-- This IE includes a transparent container from the source RAN node to the target RAN node.
-- The octets of the OCTET STRING are encoded according to the specifications of the target system.
SourceBSS-ToTargetBSS-TransparentContainer ::= OCTET STRING
@ -1916,6 +1982,8 @@ SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
SourceRNC-ToTargetRNC-TransparentContainer ::= OCTET STRING
-- This is a dummy IE used only as a reference to the actual definition in relevant specification.
SourceNgRanNode-ToTargetNgRanNode-TransparentContainer ::= OCTET STRING
-- This is a dummy IE used only as a reference to the actual definition in relevant specification.
ServedGUMMEIs ::= SEQUENCE (SIZE (1.. maxnoofRATs)) OF ServedGUMMEIsItem
@ -1936,7 +2004,7 @@ ServedMMECs ::= SEQUENCE (SIZE(1.. maxnoofMMECs)) OF MME-Code
ServedPLMNs ::= SEQUENCE (SIZE(1.. maxnoofPLMNsPerMME)) OF PLMNidentity
SubscriberProfileIDforRFP ::= INTEGER (1..256)
SubscriberProfileIDforRFP ::= INTEGER (1..256)
SupportedTAs ::= SEQUENCE (SIZE(1.. maxnoofTACs)) OF SupportedTAs-Item
@ -2090,6 +2158,8 @@ TargetID ::= CHOICE {
targeteNB-ID TargeteNB-ID,
targetRNC-ID TargetRNC-ID,
cGI CGI,
targetgNgRanNode-ID TargetNgRanNode-ID,
...
}
@ -2118,6 +2188,60 @@ TargetRNC-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
TargetNgRanNode-ID ::= SEQUENCE {
global-RAN-NODE-ID Global-RAN-NODE-ID,
selected-TAI FiveGSTAI,
iE-Extensions ProtocolExtensionContainer { { TargetNgRanNode-ID-ExtIEs} } OPTIONAL,
...
}
TargetNgRanNode-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
Global-RAN-NODE-ID::= CHOICE {
gNB GNB,
ng-eNB NG-eNB,
...
}
GNB ::= SEQUENCE {
global-gNB-ID Global-GNB-ID,
iE-Extensions ProtocolExtensionContainer { {GNB-ExtIEs} } OPTIONAL,
...
}
GNB-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
Global-GNB-ID ::= SEQUENCE {
pLMN-Identity PLMNidentity,
gNB-ID GNB-Identity,
iE-Extensions ProtocolExtensionContainer { { Global-GNB-ID-ExtIEs} } OPTIONAL,
...
}
Global-GNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
GNB-Identity ::= CHOICE {
gNB-ID GNB-ID,
...
}
NG-eNB ::= SEQUENCE {
global-ng-eNB-ID Global-ENB-ID,
iE-Extensions ProtocolExtensionContainer { { NG-eNB-ExtIEs} } OPTIONAL,
...
}
NG-eNB-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
GNB-ID ::= BIT STRING (SIZE(22..32))
TargeteNB-ToSourceeNB-TransparentContainer ::= SEQUENCE {
rRC-Container RRC-Container,
@ -2130,7 +2254,7 @@ TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
}
Target-ToSource-TransparentContainer ::= OCTET STRING
-- This IE includes a transparent container from the target RAN node to the source RAN node.
-- This IE includes a transparent container from the target RAN node to the source RAN node.
-- The octets of the OCTET STRING are coded according to the specifications of the target system.
TargetRNC-ToSourceRNC-TransparentContainer ::= OCTET STRING
@ -2139,7 +2263,10 @@ TargetRNC-ToSourceRNC-TransparentContainer ::= OCTET STRING
TargetBSS-ToSourceBSS-TransparentContainer ::= OCTET STRING
-- This is a dummy IE used only as a reference to the actual definition in relevant specification.
M1ThresholdEventA2 ::= SEQUENCE {
TargetNgRanNode-ToSourceNgRanNode-TransparentContainer ::= OCTET STRING
-- This is a dummy IE used only as a reference to the actual definition in relevant specification.
M1ThresholdEventA2 ::= SEQUENCE {
measurementThreshold MeasurementThresholdA2,
iE-Extensions ProtocolExtensionContainer { { M1ThresholdEventA2-ExtIEs} } OPTIONAL,
...
@ -2184,7 +2311,7 @@ TraceActivation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
TraceDepth ::= ENUMERATED {
TraceDepth ::= ENUMERATED {
minimum,
medium,
maximum,
@ -2241,6 +2368,12 @@ UEAppLayerMeasConfig ::= SEQUENCE {
}
UEAppLayerMeasConfig-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ID id-serviceType CRITICALITY ignore EXTENSION ServiceType PRESENCE optional},
...
}
UECapabilityInfoRequest ::= ENUMERATED {
requested,
...
}
@ -2321,7 +2454,7 @@ UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
UE-Usage-Type ::= INTEGER (0..255)
UE-Usage-Type ::= INTEGER (0..255)
UL-CP-SecurityInformation ::= SEQUENCE {
ul-NAS-MAC UL-NAS-MAC,
@ -2362,13 +2495,14 @@ UEUserPlaneCIoTSupportIndicator ::= ENUMERATED {
UE-Application-Layer-Measurement-Capability ::= BIT STRING (SIZE (8))
-- First bit: QoE Measurement
-- First bit: QoE Measurement for streaming service
-- Second bit: QoE Measurement for MTSI service
-- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver.
-- V
VoiceSupportMatchIndicator ::= ENUMERATED {
VoiceSupportMatchIndicator ::= ENUMERATED {
supported,
not-supported,
...
@ -2385,13 +2519,13 @@ V2XServicesAuthorized-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
VehicleUE ::= ENUMERATED {
VehicleUE ::= ENUMERATED {
authorized,
not-authorized,
...
}
PedestrianUE ::= ENUMERATED {
PedestrianUE ::= ENUMERATED {
authorized,
not-authorized,
...

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@ -6,11 +6,11 @@
--
-- **************************************************************
S1AP-PDU-Contents {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
S1AP-PDU-Contents {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-PDU-Contents (1) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -21,7 +21,7 @@ BEGIN
-- **************************************************************
IMPORTS
UEAggregateMaximumBitrate,
BearerType,
Cause,
@ -39,7 +39,7 @@ IMPORTS
CriticalityDiagnostics,
CSFallbackIndicator,
CSG-Id,
CSG-IdList,
CSG-IdList,
CSGMembershipStatus,
Data-Forwarding-Not-Possible,
Direct-Forwarding-Path-Availability,
@ -95,7 +95,7 @@ IMPORTS
SupportedTAs,
TAI,
Target-ToSource-TransparentContainer,
TargetBSS-ToSourceBSS-TransparentContainer,
TargetBSS-ToSourceBSS-TransparentContainer,
TargeteNB-ToSourceeNB-TransparentContainer,
TargetID,
TargetRNC-ToSourceRNC-TransparentContainer,
@ -169,7 +169,16 @@ IMPORTS
HandoverFlag,
NRUESecurityCapabilities,
UE-Application-Layer-Measurement-Capability,
CE-ModeBRestricted
CE-ModeBRestricted,
Packet-LossRate,
UECapabilityInfoRequest,
SourceNgRanNode-ToTargetNgRanNode-TransparentContainer,
TargetNgRanNode-ToSourceNgRanNode-TransparentContainer,
EndIndication,
EDT-Session,
LTE-M-Indication,
AerialUEsubscriptionInformation
@ -190,6 +199,7 @@ FROM S1AP-Containers
id-AssistanceDataForPaging,
id-AerialUEsubscriptionInformation,
id-uEaggregateMaximumBitrate,
id-BearerType,
id-Cause,
@ -217,7 +227,7 @@ FROM S1AP-Containers
id-EUTRAN-CGI,
id-eNBname,
id-eNB-StatusTransfer-TransparentContainer,
id-eNB-UE-S1AP-ID,
id-eNB-UE-S1AP-ID,
id-GERANtoLTEHOInformationRes,
id-GUMMEI-ID,
id-GUMMEIType,
@ -281,7 +291,7 @@ FROM S1AP-Containers
id-E-RABNotToBeModifiedItemBearerModInd,
id-E-RABModifyListBearerModConf,
id-E-RABModifyItemBearerModConf,
id-E-RABFailedToModifyListBearerModConf,
id-E-RABFailedToModifyListBearerModConf,
id-E-RABToBeReleasedListBearerModConf,
id-E-RABToBeReleasedList,
id-E-RABReleasedList,
@ -409,7 +419,14 @@ FROM S1AP-Containers
id-HandoverFlag,
id-NRUESecurityCapabilities,
id-UE-Application-Layer-Measurement-Capability,
id-CE-ModeBRestricted
id-CE-ModeBRestricted,
id-DownlinkPacketLossRate,
id-UplinkPacketLossRate,
id-UECapabilityInfoRequest,
id-EndIndication,
id-EDT-Session,
id-LTE-M-Indication
FROM S1AP-Constants;
@ -441,7 +458,7 @@ HandoverRequired ::= SEQUENCE {
...
}
HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory}|
@ -471,7 +488,7 @@ HandoverCommand ::= SEQUENCE {
...
}
HandoverCommandIEs S1AP-PROTOCOL-IES ::= {
HandoverCommandIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory}|
@ -519,7 +536,7 @@ HandoverPreparationFailure ::= SEQUENCE {
...
}
HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {
HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
@ -573,7 +590,8 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
...
}
@ -676,7 +694,7 @@ HandoverFailure ::= SEQUENCE {
...
}
HandoverFailureIEs S1AP-PROTOCOL-IES ::= {
HandoverFailureIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
@ -700,12 +718,12 @@ HandoverNotify ::= SEQUENCE {
...
}
HandoverNotifyIEs S1AP-PROTOCOL-IES ::= {
HandoverNotifyIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-EUTRAN-CGI CRITICALITY ignore TYPE EUTRAN-CGI PRESENCE mandatory}|
{ ID id-TAI CRITICALITY ignore TYPE TAI PRESENCE mandatory}|
-- Extension for Release 11 to support BBAI --
-- Extension for Release 11 to support BBAI --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}|
{ ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional},
...
@ -728,7 +746,7 @@ PathSwitchRequest ::= SEQUENCE {
...
}
PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {
PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-E-RABToBeSwitchedDLList CRITICALITY reject TYPE E-RABToBeSwitchedDLList PRESENCE mandatory}|
{ ID id-SourceMME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
@ -739,7 +757,7 @@ PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-CellAccessMode CRITICALITY ignore TYPE CellAccessMode PRESENCE optional}|
{ ID id-SourceMME-GUMMEI CRITICALITY ignore TYPE GUMMEI PRESENCE optional}|
{ ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional}|
-- Extension for Release 11 to support BBAI --
-- Extension for Release 11 to support BBAI --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}|
{ ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional}|
{ ID id-RRC-Resume-Cause CRITICALITY ignore TYPE RRC-Establishment-Cause PRESENCE optional }|
@ -777,7 +795,7 @@ PathSwitchRequestAcknowledge ::= SEQUENCE {
...
}
PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-uEaggregateMaximumBitrate CRITICALITY ignore TYPE UEAggregateMaximumBitrate PRESENCE optional}|
@ -793,7 +811,8 @@ PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
...
}
@ -828,7 +847,7 @@ PathSwitchRequestFailure ::= SEQUENCE {
...
}
PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= {
PathSwitchRequestFailureIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
@ -853,7 +872,7 @@ HandoverCancel ::= SEQUENCE {
...
}
HandoverCancelIEs S1AP-PROTOCOL-IES ::= {
HandoverCancelIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
@ -871,7 +890,7 @@ HandoverCancelAcknowledge ::= SEQUENCE {
...
}
HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
HandoverCancelAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
@ -1108,7 +1127,7 @@ E-RABReleaseResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-E-RABReleaseListBearerRelComp CRITICALITY ignore TYPE E-RABReleaseListBearerRelComp PRESENCE optional }|
{ ID id-E-RABFailedToReleaseList CRITICALITY ignore TYPE E-RABList PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
-- Extension for Release 12 to support User Location Information --
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }|
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
@ -1156,7 +1175,7 @@ E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-E-RABReleasedList CRITICALITY ignore TYPE E-RABList PRESENCE mandatory }|
-- Extension for Release 12 to support User Location Information --
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }|
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
@ -1206,7 +1225,8 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
...
}
@ -1327,7 +1347,7 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
{ ID id-CSG-IdList CRITICALITY ignore TYPE CSG-IdList PRESENCE optional}|
{ ID id-PagingPriority CRITICALITY ignore TYPE PagingPriority PRESENCE optional}|
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional}|
-- Extension for Release 13 to support Paging Optimisation and Coverage Enhancement paging --
-- Extension for Release 13 to support Paging Optimisation and Coverage Enhancement paging -
{ ID id-AssistanceDataForPaging CRITICALITY ignore TYPE AssistanceDataForPaging PRESENCE optional}|
{ ID id-Paging-eDRXInformation CRITICALITY ignore TYPE Paging-eDRXInformation PRESENCE optional}|
{ ID id-extended-UEIdentityIndexValue CRITICALITY ignore TYPE Extended-UEIdentityIndexValue PRESENCE optional}|
@ -1414,11 +1434,11 @@ UEContextReleaseComplete-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
-- Extension for Release 12 to support User Location Information --
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional}|
-- Extension for Release 13 to support Paging Optimisation
{ ID id-InformationOnRecommendedCellsAndENBsForPaging CRITICALITY ignore TYPE InformationOnRecommendedCellsAndENBsForPaging PRESENCE optional}|
-- Extension for Release 13 to support coverage enhancement paging -
-- Extension for Release 13 to support coverage enhancement paging
{ ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional}|
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
@ -1442,7 +1462,7 @@ UEContextModificationRequest ::= SEQUENCE {
...
}
UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-SecurityKey CRITICALITY reject TYPE SecurityKey PRESENCE optional}|
@ -1458,7 +1478,8 @@ UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-SRVCCOperationNotPossible CRITICALITY ignore TYPE SRVCCOperationNotPossible PRESENCE optional}|
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
...
}
-- **************************************************************
@ -1472,7 +1493,7 @@ UEContextModificationResponse ::= SEQUENCE {
...
}
UEContextModificationResponseIEs S1AP-PROTOCOL-IES ::= {
UEContextModificationResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
@ -1489,7 +1510,7 @@ UEContextModificationFailure ::= SEQUENCE {
...
}
UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= {
UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
@ -1514,7 +1535,7 @@ UERadioCapabilityMatchRequest ::= SEQUENCE {
...
}
UERadioCapabilityMatchRequestIEs S1AP-PROTOCOL-IES ::= {
UERadioCapabilityMatchRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional },
@ -1532,7 +1553,7 @@ UERadioCapabilityMatchResponse ::= SEQUENCE {
...
}
UERadioCapabilityMatchResponseIEs S1AP-PROTOCOL-IES ::= {
UERadioCapabilityMatchResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-VoiceSupportMatchIndicator CRITICALITY reject TYPE VoiceSupportMatchIndicator PRESENCE mandatory }|
@ -1568,7 +1589,9 @@ DownlinkNASTransport-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-DLNASPDUDeliveryAckRequest CRITICALITY ignore TYPE DLNASPDUDeliveryAckRequest PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-UECapabilityInfoRequest CRITICALITY ignore TYPE UECapabilityInfoRequest PRESENCE optional}|
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional},
...
}
@ -1597,7 +1620,7 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-GW-TransportLayerAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE optional}|
{ ID id-RelayNode-Indicator CRITICALITY reject TYPE RelayNode-Indicator PRESENCE optional}|
{ ID id-GUMMEIType CRITICALITY ignore TYPE GUMMEIType PRESENCE optional}|
-- Extension for Release 11 to support BBAI --
-- Extension for Release 11 to support BBAI --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}|
{ ID id-SIPTO-L-GW-TransportLayerAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE optional}|
{ ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional}|
@ -1606,7 +1629,8 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-CE-mode-B-SupportIndicator CRITICALITY ignore TYPE CE-mode-B-SupportIndicator PRESENCE optional}|
{ ID id-DCN-ID CRITICALITY ignore TYPE DCN-ID PRESENCE optional}|
{ ID id-Coverage-Level CRITICALITY ignore TYPE Coverage-Level PRESENCE optional}|
{ ID id-UE-Application-Layer-Measurement-Capability CRITICALITY ignore TYPE UE-Application-Layer-Measurement-Capability PRESENCE optional},
{ ID id-UE-Application-Layer-Measurement-Capability CRITICALITY ignore TYPE UE-Application-Layer-Measurement-Capability PRESENCE optional}|
{ ID id-EDT-Session CRITICALITY ignore TYPE EDT-Session PRESENCE optional},
...
}
@ -1867,7 +1891,7 @@ S1SetupFailureIEs S1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
-- eNB Configuration Update
-- eNB Configuration Update
--
-- **************************************************************
@ -1929,7 +1953,7 @@ ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
-- MME Configuration Update
-- MME Configuration Update
--
-- **************************************************************
@ -2062,7 +2086,8 @@ UECapabilityInfoIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE mandatory}|
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional}|
{ ID id-UE-Application-Layer-Measurement-Capability CRITICALITY ignore TYPE UE-Application-Layer-Measurement-Capability PRESENCE optional},
{ ID id-UE-Application-Layer-Measurement-Capability CRITICALITY ignore TYPE UE-Application-Layer-Measurement-Capability PRESENCE optional}|
{ ID id-LTE-M-Indication CRITICALITY ignore TYPE LTE-M-Indication PRESENCE optional},
...
}
@ -2253,7 +2278,7 @@ LocationReportingFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
-- Location Report
-- Location Report
--
-- **************************************************************
@ -2288,7 +2313,7 @@ OverloadStart ::= SEQUENCE {
...
}
OverloadStartIEs S1AP-PROTOCOL-IES ::= {
OverloadStartIEs S1AP-PROTOCOL-IES ::= {
{ ID id-OverloadResponse CRITICALITY reject TYPE OverloadResponse PRESENCE mandatory }|
{ ID id-GUMMEIList CRITICALITY ignore TYPE GUMMEIList PRESENCE optional }|
{ ID id-TrafficLoadReductionIndication CRITICALITY ignore TYPE TrafficLoadReductionIndication PRESENCE optional },
@ -2305,13 +2330,13 @@ OverloadStop ::= SEQUENCE {
...
}
OverloadStopIEs S1AP-PROTOCOL-IES ::= {
OverloadStopIEs S1AP-PROTOCOL-IES ::= {
{ ID id-GUMMEIList CRITICALITY ignore TYPE GUMMEIList PRESENCE optional },
...
}
-- **************************************************************
--
-- WRITE-REPLACE WARNING ELEMENTARY PROCEDURE
-- WRITE-REPLACE WARNING ELEMENTARY PROCEDURE
--
-- **************************************************************
@ -2327,7 +2352,7 @@ WriteReplaceWarningRequest ::= SEQUENCE {
...
}
WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory }|
{ ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory }|
{ ID id-WarningAreaList CRITICALITY ignore TYPE WarningAreaList PRESENCE optional }|
@ -2491,7 +2516,7 @@ KillRequest ::= SEQUENCE {
...
}
KillRequestIEs S1AP-PROTOCOL-IES ::= {
KillRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MessageIdentifier CRITICALITY reject TYPE MessageIdentifier PRESENCE mandatory}|
{ ID id-SerialNumber CRITICALITY reject TYPE SerialNumber PRESENCE mandatory}|
{ ID id-WarningAreaList CRITICALITY ignore TYPE WarningAreaList PRESENCE optional}|
@ -2662,7 +2687,7 @@ E-RABModificationIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-E-RABToBeModifiedListBearerModInd CRITICALITY reject TYPE E-RABToBeModifiedListBearerModInd PRESENCE mandatory}|
{ ID id-E-RABNotToBeModifiedListBearerModInd CRITICALITY reject TYPE E-RABNotToBeModifiedListBearerModInd PRESENCE optional}|
{ ID id-CSGMembershipInfo CRITICALITY reject TYPE CSGMembershipInfo PRESENCE optional}|
-- Extension for Release 11 to support BBAI --
-- Extension for Release 11 to support BBAI --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}|
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
@ -2966,13 +2991,14 @@ ConnectionEstablishmentIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional }|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional }|
{ ID id-DL-CP-SecurityInformation CRITICALITY ignore TYPE DL-CP-SecurityInformation PRESENCE optional }|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional},
...
}
-- **************************************************************
--
-- Retrieve UE Information
-- Retrieve UE Information
--
-- **************************************************************

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
--
@ -6,11 +6,11 @@
--
-- **************************************************************
S1AP-PDU-Descriptions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
S1AP-PDU-Descriptions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-PDU-Descriptions (0)}
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -66,7 +66,7 @@ FROM S1AP-CommonDataTypes
Paging,
PathSwitchRequest,
PathSwitchRequestAcknowledge,
PathSwitchRequestFailure,
PathSwitchRequestFailure,
PrivateMessage,
Reset,
ResetAcknowledge,
@ -121,7 +121,7 @@ FROM S1AP-CommonDataTypes
FROM S1AP-PDU-Contents
id-CellTrafficTrace,
id-DeactivateTrace,
id-downlinkUEAssociatedLPPaTransport,
@ -250,7 +250,7 @@ UnsuccessfulOutcome ::= SEQUENCE {
S1AP-ELEMENTARY-PROCEDURES S1AP-ELEMENTARY-PROCEDURE ::= {
S1AP-ELEMENTARY-PROCEDURES-CLASS-1 |
S1AP-ELEMENTARY-PROCEDURES-CLASS-2,
S1AP-ELEMENTARY-PROCEDURES-CLASS-2,
...
}
@ -280,7 +280,7 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
uEContextResume
}
S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
handoverNotification |
e-RABReleaseIndication |
paging |

View File

@ -1,15 +1,15 @@
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- B.2 ASN.1 definition
-- **************************************************************
--
-- IE definitions for the SON Transfer application
-- The IEs in this ASN.1 module shall be defined and encoded
-- using the same rules as applicable for the S1AP-IEs module.
--
--
-- **************************************************************
SonTransfer-IEs
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -152,7 +152,7 @@ ReportingCellList ::= SEQUENCE (SIZE(1.. maxnoofIRATReportingCells)) OF Reportin
MultiCellLoadReportingResponse ::= SEQUENCE (SIZE(1.. maxnoofIRATReportingCells)) OF MultiCellLoadReportingResponse-Item
MultiCellLoadReportingResponse-Item ::= CHOICE{
MultiCellLoadReportingResponse-Item ::= CHOICE{
eUTRANResponse EUTRANResponse,
uTRANResponse OCTET STRING,
gERANResponse OCTET STRING,

View File

@ -38,6 +38,7 @@
#include "packet-cell_broadcast.h"
#include "packet-gsm_a_common.h"
#include "packet-ntp.h"
#include "packet-ngap.h"
#define PNAME "S1 Application Protocol"
#define PSNAME "S1AP"
@ -105,7 +106,8 @@ static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA1 = -1;
static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA2 = -1;
static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA3 = -1;
static int hf_s1ap_NRintegrityProtectionAlgorithms_Reserved = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved = -1;
#include "packet-s1ap-hf.c"
@ -311,6 +313,12 @@ static const true_false_string s1ap_tfs_activate_do_not_activate = {
"Do not activate"
};
static void
s1ap_Packet_LossRate_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f %% (%u)", (float)v/10, v);
}
static struct s1ap_private_data*
s1ap_get_private_data(packet_info *pinfo)
{
@ -657,13 +665,17 @@ void proto_register_s1ap(void) {
{ "Reserved", "s1ap.NRintegrityProtectionAlgorithms.Reserved",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
{ &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement,
{ "QoE Measurement", "s1ap.UE_Application_Layer_Measurement_Capability.QoE_Measurement",
{ &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service,
{ "QoE Measurement for streaming service", "s1ap.UE_Application_Layer_Measurement_Capability.QoE_Measurement_for_streaming_service",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }},
{ &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service,
{ "QoE Measurement for MTSI service", "s1ap.UE_Application_Layer_Measurement_Capability.QoE_Measurement_for_MTSI_service",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{ &hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved,
{ "Reserved", "s1ap.UE_Application_Layer_Measurement_Capability.Reserved",
FT_UINT8, BASE_HEX, NULL, 0x7f,
FT_UINT8, BASE_HEX, NULL, 0x3f,
NULL, HFILL }},
#include "packet-s1ap-hfarr.c"
};

View File

@ -43,6 +43,7 @@ SONtransferCause
UE-HistoryInformation
#.MAKE_ENUM
HandoverType
ProcedureCode
ProtocolIE-ID
RAT-Type
@ -53,6 +54,8 @@ SourceBSS-ToTargetBSS-TransparentContainer
TargetBSS-ToSourceBSS-TransparentContainer
SourceRNC-ToTargetRNC-TransparentContainer
TargetRNC-ToSourceRNC-TransparentContainer
SourceNgRanNode-ToTargetNgRanNode-TransparentContainer
TargetNgRanNode-ToSourceNgRanNode-TransparentContainer
ReportingCellList
ReportingCellList-Item
@ -356,19 +359,19 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
struct s1ap_private_data *s1ap_data = s1ap_get_private_data(actx->pinfo);
%(DEFAULT_BODY)s
#Zero the value before use
#Undef the value before use
#.FN_HDR HandoverRequired
struct s1ap_private_data *s1ap_data = s1ap_get_private_data(actx->pinfo);
s1ap_data->handover_type_value = 0;
s1ap_data->handover_type_value = 0xff;
#.FN_HDR HandoverCommand
struct s1ap_private_data *s1ap_data = s1ap_get_private_data(actx->pinfo);
s1ap_data->handover_type_value = 0;
s1ap_data->handover_type_value = 0xff;
#.FN_HDR HandoverRequest
struct s1ap_private_data *s1ap_data = s1ap_get_private_data(actx->pinfo);
s1ap_data->handover_type_value = 0;
s1ap_data->handover_type_value = 0xff;
#.FN_HDR HandoverRequestAcknowledge
struct s1ap_private_data *s1ap_data = s1ap_get_private_data(actx->pinfo);
s1ap_data->handover_type_value = 0;
s1ap_data->handover_type_value = 0xff;
#.FN_BODY Source-ToTarget-TransparentContainer VAL_PTR = &parameter_tvb
# I think the message is "directly encoded" into the octet string(no "double encoding")
@ -398,36 +401,44 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
utrantolte,
gerantolte,
...
ltetonr,
nrtolte
} */
case 0:
case intralte:
/* intralte
Intra E-UTRAN handover Source eNB to Target eNB
Transparent Container 36.413
*/
dissect_SourceeNB_ToTargeteNB_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case 1:
case ltetoutran:
/* ltetoutran
Source RNC to Target RNC
Transparent Container 25.413
*/
dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case 2:
case ltetogeran:
/* ltetogeran
Source BSS to Target BSS
Transparent Container 48.018
*/
de_bssgp_source_BSS_to_target_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0);
break;
case 3:
case utrantolte:
/* utrantolte */
break;
case 4:
case gerantolte:
/* gerantolte */
break;
case ltetonr:
/* ltetonr */
dissect_ngap_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case nrtolte:
/* nrtolte */
break;
default:
DISSECTOR_ASSERT_NOT_REACHED();
break;
}
/* Enable writing of the column again */
@ -455,37 +466,44 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
utrantolte,
gerantolte,
...
ltetonr,
nrtolte
} */
case 0:
case intralte:
/* intralte
Intra E-UTRAN handover Target eNB to Source eNB
Transparent Container 36.413
*/
dissect_TargeteNB_ToSourceeNB_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case 1:
case ltetoutran:
/* ltetoutran
Target RNC to Source RNC
Transparent Container 25.413
*/
dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case 2:
case ltetogeran:
/* ltetogeran
Target BSS to Source BSS
Transparent Container 48.018
*/
de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0);
break;
case 3:
case utrantolte:
/* utrantolte */
break;
case 4:
case gerantolte:
/* gerantolte */
break;
case ltetonr:
/* ltetonr */
dissect_ngap_TargetNGRANNode_ToSourceNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case nrtolte:
/* nrtolte */
break;
default:
DISSECTOR_ASSERT_NOT_REACHED();
break;
}
}
@ -1028,7 +1046,8 @@ ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
%(DEFAULT_BODY)s
if(parameter_tvb){
const gint *fields[] = {
&hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement,
&hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service,
&hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service,
&hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved,
NULL
};
@ -1162,6 +1181,9 @@ M-TMSI TYPE = FT_UINT32 DISPLAY = BASE_DEC_HEX
}
}
#.TYPE_ATTR
Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Packet_LossRate_fmt)
#.ASSIGN_VALUE_TO_TYPE # S1AP does not have constants assigned to types, they are pure INTEGER
# ProcedureCode
@ -1483,6 +1505,16 @@ id-SecondaryRATDataUsageRequest ProtocolIE-ID
id-NRUESecurityCapabilities ProtocolIE-ID
id-UnlicensedSpectrumRestriction ProtocolIE-ID
id-CE-ModeBRestricted ProtocolIE-ID
id-LTE-M-Indication ProtocolIE-ID
id-DownlinkPacketLossRate ProtocolIE-ID
id-UplinkPacketLossRate ProtocolIE-ID
id-UECapabilityInfoRequest ProtocolIE-ID
id-serviceType ProtocolIE-ID
id-AerialUEsubscriptionInformation ProtocolIE-ID
id-EndIndication ProtocolIE-ID
id-EDT-Session ProtocolIE-ID
id-CNTypeRestrictions ProtocolIE-ID
#.END
#.REGISTER
@ -1697,6 +1729,11 @@ UE-Application-Layer-Measurement-Capability N s1ap.ies id-UE-Application-Lay
HandoverFlag N s1ap.ies id-HandoverFlag
EmergencyAreaIDListForRestart N s1ap.ies id-EmergencyAreaIDListForRestart
CE-ModeBRestricted N s1ap.ies id-CE-ModeBRestricted
AerialUEsubscriptionInformation N s1ap.ies id-AerialUEsubscriptionInformation
UECapabilityInfoRequest N s1ap.ies id-UECapabilityInfoRequest
EndIndication N s1ap.ies id-EndIndication
EDT-Session N s1ap.ies id-EDT-Session
LTE-M-Indication N s1ap.ies id-LTE-M-Indication
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@ -1747,6 +1784,10 @@ UEAppLayerMeasConfig N s1ap.extension id-UEAppLayerMeasConfig
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateDL
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateUL
UnlicensedSpectrumRestriction N s1ap.extension id-UnlicensedSpectrumRestriction
CNTypeRestrictions N s1ap.extension id-CNTypeRestrictions
Packet-LossRate N s1ap.extension id-DownlinkPacketLossRate
Packet-LossRate N s1ap.extension id-UplinkPacketLossRate
ServiceType N s1ap.extension id-serviceType
#S1AP-ELEMENTARY-PROCEDURE
HandoverRequired N s1ap.proc.imsg id-HandoverPreparation

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,44 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-ngap.h */
/* asn2wrs.py -p ngap -c ./ngap.cnf -s ./packet-ngap-template -D . -O ../.. NGAP-CommonDataTypes.asn NGAP-Constants.asn NGAP-Containers.asn NGAP-IEs.asn NGAP-PDU-Contents.asn NGAP-PDU-Descriptions.asn */
/* Input file: packet-ngap-template.h */
#line 1 "./asn1/ngap/packet-ngap-template.h"
/* packet-s1ap.h
* Routines for E-UTRAN NG Application Protocol (NGAP) packet dissection
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_NGAP_H
#define PACKET_NGAP_H
/*--- Included file: packet-ngap-exp.h ---*/
#line 1 "./asn1/ngap/packet-ngap-exp.h"
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_);
/*--- End of included file: packet-ngap-exp.h ---*/
#line 15 "./asn1/ngap/packet-ngap-template.h"
#endif /* PACKET_NGAP_H */
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/

File diff suppressed because it is too large Load Diff