aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-06-12 19:18:06 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-06-12 19:18:06 +0000
commita1011ad64dadff3f25cc52db9eba1342043196c6 (patch)
tree7b5edffdae6f73b327def19771ff41d913ce318a
parente5b6e5e8c224c49f7aaa942ff62f060f6118cf98 (diff)
Update to 3GPP TS 36.413 V8.2.0 (2008-06)
svn path=/trunk/; revision=25447
Diffstat
-rw-r--r--asn1/s1ap/S1AP-CommonDataTypes.asn1
-rw-r--r--asn1/s1ap/S1AP-Constants.asn48
-rw-r--r--asn1/s1ap/S1AP-Containers.asn2
-rw-r--r--asn1/s1ap/S1AP-IEs.asn171
-rw-r--r--asn1/s1ap/S1AP-PDU-Contents.asn551
-rw-r--r--asn1/s1ap/S1AP-PDU-Descriptions.asn181
-rw-r--r--asn1/s1ap/packet-s1ap-template.c2
-rw-r--r--asn1/s1ap/s1ap.cnf144
-rw-r--r--epan/dissectors/packet-s1ap.c1472
9 files changed, 2060 insertions, 512 deletions
diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index fcc04543e1..923b7506a4 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,4 +1,5 @@
-- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
-- 9.3.5 Common Definitions
-- **************************************************************
--
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 4cec21140c..45360c97ad 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,4 +1,5 @@
-- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
-- 9.3.6 Constant Definitions
-- **************************************************************
--
@@ -59,7 +60,14 @@ id-UECapabilityInfoIndication ProcedureCode ::= 22
id-UEContextRelease ProcedureCode ::= 23
id-eNBStatusTransfer ProcedureCode ::= 24
id-MMEStatusTransfer ProcedureCode ::= 25
-
+id-DeactivateTrace ProcedureCode ::= 26
+id-TraceStart ProcedureCode ::= 27
+id-TraceFailureIndication ProcedureCode ::= 28
+id-ENBConfigurationUpdate ProcedureCode ::= 29
+id-MMEConfigurationUpdate ProcedureCode ::= 30
+id-LocationReportingControl ProcedureCode ::= 31
+id-LocationReportingFailureIndication ProcedureCode ::= 32
+id-LocationReport ProcedureCode ::= 33
-- **************************************************************
--
@@ -79,14 +87,16 @@ maxProtocolIEs INTEGER ::= 65535
maxNrOfSAEBs INTEGER ::= 256
maxNrOfInterfaces INTEGER ::= 3 --FFS
maxnoofTAI INTEGER ::= 256 --FFS
+maxnoofTACs INTEGER ::= 256 --FFS
maxNrOfErrors INTEGER ::= 256
maxnoofBPLMNs INTEGER ::= 6
maxnoofPLMNsPerMME INTEGER ::= 32 -- FFS
-maxnoofTAIs INTEGER ::= 256 -- FFS
maxnoofEPLMNs INTEGER ::= 15
maxnoofEPLMNsPlusOne INTEGER ::= 16
maxnoofForbLACs INTEGER ::= 256 -- FFS Value to be checked
-maxnoofForbTAIs INTEGER ::= 256 -- FFS Value to be checked
+maxnoofForbTACs INTEGER ::= 256 -- FFS Value to be checked
+maxNrOfIndividualS1ConnectionsToReset INTEGER ::= 256
+
@@ -141,8 +151,8 @@ id-HandoverRestrictionList ProtocolIE-ID ::= 41
id-UEPagingID ProtocolIE-ID ::= 43
id-pagingDRX ProtocolIE-ID ::= 44
id-pagingCause ProtocolIE-ID ::= 45
-id-TAIdList ProtocolIE-ID ::= 46
-id-TAIdItem ProtocolIE-ID ::= 47
+id-TAIList ProtocolIE-ID ::= 46
+id-TAIItem ProtocolIE-ID ::= 47
id-SAEBearerFailedToSetupListCtxtSURes ProtocolIE-ID ::= 48
id-SAEBearerReleaseItemHOCmd ProtocolIE-ID ::= 49
id-SAEBearerSetupItemCtxtSURes ProtocolIE-ID ::= 50
@@ -158,11 +168,10 @@ id-ENB-Global-ID ProtocolIE-ID ::= 59
id-eNBname ProtocolIE-ID ::= 60
id-MMEname ProtocolIE-ID ::= 61
id-ServedPLMNs ProtocolIE-ID ::= 63
-id-SupportedTAIs ProtocolIE-ID ::= 64
+id-SupportedTAs ProtocolIE-ID ::= 64
id-TimeToWait ProtocolIE-ID ::= 65
id-aggregateMaximumBitrate ProtocolIE-ID ::= 66
-id-TAId ProtocolIE-ID ::= 67
-id-ServingPLMN ProtocolIE-ID ::= 68
+id-TAI ProtocolIE-ID ::= 67
id-SAEBearerReleaseListBearerRelComp ProtocolIE-ID ::= 69
id-cdma2000PDU ProtocolIE-ID ::= 70
id-cdma2000RATType ProtocolIE-ID ::= 71
@@ -170,13 +179,28 @@ id-cdma2000SectorID ProtocolIE-ID ::= 72
id-SecurityInfo ProtocolIE-ID ::= 73
id-UERadioCapability ProtocolIE-ID ::= 74
id-GUMMEI-ID ProtocolIE-ID ::= 75
-id-Bearers-SubjectToStatusTransferENB-List ProtocolIE-ID ::= 76
-id-Bearers-SubjectToStatusTransferENB-Item ProtocolIE-ID ::= 77
id-SAEBearerInformationListItem ProtocolIE-ID ::= 78
id-Direct-Forwarding-Path-Availability ProtocolIE-ID ::= 79
id-UEIdentityIndexValue ProtocolIE-ID ::= 80
-id-Bearers-SubjectToStatusTransferMME-List ProtocolIE-ID ::= 80
-id-Bearers-SubjectToStatusTransferMME-Item ProtocolIE-ID ::= 81
+id-cdma2000HOStatus ProtocolIE-ID ::= 83
+id-cdma2000HORequiredIndication ProtocolIE-ID ::= 84
+id-cdma2000OneXMEID ProtocolIE-ID ::= 85
+id-TraceReference ProtocolIE-ID ::= 86
+id-RelativeMMECapacity ProtocolIE-ID ::= 87
+id-SourceMME-UE-S1AP-ID ProtocolIE-ID ::= 88
+id-Bearers-SubjectToStatusTransfer-Item ProtocolIE-ID ::= 89
+id-eNB-StatusTransfer-TransparentContainer ProtocolIE-ID ::= 90
+id-UE-associatedLogicalS1-ConnectionItem ProtocolIE-ID ::= 91
+id-ResetType ProtocolIE-ID ::= 92
+id-UE-associatedLogicalS1-ConnectionListResAck ProtocolIE-ID ::= 93
+id-SAEBearerToBeSwitchedULItem ProtocolIE-ID ::= 94
+id-SAEBearerToBeSwitchedULList ProtocolIE-ID ::= 95
+id-S-TMSI ProtocolIE-ID ::= 96
+id-cdma2000OneXRAND ProtocolIE-ID ::= 97
+id-RequestType ProtocolIE-ID ::= 98
+id-UE-S1AP-IDs ProtocolIE-ID ::= 99
+id-EUTRAN-CGI-ID ProtocolIE-ID ::= 100
END
+
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index c75c7ffc0e..b84a31ed5d 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,4 +1,5 @@
-- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
-- 9.3.7 Container Definitions
-- **************************************************************
--
@@ -198,3 +199,4 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
}
END
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 7d7e2ad67e..6205383d87 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,4 +1,5 @@
-- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
-- 9.3.4 Information Element Definitions
-- **************************************************************
--
@@ -17,17 +18,19 @@ BEGIN
IMPORTS
id-SAEBearerInformationListItem,
id-SAEBearerItem,
+ id-Bearers-SubjectToStatusTransfer-Item,
maxNrOfSAEBs,
maxNrOfInterfaces,
maxNrOfErrors,
maxnoofBPLMNs,
maxnoofPLMNsPerMME,
- maxnoofTAIs,
+ maxnoofTACs,
maxnoofEPLMNs,
maxnoofEPLMNsPlusOne,
maxnoofForbLACs,
- maxnoofForbTAIs
+ maxnoofForbTACs,
+ maxnoofTACs
FROM S1AP-Constants
@@ -69,6 +72,25 @@ Aggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- B
+Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }
+
+Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-Bearers-SubjectToStatusTransfer-Item CRITICALITY ignore TYPE Bearers-SubjectToStatusTransfer-Item PRESENCE mandatory },
+ ...
+}
+
+Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE {
+ sAE-Bearer-ID SAE-Bearer-ID,
+ uL-COUNTvalue COUNTvalue,
+ dL-COUNTvalue COUNTvalue,
+ iE-Extensions ProtocolExtensionContainer { {Bearers-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL,
+ ...
+}
+
+Bearers-SubjectToStatusTransfer-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
@@ -89,7 +111,8 @@ CauseMisc ::= ENUMERATED {
hardware-failure,
om-intervention,
unspecified,
- ...
+ unknown-PLMN,
+...
}
CauseProtocol ::= ENUMERATED {
@@ -110,6 +133,17 @@ CauseRadioNetwork ::= ENUMERATED {
successful-handover,
release-due-to-eutran-generated-reason,
handover-cancelled,
+ partial-handover,
+ ho-failure-in-target-EPC-eNB-or-target-system,
+ ho-target-not-allowed,
+ tS1relocoverall-expiry,
+ tS1relocprep-expiry,
+ cell-not-available,
+ unknown-targetID,
+ no-radio-resources-available-in-target-cell,
+ unknown-mme-ue-s1ap-id,
+ unknown-enb-ue-s1ap-id,
+ unknown-pair-ue-s1ap-id,
...
}
@@ -139,6 +173,21 @@ Cdma2000RATType ::= ENUMERATED {
Cdma2000SectorID ::= OCTET STRING
+Cdma2000HOStatus ::= ENUMERATED {
+ hOSuccess,
+ hOFailure,
+ ...
+}
+
+Cdma2000HORequiredIndication ::= ENUMERATED {
+ true,
+ ...
+}
+
+Cdma2000OneXMEID ::= OCTET STRING
+
+Cdma2000OneXRAND ::= OCTET STRING
+
CGI ::= SEQUENCE {
pLMNidentity PLMNidentity,
lAC LAC,
@@ -148,6 +197,12 @@ CGI ::= SEQUENCE {
CI ::= OCTET STRING (SIZE (2))
+COUNTvalue ::= SEQUENCE {
+ pDCP-SN PDCP-SN,
+ hFN HFN,
+ ...
+}
+
CriticalityDiagnostics ::= SEQUENCE {
procedureCode ProcedureCode OPTIONAL,
triggeringMessage TriggeringMessage OPTIONAL,
@@ -190,13 +245,30 @@ Direct-Forwarding-Path-Availability ::= ENUMERATED {
-- E
-ENB-UE-S1AP-ID ::= TBCD-STRING
+ENB-StatusTransfer-TransparentContainer ::= SEQUENCE {
+ bearers-SubjectToStatusTransferList Bearers-SubjectToStatusTransferList OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { {ENB-StatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL,
+ ...
+}
+
+ENB-StatusTransfer-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+ENB-UE-S1AP-ID ::= INTEGER (0..16777215)
ENB-Global-ID ::= INTEGER (0..65535)
ENBname ::= OCTET STRING
EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMNidentity
+EventType ::= ENUMERATED {
+ direct,
+ change-of-serve-cell,
+ stop-change-of-serve-cell,
+ ...
+}
+EUTRAN-CGI-ID ::= OCTET STRING
ExtendedRNC-ID ::= INTEGER (4096..65535)
-- F
@@ -212,10 +284,10 @@ ForbiddenTAs ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF ForbiddenTAs-Item
ForbiddenTAs-Item ::= SEQUENCE {
pLMN-Identity PLMNidentity,
- forbiddenTAIs ForbiddenTAIs
+ forbiddenTACs ForbiddenTACs
}
-ForbiddenTAIs ::= SEQUENCE (SIZE(1..maxnoofForbTAIs)) OF TAI
+ForbiddenTACs ::= SEQUENCE (SIZE(1..maxnoofForbTACs)) OF TAC
ForbiddenLAs ::= SEQUENCE (SIZE(1..maxnoofEPLMNsPlusOne)) OF ForbiddenLAs-Item
@@ -233,7 +305,7 @@ GTP-TEID ::= OCTET STRING (SIZE (4))
GUMMEI ::= SEQUENCE {
pLMN-Identity PLMNidentity,
mME-Group-ID MME-Group-ID,
- mMME-Code MME-Code,
+ mME-Code MME-Code,
iE-Extensions ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL,
...
}
@@ -245,6 +317,7 @@ GUMMEI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-- H
HandoverRestrictionList ::= SEQUENCE {
+ servingPLMN PLMNidentity,
equivalentPLMNs EPLMNs OPTIONAL,
forbiddenTAs ForbiddenTAs OPTIONAL,
forbiddenLAs ForbiddenLAs OPTIONAL,
@@ -266,6 +339,8 @@ HandoverType ::= ENUMERATED {
...
}
+HFN ::= INTEGER (0..1048575)
+
-- I
IMSI ::= OCTET STRING (SIZE (3..8))
@@ -294,7 +369,6 @@ InterfaceType ::= ENUMERATED {
-- K
-- L
-Label ::= INTEGER (1..256)
LAC ::= OCTET STRING (SIZE (2))
@@ -316,7 +390,7 @@ MME-Group-ID ::= OCTET STRING (SIZE (2))
MME-Code ::= OCTET STRING (SIZE (1))
-MME-UE-S1AP-ID ::= TBCD-STRING
+MME-UE-S1AP-ID ::= INTEGER (0..4294967295)
M-TMSI ::= OCTET STRING (SIZE (4))
@@ -339,7 +413,7 @@ PagingCause ::= ENUMERATED {
...,
terminating-high-priority-signalling
}
-PDCP-SN ::= INTEGER -- FFS
+PDCP-SN ::= INTEGER (0..4095)
PLMNidentity ::= TBCD-STRING
@@ -347,11 +421,31 @@ PriorityLevel ::= INTEGER (0..15)
-- Q
+
+QCI ::= INTEGER (1..256)
+
-- R
+RelativeMMECapacity ::= INTEGER (0..255)
+
RAC ::= OCTET STRING (SIZE (1))
+RequestType ::= SEQUENCE {
+ eventType EventType,
+ reportArea ReportArea,
+ iE-Extensions ProtocolExtensionContainer { { RequestType-ExtIEs} } OPTIONAL,
+ ...
+}
+
+
+RequestType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+ReportArea ::= OCTET STRING
+
+
RNC-ID ::= INTEGER (0..4095)
RRC-Container ::= OCTET STRING
@@ -396,11 +490,12 @@ SAEBearerItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
+
SAE-Bearer-BitRate ::= INTEGER (0..10000000)
SAE-BearerLevelQoSParameters ::= SEQUENCE {
- label Label,
+ qCI QCI,
allocationRetentionPriority AllocationRetentionPriority OPTIONAL,
sAE-BearerType SAE-Bearer-Type,
iE-Extensions ProtocolExtensionContainer { {SAE-Bearer-QoSParameters-ExtIEs} } OPTIONAL,
@@ -503,10 +598,10 @@ SourceRNC-ToTargetRNC-TransparentContainer ::= OCTET STRING
ServedPLMNs ::= SEQUENCE (SIZE(1.. maxnoofPLMNsPerMME)) OF PLMNidentity
-SupportedTAIs ::= SEQUENCE (SIZE(1.. maxnoofTAIs)) OF SupportedTAs-Item
+SupportedTAs ::= SEQUENCE (SIZE(1.. maxnoofTACs)) OF SupportedTAs-Item
SupportedTAs-Item ::= SEQUENCE {
- tAI TAId,
+ tAC TAC,
broadcastPLMNs BPLMNs,
...
}
@@ -520,9 +615,17 @@ S-TMSI ::= SEQUENCE {
-- T
-TAI ::= OCTET STRING
+TAC ::= OCTET STRING
+
+TAI ::= SEQUENCE {
+ pLMNidentity PLMNidentity,
+ tAC TAC,
+ iE-Extensions ProtocolExtensionContainer { {TAI-ExtIEs} } OPTIONAL
+}
-TAId ::= OCTET STRING
+TAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
TBCD-STRING ::= OCTET STRING (SIZE (3))
@@ -545,7 +648,16 @@ TargetRNC-ID ::= SEQUENCE {
}
-TargeteNodeB-ToSourceeNodeB-TransparentContainer ::= OCTET STRING
+TargeteNodeB-ToSourceeNodeB-TransparentContainer ::= SEQUENCE {
+ rRC-Container RRC-Container,
+ iE-Extensions ProtocolExtensionContainer { {TargeteNodeB-ToSourceeNodeB-TransparentContainer-ExtIEs} } OPTIONAL,
+ ...
+}
+
+TargeteNodeB-ToSourceeNodeB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
TargetRNC-ToSourceRNC-TransparentContainer ::= OCTET STRING
TargetBSS-ToSourceBSS-TransparentContainer ::= OCTET STRING
@@ -573,7 +685,7 @@ TraceDepth ::= ENUMERATED {
...
}
-TraceReference ::= OCTET STRING (SIZE (3))
+TraceReference ::= OCTET STRING (SIZE (8))
TypeOfError ::= ENUMERATED {
not-understood,
@@ -583,6 +695,31 @@ TypeOfError ::= ENUMERATED {
-- U
+
+UE-S1AP-IDs ::= CHOICE{
+ uE-S1AP-ID-pair UE-S1AP-ID-pair,
+ mME-UE-S1AP-ID MME-UE-S1AP-ID,
+ eNB-UE-S1AP-ID ENB-UE-S1AP-ID,
+ ...
+}
+
+UE-S1AP-ID-pair ::= SEQUENCE{
+ mME-UE-S1AP-ID MME-UE-S1AP-ID,
+ eNB-UE-S1AP-ID ENB-UE-S1AP-ID
+}
+
+UE-associatedLogicalS1-ConnectionItem ::= SEQUENCE {
+ mME-UE-S1AP-ID MME-UE-S1AP-ID OPTIONAL,
+ eNB-UE-S1AP-ID ENB-UE-S1AP-ID OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { UE-associatedLogicalS1-ConnectionItemExtIEs} } OPTIONAL,
+ ...
+}
+
+
+UE-associatedLogicalS1-ConnectionItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
UEIdentityIndexValue ::= OCTET STRING
UEPagingID ::= CHOICE {
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 312eee132e..74a6861a97 100644
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,4 +1,5 @@
-- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@@ -20,53 +21,58 @@ BEGIN
-- **************************************************************
IMPORTS
+
AggregateMaximumBitrate,
- MME-UE-S1AP-ID,
- ENB-UE-S1AP-ID,
- HandoverType,
Cause,
- SourceID,
- TargetID,
- SourceeNodeB-ToTargeteNodeB-TransparentContainer,
- SourceRNC-ToTargetRNC-TransparentContainer,
- SourceBSS-ToTargetBSS-TransparentContainer,
- TargeteNodeB-ToSourceeNodeB-TransparentContainer,
- TargetRNC-ToSourceRNC-TransparentContainer,
- TargetBSS-ToSourceBSS-TransparentContainer,
- SAE-Bearer-ID,
- TransportLayerAddress,
+ Cdma2000HORequiredIndication,
+ Cdma2000HOStatus,
+ Cdma2000OneXMEID,
+ Cdma2000OneXRAND,
+ Cdma2000PDU,
+ Cdma2000RATType,
+ Cdma2000SectorID,
+ CriticalityDiagnostics,
+ Direct-Forwarding-Path-Availability,
+ ENB-Global-ID,
+ EUTRAN-CGI-ID, ENBname,
+ ENB-StatusTransfer-TransparentContainer,
+ ENB-UE-S1AP-ID,
GTP-TEID,
GUMMEI,
+ HandoverRestrictionList,
+ HandoverType,
+ MMEname,
+ MME-UE-S1AP-ID,
+ NAS-PDU, PagingCause,
+ PagingDRX,
+ PLMNidentity,
+ RelativeMMECapacity, RequestType,
+ SAE-Bearer-ID,
SAE-BearerLevelQoSParameters,
SAEBearerList,
- Cause,
- TraceActivation,
- NAS-PDU,
-
+ SecurityInfo,
SecurityInformation,
- UEPagingID,
- PagingDRX,
- PagingCause,
- TAId,
- CriticalityDiagnostics,
- ENB-Global-ID,
- ENBname,
- MMEname,
ServedPLMNs,
- SupportedTAIs,
+ SourceBSS-ToTargetBSS-TransparentContainer,
+ SourceeNodeB-ToTargeteNodeB-TransparentContainer,
+ SourceID,
+ SourceRNC-ToTargetRNC-TransparentContainer,
+ SupportedTAs,
+ TAI,
+ TargetBSS-ToSourceBSS-TransparentContainer,
+ TargeteNodeB-ToSourceeNodeB-TransparentContainer,
+ TargetID,
+ TargetRNC-ToSourceRNC-TransparentContainer,
TimeToWait,
- HandoverRestrictionList,
- PLMNidentity,
- Cdma2000PDU,
- Cdma2000RATType,
- Cdma2000SectorID,
- SecurityInfo,
+ TraceActivation,
+ TraceReference,
+ TransportLayerAddress,
+ UEIdentityIndexValue,
+ UEPagingID,
UERadioCapability,
- PDCP-SN,
- Direct-Forwarding-Path-Availability,
- UEIdentityIndexValue
-
-
+ UE-S1AP-IDs,
+ UE-associatedLogicalS1-ConnectionItem,
+ S-TMSI
FROM S1AP-IEs
@@ -85,18 +91,24 @@ FROM S1AP-Containers
id-aggregateMaximumBitrate,
- id-Bearers-SubjectToStatusTransferENB-List,
- id-Bearers-SubjectToStatusTransferENB-Item,
- id-Bearers-SubjectToStatusTransferMME-List,
- id-Bearers-SubjectToStatusTransferMME-Item,
+
id-Cause,
+ id-cdma2000HORequiredIndication,
+ id-cdma2000HOStatus,
+ id-cdma2000OneXMEID,
+ id-cdma2000OneXRAND,
+ id-cdma2000PDU,
+ id-cdma2000RATType,
+ id-cdma2000SectorID,
id-CriticalityDiagnostics,
id-Direct-Forwarding-Path-Availability,
id-ENB-Global-ID,
+ id-EUTRAN-CGI-ID,
id-eNBname,
- id-eNB-UE-S1AP-ID,
+ id-eNB-StatusTransfer-TransparentContainer, id-eNB-UE-S1AP-ID,
id-GERANtoLTEHOInformationReq,
id-GERANtoLTEHOInformationRes,
+ id-GUMMEI-ID,
id-HandoverRestrictionList,
id-HandoverType,
id-InitialContextSetup,
@@ -111,7 +123,8 @@ FROM S1AP-Containers
id-NAS-PDU,
id-pagingCause,
id-pagingDRX,
- id-ServingPLMN,
+ id-RelativeMMECapacity,
+ id-RequestType,
id-SAEBearerAdmittedItem,
id-SAEBearerAdmittedList,
id-SAEBearerDataForwardingItem,
@@ -146,30 +159,36 @@ FROM S1AP-Containers
id-SAEBearerToBeSetupListHOReq,
id-SAEBearerToBeSwitchedDLItem,
id-SAEBearerToBeSwitchedDLList,
+ id-SAEBearerToBeSwitchedULList,
+ id-SAEBearerToBeSwitchedULItem,
id-SAEBearertoReleaseListHOCmd,
+ id-SecurityInfo,
id-Security-Information,
id-ServedPLMNs,
id-SourceID,
- id-UEPagingID,
- id-SupportedTAIs,
- id-TAId,
- id-TAIdItem,
- id-TAIdList,
+ id-SourceMME-UE-S1AP-ID,
+ id-SupportedTAs,
+ id-S-TMSI,
+ id-TAI,
+ id-TAIItem,
+ id-TAIList,
id-TargetID,
id-TimeToWait,
id-TraceActivation,
+ id-TraceReference,
+ id-UEIdentityIndexValue,
+ id-UEPagingID,
+ id-UERadioCapability,
id-UTRANtoLTEHOInformationReq,
id-UTRANtoLTEHOInformationRes,
- id-cdma2000PDU,
- id-cdma2000RATType,
- id-cdma2000SectorID,
- id-SecurityInfo,
- id-UERadioCapability,
- id-UEIdentityIndexValue,
- id-GUMMEI-ID,
+ id-UE-associatedLogicalS1-ConnectionListResAck,
+ id-UE-associatedLogicalS1-ConnectionItem,
+ id-UE-S1AP-IDs,
+ id-ResetType,
maxnoofTAI,
maxNrOfErrors,
- maxNrOfSAEBs
+ maxNrOfSAEBs,
+ maxNrOfIndividualS1ConnectionsToReset
FROM S1AP-Constants;
@@ -269,7 +288,8 @@ HandoverCommandIEs S1AP-PROTOCOL-IES ::= {
-- This IE shall be present if the Handover Type IE is set to value "LTEtoUTRAN" -- } |
{ ID id-LTEtoGERANHOInformationRes
CRITICALITY reject TYPE LTEtoGERANHOInformationRes PRESENCE conditional
- -- This IE shall be present if the Handover Type IE is set to value "LTEtoGERAN" -- },
+ -- This IE shall be present if the Handover Type IE is set to value "LTEtoGERAN" -- }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -352,7 +372,8 @@ HandoverPreparationFailure ::= SEQUENCE {
HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory } |
- { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -375,9 +396,9 @@ HandoverRequest ::= SEQUENCE {
HandoverRequestIEs 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 } |
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory } |
+ { ID id-aggregateMaximumBitrate CRITICALITY reject TYPE AggregateMaximumBitrate PRESENCE mandatory }|
{ ID id-SAEBearerToBeSetupListHOReq CRITICALITY reject TYPE SAEBearerToBeSetupListHOReq PRESENCE mandatory } |
{ ID id-Intra-LTEHOInformationReq CRITICALITY reject TYPE Intra-LTEHOInformationReq PRESENCE conditional
-- This IE shall be present if Handover Type IE is set to value "IntraLTE" -- } |
@@ -386,8 +407,8 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-GERANtoLTEHOInformationReq
CRITICALITY reject TYPE GERANtoLTEHOInformationReq PRESENCE conditional
-- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" -- } |
- { ID id-ServingPLMN CRITICALITY reject TYPE PLMNidentity PRESENCE optional } |
- { ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional },
+ { ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional }|
+ { ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional },
...
}
@@ -454,7 +475,8 @@ HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
-- This IE shall be present if the Handover Type IE is set to value "UTRANtoLTE" -- } |
{ ID id-GERANtoLTEHOInformationRes
CRITICALITY reject TYPE GERANtoLTEHOInformationRes PRESENCE conditional
- -- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" -- },
+ -- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" -- }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -531,7 +553,8 @@ HandoverFailure ::= SEQUENCE {
HandoverFailureIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory } |
- { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -577,9 +600,9 @@ PathSwitchRequest ::= SEQUENCE {
}
PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {
- { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory } |
- { ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory } |
- { ID id-SAEBearerToBeSwitchedDLList CRITICALITY reject TYPE SAEBearerToBeSwitchedDLList PRESENCE mandatory },
+ { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
+ { ID id-SAEBearerToBeSwitchedDLList CRITICALITY reject TYPE SAEBearerToBeSwitchedDLList PRESENCE mandatory }|
+ { ID id-SourceMME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory },
...
}
@@ -615,10 +638,31 @@ PathSwitchRequestAcknowledge ::= SEQUENCE {
PathSwitchRequestAcknowledgeIEs 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-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }| { ID id-SAEBearerToBeSwitchedULList CRITICALITY ignore TYPE SAEBearerToBeSwitchedULList PRESENCE optional }|
+ { ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional } | { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
+SAEBearerToBeSwitchedULList ::= SAEB-IE-ContainerList { {SAEBearerToBeSwitchedULItemIEs} }
+
+SAEBearerToBeSwitchedULItemIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-SAEBearerToBeSwitchedULItem CRITICALITY ignore TYPE SAEBearerToBeSwitchedULItem PRESENCE mandatory },
+ ...
+}
+
+SAEBearerToBeSwitchedULItem ::= SEQUENCE {
+ sAE-Bearer-ID SAE-Bearer-ID,
+ transportLayerAddress TransportLayerAddress,
+ gTP-TEID GTP-TEID,
+ iE-Extensions ProtocolExtensionContainer { { SAEBearerToBeSwitchedULItem-ExtIEs} } OPTIONAL,
+ ...
+}
+
+SAEBearerToBeSwitchedULItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+
-- **************************************************************
--
-- Path Switch Request Failure
@@ -633,7 +677,8 @@ PathSwitchRequestFailure ::= SEQUENCE {
PathSwitchRequestFailureIEs 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 reject TYPE Cause PRESENCE mandatory },
+ { ID id-Cause CRITICALITY reject TYPE Cause PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -674,7 +719,8 @@ HandoverCancelAcknowledge ::= SEQUENCE {
HandoverCancelAcknowledgeIEs 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-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -699,8 +745,7 @@ SAEBearerSetupRequestIEs 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-SAEBearerToBeSetupListBearerSUReq CRITICALITY reject TYPE SAEBearerToBeSetupListBearerSUReq PRESENCE mandatory }|
- { ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional }|
- { ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE mandatory},
+ { ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE mandatory},
...
}
@@ -742,7 +787,8 @@ SAEBearerSetupResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-SAEBearerSetupListBearerSURes CRITICALITY reject TYPE SAEBearerSetupListBearerSURes PRESENCE optional }|
{ ID id-SAEBearerFailedToSetupListBearerSURes CRITICALITY ignore TYPE SAEBearerList PRESENCE optional }|
- { ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE mandatory},
+ { ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE mandatory}|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -831,7 +877,8 @@ SAEBearerModifyResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-SAEBearerModifyListBearerModRes CRITICALITY ignore TYPE SAEBearerModifyListBearerModRes PRESENCE optional }|
{ ID id-SAEBearerFailedToModifyList CRITICALITY ignore TYPE SAEBearerList PRESENCE optional }|
- { ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE mandatory},
+ { ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE mandatory}|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -884,20 +931,21 @@ SAEBearerReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
--- SAE Bearer Release Complete
+-- SAE Bearer Release Response
--
-- **************************************************************
-SAEBearerReleaseComplete ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { { SAEBearerReleaseCompleteIEs } },
+SAEBearerReleaseResponse ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { { SAEBearerReleaseResponseIEs } },
...
}
-SAEBearerReleaseCompleteIEs S1AP-PROTOCOL-IES ::= {
+SAEBearerReleaseResponseIEs 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-SAEBearerReleaseListBearerRelComp CRITICALITY ignore TYPE SAEBearerReleaseListBearerRelComp PRESENCE optional }|
- { ID id-SAEBearerFailedToReleaseList CRITICALITY ignore TYPE SAEBearerList PRESENCE optional },
+ { ID id-SAEBearerFailedToReleaseList CRITICALITY ignore TYPE SAEBearerList PRESENCE optional }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -965,11 +1013,10 @@ InitialContextSetupRequest ::= SEQUENCE {
InitialContextSetupRequestIEs 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-aggregateMaximumBitrate CRITICALITY reject TYPE AggregateMaximumBitrate PRESENCE optional }|
+ { ID id-aggregateMaximumBitrate CRITICALITY reject TYPE AggregateMaximumBitrate PRESENCE mandatory }|
{ ID id-SAEBearerToBeSetupListCtxtSUReq CRITICALITY reject TYPE SAEBearerToBeSetupListCtxtSUReq PRESENCE mandatory }|
{ ID id-Security-Information CRITICALITY ignore TYPE SecurityInformation PRESENCE mandatory }|
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional }|
- { ID id-ServingPLMN CRITICALITY reject TYPE PLMNidentity PRESENCE optional } |
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional }|
{ ID id-NAS-PDU CRITICALITY ignore TYPE NAS-PDU PRESENCE optional}|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional },
@@ -1033,7 +1080,8 @@ InitialContextSetupResponseIEs 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-SAEBearerSetupListCtxtSURes CRITICALITY reject TYPE SAEBearerSetupListCtxtSURes PRESENCE optional }|
- { ID id-SAEBearerFailedToSetupListCtxtSURes CRITICALITY ignore TYPE SAEBearerList PRESENCE optional },
+ { ID id-SAEBearerFailedToSetupListCtxtSURes CRITICALITY ignore TYPE SAEBearerList PRESENCE optional }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -1073,7 +1121,8 @@ InitialContextSetupFailure ::= SEQUENCE {
InitialContextSetupFailureIEs 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 },
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -1093,25 +1142,25 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
{ ID id-UEPagingID CRITICALITY ignore TYPE UEPagingID PRESENCE mandatory } |
{ ID id-pagingDRX CRITICALITY ignore TYPE PagingDRX PRESENCE mandatory } |
{ ID id-pagingCause CRITICALITY ignore TYPE PagingCause PRESENCE mandatory } |
- { ID id-TAIdList CRITICALITY ignore TYPE TAIdList PRESENCE mandatory },
+ { ID id-TAIList CRITICALITY ignore TYPE TAIList PRESENCE mandatory },
...
}
-TAIdList::= SEQUENCE (SIZE(1.. maxnoofTAI)) OF ProtocolIE-SingleContainer {{TAIdItemIEs}}
+TAIList::= SEQUENCE (SIZE(1.. maxnoofTAI)) OF ProtocolIE-SingleContainer {{TAIItemIEs}}
-TAIdItemIEs S1AP-PROTOCOL-IES ::= {
- { ID id-TAIdItem CRITICALITY ignore TYPE TAIdItem PRESENCE mandatory },
+TAIItemIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-TAIItem CRITICALITY ignore TYPE TAIItem PRESENCE mandatory },
...
}
-TAIdItem ::= SEQUENCE {
- tAId TAId, -- FFS
- iE-Extensions ProtocolExtensionContainer { {TAIdItemExtIEs} } OPTIONAL,
+TAIItem ::= SEQUENCE {
+ tAI TAI,
+ iE-Extensions ProtocolExtensionContainer { {TAIItemExtIEs} } OPTIONAL,
...
}
-TAIdItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+TAIItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
@@ -1134,8 +1183,8 @@ UEContextReleaseCommand ::= SEQUENCE {
}
UEContextReleaseCommand-IEs 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-UE-S1AP-IDs CRITICALITY reject TYPE UE-S1AP-IDs PRESENCE mandatory} |
+
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory} ,
...
}
@@ -1153,7 +1202,8 @@ UEContextReleaseComplete ::= SEQUENCE {
UEContextReleaseComplete-IEs 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-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory} |
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -1193,7 +1243,8 @@ UEContextModificationResponse ::= SEQUENCE {
UEContextModificationResponseIEs 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-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}-- **************************************************************
--
@@ -1209,7 +1260,8 @@ UEContextModificationFailure ::= SEQUENCE {
UEContextModificationFailureIEs 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 },
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -1228,7 +1280,6 @@ DownlinkNASTransport-IEs 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-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory} |
- { ID id-ServingPLMN CRITICALITY reject TYPE PLMNidentity PRESENCE optional } |
{ ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional },
...
}
@@ -1248,7 +1299,8 @@ InitialUEMessage ::= SEQUENCE {
InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory} |
{ ID id-NAS-PDU CRITICALITY reject TYPE NAS-PDU PRESENCE mandatory} |
- { ID id-TAId CRITICALITY reject TYPE TAId PRESENCE mandatory},
+ { ID id-TAI CRITICALITY reject TYPE TAI PRESENCE mandatory}|
+ { ID id-S-TMSI CRITICALITY reject TYPE S-TMSI PRESENCE optional},
...
}
@@ -1307,10 +1359,30 @@ Reset ::= SEQUENCE {
}
ResetIEs S1AP-PROTOCOL-IES ::= {
- { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
+ { ID id-ResetType CRITICALITY reject TYPE ResetType PRESENCE mandatory },
...
}
+ResetType ::= CHOICE {
+ s1-Interface ResetAll,
+ partOfS1-Interface UE-associatedLogicalS1-ConnectionListRes,
+ ...
+}
+
+
+
+ResetAll ::= ENUMERATED {
+ reset-all,
+ ...
+}
+
+UE-associatedLogicalS1-ConnectionListRes ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { UE-associatedLogicalS1-ConnectionItemRes } }
+
+UE-associatedLogicalS1-ConnectionItemRes S1AP-PROTOCOL-IES ::= {
+ { ID id-UE-associatedLogicalS1-ConnectionItem CRITICALITY reject TYPE UE-associatedLogicalS1-ConnectionItem PRESENCE mandatory },
+ ...
+}
-- **************************************************************
@@ -1325,10 +1397,18 @@ ResetAcknowledge ::= SEQUENCE {
}
ResetAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-UE-associatedLogicalS1-ConnectionListResAck CRITICALITY ignore TYPE UE-associatedLogicalS1-ConnectionListResAck PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
+UE-associatedLogicalS1-ConnectionListResAck ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { UE-associatedLogicalS1-ConnectionItemResAck } }
+
+UE-associatedLogicalS1-ConnectionItemResAck S1AP-PROTOCOL-IES ::= {
+ { ID id-UE-associatedLogicalS1-ConnectionItem CRITICALITY ignore TYPE UE-associatedLogicalS1-ConnectionItem PRESENCE mandatory },
+ ...
+}
+
-- **************************************************************
--
-- ERROR INDICATION ELEMENTARY PROCEDURE
@@ -1374,7 +1454,7 @@ S1SetupRequest ::= SEQUENCE {
S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-ENB-Global-ID CRITICALITY reject TYPE ENB-Global-ID PRESENCE mandatory }|
{ ID id-eNBname CRITICALITY ignore TYPE ENBname PRESENCE mandatory }|
- { ID id-SupportedTAIs CRITICALITY reject TYPE SupportedTAIs PRESENCE mandatory },
+ { ID id-SupportedTAs CRITICALITY reject TYPE SupportedTAs PRESENCE mandatory },
...
}
@@ -1393,7 +1473,9 @@ S1SetupResponse ::= SEQUENCE {
S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MMEname CRITICALITY ignore TYPE MMEname PRESENCE mandatory }|
{ ID id-ServedPLMNs CRITICALITY reject TYPE ServedPLMNs PRESENCE mandatory }|
- { ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE mandatory },
+ { ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE mandatory }|
+ { ID id-RelativeMMECapacity CRITICALITY reject TYPE RelativeMMECapacity PRESENCE mandatory }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -1410,7 +1492,127 @@ S1SetupFailure ::= SEQUENCE {
S1SetupFailureIEs S1AP-PROTOCOL-IES ::= {
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
- { ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional },
+ { ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
+ ...
+}
+
+-- **************************************************************
+--
+-- ENB CONFIGURATION UPDATE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- eNB Configuration Update
+--
+-- **************************************************************
+
+ENBConfigurationUpdate ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {ENBConfigurationUpdateIEs} },
+ ...
+}
+
+ENBConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-eNBname CRITICALITY ignore TYPE ENBname PRESENCE optional }|
+ { ID id-SupportedTAs CRITICALITY reject TYPE SupportedTAs PRESENCE optional },
+ ...
+}
+
+-- **************************************************************
+--
+-- eNB Configuration Update Acknowledge
+--
+-- **************************************************************
+
+ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {ENBConfigurationUpdateAcknowledgeIEs} },
+ ...
+}
+
+
+ENBConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
+ ...
+}
+
+-- **************************************************************
+--
+-- eNB Configuration Update Failure
+--
+-- **************************************************************
+
+ENBConfigurationUpdateFailure ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {ENBConfigurationUpdateFailureIEs} },
+ ...
+}
+
+ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
+ { ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
+...
+}
+
+
+-- **************************************************************
+--
+-- MME Configuration UPDATE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- MME Configuration Update
+--
+-- **************************************************************
+
+MMEConfigurationUpdate ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {MMEConfigurationUpdateIEs} },
+ ...
+}
+
+MMEConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-MMEname CRITICALITY ignore TYPE MMEname PRESENCE optional }|
+ { ID id-ServedPLMNs CRITICALITY reject TYPE ServedPLMNs PRESENCE optional }|
+ { ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE optional }|
+ { ID id-RelativeMMECapacity CRITICALITY reject TYPE RelativeMMECapacity PRESENCE optional},
+ ...
+}
+
+-- **************************************************************
+--
+-- MME Configuration Update Acknowledge
+--
+-- **************************************************************
+
+MMEConfigurationUpdateAcknowledge ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {MMEConfigurationUpdateAcknowledgeIEs} },
+ ...
+}
+
+
+MMEConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
+ ...
+}
+
+-- **************************************************************
+--
+-- MME Configuration Update Failure
+--
+-- **************************************************************
+
+MMEConfigurationUpdateFailure ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {MMEConfigurationUpdateFailureIEs} },
+ ...
+}
+
+MMEConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
+ { ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
@@ -1434,6 +1636,9 @@ DownlinkS1cdma2000tunneling ::= SEQUENCE {
DownlinkS1cdma2000tunnelingIEs 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-SAEBearerSubjecttoDataForwardingList CRITICALITY ignore TYPE SAEBearerSubjecttoDataForwardingList PRESENCE optional } |
+ { ID id-cdma2000HOStatus CRITICALITY ignore TYPE Cdma2000HOStatus PRESENCE optional } |
+ { ID id-cdma2000RATType CRITICALITY reject TYPE Cdma2000RATType PRESENCE mandatory } |
{ ID id-cdma2000PDU CRITICALITY reject TYPE Cdma2000PDU PRESENCE mandatory },
...
}
@@ -1460,6 +1665,9 @@ UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory } |
{ ID id-cdma2000RATType CRITICALITY reject TYPE Cdma2000RATType PRESENCE mandatory } |
{ ID id-cdma2000SectorID CRITICALITY reject TYPE Cdma2000SectorID PRESENCE mandatory } |
+ { ID id-cdma2000HORequiredIndication CRITICALITY ignore TYPE Cdma2000HORequiredIndication PRESENCE optional } |
+ { ID id-cdma2000OneXMEID CRITICALITY ignore TYPE Cdma2000OneXMEID PRESENCE optional } |
+ { ID id-cdma2000OneXRAND CRITICALITY ignore TYPE Cdma2000OneXRAND PRESENCE optional } |
{ ID id-cdma2000PDU CRITICALITY reject TYPE Cdma2000PDU PRESENCE mandatory },
...
}
@@ -1508,71 +1716,154 @@ ENBStatusTransfer ::= SEQUENCE {
ENBStatusTransferIEs 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-Bearers-SubjectToStatusTransferENB-List CRITICALITY ignore TYPE Bearers-SubjectToStatusTransferENB-List PRESENCE mandatory} ,
+ { ID id-eNB-StatusTransfer-TransparentContainer CRITICALITY reject TYPE ENB-StatusTransfer-TransparentContainer PRESENCE mandatory} ,
...
}
-Bearers-SubjectToStatusTransferENB-List ::= SAEB-IE-ContainerList { { Bearers-SubjectToStatusTransferENB-ItemIEs } }
-Bearers-SubjectToStatusTransferENB-ItemIEs S1AP-PROTOCOL-IES ::= {
- { ID id-Bearers-SubjectToStatusTransferENB-Item CRITICALITY ignore TYPE Bearers-SubjectToStatusTransferENB-Item PRESENCE mandatory }
+-- **************************************************************
+--
+-- MME STATUS TRANSFER
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- MME Status Transfer
+--
+-- **************************************************************
+
+MMEStatusTransfer ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {MMEStatusTransferIEs} },
+ ...
}
-Bearers-SubjectToStatusTransferENB-Item ::= SEQUENCE {
- sAE-Bearer-ID SAE-Bearer-ID,
- lIS-HFN PDCP-SN,
- lIS PDCP-SN,
- dL-PDCP-HFN-NextToAssign PDCP-SN,
- dL-PDCP-SN-NextToAssign PDCP-SN,
- iE-Extensions ProtocolExtensionContainer { {Bearers-SubjectToStatusTransferENB-ItemExtIEs} } OPTIONAL,
+MMEStatusTransferIEs 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-eNB-StatusTransfer-TransparentContainer CRITICALITY reject TYPE ENB-StatusTransfer-TransparentContainer PRESENCE mandatory} ,
...
}
-Bearers-SubjectToStatusTransferENB-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+
+-- **************************************************************
+--
+-- Trace Procedures
+--
+-- **************************************************************
+-- **************************************************************
+--
+-- Trace Start
+--
+-- **************************************************************
+
+TraceStart ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {TraceStartIEs} },
+ ...
+}
+
+TraceStartIEs 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-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional },
...
}
-- **************************************************************
--
--- MME STATUS TRANSFER
+-- Trace Failure Indication
--
-- **************************************************************
+TraceFailureIndication ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {TraceFailureIndicationIEs} },
+ ...
+}
+
+TraceFailureIndicationIEs 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-TraceReference CRITICALITY ignore TYPE TraceReference PRESENCE mandatory} |
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory} ,
+ ...
+}
+
-- **************************************************************
--
--- MME Status Transfer
+-- DEACTIVATE TRACE ELEMENTARY PROCEDURE
--
-- **************************************************************
-MMEStatusTransfer ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { {MMEStatusTransferIEs} },
+-- **************************************************************
+--
+-- DEACTIVATE TRACE
+--
+-- **************************************************************
+
+DeactivateTrace ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { { DeactivateTraceIEs} },
...
}
-MMEStatusTransferIEs S1AP-PROTOCOL-IES ::= {
+DeactivateTraceIEs 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-TraceReference CRITICALITY ignore TYPE TraceReference PRESENCE mandatory },
+ ...
+}
+
+-- **************************************************************
+--
+-- Location Reporting Control
+--
+-- **************************************************************
+
+LocationReportingControl ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { { LocationReportingControlIEs} },
+ ...
+}
+
+LocationReportingControlIEs 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-Bearers-SubjectToStatusTransferMME-List CRITICALITY ignore TYPE Bearers-SubjectToStatusTransferMME-List PRESENCE mandatory} ,
+ { ID id-RequestType CRITICALITY ignore TYPE RequestType PRESENCE mandatory } ,
...
}
-Bearers-SubjectToStatusTransferMME-List ::= SAEB-IE-ContainerList { { Bearers-SubjectToStatusTransferMME-ItemIEs } }
+-- **************************************************************
+--
+-- Location Report Failure Indication
+--
+-- **************************************************************
-Bearers-SubjectToStatusTransferMME-ItemIEs S1AP-PROTOCOL-IES ::= {
- { ID id-Bearers-SubjectToStatusTransferMME-Item CRITICALITY ignore TYPE Bearers-SubjectToStatusTransferMME-Item PRESENCE mandatory }
+LocationReportingFailureIndication ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { { LocationReportingFailureIndicationIEs} },
+ ...
+}
+
+LocationReportingFailureIndicationIEs 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 optional } ,
+ ...
}
-Bearers-SubjectToStatusTransferMME-Item ::= SEQUENCE {
- sAE-Bearer-ID SAE-Bearer-ID,
- lIS-HFN PDCP-SN,
- lIS PDCP-SN,
- dL-PDCP-HFN-NextToAssign PDCP-SN,
- dL-PDCP-SN-NextToAssign PDCP-SN,
- iE-Extensions ProtocolExtensionContainer { {Bearers-SubjectToStatusTransferMME-ItemExtIEs} } OPTIONAL,
+-- **************************************************************
+--
+-- Location Report
+--
+-- **************************************************************
+
+LocationReport ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { { LocationReportIEs} },
...
}
-Bearers-SubjectToStatusTransferMME-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+LocationReportIEs 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-ID CRITICALITY ignore TYPE EUTRAN-CGI-ID PRESENCE mandatory} |
+ { ID id-RequestType CRITICALITY ignore TYPE RequestType PRESENCE mandatory} ,
...
}
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 31151a06f5..baf5c68990 100644
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,4 +1,5 @@
-- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
--
@@ -25,79 +26,100 @@ IMPORTS
ProcedureCode
FROM S1AP-CommonDataTypes
- HandoverRequired,
+ DeactivateTrace,
+ DownlinkNASTransport,
+ DownlinkS1cdma2000tunneling,
+ ENBStatusTransfer,
+ ENBConfigurationUpdate,
+ ENBConfigurationUpdateAcknowledge,
+ ENBConfigurationUpdateFailure,
+ ErrorIndication,
+ HandoverCancel,
+ HandoverCancelAcknowledge,
HandoverCommand,
+ HandoverFailure,
+ HandoverNotify,
HandoverPreparationFailure,
HandoverRequest,
HandoverRequestAcknowledge,
- HandoverFailure,
- HandoverNotify,
- PathSwitchRequest,
- PathSwitchRequestAcknowledge,
- PathSwitchRequestFailure,
- SAEBearerSetupRequest,
- SAEBearerSetupResponse,
- SAEBearerModifyRequest,
- SAEBearerModifyResponse,
- SAEBearerReleaseCommand,
- SAEBearerReleaseComplete,
- SAEBearerReleaseRequest,
+ HandoverRequired,
+ InitialContextSetupFailure,
InitialContextSetupRequest,
InitialContextSetupResponse,
- InitialContextSetupFailure,
- Paging,
- DownlinkNASTransport,
InitialUEMessage,
- UplinkNASTransport,
- HandoverCancel,
- HandoverCancelAcknowledge,
+ LocationReportingControl,
+ LocationReportingFailureIndication,
+ LocationReport,
+
+ MMEConfigurationUpdate,
+ MMEConfigurationUpdateAcknowledge,
+ MMEConfigurationUpdateFailure,
+ MMEStatusTransfer,
+ NASNonDeliveryIndication,
+ Paging,
+ PathSwitchRequest,
+ PathSwitchRequestAcknowledge,
+ PathSwitchRequestFailure,
Reset,
ResetAcknowledge,
- ErrorIndication,
- NASNonDeliveryIndication,
+ S1SetupFailure,
S1SetupRequest,
S1SetupResponse,
- S1SetupFailure,
- UEContextReleaseRequest,
- UplinkS1cdma2000tunneling,
- DownlinkS1cdma2000tunneling,
+ SAEBearerModifyRequest,
+ SAEBearerModifyResponse,
+ SAEBearerReleaseCommand,
+ SAEBearerReleaseResponse,
+ SAEBearerReleaseRequest,
+ SAEBearerSetupRequest,
+ SAEBearerSetupResponse,
+ TraceFailureIndication,
+ TraceStart,
+ UECapabilityInfoIndication,
+ UEContextModificationFailure,
UEContextModificationRequest,
UEContextModificationResponse,
- UEContextModificationFailure,
- UECapabilityInfoIndication,
UEContextReleaseCommand,
UEContextReleaseComplete,
- ENBStatusTransfer,
- MMEStatusTransfer
+ UEContextReleaseRequest,
+ UplinkNASTransport,
+ UplinkS1cdma2000tunneling
FROM S1AP-PDU-Contents
+ id-DeactivateTrace,
+ id-downlinkNASTransport,
+ id-DownlinkS1cdma2000tunneling,
+ id-eNBStatusTransfer,
+ id-ErrorIndication,
+ id-HandoverCancel,
+ id-HandoverNotification,
id-HandoverPreparation,
id-HandoverResourceAllocation,
- id-HandoverNotification,
- id-PathSwitchRequest,
- id-SAEBearerSetup,
- id-SAEBearerModify,
- id-SAEBearerRelease,
- id-SAEBearerReleaseRequest,
id-InitialContextSetup,
- id-Paging,
- id-downlinkNASTransport,
id-initialUEMessage,
- id-uplinkNASTransport,
- id-HandoverCancel,
- id-Reset,
- id-ErrorIndication,
+ id-ENBConfigurationUpdate,
+ id-LocationReportingControl,
+ id-LocationReportingFailureIndication,
+ id-LocationReport,
+ id-MMEConfigurationUpdate,
+ id-MMEStatusTransfer,
id-NASNonDeliveryIndication,
+ id-Paging,
+ id-PathSwitchRequest,
+ id-Reset,
id-S1Setup,
- id-UEContextReleaseRequest,
- id-UplinkS1cdma2000tunneling,
- id-DownlinkS1cdma2000tunneling,
- id-UEContextModification,
+ id-SAEBearerModify,
+ id-SAEBearerRelease,
+ id-SAEBearerReleaseRequest,
+ id-SAEBearerSetup,
+ id-TraceFailureIndication,
+ id-TraceStart,
id-UECapabilityInfoIndication,
+ id-UEContextModification,
id-UEContextRelease,
- id-eNBStatusTransfer,
- id-MMEStatusTransfer
+ id-UEContextReleaseRequest,
+ id-uplinkNASTransport,
+ id-UplinkS1cdma2000tunneling
FROM S1AP-Constants;
@@ -178,7 +200,9 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
reset |
s1Setup |
uEContextModification |
- uEContextRelease ,
+ uEContextRelease |
+ eNBConfigurationUpdate |
+ mMEConfigurationUpdate ,
...
}
@@ -196,7 +220,13 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
uplinkS1cdma2000tunneling |
uECapabilityInfoIndication |
eNBStatusTransfer |
- mMEStatusTransfer ,
+ mMEStatusTransfer |
+ deactivateTrace |
+ traceStart |
+ traceFailureIndication |
+ locationReportingControl |
+ locationReportingFailureIndication |
+ locationReport ,
...
}
@@ -252,7 +282,7 @@ sAEbearerModify S1AP-ELEMENTARY-PROCEDURE ::= {
sAEbearerRelease S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SAEBearerReleaseCommand
- SUCCESSFUL OUTCOME SAEBearerReleaseComplete
+ SUCCESSFUL OUTCOME SAEBearerReleaseResponse
PROCEDURE CODE id-SAEBearerRelease
CRITICALITY reject
}
@@ -334,6 +364,22 @@ s1Setup S1AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY reject
}
+eNBConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE ENBConfigurationUpdate
+ SUCCESSFUL OUTCOME ENBConfigurationUpdateAcknowledge
+ UNSUCCESSFUL OUTCOME ENBConfigurationUpdateFailure
+ PROCEDURE CODE id-ENBConfigurationUpdate
+ CRITICALITY reject
+}
+
+mMEConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE MMEConfigurationUpdate
+ SUCCESSFUL OUTCOME MMEConfigurationUpdateAcknowledge
+ UNSUCCESSFUL OUTCOME MMEConfigurationUpdateFailure
+ PROCEDURE CODE id-MMEConfigurationUpdate
+ CRITICALITY reject
+}
+
downlinkS1cdma2000tunneling S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE DownlinkS1cdma2000tunneling
PROCEDURE CODE id-DownlinkS1cdma2000tunneling
@@ -380,4 +426,39 @@ mMEStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY ignore
}
+deactivateTrace S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE DeactivateTrace
+ PROCEDURE CODE id-DeactivateTrace
+ CRITICALITY ignore
+}
+
+traceStart S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE TraceStart
+ PROCEDURE CODE id-TraceStart
+ CRITICALITY ignore
+}
+
+traceFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE TraceFailureIndication
+ PROCEDURE CODE id-TraceFailureIndication
+ CRITICALITY ignore
+}
+
+locationReportingControl S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE LocationReportingControl
+ PROCEDURE CODE id-LocationReportingControl
+ CRITICALITY ignore
+}
+
+locationReportingFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE LocationReportingFailureIndication
+ PROCEDURE CODE id-LocationReportingFailureIndication
+ CRITICALITY ignore
+}
+
+locationReport S1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE LocationReport
+ PROCEDURE CODE id-LocationReport
+ CRITICALITY ignore
+}
END
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 703632900f..f15ddfcdd4 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -1,6 +1,6 @@
/* packet-s1ap.c
* Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection
- * Copyright 2007, Anders Broman <anders.broman@ericsson.com>
+ * Copyright 2007-2008, Anders Broman <anders.broman@ericsson.com>
*
* $Id$
*
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index a5c0bb8f43..8213cf33cf 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -150,32 +150,40 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(s1ap_Prot
#.ASSIGN_VALUE_TO_TYPE # S1AP does not have constants assigned to types, they are pure INTEGER
# ProcedureCode
-id-HandoverPreparation ProcedureCode
-id-HandoverResourceAllocation ProcedureCode
-id-HandoverNotification ProcedureCode
-id-PathSwitchRequest ProcedureCode
-id-HandoverCancel ProcedureCode
-id-SAEBearerSetup ProcedureCode
-id-SAEBearerModify ProcedureCode
-id-SAEBearerRelease ProcedureCode
-id-SAEBearerReleaseRequest ProcedureCode
-id-InitialContextSetup ProcedureCode
-id-Paging ProcedureCode
-id-downlinkNASTransport ProcedureCode
-id-initialUEMessage ProcedureCode
-id-uplinkNASTransport ProcedureCode
-id-Reset ProcedureCode
-id-ErrorIndication ProcedureCode
-id-NASNonDeliveryIndication ProcedureCode
-id-S1Setup ProcedureCode
-id-UEContextReleaseRequest ProcedureCode
-id-DownlinkS1cdma2000tunneling ProcedureCode
-id-UplinkS1cdma2000tunneling ProcedureCode
-id-UEContextModification ProcedureCode
-id-UECapabilityInfoIndication ProcedureCode
-id-UEContextRelease ProcedureCode
-id-eNBStatusTransfer ProcedureCode
-id-MMEStatusTransfer ProcedureCode
+id-HandoverPreparation ProcedureCode
+id-HandoverResourceAllocation ProcedureCode
+id-HandoverNotification ProcedureCode
+id-PathSwitchRequest ProcedureCode
+id-HandoverCancel ProcedureCode
+id-SAEBearerSetup ProcedureCode
+id-SAEBearerModify ProcedureCode
+id-SAEBearerRelease ProcedureCode
+id-SAEBearerReleaseRequest ProcedureCode
+id-InitialContextSetup ProcedureCode
+id-Paging ProcedureCode
+id-downlinkNASTransport ProcedureCode
+id-initialUEMessage ProcedureCode
+id-uplinkNASTransport ProcedureCode
+id-Reset ProcedureCode
+id-ErrorIndication ProcedureCode
+id-NASNonDeliveryIndication ProcedureCode
+id-S1Setup ProcedureCode
+id-UEContextReleaseRequest ProcedureCode
+id-DownlinkS1cdma2000tunneling ProcedureCode
+id-UplinkS1cdma2000tunneling ProcedureCode
+id-UEContextModification ProcedureCode
+id-UECapabilityInfoIndication ProcedureCode
+id-UEContextRelease ProcedureCode
+id-eNBStatusTransfer ProcedureCode
+id-MMEStatusTransfer ProcedureCode
+id-DeactivateTrace ProcedureCode
+id-TraceStart ProcedureCode
+id-TraceFailureIndication ProcedureCode
+id-ENBConfigurationUpdate ProcedureCode
+id-MMEConfigurationUpdate ProcedureCode
+id-LocationReportingControl ProcedureCode
+id-LocationReportingFailureIndication ProcedureCode
+id-LocationReport ProcedureCode
# ProtocolIE-ID
id-MME-UE-S1AP-ID ProtocolIE-ID
@@ -222,8 +230,8 @@ id-Security-Information ProtocolIE-ID
id-HandoverRestrictionList ProtocolIE-ID
id-pagingDRX ProtocolIE-ID
id-pagingCause ProtocolIE-ID
-id-TAIdList ProtocolIE-ID
-id-TAIdItem ProtocolIE-ID
+id-TAIList ProtocolIE-ID
+id-TAIItem ProtocolIE-ID
id-SAEBearerFailedToSetupListCtxtSURes ProtocolIE-ID
id-SAEBearerReleaseItemHOCmd ProtocolIE-ID
id-SAEBearerSetupItemCtxtSURes ProtocolIE-ID
@@ -238,11 +246,10 @@ id-CriticalityDiagnostics ProtocolIE-ID
id-eNBname ProtocolIE-ID
id-MMEname ProtocolIE-ID
id-ServedPLMNs ProtocolIE-ID
-id-SupportedTAIs ProtocolIE-ID
+id-SupportedTAs ProtocolIE-ID
id-TimeToWait ProtocolIE-ID
id-aggregateMaximumBitrate ProtocolIE-ID
-id-TAId ProtocolIE-ID
-id-ServingPLMN ProtocolIE-ID
+id-TAI ProtocolIE-ID
id-SAEBearerReleaseListBearerRelComp ProtocolIE-ID
id-cdma2000PDU ProtocolIE-ID
id-cdma2000RATType ProtocolIE-ID
@@ -250,13 +257,27 @@ id-cdma2000SectorID ProtocolIE-ID
id-SecurityInfo ProtocolIE-ID
id-UERadioCapability ProtocolIE-ID
id-GUMMEI-ID ProtocolIE-ID
-id-Bearers-SubjectToStatusTransferENB-List ProtocolIE-ID
-id-Bearers-SubjectToStatusTransferENB-Item ProtocolIE-ID
id-SAEBearerInformationListItem ProtocolIE-ID
id-Direct-Forwarding-Path-Availability ProtocolIE-ID
id-UEIdentityIndexValue ProtocolIE-ID
-id-Bearers-SubjectToStatusTransferMME-List ProtocolIE-ID
-id-Bearers-SubjectToStatusTransferMME-Item ProtocolIE-ID
+id-cdma2000HOStatus ProtocolIE-ID
+id-cdma2000HORequiredIndication ProtocolIE-ID
+id-cdma2000OneXMEID ProtocolIE-ID
+id-TraceReference ProtocolIE-ID
+id-RelativeMMECapacity ProtocolIE-ID
+id-SourceMME-UE-S1AP-ID ProtocolIE-ID
+id-Bearers-SubjectToStatusTransfer-Item ProtocolIE-ID
+id-eNB-StatusTransfer-TransparentContainer ProtocolIE-ID
+id-UE-associatedLogicalS1-ConnectionItem ProtocolIE-ID
+id-ResetType ProtocolIE-ID
+id-UE-associatedLogicalS1-ConnectionListResAck ProtocolIE-ID
+id-SAEBearerToBeSwitchedULItem ProtocolIE-ID
+id-SAEBearerToBeSwitchedULList ProtocolIE-ID
+id-S-TMSI ProtocolIE-ID
+id-cdma2000OneXRAND ProtocolIE-ID
+id-RequestType ProtocolIE-ID
+id-UE-S1AP-IDs ProtocolIE-ID
+id-EUTRAN-CGI-ID ProtocolIE-ID
#.END
@@ -307,8 +328,8 @@ SecurityInformation N s1ap.ies id-Security-Information
HandoverRestrictionList N s1ap.ies id-HandoverRestrictionList
PagingDRX N s1ap.ies id-pagingDRX
PagingCause N s1ap.ies id-pagingCause
-TAIdList N s1ap.ies id-TAIdList
-TAIdItem N s1ap.ies id-TAIdItem
+TAIList N s1ap.ies id-TAIList
+TAIItem N s1ap.ies id-TAIItem
SAEBearerList N s1ap.ies id-SAEBearerFailedToSetupListCtxtSURes
SAEBearerReleaseItemHOCmd N s1ap.ies id-SAEBearerReleaseItemHOCmd
SAEBearerSetupItemCtxtSURes N s1ap.ies id-SAEBearerSetupItemCtxtSURes
@@ -323,11 +344,10 @@ CriticalityDiagnostics N s1ap.ies id-CriticalityDiagnostics
ENBname N s1ap.ies id-eNBname
MMEname N s1ap.ies id-MMEname
ServedPLMNs N s1ap.ies id-ServedPLMNs
-SupportedTAIs N s1ap.ies id-SupportedTAIs
+SupportedTAs N s1ap.ies id-SupportedTAs
TimeToWait N s1ap.ies id-TimeToWait
AggregateMaximumBitrate N s1ap.ies id-aggregateMaximumBitrate
-TAId N s1ap.ies id-TAId
-PLMNidentity N s1ap.ies id-ServingPLMN
+TAI N s1ap.ies id-TAI
SAEBearerReleaseListBearerRelComp N s1ap.ies id-SAEBearerReleaseListBearerRelComp
Cdma2000PDU N s1ap.ies id-cdma2000PDU
Cdma2000RATType N s1ap.ies id-cdma2000RATType
@@ -335,13 +355,27 @@ Cdma2000SectorID N s1ap.ies id-cdma2000SectorID
SecurityInfo N s1ap.ies id-SecurityInfo
UERadioCapability N s1ap.ies id-UERadioCapability
GUMMEI N s1ap.ies id-GUMMEI-ID
-Bearers-SubjectToStatusTransferENB-List N s1ap.ies id-Bearers-SubjectToStatusTransferENB-List
-Bearers-SubjectToStatusTransferENB-Item N s1ap.ies id-Bearers-SubjectToStatusTransferENB-Item
#N s1ap.ies id-SAEBearerInformationListItem
Direct-Forwarding-Path-Availability N s1ap.ies id-Direct-Forwarding-Path-Availability
UEIdentityIndexValue N s1ap.ies id-UEIdentityIndexValue
-Bearers-SubjectToStatusTransferMME-List N s1ap.ies id-Bearers-SubjectToStatusTransferMME-List
-Bearers-SubjectToStatusTransferMME-Item N s1ap.ies id-Bearers-SubjectToStatusTransferMME-Item
+Cdma2000HOStatus N s1ap.ies id-cdma2000HOStatus
+Cdma2000HORequiredIndication N s1ap.ies id-cdma2000HORequiredIndication
+Cdma2000OneXMEID N s1ap.ies id-cdma2000OneXMEID
+TraceReference N s1ap.ies id-TraceReference
+RelativeMMECapacity N s1ap.ies id-RelativeMMECapacity
+MME-UE-S1AP-ID N s1ap.ies id-SourceMME-UE-S1AP-ID
+Bearers-SubjectToStatusTransfer-Item N s1ap.ies id-Bearers-SubjectToStatusTransfer-Item
+ENB-StatusTransfer-TransparentContainer N s1ap.ies id-eNB-StatusTransfer-TransparentContainer
+UE-associatedLogicalS1-ConnectionItem N s1ap.ies id-UE-associatedLogicalS1-ConnectionItem
+ResetType N s1ap.ies id-ResetType
+UE-associatedLogicalS1-ConnectionListResAck N s1ap.ies id-UE-associatedLogicalS1-ConnectionListResAck
+SAEBearerToBeSwitchedULItem N s1ap.ies id-SAEBearerToBeSwitchedULItem
+SAEBearerToBeSwitchedULList N s1ap.ies id-SAEBearerToBeSwitchedULList
+S-TMSI N s1ap.ies id-S-TMSI
+Cdma2000OneXRAND N s1ap.ies id-cdma2000OneXRAND
+RequestType N s1ap.ies id-RequestType
+UE-S1AP-IDs N s1ap.ies id-UE-S1AP-IDs
+EUTRAN-CGI-ID N s1ap.ies id-EUTRAN-CGI-ID
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -373,7 +407,7 @@ SAEBearerModifyRequest N s1ap.proc.imsg id-SAEBearerModify
SAEBearerModifyResponse N s1ap.proc.sout id-SAEBearerModify
SAEBearerReleaseCommand N s1ap.proc.imsg id-SAEBearerRelease
-SAEBearerReleaseComplete N s1ap.proc.sout id-SAEBearerRelease
+SAEBearerReleaseResponse N s1ap.proc.sout id-SAEBearerRelease
SAEBearerReleaseRequest N s1ap.proc.imsg id-SAEBearerReleaseRequest
@@ -407,6 +441,14 @@ S1SetupFailure N s1ap.proc.uout id-S1Setup
DownlinkS1cdma2000tunneling N s1ap.proc.imsg id-DownlinkS1cdma2000tunneling
+ENBConfigurationUpdate N s1ap.proc.imsg id-ENBConfigurationUpdate
+ENBConfigurationUpdateAcknowledge N s1ap.proc.sout id-ENBConfigurationUpdate
+ENBConfigurationUpdateFailure N s1ap.proc.uout id-ENBConfigurationUpdate
+
+MMEConfigurationUpdate N s1ap.proc.imsg id-MMEConfigurationUpdate
+MMEConfigurationUpdateAcknowledge N s1ap.proc.sout id-MMEConfigurationUpdate
+MMEConfigurationUpdateFailure N s1ap.proc.uout id-MMEConfigurationUpdate
+
UplinkS1cdma2000tunneling N s1ap.proc.imsg id-UplinkS1cdma2000tunneling
UEContextModificationRequest N s1ap.proc.imsg id-UEContextModification
@@ -421,4 +463,16 @@ UEContextReleaseComplete N s1ap.proc.sout id-UEContextRelease
ENBStatusTransfer N s1ap.proc.imsg id-eNBStatusTransfer
MMEStatusTransfer N s1ap.proc.imsg id-MMEStatusTransfer
+
+DeactivateTrace N s1ap.proc.imsg id-DeactivateTrace
+
+TraceStart N s1ap.proc.imsg id-TraceStart
+
+TraceFailureIndication N s1ap.proc.imsg id-TraceFailureIndication
+
+LocationReportingControl N s1ap.proc.imsg id-LocationReportingControl
+
+LocationReportingFailureIndication N s1ap.proc.imsg id-LocationReportingFailureIndication
+
+LocationReport N s1ap.proc.imsg id-LocationReport
#.END \ No newline at end of file
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index ef46631f73..f8ff2be31b 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -72,14 +72,15 @@
#define maxNrOfSAEBs 256
#define maxNrOfInterfaces 3
#define maxnoofTAI 256
+#define maxnoofTACs 256
#define maxNrOfErrors 256
#define maxnoofBPLMNs 6
#define maxnoofPLMNsPerMME 32
-#define maxnoofTAIs 256
#define maxnoofEPLMNs 15
#define maxnoofEPLMNsPlusOne 16
#define maxnoofForbLACs 256
-#define maxnoofForbTAIs 256
+#define maxnoofForbTACs 256
+#define maxNrOfIndividualS1ConnectionsToReset 256
typedef enum _ProcedureCode_enum {
id_HandoverPreparation = 0,
@@ -107,7 +108,15 @@ typedef enum _ProcedureCode_enum {
id_UECapabilityInfoIndication = 22,
id_UEContextRelease = 23,
id_eNBStatusTransfer = 24,
- id_MMEStatusTransfer = 25
+ id_MMEStatusTransfer = 25,
+ id_DeactivateTrace = 26,
+ id_TraceStart = 27,
+ id_TraceFailureIndication = 28,
+ id_ENBConfigurationUpdate = 29,
+ id_MMEConfigurationUpdate = 30,
+ id_LocationReportingControl = 31,
+ id_LocationReportingFailureIndication = 32,
+ id_LocationReport = 33
} ProcedureCode_enum;
typedef enum _ProtocolIE_ID_enum {
@@ -156,8 +165,8 @@ typedef enum _ProtocolIE_ID_enum {
id_UEPagingID = 43,
id_pagingDRX = 44,
id_pagingCause = 45,
- id_TAIdList = 46,
- id_TAIdItem = 47,
+ id_TAIList = 46,
+ id_TAIItem = 47,
id_SAEBearerFailedToSetupListCtxtSURes = 48,
id_SAEBearerReleaseItemHOCmd = 49,
id_SAEBearerSetupItemCtxtSURes = 50,
@@ -173,11 +182,10 @@ typedef enum _ProtocolIE_ID_enum {
id_eNBname = 60,
id_MMEname = 61,
id_ServedPLMNs = 63,
- id_SupportedTAIs = 64,
+ id_SupportedTAs = 64,
id_TimeToWait = 65,
id_aggregateMaximumBitrate = 66,
- id_TAId = 67,
- id_ServingPLMN = 68,
+ id_TAI = 67,
id_SAEBearerReleaseListBearerRelComp = 69,
id_cdma2000PDU = 70,
id_cdma2000RATType = 71,
@@ -185,13 +193,27 @@ typedef enum _ProtocolIE_ID_enum {
id_SecurityInfo = 73,
id_UERadioCapability = 74,
id_GUMMEI_ID = 75,
- id_Bearers_SubjectToStatusTransferENB_List = 76,
- id_Bearers_SubjectToStatusTransferENB_Item = 77,
id_SAEBearerInformationListItem = 78,
id_Direct_Forwarding_Path_Availability = 79,
id_UEIdentityIndexValue = 80,
- id_Bearers_SubjectToStatusTransferMME_List = 80,
- id_Bearers_SubjectToStatusTransferMME_Item = 81
+ id_cdma2000HOStatus = 83,
+ id_cdma2000HORequiredIndication = 84,
+ id_cdma2000OneXMEID = 85,
+ id_TraceReference = 86,
+ id_RelativeMMECapacity = 87,
+ id_SourceMME_UE_S1AP_ID = 88,
+ id_Bearers_SubjectToStatusTransfer_Item = 89,
+ id_eNB_StatusTransfer_TransparentContainer = 90,
+ id_UE_associatedLogicalS1_ConnectionItem = 91,
+ id_ResetType = 92,
+ id_UE_associatedLogicalS1_ConnectionListResAck = 93,
+ id_SAEBearerToBeSwitchedULItem = 94,
+ id_SAEBearerToBeSwitchedULList = 95,
+ id_S_TMSI = 96,
+ id_cdma2000OneXRAND = 97,
+ id_RequestType = 98,
+ id_UE_S1AP_IDs = 99,
+ id_EUTRAN_CGI_ID = 100
} ProtocolIE_ID_enum;
/*--- End of included file: packet-s1ap-val.h ---*/
@@ -206,14 +228,21 @@ static int proto_s1ap = -1;
/*--- Included file: packet-s1ap-hf.c ---*/
#line 1 "packet-s1ap-hf.c"
static int hf_s1ap_AggregateMaximumBitrate_PDU = -1; /* AggregateMaximumBitrate */
+static int hf_s1ap_Bearers_SubjectToStatusTransfer_Item_PDU = -1; /* Bearers_SubjectToStatusTransfer_Item */
static int hf_s1ap_Cause_PDU = -1; /* Cause */
static int hf_s1ap_Cdma2000PDU_PDU = -1; /* Cdma2000PDU */
static int hf_s1ap_Cdma2000RATType_PDU = -1; /* Cdma2000RATType */
static int hf_s1ap_Cdma2000SectorID_PDU = -1; /* Cdma2000SectorID */
+static int hf_s1ap_Cdma2000HOStatus_PDU = -1; /* Cdma2000HOStatus */
+static int hf_s1ap_Cdma2000HORequiredIndication_PDU = -1; /* Cdma2000HORequiredIndication */
+static int hf_s1ap_Cdma2000OneXMEID_PDU = -1; /* Cdma2000OneXMEID */
+static int hf_s1ap_Cdma2000OneXRAND_PDU = -1; /* Cdma2000OneXRAND */
static int hf_s1ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */
static int hf_s1ap_Direct_Forwarding_Path_Availability_PDU = -1; /* Direct_Forwarding_Path_Availability */
+static int hf_s1ap_ENB_StatusTransfer_TransparentContainer_PDU = -1; /* ENB_StatusTransfer_TransparentContainer */
static int hf_s1ap_ENB_UE_S1AP_ID_PDU = -1; /* ENB_UE_S1AP_ID */
static int hf_s1ap_ENBname_PDU = -1; /* ENBname */
+static int hf_s1ap_EUTRAN_CGI_ID_PDU = -1; /* EUTRAN_CGI_ID */
static int hf_s1ap_GUMMEI_PDU = -1; /* GUMMEI */
static int hf_s1ap_HandoverRestrictionList_PDU = -1; /* HandoverRestrictionList */
static int hf_s1ap_HandoverType_PDU = -1; /* HandoverType */
@@ -222,18 +251,23 @@ static int hf_s1ap_MME_UE_S1AP_ID_PDU = -1; /* MME_UE_S1AP_ID */
static int hf_s1ap_NAS_PDU_PDU = -1; /* NAS_PDU */
static int hf_s1ap_PagingDRX_PDU = -1; /* PagingDRX */
static int hf_s1ap_PagingCause_PDU = -1; /* PagingCause */
-static int hf_s1ap_PLMNidentity_PDU = -1; /* PLMNidentity */
+static int hf_s1ap_RelativeMMECapacity_PDU = -1; /* RelativeMMECapacity */
+static int hf_s1ap_RequestType_PDU = -1; /* RequestType */
static int hf_s1ap_SAEBearerList_PDU = -1; /* SAEBearerList */
static int hf_s1ap_SAEBearerItem_PDU = -1; /* SAEBearerItem */
static int hf_s1ap_SecurityInfo_PDU = -1; /* SecurityInfo */
static int hf_s1ap_SecurityInformation_PDU = -1; /* SecurityInformation */
static int hf_s1ap_SourceID_PDU = -1; /* SourceID */
static int hf_s1ap_ServedPLMNs_PDU = -1; /* ServedPLMNs */
-static int hf_s1ap_SupportedTAIs_PDU = -1; /* SupportedTAIs */
-static int hf_s1ap_TAId_PDU = -1; /* TAId */
+static int hf_s1ap_SupportedTAs_PDU = -1; /* SupportedTAs */
+static int hf_s1ap_S_TMSI_PDU = -1; /* S_TMSI */
+static int hf_s1ap_TAI_PDU = -1; /* TAI */
static int hf_s1ap_TargetID_PDU = -1; /* TargetID */
static int hf_s1ap_TimeToWait_PDU = -1; /* TimeToWait */
static int hf_s1ap_TraceActivation_PDU = -1; /* TraceActivation */
+static int hf_s1ap_TraceReference_PDU = -1; /* TraceReference */
+static int hf_s1ap_UE_S1AP_IDs_PDU = -1; /* UE_S1AP_IDs */
+static int hf_s1ap_UE_associatedLogicalS1_ConnectionItem_PDU = -1; /* UE_associatedLogicalS1_ConnectionItem */
static int hf_s1ap_UEIdentityIndexValue_PDU = -1; /* UEIdentityIndexValue */
static int hf_s1ap_UERadioCapability_PDU = -1; /* UERadioCapability */
static int hf_s1ap_HandoverRequired_PDU = -1; /* HandoverRequired */
@@ -267,6 +301,8 @@ static int hf_s1ap_PathSwitchRequest_PDU = -1; /* PathSwitchRequest */
static int hf_s1ap_SAEBearerToBeSwitchedDLList_PDU = -1; /* SAEBearerToBeSwitchedDLList */
static int hf_s1ap_SAEBearerToBeSwitchedDLItem_PDU = -1; /* SAEBearerToBeSwitchedDLItem */
static int hf_s1ap_PathSwitchRequestAcknowledge_PDU = -1; /* PathSwitchRequestAcknowledge */
+static int hf_s1ap_SAEBearerToBeSwitchedULList_PDU = -1; /* SAEBearerToBeSwitchedULList */
+static int hf_s1ap_SAEBearerToBeSwitchedULItem_PDU = -1; /* SAEBearerToBeSwitchedULItem */
static int hf_s1ap_PathSwitchRequestFailure_PDU = -1; /* PathSwitchRequestFailure */
static int hf_s1ap_HandoverCancel_PDU = -1; /* HandoverCancel */
static int hf_s1ap_HandoverCancelAcknowledge_PDU = -1; /* HandoverCancelAcknowledge */
@@ -283,7 +319,7 @@ static int hf_s1ap_SAEBearerModifyResponse_PDU = -1; /* SAEBearerModifyResponse
static int hf_s1ap_SAEBearerModifyListBearerModRes_PDU = -1; /* SAEBearerModifyListBearerModRes */
static int hf_s1ap_SAEBearerModifyItemBearerModRes_PDU = -1; /* SAEBearerModifyItemBearerModRes */
static int hf_s1ap_SAEBearerReleaseCommand_PDU = -1; /* SAEBearerReleaseCommand */
-static int hf_s1ap_SAEBearerReleaseComplete_PDU = -1; /* SAEBearerReleaseComplete */
+static int hf_s1ap_SAEBearerReleaseResponse_PDU = -1; /* SAEBearerReleaseResponse */
static int hf_s1ap_SAEBearerReleaseListBearerRelComp_PDU = -1; /* SAEBearerReleaseListBearerRelComp */
static int hf_s1ap_SAEBearerReleaseItemBearerRelComp_PDU = -1; /* SAEBearerReleaseItemBearerRelComp */
static int hf_s1ap_SAEBearerReleaseRequest_PDU = -1; /* SAEBearerReleaseRequest */
@@ -296,8 +332,8 @@ static int hf_s1ap_SAEBearerSetupListCtxtSURes_PDU = -1; /* SAEBearerSetupListC
static int hf_s1ap_SAEBearerSetupItemCtxtSURes_PDU = -1; /* SAEBearerSetupItemCtxtSURes */
static int hf_s1ap_InitialContextSetupFailure_PDU = -1; /* InitialContextSetupFailure */
static int hf_s1ap_Paging_PDU = -1; /* Paging */
-static int hf_s1ap_TAIdList_PDU = -1; /* TAIdList */
-static int hf_s1ap_TAIdItem_PDU = -1; /* TAIdItem */
+static int hf_s1ap_TAIList_PDU = -1; /* TAIList */
+static int hf_s1ap_TAIItem_PDU = -1; /* TAIItem */
static int hf_s1ap_UEContextReleaseCommand_PDU = -1; /* UEContextReleaseCommand */
static int hf_s1ap_UEContextReleaseComplete_PDU = -1; /* UEContextReleaseComplete */
static int hf_s1ap_UEContextModificationRequest_PDU = -1; /* UEContextModificationRequest */
@@ -308,20 +344,30 @@ static int hf_s1ap_InitialUEMessage_PDU = -1; /* InitialUEMessage */
static int hf_s1ap_UplinkNASTransport_PDU = -1; /* UplinkNASTransport */
static int hf_s1ap_NASNonDeliveryIndication_PDU = -1; /* NASNonDeliveryIndication */
static int hf_s1ap_Reset_PDU = -1; /* Reset */
+static int hf_s1ap_ResetType_PDU = -1; /* ResetType */
static int hf_s1ap_ResetAcknowledge_PDU = -1; /* ResetAcknowledge */
+static int hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_PDU = -1; /* UE_associatedLogicalS1_ConnectionListResAck */
static int hf_s1ap_ErrorIndication_PDU = -1; /* ErrorIndication */
static int hf_s1ap_S1SetupRequest_PDU = -1; /* S1SetupRequest */
static int hf_s1ap_S1SetupResponse_PDU = -1; /* S1SetupResponse */
static int hf_s1ap_S1SetupFailure_PDU = -1; /* S1SetupFailure */
+static int hf_s1ap_ENBConfigurationUpdate_PDU = -1; /* ENBConfigurationUpdate */
+static int hf_s1ap_ENBConfigurationUpdateAcknowledge_PDU = -1; /* ENBConfigurationUpdateAcknowledge */
+static int hf_s1ap_ENBConfigurationUpdateFailure_PDU = -1; /* ENBConfigurationUpdateFailure */
+static int hf_s1ap_MMEConfigurationUpdate_PDU = -1; /* MMEConfigurationUpdate */
+static int hf_s1ap_MMEConfigurationUpdateAcknowledge_PDU = -1; /* MMEConfigurationUpdateAcknowledge */
+static int hf_s1ap_MMEConfigurationUpdateFailure_PDU = -1; /* MMEConfigurationUpdateFailure */
static int hf_s1ap_DownlinkS1cdma2000tunneling_PDU = -1; /* DownlinkS1cdma2000tunneling */
static int hf_s1ap_UplinkS1cdma2000tunneling_PDU = -1; /* UplinkS1cdma2000tunneling */
static int hf_s1ap_UECapabilityInfoIndication_PDU = -1; /* UECapabilityInfoIndication */
static int hf_s1ap_ENBStatusTransfer_PDU = -1; /* ENBStatusTransfer */
-static int hf_s1ap_Bearers_SubjectToStatusTransferENB_List_PDU = -1; /* Bearers_SubjectToStatusTransferENB_List */
-static int hf_s1ap_Bearers_SubjectToStatusTransferENB_Item_PDU = -1; /* Bearers_SubjectToStatusTransferENB_Item */
static int hf_s1ap_MMEStatusTransfer_PDU = -1; /* MMEStatusTransfer */
-static int hf_s1ap_Bearers_SubjectToStatusTransferMME_List_PDU = -1; /* Bearers_SubjectToStatusTransferMME_List */
-static int hf_s1ap_Bearers_SubjectToStatusTransferMME_Item_PDU = -1; /* Bearers_SubjectToStatusTransferMME_Item */
+static int hf_s1ap_TraceStart_PDU = -1; /* TraceStart */
+static int hf_s1ap_TraceFailureIndication_PDU = -1; /* TraceFailureIndication */
+static int hf_s1ap_DeactivateTrace_PDU = -1; /* DeactivateTrace */
+static int hf_s1ap_LocationReportingControl_PDU = -1; /* LocationReportingControl */
+static int hf_s1ap_LocationReportingFailureIndication_PDU = -1; /* LocationReportingFailureIndication */
+static int hf_s1ap_LocationReport_PDU = -1; /* LocationReport */
static int hf_s1ap_S1AP_PDU_PDU = -1; /* S1AP_PDU */
static int hf_s1ap_local = -1; /* INTEGER_0_65535 */
static int hf_s1ap_global = -1; /* OBJECT_IDENTIFIER */
@@ -346,6 +392,10 @@ static int hf_s1ap_priorityLevel = -1; /* PriorityLevel */
static int hf_s1ap_iE_Extensions = -1; /* ProtocolExtensionContainer */
static int hf_s1ap_aggregateMaximumBitRateDL = -1; /* SAE_Bearer_BitRate */
static int hf_s1ap_aggregateMaximumBitRateUL = -1; /* SAE_Bearer_BitRate */
+static int hf_s1ap_Bearers_SubjectToStatusTransferList_item = -1; /* ProtocolIE_SingleContainer */
+static int hf_s1ap_sAE_Bearer_ID = -1; /* SAE_Bearer_ID */
+static int hf_s1ap_uL_COUNTvalue = -1; /* COUNTvalue */
+static int hf_s1ap_dL_COUNTvalue = -1; /* COUNTvalue */
static int hf_s1ap_BPLMNs_item = -1; /* PLMNidentity */
static int hf_s1ap_radioNetwork = -1; /* CauseRadioNetwork */
static int hf_s1ap_transport = -1; /* CauseTransport */
@@ -355,6 +405,8 @@ static int hf_s1ap_misc = -1; /* CauseMisc */
static int hf_s1ap_pLMNidentity = -1; /* PLMNidentity */
static int hf_s1ap_lAC = -1; /* LAC */
static int hf_s1ap_cI = -1; /* CI */
+static int hf_s1ap_pDCP_SN = -1; /* PDCP_SN */
+static int hf_s1ap_hFN = -1; /* HFN */
static int hf_s1ap_procedureCode = -1; /* ProcedureCode */
static int hf_s1ap_triggeringMessage = -1; /* TriggeringMessage */
static int hf_s1ap_procedureCriticality = -1; /* Criticality */
@@ -363,16 +415,18 @@ static int hf_s1ap_CriticalityDiagnostics_IE_List_item = -1; /* CriticalityDiag
static int hf_s1ap_iECriticality = -1; /* Criticality */
static int hf_s1ap_iE_ID = -1; /* ProtocolIE_ID */
static int hf_s1ap_typeOfError = -1; /* TypeOfError */
+static int hf_s1ap_bearers_SubjectToStatusTransferList = -1; /* Bearers_SubjectToStatusTransferList */
static int hf_s1ap_EPLMNs_item = -1; /* PLMNidentity */
static int hf_s1ap_ForbiddenTAs_item = -1; /* ForbiddenTAs_Item */
static int hf_s1ap_pLMN_Identity = -1; /* PLMNidentity */
-static int hf_s1ap_forbiddenTAIs = -1; /* ForbiddenTAIs */
-static int hf_s1ap_ForbiddenTAIs_item = -1; /* TAI */
+static int hf_s1ap_forbiddenTACs = -1; /* ForbiddenTACs */
+static int hf_s1ap_ForbiddenTACs_item = -1; /* TAC */
static int hf_s1ap_ForbiddenLAs_item = -1; /* ForbiddenLAs_Item */
static int hf_s1ap_forbiddenLACs = -1; /* ForbiddenLACs */
static int hf_s1ap_ForbiddenLACs_item = -1; /* LAC */
static int hf_s1ap_mME_Group_ID = -1; /* MME_Group_ID */
-static int hf_s1ap_mMME_Code = -1; /* MME_Code */
+static int hf_s1ap_mME_Code = -1; /* MME_Code */
+static int hf_s1ap_servingPLMN = -1; /* PLMNidentity */
static int hf_s1ap_equivalentPLMNs = -1; /* EPLMNs */
static int hf_s1ap_forbiddenTAs = -1; /* ForbiddenTAs */
static int hf_s1ap_forbiddenLAs = -1; /* ForbiddenLAs */
@@ -380,12 +434,13 @@ static int hf_s1ap_forbiddenInterRATs = -1; /* ForbiddenInterRATs */
static int hf_s1ap_InterfacesToTraceList_item = -1; /* InterfacesToTraceItem */
static int hf_s1ap_interfaceType = -1; /* InterfaceType */
static int hf_s1ap_traceDepth = -1; /* TraceDepth */
+static int hf_s1ap_eventType = -1; /* EventType */
+static int hf_s1ap_reportArea = -1; /* ReportArea */
static int hf_s1ap_SAEBearerInformationList_item = -1; /* ProtocolIE_SingleContainer */
-static int hf_s1ap_sAE_Bearer_ID = -1; /* SAE_Bearer_ID */
static int hf_s1ap_dL_Forwarding = -1; /* DL_Forwarding */
static int hf_s1ap_SAEBearerList_item = -1; /* ProtocolIE_SingleContainer */
static int hf_s1ap_cause = -1; /* Cause */
-static int hf_s1ap_label = -1; /* Label */
+static int hf_s1ap_qCI = -1; /* QCI */
static int hf_s1ap_allocationRetentionPriority = -1; /* AllocationRetentionPriority */
static int hf_s1ap_sAE_BearerType = -1; /* SAE_Bearer_Type */
static int hf_s1ap_sAE_GBR_Bearer = -1; /* SAE_GBR_Bearer */
@@ -402,8 +457,8 @@ static int hf_s1ap_eNB_Global_ID = -1; /* ENB_Global_ID */
static int hf_s1ap_rRC_Container = -1; /* RRC_Container */
static int hf_s1ap_sAEBearerInformationList = -1; /* SAEBearerInformationList */
static int hf_s1ap_ServedPLMNs_item = -1; /* PLMNidentity */
-static int hf_s1ap_SupportedTAIs_item = -1; /* SupportedTAs_Item */
-static int hf_s1ap_tAI = -1; /* TAId */
+static int hf_s1ap_SupportedTAs_item = -1; /* SupportedTAs_Item */
+static int hf_s1ap_tAC = -1; /* TAC */
static int hf_s1ap_broadcastPLMNs = -1; /* BPLMNs */
static int hf_s1ap_mMEC = -1; /* MME_Code */
static int hf_s1ap_m_TMSI = -1; /* M_TMSI */
@@ -415,6 +470,9 @@ static int hf_s1ap_rAC = -1; /* RAC */
static int hf_s1ap_rNC_ID = -1; /* RNC_ID */
static int hf_s1ap_traceReference = -1; /* TraceReference */
static int hf_s1ap_interfacesToTraceList = -1; /* InterfacesToTraceList */
+static int hf_s1ap_uE_S1AP_ID_pair = -1; /* UE_S1AP_ID_pair */
+static int hf_s1ap_mME_UE_S1AP_ID = -1; /* MME_UE_S1AP_ID */
+static int hf_s1ap_eNB_UE_S1AP_ID = -1; /* ENB_UE_S1AP_ID */
static int hf_s1ap_s_TMSI = -1; /* S_TMSI */
static int hf_s1ap_iMSI = -1; /* IMSI */
static int hf_s1ap_protocolIEs = -1; /* ProtocolIE_Container */
@@ -438,12 +496,12 @@ static int hf_s1ap_SAEBearerModifyListBearerModRes_item = -1; /* ProtocolIE_Sin
static int hf_s1ap_SAEBearerReleaseListBearerRelComp_item = -1; /* ProtocolIE_SingleContainer */
static int hf_s1ap_SAEBearerToBeSetupListCtxtSUReq_item = -1; /* ProtocolIE_SingleContainer */
static int hf_s1ap_SAEBearerSetupListCtxtSURes_item = -1; /* ProtocolIE_SingleContainer */
-static int hf_s1ap_TAIdList_item = -1; /* ProtocolIE_SingleContainer */
-static int hf_s1ap_tAId = -1; /* TAId */
-static int hf_s1ap_lIS_HFN = -1; /* PDCP_SN */
-static int hf_s1ap_lIS = -1; /* PDCP_SN */
-static int hf_s1ap_dL_PDCP_HFN_NextToAssign = -1; /* PDCP_SN */
-static int hf_s1ap_dL_PDCP_SN_NextToAssign = -1; /* PDCP_SN */
+static int hf_s1ap_TAIList_item = -1; /* ProtocolIE_SingleContainer */
+static int hf_s1ap_tAI = -1; /* TAI */
+static int hf_s1ap_s1_Interface = -1; /* ResetAll */
+static int hf_s1ap_partOfS1_Interface = -1; /* UE_associatedLogicalS1_ConnectionListRes */
+static int hf_s1ap_UE_associatedLogicalS1_ConnectionListRes_item = -1; /* ProtocolIE_SingleContainer */
+static int hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_item = -1; /* ProtocolIE_SingleContainer */
static int hf_s1ap_initiatingMessage = -1; /* InitiatingMessage */
static int hf_s1ap_successfulOutcome = -1; /* SuccessfulOutcome */
static int hf_s1ap_unsuccessfulOutcome = -1; /* UnsuccessfulOutcome */
@@ -473,16 +531,20 @@ static gint ett_s1ap_PrivateIE_Container = -1;
static gint ett_s1ap_PrivateIE_Field = -1;
static gint ett_s1ap_AllocationRetentionPriority = -1;
static gint ett_s1ap_AggregateMaximumBitrate = -1;
+static gint ett_s1ap_Bearers_SubjectToStatusTransferList = -1;
+static gint ett_s1ap_Bearers_SubjectToStatusTransfer_Item = -1;
static gint ett_s1ap_BPLMNs = -1;
static gint ett_s1ap_Cause = -1;
static gint ett_s1ap_CGI = -1;
+static gint ett_s1ap_COUNTvalue = -1;
static gint ett_s1ap_CriticalityDiagnostics = -1;
static gint ett_s1ap_CriticalityDiagnostics_IE_List = -1;
static gint ett_s1ap_CriticalityDiagnostics_IE_Item = -1;
+static gint ett_s1ap_ENB_StatusTransfer_TransparentContainer = -1;
static gint ett_s1ap_EPLMNs = -1;
static gint ett_s1ap_ForbiddenTAs = -1;
static gint ett_s1ap_ForbiddenTAs_Item = -1;
-static gint ett_s1ap_ForbiddenTAIs = -1;
+static gint ett_s1ap_ForbiddenTACs = -1;
static gint ett_s1ap_ForbiddenLAs = -1;
static gint ett_s1ap_ForbiddenLAs_Item = -1;
static gint ett_s1ap_ForbiddenLACs = -1;
@@ -491,6 +553,7 @@ static gint ett_s1ap_HandoverRestrictionList = -1;
static gint ett_s1ap_InterfacesToTraceList = -1;
static gint ett_s1ap_InterfacesToTraceItem = -1;
static gint ett_s1ap_LAI = -1;
+static gint ett_s1ap_RequestType = -1;
static gint ett_s1ap_SAEBearerInformationList = -1;
static gint ett_s1ap_SAEBearerInformationListItem = -1;
static gint ett_s1ap_SAEBearerList = -1;
@@ -505,13 +568,18 @@ static gint ett_s1ap_SourceID = -1;
static gint ett_s1ap_SourceeNB_ID = -1;
static gint ett_s1ap_SourceeNodeB_ToTargeteNodeB_TransparentContainer = -1;
static gint ett_s1ap_ServedPLMNs = -1;
-static gint ett_s1ap_SupportedTAIs = -1;
+static gint ett_s1ap_SupportedTAs = -1;
static gint ett_s1ap_SupportedTAs_Item = -1;
static gint ett_s1ap_S_TMSI = -1;
+static gint ett_s1ap_TAI = -1;
static gint ett_s1ap_TargetID = -1;
static gint ett_s1ap_TargeteNB_ID = -1;
static gint ett_s1ap_TargetRNC_ID = -1;
+static gint ett_s1ap_TargeteNodeB_ToSourceeNodeB_TransparentContainer = -1;
static gint ett_s1ap_TraceActivation = -1;
+static gint ett_s1ap_UE_S1AP_IDs = -1;
+static gint ett_s1ap_UE_S1AP_ID_pair = -1;
+static gint ett_s1ap_UE_associatedLogicalS1_ConnectionItem = -1;
static gint ett_s1ap_UEPagingID = -1;
static gint ett_s1ap_HandoverRequired = -1;
static gint ett_s1ap_Intra_LTEHOInformationReq = -1;
@@ -538,6 +606,7 @@ static gint ett_s1ap_HandoverNotify = -1;
static gint ett_s1ap_PathSwitchRequest = -1;
static gint ett_s1ap_SAEBearerToBeSwitchedDLItem = -1;
static gint ett_s1ap_PathSwitchRequestAcknowledge = -1;
+static gint ett_s1ap_SAEBearerToBeSwitchedULItem = -1;
static gint ett_s1ap_PathSwitchRequestFailure = -1;
static gint ett_s1ap_HandoverCancel = -1;
static gint ett_s1ap_HandoverCancelAcknowledge = -1;
@@ -554,7 +623,7 @@ static gint ett_s1ap_SAEBearerModifyResponse = -1;
static gint ett_s1ap_SAEBearerModifyListBearerModRes = -1;
static gint ett_s1ap_SAEBearerModifyItemBearerModRes = -1;
static gint ett_s1ap_SAEBearerReleaseCommand = -1;
-static gint ett_s1ap_SAEBearerReleaseComplete = -1;
+static gint ett_s1ap_SAEBearerReleaseResponse = -1;
static gint ett_s1ap_SAEBearerReleaseListBearerRelComp = -1;
static gint ett_s1ap_SAEBearerReleaseItemBearerRelComp = -1;
static gint ett_s1ap_SAEBearerReleaseRequest = -1;
@@ -567,8 +636,8 @@ static gint ett_s1ap_SAEBearerSetupListCtxtSURes = -1;
static gint ett_s1ap_SAEBearerSetupItemCtxtSURes = -1;
static gint ett_s1ap_InitialContextSetupFailure = -1;
static gint ett_s1ap_Paging = -1;
-static gint ett_s1ap_TAIdList = -1;
-static gint ett_s1ap_TAIdItem = -1;
+static gint ett_s1ap_TAIList = -1;
+static gint ett_s1ap_TAIItem = -1;
static gint ett_s1ap_UEContextReleaseCommand = -1;
static gint ett_s1ap_UEContextReleaseComplete = -1;
static gint ett_s1ap_UEContextModificationRequest = -1;
@@ -579,18 +648,31 @@ static gint ett_s1ap_InitialUEMessage = -1;
static gint ett_s1ap_UplinkNASTransport = -1;
static gint ett_s1ap_NASNonDeliveryIndication = -1;
static gint ett_s1ap_Reset = -1;
+static gint ett_s1ap_ResetType = -1;
+static gint ett_s1ap_UE_associatedLogicalS1_ConnectionListRes = -1;
static gint ett_s1ap_ResetAcknowledge = -1;
+static gint ett_s1ap_UE_associatedLogicalS1_ConnectionListResAck = -1;
static gint ett_s1ap_ErrorIndication = -1;
static gint ett_s1ap_S1SetupRequest = -1;
static gint ett_s1ap_S1SetupResponse = -1;
static gint ett_s1ap_S1SetupFailure = -1;
+static gint ett_s1ap_ENBConfigurationUpdate = -1;
+static gint ett_s1ap_ENBConfigurationUpdateAcknowledge = -1;
+static gint ett_s1ap_ENBConfigurationUpdateFailure = -1;
+static gint ett_s1ap_MMEConfigurationUpdate = -1;
+static gint ett_s1ap_MMEConfigurationUpdateAcknowledge = -1;
+static gint ett_s1ap_MMEConfigurationUpdateFailure = -1;
static gint ett_s1ap_DownlinkS1cdma2000tunneling = -1;
static gint ett_s1ap_UplinkS1cdma2000tunneling = -1;
static gint ett_s1ap_UECapabilityInfoIndication = -1;
static gint ett_s1ap_ENBStatusTransfer = -1;
-static gint ett_s1ap_Bearers_SubjectToStatusTransferENB_Item = -1;
static gint ett_s1ap_MMEStatusTransfer = -1;
-static gint ett_s1ap_Bearers_SubjectToStatusTransferMME_Item = -1;
+static gint ett_s1ap_TraceStart = -1;
+static gint ett_s1ap_TraceFailureIndication = -1;
+static gint ett_s1ap_DeactivateTrace = -1;
+static gint ett_s1ap_LocationReportingControl = -1;
+static gint ett_s1ap_LocationReportingFailureIndication = -1;
+static gint ett_s1ap_LocationReport = -1;
static gint ett_s1ap_S1AP_PDU = -1;
static gint ett_s1ap_InitiatingMessage = -1;
static gint ett_s1ap_SuccessfulOutcome = -1;
@@ -729,6 +811,14 @@ static const value_string s1ap_ProcedureCode_vals[] = {
{ id_UEContextRelease, "id-UEContextRelease" },
{ id_eNBStatusTransfer, "id-eNBStatusTransfer" },
{ id_MMEStatusTransfer, "id-MMEStatusTransfer" },
+ { id_DeactivateTrace, "id-DeactivateTrace" },
+ { id_TraceStart, "id-TraceStart" },
+ { id_TraceFailureIndication, "id-TraceFailureIndication" },
+ { id_ENBConfigurationUpdate, "id-ENBConfigurationUpdate" },
+ { id_MMEConfigurationUpdate, "id-MMEConfigurationUpdate" },
+ { id_LocationReportingControl, "id-LocationReportingControl" },
+ { id_LocationReportingFailureIndication, "id-LocationReportingFailureIndication" },
+ { id_LocationReport, "id-LocationReport" },
{ 0, NULL }
};
@@ -804,8 +894,8 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
{ id_UEPagingID, "id-UEPagingID" },
{ id_pagingDRX, "id-pagingDRX" },
{ id_pagingCause, "id-pagingCause" },
- { id_TAIdList, "id-TAIdList" },
- { id_TAIdItem, "id-TAIdItem" },
+ { id_TAIList, "id-TAIList" },
+ { id_TAIItem, "id-TAIItem" },
{ id_SAEBearerFailedToSetupListCtxtSURes, "id-SAEBearerFailedToSetupListCtxtSURes" },
{ id_SAEBearerReleaseItemHOCmd, "id-SAEBearerReleaseItemHOCmd" },
{ id_SAEBearerSetupItemCtxtSURes, "id-SAEBearerSetupItemCtxtSURes" },
@@ -821,11 +911,10 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
{ id_eNBname, "id-eNBname" },
{ id_MMEname, "id-MMEname" },
{ id_ServedPLMNs, "id-ServedPLMNs" },
- { id_SupportedTAIs, "id-SupportedTAIs" },
+ { id_SupportedTAs, "id-SupportedTAs" },
{ id_TimeToWait, "id-TimeToWait" },
{ id_aggregateMaximumBitrate, "id-aggregateMaximumBitrate" },
- { id_TAId, "id-TAId" },
- { id_ServingPLMN, "id-ServingPLMN" },
+ { id_TAI, "id-TAI" },
{ id_SAEBearerReleaseListBearerRelComp, "id-SAEBearerReleaseListBearerRelComp" },
{ id_cdma2000PDU, "id-cdma2000PDU" },
{ id_cdma2000RATType, "id-cdma2000RATType" },
@@ -833,13 +922,27 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
{ id_SecurityInfo, "id-SecurityInfo" },
{ id_UERadioCapability, "id-UERadioCapability" },
{ id_GUMMEI_ID, "id-GUMMEI-ID" },
- { id_Bearers_SubjectToStatusTransferENB_List, "id-Bearers-SubjectToStatusTransferENB-List" },
- { id_Bearers_SubjectToStatusTransferENB_Item, "id-Bearers-SubjectToStatusTransferENB-Item" },
{ id_SAEBearerInformationListItem, "id-SAEBearerInformationListItem" },
{ id_Direct_Forwarding_Path_Availability, "id-Direct-Forwarding-Path-Availability" },
{ id_UEIdentityIndexValue, "id-UEIdentityIndexValue" },
- { id_Bearers_SubjectToStatusTransferMME_List, "id-Bearers-SubjectToStatusTransferMME-List" },
- { id_Bearers_SubjectToStatusTransferMME_Item, "id-Bearers-SubjectToStatusTransferMME-Item" },
+ { id_cdma2000HOStatus, "id-cdma2000HOStatus" },
+ { id_cdma2000HORequiredIndication, "id-cdma2000HORequiredIndication" },
+ { id_cdma2000OneXMEID, "id-cdma2000OneXMEID" },
+ { id_TraceReference, "id-TraceReference" },
+ { id_RelativeMMECapacity, "id-RelativeMMECapacity" },
+ { id_SourceMME_UE_S1AP_ID, "id-SourceMME-UE-S1AP-ID" },
+ { id_Bearers_SubjectToStatusTransfer_Item, "id-Bearers-SubjectToStatusTransfer-Item" },
+ { id_eNB_StatusTransfer_TransparentContainer, "id-eNB-StatusTransfer-TransparentContainer" },
+ { id_UE_associatedLogicalS1_ConnectionItem, "id-UE-associatedLogicalS1-ConnectionItem" },
+ { id_ResetType, "id-ResetType" },
+ { id_UE_associatedLogicalS1_ConnectionListResAck, "id-UE-associatedLogicalS1-ConnectionListResAck" },
+ { id_SAEBearerToBeSwitchedULItem, "id-SAEBearerToBeSwitchedULItem" },
+ { id_SAEBearerToBeSwitchedULList, "id-SAEBearerToBeSwitchedULList" },
+ { id_S_TMSI, "id-S-TMSI" },
+ { id_cdma2000OneXRAND, "id-cdma2000OneXRAND" },
+ { id_RequestType, "id-RequestType" },
+ { id_UE_S1AP_IDs, "id-UE-S1AP-IDs" },
+ { id_EUTRAN_CGI_ID, "id-EUTRAN-CGI-ID" },
{ 0, NULL }
};
@@ -1146,6 +1249,82 @@ dissect_s1ap_AggregateMaximumBitrate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
}
+static const per_sequence_t Bearers_SubjectToStatusTransferList_sequence_of[1] = {
+ { &hf_s1ap_Bearers_SubjectToStatusTransferList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_SingleContainer },
+};
+
+static int
+dissect_s1ap_Bearers_SubjectToStatusTransferList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_Bearers_SubjectToStatusTransferList, Bearers_SubjectToStatusTransferList_sequence_of,
+ 0, maxNrOfSAEBs);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_SAE_Bearer_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_PDCP_SN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 4095U, NULL, FALSE);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_HFN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 1048575U, NULL, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t COUNTvalue_sequence[] = {
+ { &hf_s1ap_pDCP_SN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
+ { &hf_s1ap_hFN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_HFN },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_COUNTvalue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_COUNTvalue, COUNTvalue_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t Bearers_SubjectToStatusTransfer_Item_sequence[] = {
+ { &hf_s1ap_sAE_Bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_SAE_Bearer_ID },
+ { &hf_s1ap_uL_COUNTvalue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_COUNTvalue },
+ { &hf_s1ap_dL_COUNTvalue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_COUNTvalue },
+ { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_Bearers_SubjectToStatusTransfer_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_Bearers_SubjectToStatusTransfer_Item, Bearers_SubjectToStatusTransfer_Item_sequence);
+
+ return offset;
+}
+
+
static int
dissect_s1ap_TBCD_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -1195,6 +1374,17 @@ static const value_string s1ap_CauseRadioNetwork_vals[] = {
{ 3, "successful-handover" },
{ 4, "release-due-to-eutran-generated-reason" },
{ 5, "handover-cancelled" },
+ { 6, "partial-handover" },
+ { 7, "ho-failure-in-target-EPC-eNB-or-target-system" },
+ { 8, "ho-target-not-allowed" },
+ { 9, "tS1relocoverall-expiry" },
+ { 10, "tS1relocprep-expiry" },
+ { 11, "cell-not-available" },
+ { 12, "unknown-targetID" },
+ { 13, "no-radio-resources-available-in-target-cell" },
+ { 14, "unknown-mme-ue-s1ap-id" },
+ { 15, "unknown-enb-ue-s1ap-id" },
+ { 16, "unknown-pair-ue-s1ap-id" },
{ 0, NULL }
};
@@ -1202,7 +1392,7 @@ static const value_string s1ap_CauseRadioNetwork_vals[] = {
static int
dissect_s1ap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
- 6, NULL, TRUE, 0, NULL);
+ 17, NULL, TRUE, 0, NULL);
return offset;
}
@@ -1269,6 +1459,7 @@ static const value_string s1ap_CauseMisc_vals[] = {
{ 2, "hardware-failure" },
{ 3, "om-intervention" },
{ 4, "unspecified" },
+ { 5, "unknown-PLMN" },
{ 0, NULL }
};
@@ -1276,7 +1467,7 @@ static const value_string s1ap_CauseMisc_vals[] = {
static int
dissect_s1ap_CauseMisc(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
- 5, NULL, TRUE, 0, NULL);
+ 6, NULL, TRUE, 0, NULL);
return offset;
}
@@ -1346,6 +1537,57 @@ dissect_s1ap_Cdma2000SectorID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
}
+static const value_string s1ap_Cdma2000HOStatus_vals[] = {
+ { 0, "hOSuccess" },
+ { 1, "hOFailure" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_s1ap_Cdma2000HOStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 2, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const value_string s1ap_Cdma2000HORequiredIndication_vals[] = {
+ { 0, "true" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_s1ap_Cdma2000HORequiredIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_Cdma2000OneXMEID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_Cdma2000OneXRAND(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, NULL);
+
+ return offset;
+}
+
+
static int
dissect_s1ap_LAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -1477,10 +1719,26 @@ dissect_s1ap_Direct_Forwarding_Path_Availability(tvbuff_t *tvb _U_, int offset _
}
+static const per_sequence_t ENB_StatusTransfer_TransparentContainer_sequence[] = {
+ { &hf_s1ap_bearers_SubjectToStatusTransferList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_Bearers_SubjectToStatusTransferList },
+ { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_ENB_StatusTransfer_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_ENB_StatusTransfer_TransparentContainer, ENB_StatusTransfer_TransparentContainer_sequence);
+
+ return offset;
+}
+
+
static int
dissect_s1ap_ENB_UE_S1AP_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_s1ap_TBCD_STRING(tvb, offset, actx, tree, hf_index);
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 16777215U, NULL, FALSE);
return offset;
}
@@ -1520,6 +1778,33 @@ dissect_s1ap_EPLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
}
+static const value_string s1ap_EventType_vals[] = {
+ { 0, "direct" },
+ { 1, "change-of-serve-cell" },
+ { 2, "stop-change-of-serve-cell" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_s1ap_EventType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 3, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_EUTRAN_CGI_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, NULL);
+
+ return offset;
+}
+
+
static int
dissect_s1ap_ExtendedRNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -1549,7 +1834,7 @@ dissect_s1ap_ForbiddenInterRATs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
-dissect_s1ap_TAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
@@ -1557,15 +1842,15 @@ dissect_s1ap_TAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_
}
-static const per_sequence_t ForbiddenTAIs_sequence_of[1] = {
- { &hf_s1ap_ForbiddenTAIs_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_TAI },
+static const per_sequence_t ForbiddenTACs_sequence_of[1] = {
+ { &hf_s1ap_ForbiddenTACs_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_TAC },
};
static int
-dissect_s1ap_ForbiddenTAIs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_ForbiddenTACs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
- ett_s1ap_ForbiddenTAIs, ForbiddenTAIs_sequence_of,
- 1, maxnoofForbTAIs);
+ ett_s1ap_ForbiddenTACs, ForbiddenTACs_sequence_of,
+ 1, maxnoofForbTACs);
return offset;
}
@@ -1573,7 +1858,7 @@ dissect_s1ap_ForbiddenTAIs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
static const per_sequence_t ForbiddenTAs_Item_sequence[] = {
{ &hf_s1ap_pLMN_Identity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_PLMNidentity },
- { &hf_s1ap_forbiddenTAIs , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ForbiddenTAIs },
+ { &hf_s1ap_forbiddenTACs , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ForbiddenTACs },
{ NULL, 0, 0, NULL }
};
@@ -1676,7 +1961,7 @@ dissect_s1ap_MME_Code(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
static const per_sequence_t GUMMEI_sequence[] = {
{ &hf_s1ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PLMNidentity },
{ &hf_s1ap_mME_Group_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_MME_Group_ID },
- { &hf_s1ap_mMME_Code , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_MME_Code },
+ { &hf_s1ap_mME_Code , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_MME_Code },
{ &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -1691,6 +1976,7 @@ dissect_s1ap_GUMMEI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
static const per_sequence_t HandoverRestrictionList_sequence[] = {
+ { &hf_s1ap_servingPLMN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PLMNidentity },
{ &hf_s1ap_equivalentPLMNs, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_EPLMNs },
{ &hf_s1ap_forbiddenTAs , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ForbiddenTAs },
{ &hf_s1ap_forbiddenLAs , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ForbiddenLAs },
@@ -1804,16 +2090,6 @@ dissect_s1ap_InterfacesToTraceList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
-
-static int
-dissect_s1ap_Label(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
- 1U, 256U, NULL, FALSE);
-
- return offset;
-}
-
-
static const per_sequence_t LAI_sequence[] = {
{ &hf_s1ap_pLMNidentity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_PLMNidentity },
{ &hf_s1ap_lAC , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_LAC },
@@ -1843,7 +2119,8 @@ dissect_s1ap_MMEname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
static int
dissect_s1ap_MME_UE_S1AP_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_s1ap_TBCD_STRING(tvb, offset, actx, tree, hf_index);
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 4294967295U, NULL, FALSE);
return offset;
}
@@ -1901,8 +2178,19 @@ dissect_s1ap_PagingCause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
-dissect_s1ap_PDCP_SN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL);
+dissect_s1ap_QCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 1U, 256U, NULL, FALSE);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_RelativeMMECapacity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 255U, NULL, FALSE);
return offset;
}
@@ -1920,19 +2208,25 @@ dissect_s1ap_RAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_
static int
-dissect_s1ap_RNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
- 0U, 4095U, NULL, FALSE);
+dissect_s1ap_ReportArea(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, NULL);
return offset;
}
+static const per_sequence_t RequestType_sequence[] = {
+ { &hf_s1ap_eventType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_EventType },
+ { &hf_s1ap_reportArea , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ReportArea },
+ { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
static int
-dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
- NO_BOUND, NO_BOUND, FALSE, NULL);
+dissect_s1ap_RequestType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_RequestType, RequestType_sequence);
return offset;
}
@@ -1940,7 +2234,17 @@ dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
static int
-dissect_s1ap_SAE_Bearer_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_RNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 4095U, NULL, FALSE);
+
+ return offset;
+}
+
+
+
+static int
+dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, NULL);
@@ -2079,7 +2383,7 @@ dissect_s1ap_SAE_Bearer_Type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static const per_sequence_t SAE_BearerLevelQoSParameters_sequence[] = {
- { &hf_s1ap_label , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_Label },
+ { &hf_s1ap_qCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_QCI },
{ &hf_s1ap_allocationRetentionPriority, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_AllocationRetentionPriority },
{ &hf_s1ap_sAE_BearerType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_SAE_Bearer_Type },
{ &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
@@ -2229,18 +2533,8 @@ dissect_s1ap_ServedPLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
}
-
-static int
-dissect_s1ap_TAId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
- NO_BOUND, NO_BOUND, FALSE, NULL);
-
- return offset;
-}
-
-
static const per_sequence_t SupportedTAs_Item_sequence[] = {
- { &hf_s1ap_tAI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_TAId },
+ { &hf_s1ap_tAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_TAC },
{ &hf_s1ap_broadcastPLMNs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_BPLMNs },
{ NULL, 0, 0, NULL }
};
@@ -2254,15 +2548,15 @@ dissect_s1ap_SupportedTAs_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
}
-static const per_sequence_t SupportedTAIs_sequence_of[1] = {
- { &hf_s1ap_SupportedTAIs_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_SupportedTAs_Item },
+static const per_sequence_t SupportedTAs_sequence_of[1] = {
+ { &hf_s1ap_SupportedTAs_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_SupportedTAs_Item },
};
static int
-dissect_s1ap_SupportedTAIs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_SupportedTAs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
- ett_s1ap_SupportedTAIs, SupportedTAIs_sequence_of,
- 1, maxnoofTAIs);
+ ett_s1ap_SupportedTAs, SupportedTAs_sequence_of,
+ 1, maxnoofTACs);
return offset;
}
@@ -2283,6 +2577,22 @@ dissect_s1ap_S_TMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
}
+static const per_sequence_t TAI_sequence[] = {
+ { &hf_s1ap_pLMNidentity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_PLMNidentity },
+ { &hf_s1ap_tAC , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_TAC },
+ { &hf_s1ap_iE_Extensions , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_TAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_TAI, TAI_sequence);
+
+ return offset;
+}
+
+
static const per_sequence_t TargeteNB_ID_sequence[] = {
{ &hf_s1ap_pLMNidentity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_PLMNidentity },
{ &hf_s1ap_eNB_Global_ID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ENB_Global_ID },
@@ -2338,11 +2648,16 @@ dissect_s1ap_TargetID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
}
+static const per_sequence_t TargeteNodeB_ToSourceeNodeB_TransparentContainer_sequence[] = {
+ { &hf_s1ap_rRC_Container , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_RRC_Container },
+ { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
static int
dissect_s1ap_TargeteNodeB_ToSourceeNodeB_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
- NO_BOUND, NO_BOUND, FALSE, NULL);
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_TargeteNodeB_ToSourceeNodeB_TransparentContainer, TargeteNodeB_ToSourceeNodeB_TransparentContainer_sequence);
return offset;
}
@@ -2392,7 +2707,7 @@ dissect_s1ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_s1ap_TraceReference(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
- 3, 3, FALSE, NULL);
+ 8, 8, FALSE, NULL);
return offset;
}
@@ -2414,6 +2729,61 @@ dissect_s1ap_TraceActivation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
+static const per_sequence_t UE_S1AP_ID_pair_sequence[] = {
+ { &hf_s1ap_mME_UE_S1AP_ID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_MME_UE_S1AP_ID },
+ { &hf_s1ap_eNB_UE_S1AP_ID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ENB_UE_S1AP_ID },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_UE_S1AP_ID_pair(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_UE_S1AP_ID_pair, UE_S1AP_ID_pair_sequence);
+
+ return offset;
+}
+
+
+static const value_string s1ap_UE_S1AP_IDs_vals[] = {
+ { 0, "uE-S1AP-ID-pair" },
+ { 1, "mME-UE-S1AP-ID" },
+ { 2, "eNB-UE-S1AP-ID" },
+ { 0, NULL }
+};
+
+static const per_choice_t UE_S1AP_IDs_choice[] = {
+ { 0, &hf_s1ap_uE_S1AP_ID_pair, ASN1_EXTENSION_ROOT , dissect_s1ap_UE_S1AP_ID_pair },
+ { 1, &hf_s1ap_mME_UE_S1AP_ID , ASN1_EXTENSION_ROOT , dissect_s1ap_MME_UE_S1AP_ID },
+ { 2, &hf_s1ap_eNB_UE_S1AP_ID , ASN1_EXTENSION_ROOT , dissect_s1ap_ENB_UE_S1AP_ID },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_s1ap_UE_S1AP_IDs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_UE_S1AP_IDs, UE_S1AP_IDs_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t UE_associatedLogicalS1_ConnectionItem_sequence[] = {
+ { &hf_s1ap_mME_UE_S1AP_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_MME_UE_S1AP_ID },
+ { &hf_s1ap_eNB_UE_S1AP_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ENB_UE_S1AP_ID },
+ { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_UE_associatedLogicalS1_ConnectionItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_UE_associatedLogicalS1_ConnectionItem, UE_associatedLogicalS1_ConnectionItem_sequence);
+
+ return offset;
+}
+
+
static int
dissect_s1ap_UEIdentityIndexValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -2936,6 +3306,32 @@ dissect_s1ap_PathSwitchRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn
}
+
+static int
+dissect_s1ap_SAEBearerToBeSwitchedULList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_s1ap_SAEB_IE_ContainerList(tvb, offset, actx, tree, hf_index);
+
+ return offset;
+}
+
+
+static const per_sequence_t SAEBearerToBeSwitchedULItem_sequence[] = {
+ { &hf_s1ap_sAE_Bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_SAE_Bearer_ID },
+ { &hf_s1ap_transportLayerAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_TransportLayerAddress },
+ { &hf_s1ap_gTP_TEID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_GTP_TEID },
+ { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_SAEBearerToBeSwitchedULItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_SAEBearerToBeSwitchedULItem, SAEBearerToBeSwitchedULItem_sequence);
+
+ return offset;
+}
+
+
static const per_sequence_t PathSwitchRequestFailure_sequence[] = {
{ &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -3170,15 +3566,15 @@ dissect_s1ap_SAEBearerReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
}
-static const per_sequence_t SAEBearerReleaseComplete_sequence[] = {
+static const per_sequence_t SAEBearerReleaseResponse_sequence[] = {
{ &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
};
static int
-dissect_s1ap_SAEBearerReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_SAEBearerReleaseResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
- ett_s1ap_SAEBearerReleaseComplete, SAEBearerReleaseComplete_sequence);
+ ett_s1ap_SAEBearerReleaseResponse, SAEBearerReleaseResponse_sequence);
return offset;
}
@@ -3360,30 +3756,30 @@ dissect_s1ap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
}
-static const per_sequence_t TAIdList_sequence_of[1] = {
- { &hf_s1ap_TAIdList_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_SingleContainer },
+static const per_sequence_t TAIList_sequence_of[1] = {
+ { &hf_s1ap_TAIList_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_SingleContainer },
};
static int
-dissect_s1ap_TAIdList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_TAIList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
- ett_s1ap_TAIdList, TAIdList_sequence_of,
+ ett_s1ap_TAIList, TAIList_sequence_of,
1, maxnoofTAI);
return offset;
}
-static const per_sequence_t TAIdItem_sequence[] = {
- { &hf_s1ap_tAId , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_TAId },
+static const per_sequence_t TAIItem_sequence[] = {
+ { &hf_s1ap_tAI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_TAI },
{ &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
-dissect_s1ap_TAIdItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_TAIItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
- ett_s1ap_TAIdItem, TAIdItem_sequence);
+ ett_s1ap_TAIItem, TAIItem_sequence);
return offset;
}
@@ -3529,6 +3925,57 @@ dissect_s1ap_Reset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
}
+static const value_string s1ap_ResetAll_vals[] = {
+ { 0, "reset-all" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_s1ap_ResetAll(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t UE_associatedLogicalS1_ConnectionListRes_sequence_of[1] = {
+ { &hf_s1ap_UE_associatedLogicalS1_ConnectionListRes_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_SingleContainer },
+};
+
+static int
+dissect_s1ap_UE_associatedLogicalS1_ConnectionListRes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_UE_associatedLogicalS1_ConnectionListRes, UE_associatedLogicalS1_ConnectionListRes_sequence_of,
+ 1, maxNrOfIndividualS1ConnectionsToReset);
+
+ return offset;
+}
+
+
+static const value_string s1ap_ResetType_vals[] = {
+ { 0, "s1-Interface" },
+ { 1, "partOfS1-Interface" },
+ { 0, NULL }
+};
+
+static const per_choice_t ResetType_choice[] = {
+ { 0, &hf_s1ap_s1_Interface , ASN1_EXTENSION_ROOT , dissect_s1ap_ResetAll },
+ { 1, &hf_s1ap_partOfS1_Interface, ASN1_EXTENSION_ROOT , dissect_s1ap_UE_associatedLogicalS1_ConnectionListRes },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_s1ap_ResetType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_ResetType, ResetType_choice,
+ NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t ResetAcknowledge_sequence[] = {
{ &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -3543,6 +3990,20 @@ dissect_s1ap_ResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
}
+static const per_sequence_t UE_associatedLogicalS1_ConnectionListResAck_sequence_of[1] = {
+ { &hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_SingleContainer },
+};
+
+static int
+dissect_s1ap_UE_associatedLogicalS1_ConnectionListResAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_UE_associatedLogicalS1_ConnectionListResAck, UE_associatedLogicalS1_ConnectionListResAck_sequence_of,
+ 1, maxNrOfIndividualS1ConnectionsToReset);
+
+ return offset;
+}
+
+
static const per_sequence_t ErrorIndication_sequence[] = {
{ &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -3599,6 +4060,90 @@ dissect_s1ap_S1SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
+static const per_sequence_t ENBConfigurationUpdate_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_ENBConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_ENBConfigurationUpdate, ENBConfigurationUpdate_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t ENBConfigurationUpdateAcknowledge_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_ENBConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_ENBConfigurationUpdateAcknowledge, ENBConfigurationUpdateAcknowledge_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t ENBConfigurationUpdateFailure_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_ENBConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_ENBConfigurationUpdateFailure, ENBConfigurationUpdateFailure_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t MMEConfigurationUpdate_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_MMEConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_MMEConfigurationUpdate, MMEConfigurationUpdate_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t MMEConfigurationUpdateAcknowledge_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_MMEConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_MMEConfigurationUpdateAcknowledge, MMEConfigurationUpdateAcknowledge_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t MMEConfigurationUpdateFailure_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_MMEConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_MMEConfigurationUpdateFailure, MMEConfigurationUpdateFailure_sequence);
+
+ return offset;
+}
+
+
static const per_sequence_t DownlinkS1cdma2000tunneling_sequence[] = {
{ &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -3655,71 +4200,99 @@ dissect_s1ap_ENBStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
}
+static const per_sequence_t MMEStatusTransfer_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
static int
-dissect_s1ap_Bearers_SubjectToStatusTransferENB_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_s1ap_SAEB_IE_ContainerList(tvb, offset, actx, tree, hf_index);
+dissect_s1ap_MMEStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_MMEStatusTransfer, MMEStatusTransfer_sequence);
return offset;
}
-static const per_sequence_t Bearers_SubjectToStatusTransferENB_Item_sequence[] = {
- { &hf_s1ap_sAE_Bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_SAE_Bearer_ID },
- { &hf_s1ap_lIS_HFN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_lIS , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_dL_PDCP_HFN_NextToAssign, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_dL_PDCP_SN_NextToAssign, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+static const per_sequence_t TraceStart_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
};
static int
-dissect_s1ap_Bearers_SubjectToStatusTransferENB_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_TraceStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
- ett_s1ap_Bearers_SubjectToStatusTransferENB_Item, Bearers_SubjectToStatusTransferENB_Item_sequence);
+ ett_s1ap_TraceStart, TraceStart_sequence);
return offset;
}
-static const per_sequence_t MMEStatusTransfer_sequence[] = {
+static const per_sequence_t TraceFailureIndication_sequence[] = {
{ &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
};
static int
-dissect_s1ap_MMEStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_TraceFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
- ett_s1ap_MMEStatusTransfer, MMEStatusTransfer_sequence);
+ ett_s1ap_TraceFailureIndication, TraceFailureIndication_sequence);
return offset;
}
+static const per_sequence_t DeactivateTrace_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
static int
-dissect_s1ap_Bearers_SubjectToStatusTransferMME_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_s1ap_SAEB_IE_ContainerList(tvb, offset, actx, tree, hf_index);
+dissect_s1ap_DeactivateTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_DeactivateTrace, DeactivateTrace_sequence);
return offset;
}
-static const per_sequence_t Bearers_SubjectToStatusTransferMME_Item_sequence[] = {
- { &hf_s1ap_sAE_Bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_SAE_Bearer_ID },
- { &hf_s1ap_lIS_HFN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_lIS , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_dL_PDCP_HFN_NextToAssign, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_dL_PDCP_SN_NextToAssign, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_PDCP_SN },
- { &hf_s1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_s1ap_ProtocolExtensionContainer },
+static const per_sequence_t LocationReportingControl_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_LocationReportingControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_LocationReportingControl, LocationReportingControl_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t LocationReportingFailureIndication_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
};
static int
-dissect_s1ap_Bearers_SubjectToStatusTransferMME_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_s1ap_LocationReportingFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
- ett_s1ap_Bearers_SubjectToStatusTransferMME_Item, Bearers_SubjectToStatusTransferMME_Item_sequence);
+ ett_s1ap_LocationReportingFailureIndication, LocationReportingFailureIndication_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t LocationReport_sequence[] = {
+ { &hf_s1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_s1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_s1ap_LocationReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_s1ap_LocationReport, LocationReport_sequence);
return offset;
}
@@ -3833,6 +4406,14 @@ static int dissect_AggregateMaximumBitrate_PDU(tvbuff_t *tvb _U_, packet_info *p
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Bearers_SubjectToStatusTransfer_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_Bearers_SubjectToStatusTransfer_Item(tvb, offset, &asn1_ctx, tree, hf_s1ap_Bearers_SubjectToStatusTransfer_Item_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Cause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -3865,6 +4446,38 @@ static int dissect_Cdma2000SectorID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Cdma2000HOStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_Cdma2000HOStatus(tvb, offset, &asn1_ctx, tree, hf_s1ap_Cdma2000HOStatus_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_Cdma2000HORequiredIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_Cdma2000HORequiredIndication(tvb, offset, &asn1_ctx, tree, hf_s1ap_Cdma2000HORequiredIndication_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_Cdma2000OneXMEID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_Cdma2000OneXMEID(tvb, offset, &asn1_ctx, tree, hf_s1ap_Cdma2000OneXMEID_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_Cdma2000OneXRAND_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_Cdma2000OneXRAND(tvb, offset, &asn1_ctx, tree, hf_s1ap_Cdma2000OneXRAND_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_CriticalityDiagnostics_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -3881,6 +4494,14 @@ static int dissect_Direct_Forwarding_Path_Availability_PDU(tvbuff_t *tvb _U_, pa
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ENB_StatusTransfer_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_ENB_StatusTransfer_TransparentContainer(tvb, offset, &asn1_ctx, tree, hf_s1ap_ENB_StatusTransfer_TransparentContainer_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_ENB_UE_S1AP_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -3897,6 +4518,14 @@ static int dissect_ENBname_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_EUTRAN_CGI_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_EUTRAN_CGI_ID(tvb, offset, &asn1_ctx, tree, hf_s1ap_EUTRAN_CGI_ID_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_GUMMEI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -3961,11 +4590,19 @@ static int dissect_PagingCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_PLMNidentity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_RelativeMMECapacity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_PLMNidentity(tvb, offset, &asn1_ctx, tree, hf_s1ap_PLMNidentity_PDU);
+ offset = dissect_s1ap_RelativeMMECapacity(tvb, offset, &asn1_ctx, tree, hf_s1ap_RelativeMMECapacity_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_RequestType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_RequestType(tvb, offset, &asn1_ctx, tree, hf_s1ap_RequestType_PDU);
offset += 7; offset >>= 3;
return offset;
}
@@ -4017,19 +4654,27 @@ static int dissect_ServedPLMNs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_SupportedTAIs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_SupportedTAs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_SupportedTAs(tvb, offset, &asn1_ctx, tree, hf_s1ap_SupportedTAs_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_S_TMSI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_SupportedTAIs(tvb, offset, &asn1_ctx, tree, hf_s1ap_SupportedTAIs_PDU);
+ offset = dissect_s1ap_S_TMSI(tvb, offset, &asn1_ctx, tree, hf_s1ap_S_TMSI_PDU);
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_TAId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_TAI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_TAId(tvb, offset, &asn1_ctx, tree, hf_s1ap_TAId_PDU);
+ offset = dissect_s1ap_TAI(tvb, offset, &asn1_ctx, tree, hf_s1ap_TAI_PDU);
offset += 7; offset >>= 3;
return offset;
}
@@ -4057,6 +4702,30 @@ static int dissect_TraceActivation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_TraceReference_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_TraceReference(tvb, offset, &asn1_ctx, tree, hf_s1ap_TraceReference_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_UE_S1AP_IDs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_UE_S1AP_IDs(tvb, offset, &asn1_ctx, tree, hf_s1ap_UE_S1AP_IDs_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_UE_associatedLogicalS1_ConnectionItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_UE_associatedLogicalS1_ConnectionItem(tvb, offset, &asn1_ctx, tree, hf_s1ap_UE_associatedLogicalS1_ConnectionItem_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_UEIdentityIndexValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4321,6 +4990,22 @@ static int dissect_PathSwitchRequestAcknowledge_PDU(tvbuff_t *tvb _U_, packet_in
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_SAEBearerToBeSwitchedULList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_SAEBearerToBeSwitchedULList(tvb, offset, &asn1_ctx, tree, hf_s1ap_SAEBearerToBeSwitchedULList_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_SAEBearerToBeSwitchedULItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_SAEBearerToBeSwitchedULItem(tvb, offset, &asn1_ctx, tree, hf_s1ap_SAEBearerToBeSwitchedULItem_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_PathSwitchRequestFailure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4449,11 +5134,11 @@ static int dissect_SAEBearerReleaseCommand_PDU(tvbuff_t *tvb _U_, packet_info *p
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_SAEBearerReleaseComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_SAEBearerReleaseResponse_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_SAEBearerReleaseComplete(tvb, offset, &asn1_ctx, tree, hf_s1ap_SAEBearerReleaseComplete_PDU);
+ offset = dissect_s1ap_SAEBearerReleaseResponse(tvb, offset, &asn1_ctx, tree, hf_s1ap_SAEBearerReleaseResponse_PDU);
offset += 7; offset >>= 3;
return offset;
}
@@ -4553,19 +5238,19 @@ static int dissect_Paging_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_TAIdList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_TAIList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_TAIdList(tvb, offset, &asn1_ctx, tree, hf_s1ap_TAIdList_PDU);
+ offset = dissect_s1ap_TAIList(tvb, offset, &asn1_ctx, tree, hf_s1ap_TAIList_PDU);
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_TAIdItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_TAIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_TAIdItem(tvb, offset, &asn1_ctx, tree, hf_s1ap_TAIdItem_PDU);
+ offset = dissect_s1ap_TAIItem(tvb, offset, &asn1_ctx, tree, hf_s1ap_TAIItem_PDU);
offset += 7; offset >>= 3;
return offset;
}
@@ -4649,6 +5334,14 @@ static int dissect_Reset_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ResetType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_ResetType(tvb, offset, &asn1_ctx, tree, hf_s1ap_ResetType_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_ResetAcknowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4657,6 +5350,14 @@ static int dissect_ResetAcknowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UE_associatedLogicalS1_ConnectionListResAck_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_UE_associatedLogicalS1_ConnectionListResAck(tvb, offset, &asn1_ctx, tree, hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_ErrorIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4689,6 +5390,54 @@ static int dissect_S1SetupFailure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ENBConfigurationUpdate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_ENBConfigurationUpdate(tvb, offset, &asn1_ctx, tree, hf_s1ap_ENBConfigurationUpdate_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ENBConfigurationUpdateAcknowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_ENBConfigurationUpdateAcknowledge(tvb, offset, &asn1_ctx, tree, hf_s1ap_ENBConfigurationUpdateAcknowledge_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ENBConfigurationUpdateFailure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_ENBConfigurationUpdateFailure(tvb, offset, &asn1_ctx, tree, hf_s1ap_ENBConfigurationUpdateFailure_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_MMEConfigurationUpdate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_MMEConfigurationUpdate(tvb, offset, &asn1_ctx, tree, hf_s1ap_MMEConfigurationUpdate_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_MMEConfigurationUpdateAcknowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_MMEConfigurationUpdateAcknowledge(tvb, offset, &asn1_ctx, tree, hf_s1ap_MMEConfigurationUpdateAcknowledge_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_MMEConfigurationUpdateFailure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_MMEConfigurationUpdateFailure(tvb, offset, &asn1_ctx, tree, hf_s1ap_MMEConfigurationUpdateFailure_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_DownlinkS1cdma2000tunneling_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4721,43 +5470,59 @@ static int dissect_ENBStatusTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_Bearers_SubjectToStatusTransferENB_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_MMEStatusTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_Bearers_SubjectToStatusTransferENB_List(tvb, offset, &asn1_ctx, tree, hf_s1ap_Bearers_SubjectToStatusTransferENB_List_PDU);
+ offset = dissect_s1ap_MMEStatusTransfer(tvb, offset, &asn1_ctx, tree, hf_s1ap_MMEStatusTransfer_PDU);
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_Bearers_SubjectToStatusTransferENB_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_TraceStart_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_Bearers_SubjectToStatusTransferENB_Item(tvb, offset, &asn1_ctx, tree, hf_s1ap_Bearers_SubjectToStatusTransferENB_Item_PDU);
+ offset = dissect_s1ap_TraceStart(tvb, offset, &asn1_ctx, tree, hf_s1ap_TraceStart_PDU);
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_MMEStatusTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_TraceFailureIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_MMEStatusTransfer(tvb, offset, &asn1_ctx, tree, hf_s1ap_MMEStatusTransfer_PDU);
+ offset = dissect_s1ap_TraceFailureIndication(tvb, offset, &asn1_ctx, tree, hf_s1ap_TraceFailureIndication_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_DeactivateTrace_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_DeactivateTrace(tvb, offset, &asn1_ctx, tree, hf_s1ap_DeactivateTrace_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_LocationReportingControl_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_s1ap_LocationReportingControl(tvb, offset, &asn1_ctx, tree, hf_s1ap_LocationReportingControl_PDU);
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_Bearers_SubjectToStatusTransferMME_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_LocationReportingFailureIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_Bearers_SubjectToStatusTransferMME_List(tvb, offset, &asn1_ctx, tree, hf_s1ap_Bearers_SubjectToStatusTransferMME_List_PDU);
+ offset = dissect_s1ap_LocationReportingFailureIndication(tvb, offset, &asn1_ctx, tree, hf_s1ap_LocationReportingFailureIndication_PDU);
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_Bearers_SubjectToStatusTransferMME_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+static int dissect_LocationReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
- offset = dissect_s1ap_Bearers_SubjectToStatusTransferMME_Item(tvb, offset, &asn1_ctx, tree, hf_s1ap_Bearers_SubjectToStatusTransferMME_Item_PDU);
+ offset = dissect_s1ap_LocationReport(tvb, offset, &asn1_ctx, tree, hf_s1ap_LocationReport_PDU);
offset += 7; offset >>= 3;
return offset;
}
@@ -4845,6 +5610,10 @@ void proto_register_s1ap(void) {
{ "AggregateMaximumBitrate", "s1ap.AggregateMaximumBitrate",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.AggregateMaximumBitrate", HFILL }},
+ { &hf_s1ap_Bearers_SubjectToStatusTransfer_Item_PDU,
+ { "Bearers-SubjectToStatusTransfer-Item", "s1ap.Bearers_SubjectToStatusTransfer_Item",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.Bearers_SubjectToStatusTransfer_Item", HFILL }},
{ &hf_s1ap_Cause_PDU,
{ "Cause", "s1ap.Cause",
FT_UINT32, BASE_DEC, VALS(s1ap_Cause_vals), 0,
@@ -4861,6 +5630,22 @@ void proto_register_s1ap(void) {
{ "Cdma2000SectorID", "s1ap.Cdma2000SectorID",
FT_BYTES, BASE_HEX, NULL, 0,
"s1ap.Cdma2000SectorID", HFILL }},
+ { &hf_s1ap_Cdma2000HOStatus_PDU,
+ { "Cdma2000HOStatus", "s1ap.Cdma2000HOStatus",
+ FT_UINT32, BASE_DEC, VALS(s1ap_Cdma2000HOStatus_vals), 0,
+ "s1ap.Cdma2000HOStatus", HFILL }},
+ { &hf_s1ap_Cdma2000HORequiredIndication_PDU,
+ { "Cdma2000HORequiredIndication", "s1ap.Cdma2000HORequiredIndication",
+ FT_UINT32, BASE_DEC, VALS(s1ap_Cdma2000HORequiredIndication_vals), 0,
+ "s1ap.Cdma2000HORequiredIndication", HFILL }},
+ { &hf_s1ap_Cdma2000OneXMEID_PDU,
+ { "Cdma2000OneXMEID", "s1ap.Cdma2000OneXMEID",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "s1ap.Cdma2000OneXMEID", HFILL }},
+ { &hf_s1ap_Cdma2000OneXRAND_PDU,
+ { "Cdma2000OneXRAND", "s1ap.Cdma2000OneXRAND",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "s1ap.Cdma2000OneXRAND", HFILL }},
{ &hf_s1ap_CriticalityDiagnostics_PDU,
{ "CriticalityDiagnostics", "s1ap.CriticalityDiagnostics",
FT_NONE, BASE_NONE, NULL, 0,
@@ -4869,14 +5654,22 @@ void proto_register_s1ap(void) {
{ "Direct-Forwarding-Path-Availability", "s1ap.Direct_Forwarding_Path_Availability",
FT_UINT32, BASE_DEC, VALS(s1ap_Direct_Forwarding_Path_Availability_vals), 0,
"s1ap.Direct_Forwarding_Path_Availability", HFILL }},
+ { &hf_s1ap_ENB_StatusTransfer_TransparentContainer_PDU,
+ { "ENB-StatusTransfer-TransparentContainer", "s1ap.ENB_StatusTransfer_TransparentContainer",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.ENB_StatusTransfer_TransparentContainer", HFILL }},
{ &hf_s1ap_ENB_UE_S1AP_ID_PDU,
{ "ENB-UE-S1AP-ID", "s1ap.ENB_UE_S1AP_ID",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_UINT32, BASE_DEC, NULL, 0,
"s1ap.ENB_UE_S1AP_ID", HFILL }},
{ &hf_s1ap_ENBname_PDU,
{ "ENBname", "s1ap.ENBname",
FT_BYTES, BASE_HEX, NULL, 0,
"s1ap.ENBname", HFILL }},
+ { &hf_s1ap_EUTRAN_CGI_ID_PDU,
+ { "EUTRAN-CGI-ID", "s1ap.EUTRAN_CGI_ID",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "s1ap.EUTRAN_CGI_ID", HFILL }},
{ &hf_s1ap_GUMMEI_PDU,
{ "GUMMEI", "s1ap.GUMMEI",
FT_NONE, BASE_NONE, NULL, 0,
@@ -4895,7 +5688,7 @@ void proto_register_s1ap(void) {
"s1ap.MMEname", HFILL }},
{ &hf_s1ap_MME_UE_S1AP_ID_PDU,
{ "MME-UE-S1AP-ID", "s1ap.MME_UE_S1AP_ID",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_UINT32, BASE_DEC, NULL, 0,
"s1ap.MME_UE_S1AP_ID", HFILL }},
{ &hf_s1ap_NAS_PDU_PDU,
{ "NAS-PDU", "s1ap.NAS_PDU",
@@ -4909,10 +5702,14 @@ void proto_register_s1ap(void) {
{ "PagingCause", "s1ap.PagingCause",
FT_UINT32, BASE_DEC, VALS(s1ap_PagingCause_vals), 0,
"s1ap.PagingCause", HFILL }},
- { &hf_s1ap_PLMNidentity_PDU,
- { "PLMNidentity", "s1ap.PLMNidentity",
- FT_BYTES, BASE_HEX, NULL, 0,
- "s1ap.PLMNidentity", HFILL }},
+ { &hf_s1ap_RelativeMMECapacity_PDU,
+ { "RelativeMMECapacity", "s1ap.RelativeMMECapacity",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.RelativeMMECapacity", HFILL }},
+ { &hf_s1ap_RequestType_PDU,
+ { "RequestType", "s1ap.RequestType",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.RequestType", HFILL }},
{ &hf_s1ap_SAEBearerList_PDU,
{ "SAEBearerList", "s1ap.SAEBearerList",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -4937,14 +5734,18 @@ void proto_register_s1ap(void) {
{ "ServedPLMNs", "s1ap.ServedPLMNs",
FT_UINT32, BASE_DEC, NULL, 0,
"s1ap.ServedPLMNs", HFILL }},
- { &hf_s1ap_SupportedTAIs_PDU,
- { "SupportedTAIs", "s1ap.SupportedTAIs",
+ { &hf_s1ap_SupportedTAs_PDU,
+ { "SupportedTAs", "s1ap.SupportedTAs",
FT_UINT32, BASE_DEC, NULL, 0,
- "s1ap.SupportedTAIs", HFILL }},
- { &hf_s1ap_TAId_PDU,
- { "TAId", "s1ap.TAId",
- FT_BYTES, BASE_HEX, NULL, 0,
- "s1ap.TAId", HFILL }},
+ "s1ap.SupportedTAs", HFILL }},
+ { &hf_s1ap_S_TMSI_PDU,
+ { "S-TMSI", "s1ap.S_TMSI",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.S_TMSI", HFILL }},
+ { &hf_s1ap_TAI_PDU,
+ { "TAI", "s1ap.TAI",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.TAI", HFILL }},
{ &hf_s1ap_TargetID_PDU,
{ "TargetID", "s1ap.TargetID",
FT_UINT32, BASE_DEC, VALS(s1ap_TargetID_vals), 0,
@@ -4957,6 +5758,18 @@ void proto_register_s1ap(void) {
{ "TraceActivation", "s1ap.TraceActivation",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.TraceActivation", HFILL }},
+ { &hf_s1ap_TraceReference_PDU,
+ { "TraceReference", "s1ap.TraceReference",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "s1ap.TraceReference", HFILL }},
+ { &hf_s1ap_UE_S1AP_IDs_PDU,
+ { "UE-S1AP-IDs", "s1ap.UE_S1AP_IDs",
+ FT_UINT32, BASE_DEC, VALS(s1ap_UE_S1AP_IDs_vals), 0,
+ "s1ap.UE_S1AP_IDs", HFILL }},
+ { &hf_s1ap_UE_associatedLogicalS1_ConnectionItem_PDU,
+ { "UE-associatedLogicalS1-ConnectionItem", "s1ap.UE_associatedLogicalS1_ConnectionItem",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.UE_associatedLogicalS1_ConnectionItem", HFILL }},
{ &hf_s1ap_UEIdentityIndexValue_PDU,
{ "UEIdentityIndexValue", "s1ap.UEIdentityIndexValue",
FT_BYTES, BASE_HEX, NULL, 0,
@@ -5089,6 +5902,14 @@ void proto_register_s1ap(void) {
{ "PathSwitchRequestAcknowledge", "s1ap.PathSwitchRequestAcknowledge",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.PathSwitchRequestAcknowledge", HFILL }},
+ { &hf_s1ap_SAEBearerToBeSwitchedULList_PDU,
+ { "SAEBearerToBeSwitchedULList", "s1ap.SAEBearerToBeSwitchedULList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.SAEBearerToBeSwitchedULList", HFILL }},
+ { &hf_s1ap_SAEBearerToBeSwitchedULItem_PDU,
+ { "SAEBearerToBeSwitchedULItem", "s1ap.SAEBearerToBeSwitchedULItem",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.SAEBearerToBeSwitchedULItem", HFILL }},
{ &hf_s1ap_PathSwitchRequestFailure_PDU,
{ "PathSwitchRequestFailure", "s1ap.PathSwitchRequestFailure",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5153,10 +5974,10 @@ void proto_register_s1ap(void) {
{ "SAEBearerReleaseCommand", "s1ap.SAEBearerReleaseCommand",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.SAEBearerReleaseCommand", HFILL }},
- { &hf_s1ap_SAEBearerReleaseComplete_PDU,
- { "SAEBearerReleaseComplete", "s1ap.SAEBearerReleaseComplete",
+ { &hf_s1ap_SAEBearerReleaseResponse_PDU,
+ { "SAEBearerReleaseResponse", "s1ap.SAEBearerReleaseResponse",
FT_NONE, BASE_NONE, NULL, 0,
- "s1ap.SAEBearerReleaseComplete", HFILL }},
+ "s1ap.SAEBearerReleaseResponse", HFILL }},
{ &hf_s1ap_SAEBearerReleaseListBearerRelComp_PDU,
{ "SAEBearerReleaseListBearerRelComp", "s1ap.SAEBearerReleaseListBearerRelComp",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -5205,14 +6026,14 @@ void proto_register_s1ap(void) {
{ "Paging", "s1ap.Paging",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.Paging", HFILL }},
- { &hf_s1ap_TAIdList_PDU,
- { "TAIdList", "s1ap.TAIdList",
+ { &hf_s1ap_TAIList_PDU,
+ { "TAIList", "s1ap.TAIList",
FT_UINT32, BASE_DEC, NULL, 0,
- "s1ap.TAIdList", HFILL }},
- { &hf_s1ap_TAIdItem_PDU,
- { "TAIdItem", "s1ap.TAIdItem",
+ "s1ap.TAIList", HFILL }},
+ { &hf_s1ap_TAIItem_PDU,
+ { "TAIItem", "s1ap.TAIItem",
FT_NONE, BASE_NONE, NULL, 0,
- "s1ap.TAIdItem", HFILL }},
+ "s1ap.TAIItem", HFILL }},
{ &hf_s1ap_UEContextReleaseCommand_PDU,
{ "UEContextReleaseCommand", "s1ap.UEContextReleaseCommand",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5253,10 +6074,18 @@ void proto_register_s1ap(void) {
{ "Reset", "s1ap.Reset",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.Reset", HFILL }},
+ { &hf_s1ap_ResetType_PDU,
+ { "ResetType", "s1ap.ResetType",
+ FT_UINT32, BASE_DEC, VALS(s1ap_ResetType_vals), 0,
+ "s1ap.ResetType", HFILL }},
{ &hf_s1ap_ResetAcknowledge_PDU,
{ "ResetAcknowledge", "s1ap.ResetAcknowledge",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.ResetAcknowledge", HFILL }},
+ { &hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_PDU,
+ { "UE-associatedLogicalS1-ConnectionListResAck", "s1ap.UE_associatedLogicalS1_ConnectionListResAck",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.UE_associatedLogicalS1_ConnectionListResAck", HFILL }},
{ &hf_s1ap_ErrorIndication_PDU,
{ "ErrorIndication", "s1ap.ErrorIndication",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5273,6 +6102,30 @@ void proto_register_s1ap(void) {
{ "S1SetupFailure", "s1ap.S1SetupFailure",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.S1SetupFailure", HFILL }},
+ { &hf_s1ap_ENBConfigurationUpdate_PDU,
+ { "ENBConfigurationUpdate", "s1ap.ENBConfigurationUpdate",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.ENBConfigurationUpdate", HFILL }},
+ { &hf_s1ap_ENBConfigurationUpdateAcknowledge_PDU,
+ { "ENBConfigurationUpdateAcknowledge", "s1ap.ENBConfigurationUpdateAcknowledge",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.ENBConfigurationUpdateAcknowledge", HFILL }},
+ { &hf_s1ap_ENBConfigurationUpdateFailure_PDU,
+ { "ENBConfigurationUpdateFailure", "s1ap.ENBConfigurationUpdateFailure",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.ENBConfigurationUpdateFailure", HFILL }},
+ { &hf_s1ap_MMEConfigurationUpdate_PDU,
+ { "MMEConfigurationUpdate", "s1ap.MMEConfigurationUpdate",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.MMEConfigurationUpdate", HFILL }},
+ { &hf_s1ap_MMEConfigurationUpdateAcknowledge_PDU,
+ { "MMEConfigurationUpdateAcknowledge", "s1ap.MMEConfigurationUpdateAcknowledge",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.MMEConfigurationUpdateAcknowledge", HFILL }},
+ { &hf_s1ap_MMEConfigurationUpdateFailure_PDU,
+ { "MMEConfigurationUpdateFailure", "s1ap.MMEConfigurationUpdateFailure",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.MMEConfigurationUpdateFailure", HFILL }},
{ &hf_s1ap_DownlinkS1cdma2000tunneling_PDU,
{ "DownlinkS1cdma2000tunneling", "s1ap.DownlinkS1cdma2000tunneling",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5289,26 +6142,34 @@ void proto_register_s1ap(void) {
{ "ENBStatusTransfer", "s1ap.ENBStatusTransfer",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.ENBStatusTransfer", HFILL }},
- { &hf_s1ap_Bearers_SubjectToStatusTransferENB_List_PDU,
- { "Bearers-SubjectToStatusTransferENB-List", "s1ap.Bearers_SubjectToStatusTransferENB_List",
- FT_UINT32, BASE_DEC, NULL, 0,
- "s1ap.Bearers_SubjectToStatusTransferENB_List", HFILL }},
- { &hf_s1ap_Bearers_SubjectToStatusTransferENB_Item_PDU,
- { "Bearers-SubjectToStatusTransferENB-Item", "s1ap.Bearers_SubjectToStatusTransferENB_Item",
- FT_NONE, BASE_NONE, NULL, 0,
- "s1ap.Bearers_SubjectToStatusTransferENB_Item", HFILL }},
{ &hf_s1ap_MMEStatusTransfer_PDU,
{ "MMEStatusTransfer", "s1ap.MMEStatusTransfer",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.MMEStatusTransfer", HFILL }},
- { &hf_s1ap_Bearers_SubjectToStatusTransferMME_List_PDU,
- { "Bearers-SubjectToStatusTransferMME-List", "s1ap.Bearers_SubjectToStatusTransferMME_List",
- FT_UINT32, BASE_DEC, NULL, 0,
- "s1ap.Bearers_SubjectToStatusTransferMME_List", HFILL }},
- { &hf_s1ap_Bearers_SubjectToStatusTransferMME_Item_PDU,
- { "Bearers-SubjectToStatusTransferMME-Item", "s1ap.Bearers_SubjectToStatusTransferMME_Item",
+ { &hf_s1ap_TraceStart_PDU,
+ { "TraceStart", "s1ap.TraceStart",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.TraceStart", HFILL }},
+ { &hf_s1ap_TraceFailureIndication_PDU,
+ { "TraceFailureIndication", "s1ap.TraceFailureIndication",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.TraceFailureIndication", HFILL }},
+ { &hf_s1ap_DeactivateTrace_PDU,
+ { "DeactivateTrace", "s1ap.DeactivateTrace",
FT_NONE, BASE_NONE, NULL, 0,
- "s1ap.Bearers_SubjectToStatusTransferMME_Item", HFILL }},
+ "s1ap.DeactivateTrace", HFILL }},
+ { &hf_s1ap_LocationReportingControl_PDU,
+ { "LocationReportingControl", "s1ap.LocationReportingControl",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.LocationReportingControl", HFILL }},
+ { &hf_s1ap_LocationReportingFailureIndication_PDU,
+ { "LocationReportingFailureIndication", "s1ap.LocationReportingFailureIndication",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.LocationReportingFailureIndication", HFILL }},
+ { &hf_s1ap_LocationReport_PDU,
+ { "LocationReport", "s1ap.LocationReport",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.LocationReport", HFILL }},
{ &hf_s1ap_S1AP_PDU_PDU,
{ "S1AP-PDU", "s1ap.S1AP_PDU",
FT_UINT32, BASE_DEC, VALS(s1ap_S1AP_PDU_vals), 0,
@@ -5405,6 +6266,22 @@ void proto_register_s1ap(void) {
{ "aggregateMaximumBitRateUL", "s1ap.aggregateMaximumBitRateUL",
FT_UINT32, BASE_DEC, NULL, 0,
"s1ap.SAE_Bearer_BitRate", HFILL }},
+ { &hf_s1ap_Bearers_SubjectToStatusTransferList_item,
+ { "Item", "s1ap.Bearers_SubjectToStatusTransferList_item",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.ProtocolIE_SingleContainer", HFILL }},
+ { &hf_s1ap_sAE_Bearer_ID,
+ { "sAE-Bearer-ID", "s1ap.sAE_Bearer_ID",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "s1ap.SAE_Bearer_ID", HFILL }},
+ { &hf_s1ap_uL_COUNTvalue,
+ { "uL-COUNTvalue", "s1ap.uL_COUNTvalue",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.COUNTvalue", HFILL }},
+ { &hf_s1ap_dL_COUNTvalue,
+ { "dL-COUNTvalue", "s1ap.dL_COUNTvalue",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.COUNTvalue", HFILL }},
{ &hf_s1ap_BPLMNs_item,
{ "Item", "s1ap.BPLMNs_item",
FT_BYTES, BASE_HEX, NULL, 0,
@@ -5441,6 +6318,14 @@ void proto_register_s1ap(void) {
{ "cI", "s1ap.cI",
FT_BYTES, BASE_HEX, NULL, 0,
"s1ap.CI", HFILL }},
+ { &hf_s1ap_pDCP_SN,
+ { "pDCP-SN", "s1ap.pDCP_SN",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.PDCP_SN", HFILL }},
+ { &hf_s1ap_hFN,
+ { "hFN", "s1ap.hFN",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.HFN", HFILL }},
{ &hf_s1ap_procedureCode,
{ "procedureCode", "s1ap.procedureCode",
FT_UINT32, BASE_DEC, VALS(s1ap_ProcedureCode_vals), 0,
@@ -5473,6 +6358,10 @@ void proto_register_s1ap(void) {
{ "typeOfError", "s1ap.typeOfError",
FT_UINT32, BASE_DEC, VALS(s1ap_TypeOfError_vals), 0,
"s1ap.TypeOfError", HFILL }},
+ { &hf_s1ap_bearers_SubjectToStatusTransferList,
+ { "bearers-SubjectToStatusTransferList", "s1ap.bearers_SubjectToStatusTransferList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.Bearers_SubjectToStatusTransferList", HFILL }},
{ &hf_s1ap_EPLMNs_item,
{ "Item", "s1ap.EPLMNs_item",
FT_BYTES, BASE_HEX, NULL, 0,
@@ -5485,14 +6374,14 @@ void proto_register_s1ap(void) {
{ "pLMN-Identity", "s1ap.pLMN_Identity",
FT_BYTES, BASE_HEX, NULL, 0,
"s1ap.PLMNidentity", HFILL }},
- { &hf_s1ap_forbiddenTAIs,
- { "forbiddenTAIs", "s1ap.forbiddenTAIs",
+ { &hf_s1ap_forbiddenTACs,
+ { "forbiddenTACs", "s1ap.forbiddenTACs",
FT_UINT32, BASE_DEC, NULL, 0,
- "s1ap.ForbiddenTAIs", HFILL }},
- { &hf_s1ap_ForbiddenTAIs_item,
- { "Item", "s1ap.ForbiddenTAIs_item",
+ "s1ap.ForbiddenTACs", HFILL }},
+ { &hf_s1ap_ForbiddenTACs_item,
+ { "Item", "s1ap.ForbiddenTACs_item",
FT_BYTES, BASE_HEX, NULL, 0,
- "s1ap.TAI", HFILL }},
+ "s1ap.TAC", HFILL }},
{ &hf_s1ap_ForbiddenLAs_item,
{ "Item", "s1ap.ForbiddenLAs_item",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5509,10 +6398,14 @@ void proto_register_s1ap(void) {
{ "mME-Group-ID", "s1ap.mME_Group_ID",
FT_BYTES, BASE_HEX, NULL, 0,
"s1ap.MME_Group_ID", HFILL }},
- { &hf_s1ap_mMME_Code,
- { "mMME-Code", "s1ap.mMME_Code",
+ { &hf_s1ap_mME_Code,
+ { "mME-Code", "s1ap.mME_Code",
FT_BYTES, BASE_HEX, NULL, 0,
"s1ap.MME_Code", HFILL }},
+ { &hf_s1ap_servingPLMN,
+ { "servingPLMN", "s1ap.servingPLMN",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "s1ap.PLMNidentity", HFILL }},
{ &hf_s1ap_equivalentPLMNs,
{ "equivalentPLMNs", "s1ap.equivalentPLMNs",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -5541,14 +6434,18 @@ void proto_register_s1ap(void) {
{ "traceDepth", "s1ap.traceDepth",
FT_UINT32, BASE_DEC, VALS(s1ap_TraceDepth_vals), 0,
"s1ap.TraceDepth", HFILL }},
+ { &hf_s1ap_eventType,
+ { "eventType", "s1ap.eventType",
+ FT_UINT32, BASE_DEC, VALS(s1ap_EventType_vals), 0,
+ "s1ap.EventType", HFILL }},
+ { &hf_s1ap_reportArea,
+ { "reportArea", "s1ap.reportArea",
+ FT_BYTES, BASE_HEX, NULL, 0,
+ "s1ap.ReportArea", HFILL }},
{ &hf_s1ap_SAEBearerInformationList_item,
{ "Item", "s1ap.SAEBearerInformationList_item",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.ProtocolIE_SingleContainer", HFILL }},
- { &hf_s1ap_sAE_Bearer_ID,
- { "sAE-Bearer-ID", "s1ap.sAE_Bearer_ID",
- FT_BYTES, BASE_HEX, NULL, 0,
- "s1ap.SAE_Bearer_ID", HFILL }},
{ &hf_s1ap_dL_Forwarding,
{ "dL-Forwarding", "s1ap.dL_Forwarding",
FT_UINT32, BASE_DEC, VALS(s1ap_DL_Forwarding_vals), 0,
@@ -5561,10 +6458,10 @@ void proto_register_s1ap(void) {
{ "cause", "s1ap.cause",
FT_UINT32, BASE_DEC, VALS(s1ap_Cause_vals), 0,
"s1ap.Cause", HFILL }},
- { &hf_s1ap_label,
- { "label", "s1ap.label",
+ { &hf_s1ap_qCI,
+ { "qCI", "s1ap.qCI",
FT_UINT32, BASE_DEC, NULL, 0,
- "s1ap.Label", HFILL }},
+ "s1ap.QCI", HFILL }},
{ &hf_s1ap_allocationRetentionPriority,
{ "allocationRetentionPriority", "s1ap.allocationRetentionPriority",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5629,14 +6526,14 @@ void proto_register_s1ap(void) {
{ "Item", "s1ap.ServedPLMNs_item",
FT_BYTES, BASE_HEX, NULL, 0,
"s1ap.PLMNidentity", HFILL }},
- { &hf_s1ap_SupportedTAIs_item,
- { "Item", "s1ap.SupportedTAIs_item",
+ { &hf_s1ap_SupportedTAs_item,
+ { "Item", "s1ap.SupportedTAs_item",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.SupportedTAs_Item", HFILL }},
- { &hf_s1ap_tAI,
- { "tAI", "s1ap.tAI",
+ { &hf_s1ap_tAC,
+ { "tAC", "s1ap.tAC",
FT_BYTES, BASE_HEX, NULL, 0,
- "s1ap.TAId", HFILL }},
+ "s1ap.TAC", HFILL }},
{ &hf_s1ap_broadcastPLMNs,
{ "broadcastPLMNs", "s1ap.broadcastPLMNs",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -5681,6 +6578,18 @@ void proto_register_s1ap(void) {
{ "interfacesToTraceList", "s1ap.interfacesToTraceList",
FT_UINT32, BASE_DEC, NULL, 0,
"s1ap.InterfacesToTraceList", HFILL }},
+ { &hf_s1ap_uE_S1AP_ID_pair,
+ { "uE-S1AP-ID-pair", "s1ap.uE_S1AP_ID_pair",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.UE_S1AP_ID_pair", HFILL }},
+ { &hf_s1ap_mME_UE_S1AP_ID,
+ { "mME-UE-S1AP-ID", "s1ap.mME_UE_S1AP_ID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.MME_UE_S1AP_ID", HFILL }},
+ { &hf_s1ap_eNB_UE_S1AP_ID,
+ { "eNB-UE-S1AP-ID", "s1ap.eNB_UE_S1AP_ID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.ENB_UE_S1AP_ID", HFILL }},
{ &hf_s1ap_s_TMSI,
{ "s-TMSI", "s1ap.s_TMSI",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5715,7 +6624,7 @@ void proto_register_s1ap(void) {
"s1ap.GTP_TEID", HFILL }},
{ &hf_s1ap_targeteNodeB_ToSourceeNodeB_TransparentContainer,
{ "targeteNodeB-ToSourceeNodeB-TransparentContainer", "s1ap.targeteNodeB_ToSourceeNodeB_TransparentContainer",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_NONE, BASE_NONE, NULL, 0,
"s1ap.TargeteNodeB_ToSourceeNodeB_TransparentContainer", HFILL }},
{ &hf_s1ap_targetRNC_ToSourceRNC_TransparentContainer,
{ "targetRNC-ToSourceRNC-TransparentContainer", "s1ap.targetRNC_ToSourceRNC_TransparentContainer",
@@ -5773,30 +6682,30 @@ void proto_register_s1ap(void) {
{ "Item", "s1ap.SAEBearerSetupListCtxtSURes_item",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.ProtocolIE_SingleContainer", HFILL }},
- { &hf_s1ap_TAIdList_item,
- { "Item", "s1ap.TAIdList_item",
+ { &hf_s1ap_TAIList_item,
+ { "Item", "s1ap.TAIList_item",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.ProtocolIE_SingleContainer", HFILL }},
+ { &hf_s1ap_tAI,
+ { "tAI", "s1ap.tAI",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.TAI", HFILL }},
+ { &hf_s1ap_s1_Interface,
+ { "s1-Interface", "s1ap.s1_Interface",
+ FT_UINT32, BASE_DEC, VALS(s1ap_ResetAll_vals), 0,
+ "s1ap.ResetAll", HFILL }},
+ { &hf_s1ap_partOfS1_Interface,
+ { "partOfS1-Interface", "s1ap.partOfS1_Interface",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "s1ap.UE_associatedLogicalS1_ConnectionListRes", HFILL }},
+ { &hf_s1ap_UE_associatedLogicalS1_ConnectionListRes_item,
+ { "Item", "s1ap.UE_associatedLogicalS1_ConnectionListRes_item",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "s1ap.ProtocolIE_SingleContainer", HFILL }},
+ { &hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_item,
+ { "Item", "s1ap.UE_associatedLogicalS1_ConnectionListResAck_item",
FT_NONE, BASE_NONE, NULL, 0,
"s1ap.ProtocolIE_SingleContainer", HFILL }},
- { &hf_s1ap_tAId,
- { "tAId", "s1ap.tAId",
- FT_BYTES, BASE_HEX, NULL, 0,
- "s1ap.TAId", HFILL }},
- { &hf_s1ap_lIS_HFN,
- { "lIS-HFN", "s1ap.lIS_HFN",
- FT_INT32, BASE_DEC, NULL, 0,
- "s1ap.PDCP_SN", HFILL }},
- { &hf_s1ap_lIS,
- { "lIS", "s1ap.lIS",
- FT_INT32, BASE_DEC, NULL, 0,
- "s1ap.PDCP_SN", HFILL }},
- { &hf_s1ap_dL_PDCP_HFN_NextToAssign,
- { "dL-PDCP-HFN-NextToAssign", "s1ap.dL_PDCP_HFN_NextToAssign",
- FT_INT32, BASE_DEC, NULL, 0,
- "s1ap.PDCP_SN", HFILL }},
- { &hf_s1ap_dL_PDCP_SN_NextToAssign,
- { "dL-PDCP-SN-NextToAssign", "s1ap.dL_PDCP_SN_NextToAssign",
- FT_INT32, BASE_DEC, NULL, 0,
- "s1ap.PDCP_SN", HFILL }},
{ &hf_s1ap_initiatingMessage,
{ "initiatingMessage", "s1ap.initiatingMessage",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5845,16 +6754,20 @@ void proto_register_s1ap(void) {
&ett_s1ap_PrivateIE_Field,
&ett_s1ap_AllocationRetentionPriority,
&ett_s1ap_AggregateMaximumBitrate,
+ &ett_s1ap_Bearers_SubjectToStatusTransferList,
+ &ett_s1ap_Bearers_SubjectToStatusTransfer_Item,
&ett_s1ap_BPLMNs,
&ett_s1ap_Cause,
&ett_s1ap_CGI,
+ &ett_s1ap_COUNTvalue,
&ett_s1ap_CriticalityDiagnostics,
&ett_s1ap_CriticalityDiagnostics_IE_List,
&ett_s1ap_CriticalityDiagnostics_IE_Item,
+ &ett_s1ap_ENB_StatusTransfer_TransparentContainer,
&ett_s1ap_EPLMNs,
&ett_s1ap_ForbiddenTAs,
&ett_s1ap_ForbiddenTAs_Item,
- &ett_s1ap_ForbiddenTAIs,
+ &ett_s1ap_ForbiddenTACs,
&ett_s1ap_ForbiddenLAs,
&ett_s1ap_ForbiddenLAs_Item,
&ett_s1ap_ForbiddenLACs,
@@ -5863,6 +6776,7 @@ void proto_register_s1ap(void) {
&ett_s1ap_InterfacesToTraceList,
&ett_s1ap_InterfacesToTraceItem,
&ett_s1ap_LAI,
+ &ett_s1ap_RequestType,
&ett_s1ap_SAEBearerInformationList,
&ett_s1ap_SAEBearerInformationListItem,
&ett_s1ap_SAEBearerList,
@@ -5877,13 +6791,18 @@ void proto_register_s1ap(void) {
&ett_s1ap_SourceeNB_ID,
&ett_s1ap_SourceeNodeB_ToTargeteNodeB_TransparentContainer,
&ett_s1ap_ServedPLMNs,
- &ett_s1ap_SupportedTAIs,
+ &ett_s1ap_SupportedTAs,
&ett_s1ap_SupportedTAs_Item,
&ett_s1ap_S_TMSI,
+ &ett_s1ap_TAI,
&ett_s1ap_TargetID,
&ett_s1ap_TargeteNB_ID,
&ett_s1ap_TargetRNC_ID,
+ &ett_s1ap_TargeteNodeB_ToSourceeNodeB_TransparentContainer,
&ett_s1ap_TraceActivation,
+ &ett_s1ap_UE_S1AP_IDs,
+ &ett_s1ap_UE_S1AP_ID_pair,
+ &ett_s1ap_UE_associatedLogicalS1_ConnectionItem,
&ett_s1ap_UEPagingID,
&ett_s1ap_HandoverRequired,
&ett_s1ap_Intra_LTEHOInformationReq,
@@ -5910,6 +6829,7 @@ void proto_register_s1ap(void) {
&ett_s1ap_PathSwitchRequest,
&ett_s1ap_SAEBearerToBeSwitchedDLItem,
&ett_s1ap_PathSwitchRequestAcknowledge,
+ &ett_s1ap_SAEBearerToBeSwitchedULItem,
&ett_s1ap_PathSwitchRequestFailure,
&ett_s1ap_HandoverCancel,
&ett_s1ap_HandoverCancelAcknowledge,
@@ -5926,7 +6846,7 @@ void proto_register_s1ap(void) {
&ett_s1ap_SAEBearerModifyListBearerModRes,
&ett_s1ap_SAEBearerModifyItemBearerModRes,
&ett_s1ap_SAEBearerReleaseCommand,
- &ett_s1ap_SAEBearerReleaseComplete,
+ &ett_s1ap_SAEBearerReleaseResponse,
&ett_s1ap_SAEBearerReleaseListBearerRelComp,
&ett_s1ap_SAEBearerReleaseItemBearerRelComp,
&ett_s1ap_SAEBearerReleaseRequest,
@@ -5939,8 +6859,8 @@ void proto_register_s1ap(void) {
&ett_s1ap_SAEBearerSetupItemCtxtSURes,
&ett_s1ap_InitialContextSetupFailure,
&ett_s1ap_Paging,
- &ett_s1ap_TAIdList,
- &ett_s1ap_TAIdItem,
+ &ett_s1ap_TAIList,
+ &ett_s1ap_TAIItem,
&ett_s1ap_UEContextReleaseCommand,
&ett_s1ap_UEContextReleaseComplete,
&ett_s1ap_UEContextModificationRequest,
@@ -5951,18 +6871,31 @@ void proto_register_s1ap(void) {
&ett_s1ap_UplinkNASTransport,
&ett_s1ap_NASNonDeliveryIndication,
&ett_s1ap_Reset,
+ &ett_s1ap_ResetType,
+ &ett_s1ap_UE_associatedLogicalS1_ConnectionListRes,
&ett_s1ap_ResetAcknowledge,
+ &ett_s1ap_UE_associatedLogicalS1_ConnectionListResAck,
&ett_s1ap_ErrorIndication,
&ett_s1ap_S1SetupRequest,
&ett_s1ap_S1SetupResponse,
&ett_s1ap_S1SetupFailure,
+ &ett_s1ap_ENBConfigurationUpdate,
+ &ett_s1ap_ENBConfigurationUpdateAcknowledge,
+ &ett_s1ap_ENBConfigurationUpdateFailure,
+ &ett_s1ap_MMEConfigurationUpdate,
+ &ett_s1ap_MMEConfigurationUpdateAcknowledge,
+ &ett_s1ap_MMEConfigurationUpdateFailure,
&ett_s1ap_DownlinkS1cdma2000tunneling,
&ett_s1ap_UplinkS1cdma2000tunneling,
&ett_s1ap_UECapabilityInfoIndication,
&ett_s1ap_ENBStatusTransfer,
- &ett_s1ap_Bearers_SubjectToStatusTransferENB_Item,
&ett_s1ap_MMEStatusTransfer,
- &ett_s1ap_Bearers_SubjectToStatusTransferMME_Item,
+ &ett_s1ap_TraceStart,
+ &ett_s1ap_TraceFailureIndication,
+ &ett_s1ap_DeactivateTrace,
+ &ett_s1ap_LocationReportingControl,
+ &ett_s1ap_LocationReportingFailureIndication,
+ &ett_s1ap_LocationReport,
&ett_s1ap_S1AP_PDU,
&ett_s1ap_InitiatingMessage,
&ett_s1ap_SuccessfulOutcome,
@@ -6050,8 +6983,8 @@ proto_reg_handoff_s1ap(void)
dissector_add("s1ap.ies", id_HandoverRestrictionList, new_create_dissector_handle(dissect_HandoverRestrictionList_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_pagingDRX, new_create_dissector_handle(dissect_PagingDRX_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_pagingCause, new_create_dissector_handle(dissect_PagingCause_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_TAIdList, new_create_dissector_handle(dissect_TAIdList_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_TAIdItem, new_create_dissector_handle(dissect_TAIdItem_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_TAIList, new_create_dissector_handle(dissect_TAIList_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_TAIItem, new_create_dissector_handle(dissect_TAIItem_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_SAEBearerFailedToSetupListCtxtSURes, new_create_dissector_handle(dissect_SAEBearerList_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_SAEBearerReleaseItemHOCmd, new_create_dissector_handle(dissect_SAEBearerReleaseItemHOCmd_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_SAEBearerSetupItemCtxtSURes, new_create_dissector_handle(dissect_SAEBearerSetupItemCtxtSURes_PDU, proto_s1ap));
@@ -6066,11 +6999,10 @@ proto_reg_handoff_s1ap(void)
dissector_add("s1ap.ies", id_eNBname, new_create_dissector_handle(dissect_ENBname_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_MMEname, new_create_dissector_handle(dissect_MMEname_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_ServedPLMNs, new_create_dissector_handle(dissect_ServedPLMNs_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_SupportedTAIs, new_create_dissector_handle(dissect_SupportedTAIs_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_SupportedTAs, new_create_dissector_handle(dissect_SupportedTAs_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_TimeToWait, new_create_dissector_handle(dissect_TimeToWait_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_aggregateMaximumBitrate, new_create_dissector_handle(dissect_AggregateMaximumBitrate_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_TAId, new_create_dissector_handle(dissect_TAId_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_ServingPLMN, new_create_dissector_handle(dissect_PLMNidentity_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_TAI, new_create_dissector_handle(dissect_TAI_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_SAEBearerReleaseListBearerRelComp, new_create_dissector_handle(dissect_SAEBearerReleaseListBearerRelComp_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_cdma2000PDU, new_create_dissector_handle(dissect_Cdma2000PDU_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_cdma2000RATType, new_create_dissector_handle(dissect_Cdma2000RATType_PDU, proto_s1ap));
@@ -6078,12 +7010,26 @@ proto_reg_handoff_s1ap(void)
dissector_add("s1ap.ies", id_SecurityInfo, new_create_dissector_handle(dissect_SecurityInfo_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_UERadioCapability, new_create_dissector_handle(dissect_UERadioCapability_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_GUMMEI_ID, new_create_dissector_handle(dissect_GUMMEI_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_Bearers_SubjectToStatusTransferENB_List, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransferENB_List_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_Bearers_SubjectToStatusTransferENB_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransferENB_Item_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_Direct_Forwarding_Path_Availability, new_create_dissector_handle(dissect_Direct_Forwarding_Path_Availability_PDU, proto_s1ap));
dissector_add("s1ap.ies", id_UEIdentityIndexValue, new_create_dissector_handle(dissect_UEIdentityIndexValue_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_Bearers_SubjectToStatusTransferMME_List, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransferMME_List_PDU, proto_s1ap));
- dissector_add("s1ap.ies", id_Bearers_SubjectToStatusTransferMME_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransferMME_Item_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_cdma2000HOStatus, new_create_dissector_handle(dissect_Cdma2000HOStatus_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_cdma2000HORequiredIndication, new_create_dissector_handle(dissect_Cdma2000HORequiredIndication_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_cdma2000OneXMEID, new_create_dissector_handle(dissect_Cdma2000OneXMEID_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_TraceReference, new_create_dissector_handle(dissect_TraceReference_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_RelativeMMECapacity, new_create_dissector_handle(dissect_RelativeMMECapacity_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_SourceMME_UE_S1AP_ID, new_create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_Bearers_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_Item_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_eNB_StatusTransfer_TransparentContainer, new_create_dissector_handle(dissect_ENB_StatusTransfer_TransparentContainer_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_UE_associatedLogicalS1_ConnectionItem, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionItem_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_ResetType, new_create_dissector_handle(dissect_ResetType_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_UE_associatedLogicalS1_ConnectionListResAck, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionListResAck_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_SAEBearerToBeSwitchedULItem, new_create_dissector_handle(dissect_SAEBearerToBeSwitchedULItem_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_SAEBearerToBeSwitchedULList, new_create_dissector_handle(dissect_SAEBearerToBeSwitchedULList_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_S_TMSI, new_create_dissector_handle(dissect_S_TMSI_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_cdma2000OneXRAND, new_create_dissector_handle(dissect_Cdma2000OneXRAND_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_RequestType, new_create_dissector_handle(dissect_RequestType_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_UE_S1AP_IDs, new_create_dissector_handle(dissect_UE_S1AP_IDs_PDU, proto_s1ap));
+ dissector_add("s1ap.ies", id_EUTRAN_CGI_ID, new_create_dissector_handle(dissect_EUTRAN_CGI_ID_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverRequired_PDU, proto_s1ap));
dissector_add("s1ap.proc.sout", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverCommand_PDU, proto_s1ap));
dissector_add("s1ap.proc.uout", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_s1ap));
@@ -6099,7 +7045,7 @@ proto_reg_handoff_s1ap(void)
dissector_add("s1ap.proc.imsg", id_SAEBearerModify, new_create_dissector_handle(dissect_SAEBearerModifyRequest_PDU, proto_s1ap));
dissector_add("s1ap.proc.sout", id_SAEBearerModify, new_create_dissector_handle(dissect_SAEBearerModifyResponse_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_SAEBearerRelease, new_create_dissector_handle(dissect_SAEBearerReleaseCommand_PDU, proto_s1ap));
- dissector_add("s1ap.proc.sout", id_SAEBearerRelease, new_create_dissector_handle(dissect_SAEBearerReleaseComplete_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.sout", id_SAEBearerRelease, new_create_dissector_handle(dissect_SAEBearerReleaseResponse_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_SAEBearerReleaseRequest, new_create_dissector_handle(dissect_SAEBearerReleaseRequest_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupRequest_PDU, proto_s1ap));
dissector_add("s1ap.proc.sout", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupResponse_PDU, proto_s1ap));
@@ -6119,6 +7065,12 @@ proto_reg_handoff_s1ap(void)
dissector_add("s1ap.proc.sout", id_S1Setup, new_create_dissector_handle(dissect_S1SetupResponse_PDU, proto_s1ap));
dissector_add("s1ap.proc.uout", id_S1Setup, new_create_dissector_handle(dissect_S1SetupFailure_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_DownlinkS1cdma2000tunneling, new_create_dissector_handle(dissect_DownlinkS1cdma2000tunneling_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdate_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.sout", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateAcknowledge_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.uout", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateFailure_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdate_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.sout", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdateAcknowledge_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.uout", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdateFailure_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_UplinkS1cdma2000tunneling, new_create_dissector_handle(dissect_UplinkS1cdma2000tunneling_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationRequest_PDU, proto_s1ap));
dissector_add("s1ap.proc.sout", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationResponse_PDU, proto_s1ap));
@@ -6128,6 +7080,12 @@ proto_reg_handoff_s1ap(void)
dissector_add("s1ap.proc.sout", id_UEContextRelease, new_create_dissector_handle(dissect_UEContextReleaseComplete_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_eNBStatusTransfer, new_create_dissector_handle(dissect_ENBStatusTransfer_PDU, proto_s1ap));
dissector_add("s1ap.proc.imsg", id_MMEStatusTransfer, new_create_dissector_handle(dissect_MMEStatusTransfer_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_DeactivateTrace, new_create_dissector_handle(dissect_DeactivateTrace_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_TraceStart, new_create_dissector_handle(dissect_TraceStart_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_TraceFailureIndication, new_create_dissector_handle(dissect_TraceFailureIndication_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_LocationReportingControl, new_create_dissector_handle(dissect_LocationReportingControl_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_LocationReportingFailureIndication, new_create_dissector_handle(dissect_LocationReportingFailureIndication_PDU, proto_s1ap));
+ dissector_add("s1ap.proc.imsg", id_LocationReport, new_create_dissector_handle(dissect_LocationReport_PDU, proto_s1ap));
/*--- End of included file: packet-s1ap-dis-tab.c ---*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 04:12:21 +0000