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

E1AP: upgrade dissector to v15.4.0 

Change-Id: Ic9a19804b5e46ca63f3d1256e13173a92fc39f9b
Reviewed-on: https://code.wireshark.org/review/34065
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-07-24 09:19:04 +02:00
parent 5fd0f06bc7
commit c5dab4efb5
9 changed files with 511 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.463 V15.3.0 (2019-03)
-- 3GPP TS 38.463 V15.4.0 (2019-07)
-- **************************************************************
--
-- Common definitions

13
epan/dissectors/asn1/e1ap/E1AP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.463 V15.3.0 (2019-03)
-- 3GPP TS 38.463 V15.4.0 (2019-07)
-- **************************************************************
--
-- Constant definitions
@ -147,5 +147,16 @@ id-PDU-Session-To-Notify-List ProtocolIE-ID ::= 67
id-PDU-Session-Resource-Data-Usage-List ProtocolIE-ID ::= 68
id-SNSSAI ProtocolIE-ID ::= 69
id-DataDiscardRequired ProtocolIE-ID ::= 70
id-OldQoSFlowMap-ULendmarkerexpected ProtocolIE-ID ::= 71
id-DRB-QoS ProtocolIE-ID ::= 72
id-GNB-CU-UP-TNLA-To-Remove-List ProtocolIE-ID ::= 73
id-endpoint-IP-Address-and-Port ProtocolIE-ID ::= 74
id-TNLAssociationTransportLayerAddressgNBCUUP ProtocolIE-ID ::= 75
id-RANUEID ProtocolIE-ID ::= 76
id-GNB-DU-ID ProtocolIE-ID ::= 77
id-CommonNetworkInstance ProtocolIE-ID ::= 78
id-NetworkInstance ProtocolIE-ID ::= 79
id-QoSFlowMappingIndication ProtocolIE-ID ::= 80
END

2
epan/dissectors/asn1/e1ap/E1AP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.463 V15.3.0 (2019-03)
-- 3GPP TS 38.463 V15.4.0 (2019-07)
-- **************************************************************
--
-- Container definitions

99
epan/dissectors/asn1/e1ap/E1AP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.463 V15.3.0 (2019-03)
-- 3GPP TS 38.463 V15.4.0 (2019-07)
-- **************************************************************
--
-- Information Element Definitions
@ -15,7 +15,15 @@ BEGIN
IMPORTS
id-CommonNetworkInstance,
id-SNSSAI,
id-OldQoSFlowMap-ULendmarkerexpected,
id-DRB-QoS,
id-endpoint-IP-Address-and-Port,
id-NetworkInstance,
id-QoSFlowMappingIndication,
id-TNLAssociationTransportLayerAddressgNBCUUP,
id-Cause,
maxnoofErrors,
maxnoofSliceItems,
maxnoofEUTRANQOSParameters,
@ -152,7 +160,7 @@ CauseTransport ::= ENUMERATED {
Cell-Group-Information ::= SEQUENCE (SIZE(1.. maxnoofCellGroups)) OF Cell-Group-Information-Item
Cell-Group-Information-Item ::= SEQUENCE {
cell-Group-ID Cell-Gorup-ID,
cell-Group-ID Cell-Group-ID,
uL-Configuration UL-Configuration OPTIONAL,
dL-TX-Stop DL-TX-Stop OPTIONAL,
rAT-Type RAT-Type OPTIONAL,
@ -165,7 +173,7 @@ Cell-Group-Information-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
}
Cell-Gorup-ID ::= INTEGER (0..3, ...)
Cell-Group-ID ::= INTEGER (0..3, ...)
CipheringAlgorithm ::= ENUMERATED {
nEA0,
@ -182,6 +190,8 @@ CNSupport ::= ENUMERATED {
...
}
CommonNetworkInstance ::= OCTET STRING
ConfidentialityProtectionIndication ::= ENUMERATED {
required,
preferred,
@ -203,6 +213,7 @@ CP-TNL-Information ::= CHOICE {
}
CP-TNL-Information-ExtIEs E1AP-PROTOCOL-IES ::= {
{ ID id-endpoint-IP-Address-and-Port CRITICALITY reject TYPE Endpoint-IP-address-and-port PRESENCE mandatory},
...
}
@ -248,14 +259,14 @@ Data-Forwarding-Information-Request-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
...
}
Data-Forwarding-Information-Response ::= SEQUENCE {
Data-Forwarding-Information ::= SEQUENCE {
uL-Data-Forwarding UP-TNL-Information OPTIONAL,
dL-Data-Forwarding UP-TNL-Information OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { Data-Forwarding-Information-Response-ExtIEs } } OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { Data-Forwarding-Information-ExtIEs } } OPTIONAL,
...
}
Data-Forwarding-Information-Response-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
Data-Forwarding-Information-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
...
}
@ -511,7 +522,7 @@ DRB-Setup-List-EUTRAN ::= SEQUENCE (SIZE(1.. maxnoofDRBs)) OF DRB-Setup-Item-EUT
DRB-Setup-Item-EUTRAN ::= SEQUENCE {
dRB-ID DRB-ID,
s1-DL-UP-TNL-Information UP-TNL-Information,
data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
data-Forwarding-Information-Response Data-Forwarding-Information OPTIONAL,
uL-UP-Transport-Parameters UP-Parameters,
s1-DL-UP-Unchanged ENUMERATED {true, ...} OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { DRB-Setup-Item-EUTRAN-ExtIEs } } OPTIONAL,
@ -527,7 +538,7 @@ DRB-Setup-Mod-List-EUTRAN ::= SEQUENCE (SIZE(1.. maxnoofDRBs)) OF DRB-Setup-Mod-
DRB-Setup-Mod-Item-EUTRAN ::= SEQUENCE {
dRB-ID DRB-ID,
s1-DL-UP-TNL-Information UP-TNL-Information,
data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
data-Forwarding-Information-Response Data-Forwarding-Information OPTIONAL,
uL-UP-Transport-Parameters UP-Parameters,
iE-Extensions ProtocolExtensionContainer { { DRB-Setup-Mod-Item-EUTRAN-ExtIEs } } OPTIONAL,
...
@ -541,7 +552,7 @@ DRB-Setup-List-NG-RAN ::= SEQUENCE (SIZE(1.. maxnoofDRBs)) OF DRB-Setup-Item-NG-
DRB-Setup-Item-NG-RAN ::= SEQUENCE {
dRB-ID DRB-ID,
dRB-data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
dRB-data-Forwarding-Information-Response Data-Forwarding-Information OPTIONAL,
uL-UP-Transport-Parameters UP-Parameters,
flow-Setup-List QoS-Flow-List,
flow-Failed-List QoS-Flow-Failed-List OPTIONAL,
@ -557,7 +568,7 @@ DRB-Setup-Mod-List-NG-RAN ::= SEQUENCE (SIZE(1.. maxnoofDRBs)) OF DRB-Setup-Mod-
DRB-Setup-Mod-Item-NG-RAN ::= SEQUENCE {
dRB-ID DRB-ID,
dRB-data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
dRB-data-Forwarding-Information-Response Data-Forwarding-Information OPTIONAL,
uL-UP-Transport-Parameters UP-Parameters,
flow-Setup-List QoS-Flow-List,
flow-Failed-List QoS-Flow-Failed-List OPTIONAL,
@ -618,7 +629,7 @@ DRB-To-Modify-Item-EUTRAN ::= SEQUENCE {
pDCP-Configuration PDCP-Configuration OPTIONAL,
eUTRAN-QoS EUTRAN-QoS OPTIONAL,
s1-UL-UP-TNL-Information UP-TNL-Information OPTIONAL,
data-Forwarding-Information-Request Data-Forwarding-Information-Request OPTIONAL,
data-Forwarding-Information Data-Forwarding-Information OPTIONAL,
pDCP-SN-Status-Request PDCP-SN-Status-Request OPTIONAL,
pDCP-SN-Status-Information PDCP-SN-Status-Information OPTIONAL,
dL-UP-Parameters UP-Parameters OPTIONAL,
@ -640,7 +651,7 @@ DRB-To-Modify-Item-NG-RAN ::= SEQUENCE {
dRB-ID DRB-ID,
sDAP-Configuration SDAP-Configuration OPTIONAL,
pDCP-Configuration PDCP-Configuration OPTIONAL,
dRB-Data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
dRB-Data-Forwarding-Information Data-Forwarding-Information OPTIONAL,
pDCP-SN-Status-Request PDCP-SN-Status-Request OPTIONAL,
pdcp-SN-Status-Information PDCP-SN-Status-Information OPTIONAL,
dL-UP-Parameters UP-Parameters OPTIONAL,
@ -654,6 +665,8 @@ DRB-To-Modify-Item-NG-RAN ::= SEQUENCE {
}
DRB-To-Modify-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-OldQoSFlowMap-ULendmarkerexpected CRITICALITY reject EXTENSION QoS-Flow-List PRESENCE optional}|
{ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional},
...
}
@ -762,6 +775,7 @@ DRB-To-Setup-Item-NG-RAN ::= SEQUENCE {
}
DRB-To-Setup-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional},
...
}
@ -775,13 +789,13 @@ DRB-To-Setup-Mod-Item-NG-RAN ::= SEQUENCE {
flow-Mapping-Information QoS-Flow-QoS-Parameter-List,
dRB-Data-Forwarding-Information-Request Data-Forwarding-Information-Request OPTIONAL,
dRB-Inactivity-Timer Inactivity-Timer OPTIONAL,
pDCP-UL-Count PDCP-Count OPTIONAL,
pDCP-DL-Count PDCP-Count OPTIONAL,
pDCP-SN-Status-Information PDCP-SN-Status-Information OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { DRB-To-Setup-Mod-Item-NG-RAN-ExtIEs } } OPTIONAL,
...
}
DRB-To-Setup-Mod-Item-NG-RAN-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-DRB-QoS CRITICALITY ignore EXTENSION QoSFlowLevelQoSParameters PRESENCE optional},
...
}
@ -831,6 +845,16 @@ DataDiscardRequired ::= ENUMERATED {
EncryptionKey ::= OCTET STRING
Endpoint-IP-address-and-port::= SEQUENCE {
endpoint-IP-Address TransportLayerAddress,
portNumber PortNumber,
iE-Extensions ProtocolExtensionContainer { { Endpoint-IP-address-and-port-ExtIEs} } OPTIONAL
}
Endpoint-IP-address-and-port-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
...
}
EUTRANAllocationAndRetentionPriority ::= SEQUENCE {
priorityLevel PriorityLevel,
pre-emptionCapability Pre-emptionCapability,
@ -880,7 +904,7 @@ GNB-CU-UP-Capacity ::= INTEGER (0..255)
GNB-CU-UP-CellGroupRelatedConfiguration ::= SEQUENCE (SIZE(1.. maxnoofUPParameters)) OF GNB-CU-UP-CellGroupRelatedConfiguration-Item
GNB-CU-UP-CellGroupRelatedConfiguration-Item ::= SEQUENCE {
cell-Group-ID Cell-Gorup-ID,
cell-Group-ID Cell-Group-ID,
uP-TNL-Information UP-TNL-Information,
uL-Configuration UL-Configuration OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {GNB-CU-UP-CellGroupRelatedConfiguration-Item-ExtIEs } } OPTIONAL
@ -932,6 +956,7 @@ GNB-CU-CP-TNLA-To-Remove-Item::= SEQUENCE {
}
GNB-CU-CP-TNLA-To-Remove-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-TNLAssociationTransportLayerAddressgNBCUUP CRITICALITY reject EXTENSION CP-TNL-Information PRESENCE optional},
...
}
@ -945,6 +970,16 @@ GNB-CU-CP-TNLA-To-Update-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
...
}
GNB-CU-UP-TNLA-To-Remove-Item::= SEQUENCE {
tNLAssociationTransportLayerAddress CP-TNL-Information,
tNLAssociationTransportLayerAddressgNBCUCP CP-TNL-Information OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { GNB-CU-UP-TNLA-To-Remove-Item-ExtIEs} } OPTIONAL
}
GNB-CU-UP-TNLA-To-Remove-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
...
}
GBR-QosInformation ::= SEQUENCE {
e-RAB-MaximumBitrateDL BitRate,
e-RAB-MaximumBitrateUL BitRate,
@ -988,6 +1023,8 @@ GTPTunnel-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
GNB-CU-UP-OverloadInformation ::= ENUMERATED {overloaded, not-overloaded}
GNB-DU-ID ::= INTEGER (0..68719476735)
-- H
@ -1298,7 +1335,7 @@ PDU-Session-Resource-Failed-List ::= SEQUENCE (SIZE(1.. maxnoofPDUSessionResourc
PDU-Session-Resource-Failed-Item ::= SEQUENCE {
pDU-Session-ID PDU-Session-ID,
casue Cause,
cause Cause,
iE-Extensions ProtocolExtensionContainer { { PDU-Session-Resource-Failed-Item-ExtIEs } } OPTIONAL,
...
}
@ -1311,7 +1348,7 @@ PDU-Session-Resource-Failed-Mod-List ::= SEQUENCE (SIZE(1.. maxnoofPDUSessionRes
PDU-Session-Resource-Failed-Mod-Item ::= SEQUENCE {
pDU-Session-ID PDU-Session-ID,
casue Cause,
cause Cause,
iE-Extensions ProtocolExtensionContainer { { PDU-Session-Resource-Failed-Mod-Item-ExtIEs } } OPTIONAL,
...
}
@ -1324,7 +1361,7 @@ PDU-Session-Resource-Failed-To-Modify-List ::= SEQUENCE (SIZE(1.. maxnoofPDUSess
PDU-Session-Resource-Failed-To-Modify-Item ::= SEQUENCE {
pDU-Session-ID PDU-Session-ID,
casue Cause,
cause Cause,
iE-Extensions ProtocolExtensionContainer { { PDU-Session-Resource-Failed-To-Modify-Item-ExtIEs } } OPTIONAL,
...
}
@ -1339,7 +1376,7 @@ PDU-Session-Resource-Modified-Item ::= SEQUENCE {
pDU-Session-ID PDU-Session-ID,
nG-DL-UP-TNL-Information UP-TNL-Information OPTIONAL,
securityResult SecurityResult OPTIONAL,
pDU-Session-Data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
pDU-Session-Data-Forwarding-Information-Response Data-Forwarding-Information OPTIONAL,
dRB-Setup-List-NG-RAN DRB-Setup-List-NG-RAN OPTIONAL,
dRB-Failed-List-NG-RAN DRB-Failed-List-NG-RAN OPTIONAL,
dRB-Modified-List-NG-RAN DRB-Modified-List-NG-RAN OPTIONAL,
@ -1373,7 +1410,7 @@ PDU-Session-Resource-Setup-Item ::= SEQUENCE {
pDU-Session-ID PDU-Session-ID,
securityResult SecurityResult OPTIONAL,
nG-DL-UP-TNL-Information UP-TNL-Information,
pDU-Session-Data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
pDU-Session-Data-Forwarding-Information-Response Data-Forwarding-Information OPTIONAL,
nG-DL-UP-Unchanged ENUMERATED {true, ...} OPTIONAL,
dRB-Setup-List-NG-RAN DRB-Setup-List-NG-RAN,
dRB-Failed-List-NG-RAN DRB-Failed-List-NG-RAN OPTIONAL,
@ -1391,7 +1428,7 @@ PDU-Session-Resource-Setup-Mod-Item ::= SEQUENCE {
pDU-Session-ID PDU-Session-ID,
securityResult SecurityResult OPTIONAL,
nG-DL-UP-TNL-Information UP-TNL-Information,
pDU-Session-Data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
pDU-Session-Data-Forwarding-Information-Response Data-Forwarding-Information OPTIONAL,
dRB-Setup-Mod-List-NG-RAN DRB-Setup-Mod-List-NG-RAN,
dRB-Failed-Mod-List-NG-RAN DRB-Failed-Mod-List-NG-RAN OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PDU-Session-Resource-Setup-Mod-Item-ExtIEs } } OPTIONAL,
@ -1410,7 +1447,7 @@ PDU-Session-Resource-To-Modify-Item ::= SEQUENCE {
pDU-Session-Resource-DL-AMBR BitRate OPTIONAL,
nG-UL-UP-TNL-Information UP-TNL-Information OPTIONAL,
pDU-Session-Data-Forwarding-Information-Request Data-Forwarding-Information-Request OPTIONAL,
pDU-Session-Data-Forwarding-Information-Response Data-Forwarding-Information-Response OPTIONAL,
pDU-Session-Data-Forwarding-Information Data-Forwarding-Information OPTIONAL,
pDU-Session-Inactivity-Timer Inactivity-Timer OPTIONAL,
networkInstance NetworkInstance OPTIONAL,
dRB-To-Setup-List-NG-RAN DRB-To-Setup-List-NG-RAN OPTIONAL,
@ -1421,7 +1458,8 @@ PDU-Session-Resource-To-Modify-Item ::= SEQUENCE {
}
PDU-Session-Resource-To-Modify-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-SNSSAI CRITICALITY reject EXTENSION SNSSAI PRESENCE optional},
{ID id-SNSSAI CRITICALITY reject EXTENSION SNSSAI PRESENCE optional}|
{ ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional },
...
}
@ -1434,6 +1472,7 @@ PDU-Session-Resource-To-Remove-Item ::= SEQUENCE {
}
PDU-Session-Resource-To-Remove-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-Cause CRITICALITY ignore EXTENSION Cause PRESENCE optional},
...
}
@ -1456,6 +1495,7 @@ PDU-Session-Resource-To-Setup-Item ::= SEQUENCE {
}
PDU-Session-Resource-To-Setup-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional },
...
}
@ -1476,6 +1516,8 @@ PDU-Session-Resource-To-Setup-Mod-Item ::= SEQUENCE {
}
PDU-Session-Resource-To-Setup-Mod-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-NetworkInstance CRITICALITY ignore EXTENSION NetworkInstance PRESENCE optional}|
{ID id-CommonNetworkInstance CRITICALITY ignore EXTENSION CommonNetworkInstance PRESENCE optional},
...
}
@ -1501,7 +1543,9 @@ PDU-Session-Type ::= ENUMERATED {
...
}
PLMN-Identity ::= OCTET STRING (SIZE(3))
PLMN-Identity ::= OCTET STRING (SIZE(3))
PortNumber ::= BIT STRING (SIZE(16))
PPI ::= INTEGER (0..7, ...)
@ -1542,6 +1586,7 @@ QoS-Flow-Item ::= SEQUENCE {
}
QoS-Flow-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
{ID id-QoSFlowMappingIndication CRITICALITY ignore EXTENSION QoS-Flow-Mapping-Indication PRESENCE optional},
...
}
@ -1549,7 +1594,7 @@ QoS-Flow-Failed-List ::= SEQUENCE (SIZE(1.. maxnoofQoSFlows)) OF QoS-Flow-Failed
QoS-Flow-Failed-Item ::= SEQUENCE {
qoS-Flow-Identifier QoS-Flow-Identifier,
casue Cause,
cause Cause,
iE-Extensions ProtocolExtensionContainer { { QoS-Flow-Failed-Item-ExtIEs } } OPTIONAL,
...
}
@ -1618,6 +1663,8 @@ QoSFlowLevelQoSParameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
-- R
RANUEID ::= OCTET STRING (SIZE (8))
RAT-Type ::= ENUMERATED {
e-UTRA,
nR,
@ -1815,7 +1862,7 @@ UP-Parameters ::= SEQUENCE (SIZE(1.. maxnoofUPParameters)) OF UP-Parameters-Item
UP-Parameters-Item ::= SEQUENCE {
uP-TNL-Information UP-TNL-Information,
cell-Group-ID Cell-Gorup-ID,
cell-Group-ID Cell-Group-ID,
iE-Extensions ProtocolExtensionContainer { { UP-Parameters-Item-ExtIEs } } OPTIONAL,
...
}

27
epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.463 V15.3.0 (2019-03)
-- 3GPP TS 38.463 V15.4.0 (2019-07)
-- **************************************************************
--
-- PDU definitions for E1AP
@ -75,6 +75,7 @@ IMPORTS
GNB-CU-CP-TNLA-To-Add-Item,
GNB-CU-CP-TNLA-To-Remove-Item,
GNB-CU-CP-TNLA-To-Update-Item,
GNB-CU-UP-TNLA-To-Remove-Item,
TransactionID,
Inactivity-Timer,
DRBs-Subject-To-Counter-Check-List-EUTRAN,
@ -83,7 +84,9 @@ IMPORTS
GNB-CU-UP-Capacity,
GNB-CU-UP-OverloadInformation,
DataDiscardRequired,
PDU-Session-Resource-Data-Usage-List
PDU-Session-Resource-Data-Usage-List,
RANUEID,
GNB-DU-ID
FROM E1AP-IEs
@ -132,6 +135,7 @@ FROM E1AP-Containers
id-GNB-CU-CP-TNLA-To-Add-List,
id-GNB-CU-CP-TNLA-To-Remove-List,
id-GNB-CU-CP-TNLA-To-Update-List,
id-GNB-CU-UP-TNLA-To-Remove-List,
id-DRB-To-Setup-List-EUTRAN,
id-DRB-To-Modify-List-EUTRAN,
id-DRB-To-Remove-List-EUTRAN,
@ -170,6 +174,8 @@ FROM E1AP-Containers
id-UEDLMaximumIntegrityProtectedDataRate,
id-DataDiscardRequired,
id-PDU-Session-Resource-Data-Usage-List,
id-RANUEID,
id-GNB-DU-ID,
maxnoofErrors,
maxnoofSPLMNs,
@ -438,10 +444,13 @@ GNB-CU-UP-ConfigurationUpdateIEs E1AP-PROTOCOL-IES ::= {
{ ID id-gNB-CU-UP-ID CRITICALITY reject TYPE GNB-CU-UP-ID PRESENCE mandatory }|
{ ID id-gNB-CU-UP-Name CRITICALITY ignore TYPE GNB-CU-UP-Name PRESENCE optional }|
{ ID id-SupportedPLMNs CRITICALITY reject TYPE SupportedPLMNs-List PRESENCE optional }|
{ ID id-gNB-CU-UP-Capacity CRITICALITY ignore TYPE GNB-CU-UP-Capacity PRESENCE optional },
{ ID id-gNB-CU-UP-Capacity CRITICALITY ignore TYPE GNB-CU-UP-Capacity PRESENCE optional }|
{ ID id-GNB-CU-UP-TNLA-To-Remove-List CRITICALITY reject TYPE GNB-CU-UP-TNLA-To-Remove-List PRESENCE optional },
...
}
GNB-CU-UP-TNLA-To-Remove-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF GNB-CU-UP-TNLA-To-Remove-Item
-- **************************************************************
--
-- GNB-CU-UP Configuration Update Acknowledge
@ -617,7 +626,9 @@ BearerContextSetupRequestIEs E1AP-PROTOCOL-IES ::= {
{ ID id-ActivityNotificationLevel CRITICALITY reject TYPE ActivityNotificationLevel PRESENCE mandatory }|
{ ID id-UE-Inactivity-Timer CRITICALITY reject TYPE Inactivity-Timer PRESENCE optional }|
{ ID id-BearerContextStatusChange CRITICALITY reject TYPE BearerContextStatusChange PRESENCE optional }|
{ ID id-System-BearerContextSetupRequest CRITICALITY reject TYPE System-BearerContextSetupRequest PRESENCE mandatory },
{ ID id-System-BearerContextSetupRequest CRITICALITY reject TYPE System-BearerContextSetupRequest PRESENCE mandatory }|
{ ID id-RANUEID CRITICALITY ignore TYPE RANUEID PRESENCE optional }|
{ ID id-GNB-DU-ID CRITICALITY ignore TYPE GNB-DU-ID PRESENCE optional },
...
}
@ -731,7 +742,10 @@ BearerContextModificationRequestIEs E1AP-PROTOCOL-IES ::= {
{ ID id-New-UL-TNL-Information-Required CRITICALITY reject TYPE New-UL-TNL-Information-Required PRESENCE optional }|
{ ID id-UE-Inactivity-Timer CRITICALITY reject TYPE Inactivity-Timer PRESENCE optional }|
{ ID id-DataDiscardRequired CRITICALITY ignore TYPE DataDiscardRequired PRESENCE optional }|
{ ID id-System-BearerContextModificationRequest CRITICALITY reject TYPE System-BearerContextModificationRequest PRESENCE optional },
{ ID id-System-BearerContextModificationRequest CRITICALITY reject TYPE System-BearerContextModificationRequest PRESENCE optional }|
{ ID id-RANUEID CRITICALITY ignore TYPE RANUEID PRESENCE optional }|
{ ID id-GNB-DU-ID CRITICALITY ignore TYPE GNB-DU-ID PRESENCE optional }|
{ ID id-ActivityNotificationLevel CRITICALITY ignore TYPE ActivityNotificationLevel PRESENCE optional },
...
}
@ -975,7 +989,8 @@ BearerContextReleaseRequest ::= SEQUENCE {
BearerContextReleaseRequestIEs E1AP-PROTOCOL-IES ::= {
{ ID id-gNB-CU-CP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-CP-UE-E1AP-ID PRESENCE mandatory }|
{ ID id-gNB-CU-UP-UE-E1AP-ID CRITICALITY reject TYPE GNB-CU-UP-UE-E1AP-ID PRESENCE mandatory }|
{ ID id-DRB-Status-List CRITICALITY ignore TYPE DRB-Status-List PRESENCE optional },
{ ID id-DRB-Status-List CRITICALITY ignore TYPE DRB-Status-List PRESENCE optional }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
...
}

2
epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.463 V15.3.0 (2019-03)
-- 3GPP TS 38.463 V15.4.0 (2019-07)
-- **************************************************************
--
-- Elementary Procedure definitions

31
epan/dissectors/asn1/e1ap/e1ap.cnf
View File

@ -212,7 +212,16 @@ id-PDU-Session-To-Notify-List ProtocolIE-ID
id-PDU-Session-Resource-Data-Usage-List ProtocolIE-ID
id-SNSSAI ProtocolIE-ID
id-DataDiscardRequired ProtocolIE-ID
id-OldQoSFlowMap-ULendmarkerexpected ProtocolIE-ID
id-DRB-QoS ProtocolIE-ID
id-GNB-CU-UP-TNLA-To-Remove-List ProtocolIE-ID
id-endpoint-IP-Address-and-Port ProtocolIE-ID
id-TNLAssociationTransportLayerAddressgNBCUUP ProtocolIE-ID
id-RANUEID ProtocolIE-ID
id-GNB-DU-ID ProtocolIE-ID
id-CommonNetworkInstance ProtocolIE-ID
id-NetworkInstance ProtocolIE-ID
id-QoSFlowMappingIndication ProtocolIE-ID
#.END
#.REGISTER
@ -288,9 +297,19 @@ BitRate N e1ap.ies id-UEDLMaximumIntegrityP
PDU-Session-To-Notify-List N e1ap.ies id-PDU-Session-To-Notify-List
PDU-Session-Resource-Data-Usage-List N e1ap.ies id-PDU-Session-Resource-Data-Usage-List
DataDiscardRequired N e1ap.ies id-DataDiscardRequired
GNB-CU-UP-TNLA-To-Remove-List N e1ap.ies id-GNB-CU-UP-TNLA-To-Remove-List
Endpoint-IP-address-and-port N e1ap.ies id-endpoint-IP-Address-and-Port
RANUEID N e1ap.ies id-RANUEID
GNB-DU-ID N e1ap.ies id-GNB-DU-ID
#E1AP-PROTOCOL-EXTENSION
SNSSAI N e1ap.extension id-SNSSAI
QoS-Flow-List N e1ap.extension id-OldQoSFlowMap-ULendmarkerexpected
QoSFlowLevelQoSParameters N e1ap.extension id-DRB-QoS
CP-TNL-Information N e1ap.extension id-TNLAssociationTransportLayerAddressgNBCUUP
CommonNetworkInstance N e1ap.extension id-CommonNetworkInstance
NetworkInstance N e1ap.extension id-NetworkInstance
QoS-Flow-Mapping-Indication N e1ap.extension id-QoSFlowMappingIndication
#E1AP-ELEMENTARY-PROCEDURE
Reset N e1ap.proc.imsg id-reset
@ -357,6 +376,16 @@ MRDC-DataUsageReport N e1ap.proc.imsg id-mRDC-DataUsageRepor
dissect_e212_mcc_mnc(param_tvb, actx->pinfo, subtree, 0, E212_NONE, FALSE);
}
#.TYPE_ATTR
PortNumber TYPE = FT_UINT16 DISPLAY = BASE_DEC
#.FN_BODY PortNumber VAL_PTR = &parameter_tvb HF_INDEX = -1
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if (parameter_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN);
}
#.TYPE_ATTR
BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec

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

@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 38.463 V15.3.0 (2019-03)
* References: 3GPP TS 38.463 V15.4.0 (2019-07)
*/
#include "config.h"

463
epan/dissectors/packet-e1ap.c
View File

File diff suppressed because it is too large Load Diff