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

S1AP: upgrade dissector to v15.1.0 

Change-Id: Ib3728a35f3635b58da2a10736799fd825c34e58b
Reviewed-on: https://code.wireshark.org/review/26782
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-04-06 23:16:50 +02:00
parent b4b66d1b94
commit 4cc78e6fe4
10 changed files with 330 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 9.3.5 Common Definitions
-- **************************************************************
--

14
epan/dissectors/asn1/s1ap/S1AP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 9.3.6 Constant Definitions
-- **************************************************************
--
@ -95,7 +95,7 @@ id-RetrieveUEInformation ProcedureCode ::= 58
id-UEInformationTransfer ProcedureCode ::= 59
id-eNBCPRelocationIndication ProcedureCode ::= 60
id-MMECPRelocationIndication ProcedureCode ::= 61
id-SecondaryRATReport ProcedureCode ::= 62
id-SecondaryRATDataUsageReport ProcedureCode ::= 62
-- **************************************************************
--
@ -321,7 +321,7 @@ id-CellAccessMode ProtocolIE-ID ::= 145
id-CSGMembershipStatus ProtocolIE-ID ::= 146
id-LPPa-PDU ProtocolIE-ID ::= 147
id-Routing-ID ProtocolIE-ID ::= 148
id-Time-Synchronisation-Info ProtocolIE-ID ::= 149
id-Time-Synchronisation-Info ProtocolIE-ID ::= 149
id-PS-ServiceNotAvailable ProtocolIE-ID ::= 150
id-PagingPriority ProtocolIE-ID ::= 151
id-x2TNLConfigurationInfo ProtocolIE-ID ::= 152
@ -437,11 +437,13 @@ id-extended-uEaggregateMaximumBitRateUL ProtocolIE-ID ::= 260
id-NRrestriction ProtocolIE-ID ::= 261
id-UEAppLayerMeasConfig ProtocolIE-ID ::= 262
id-UE-Application-Layer-Measurement-Capability ProtocolIE-ID ::= 263
id-SecondaryRATusageReportList ProtocolIE-ID ::= 264
id-SecondaryRATusageReportItem ProtocolIE-ID ::= 265
id-SecondaryRATDataUsageReportList ProtocolIE-ID ::= 264
id-SecondaryRATDataUsageReportItem ProtocolIE-ID ::= 265
id-HandoverFlag ProtocolIE-ID ::= 266
id-E-RABUsageReportItem ProtocolIE-ID ::= 267
id-SecondaryRATusageDataRequst ProtocolIE-ID ::= 268
id-SecondaryRATDataUsageRequest ProtocolIE-ID ::= 268
id-NRUESecurityCapabilities ProtocolIE-ID ::= 269
id-UnlicensedSpectrumRestriction ProtocolIE-ID ::= 270
id-CE-ModeBRestricted ProtocolIE-ID ::= 271
END

2
epan/dissectors/asn1/s1ap/S1AP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 9.3.7 Container Definitions
-- **************************************************************
--

42
epan/dissectors/asn1/s1ap/S1AP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 9.3.4 Information Element Definitions
-- **************************************************************
--
@ -56,9 +56,10 @@ IMPORTS
id-extended-e-RAB-GuaranteedBitrateUL,
id-extended-uEaggregateMaximumBitRateDL,
id-extended-uEaggregateMaximumBitRateUL,
id-SecondaryRATusageReportItem,
id-SecondaryRATDataUsageReportItem,
id-E-RABUsageReportItem,
id-UEAppLayerMeasConfig,
id-UnlicensedSpectrumRestriction,
maxnoofCSGs,
maxnoofE-RABs,
maxnoofErrors,
@ -773,6 +774,12 @@ EnhancedCoverageRestricted ::= ENUMERATED {
...
}
CE-ModeBRestricted ::= ENUMERATED {
restricted,
not-restricted,
...
}
EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMNidentity
EventType ::= ENUMERATED {
direct,
@ -838,8 +845,8 @@ E-RABUsageReportItemIEs S1AP-PROTOCOL-IES ::= {
E-RABUsageReportItem ::= SEQUENCE {
startTimestamp OCTET STRING (SIZE(4)),
endTimestamp OCTET STRING (SIZE(4)),
usageCountUL INTEGER,
usageCountDL INTEGER,
usageCountUL INTEGER (0..18446744073709551615),
usageCountDL INTEGER (0..18446744073709551615),
iE-Extensions ProtocolExtensionContainer { { E-RABUsageReportItem-ExtIEs} } OPTIONAL,
...
}
@ -1019,7 +1026,8 @@ HandoverRestrictionList ::= SEQUENCE {
}
HandoverRestrictionList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRrestriction CRITICALITY ignore EXTENSION NRrestriction PRESENCE optional},
{ ID id-NRrestriction CRITICALITY ignore EXTENSION NRrestriction PRESENCE optional}|
{ ID id-UnlicensedSpectrumRestriction CRITICALITY ignore EXTENSION UnlicensedSpectrumRestriction PRESENCE optional},
...
}
@ -1190,7 +1198,7 @@ M3Configuration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
M3period ::= ENUMERATED {ms100, ms1000, ms10000, ... }
M3period ::= ENUMERATED {ms100, ms1000, ms10000, ...,ms1024, ms1280, ms2048, ms2560, ms5120, ms10240, min1 }
M4Configuration ::= SEQUENCE {
m4period M4period,
@ -1754,31 +1762,32 @@ SecurityContext-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
SecondaryRATType ::= ENUMERATED {
nR,
...
...,
unlicensed
}
SecondaryRATusageDataRequst ::= ENUMERATED {
SecondaryRATDataUsageRequest ::= ENUMERATED {
requested,
...
}
SecondaryRATusageReportList ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {SecondaryRATusageReportItemIEs} }
SecondaryRATDataUsageReportList ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {SecondaryRATDataUsageReportItemIEs} }
SecondaryRATusageReportItemIEs S1AP-PROTOCOL-IES ::= {
{ ID id-SecondaryRATusageReportItem CRITICALITY ignore TYPE SecondaryRATusageReportItem PRESENCE mandatory },
SecondaryRATDataUsageReportItemIEs S1AP-PROTOCOL-IES ::= {
{ ID id-SecondaryRATDataUsageReportItem CRITICALITY ignore TYPE SecondaryRATDataUsageReportItem PRESENCE mandatory },
...
}
SecondaryRATusageReportItem ::= SEQUENCE {
SecondaryRATDataUsageReportItem ::= SEQUENCE {
e-RAB-ID E-RAB-ID,
secondaryRATType SecondaryRATType,
e-RABUsageReportList E-RABUsageReportList,
iE-Extensions ProtocolExtensionContainer { { SecondaryRATusageReportItem-ExtIEs} } OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { SecondaryRATDataUsageReportItem-ExtIEs} } OPTIONAL,
...
}
SecondaryRATusageReportItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
SecondaryRATDataUsageReportItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
@ -2329,6 +2338,11 @@ UL-NAS-MAC ::= BIT STRING (SIZE (16))
UL-NAS-Count ::= BIT STRING (SIZE (5))
UnlicensedSpectrumRestriction ::= ENUMERATED {
unlicensed-restricted,
...
}
UserLocationInformation ::= SEQUENCE {
eutran-cgi EUTRAN-CGI,

64
epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@ -164,11 +164,12 @@ IMPORTS
EnhancedCoverageRestricted,
DL-CP-SecurityInformation,
UL-CP-SecurityInformation,
SecondaryRATusageDataRequst,
SecondaryRATusageReportList,
SecondaryRATDataUsageRequest,
SecondaryRATDataUsageReportList,
HandoverFlag,
NRUESecurityCapabilities,
UE-Application-Layer-Measurement-Capability
UE-Application-Layer-Measurement-Capability,
CE-ModeBRestricted
@ -403,11 +404,12 @@ FROM S1AP-Containers
id-UE-Level-QoS-Parameters,
id-DL-CP-SecurityInformation,
id-UL-CP-SecurityInformation,
id-SecondaryRATusageDataRequst,
id-SecondaryRATusageReportList,
id-SecondaryRATDataUsageRequest,
id-SecondaryRATDataUsageReportList,
id-HandoverFlag,
id-NRUESecurityCapabilities,
id-UE-Application-Layer-Measurement-Capability
id-UE-Application-Layer-Measurement-Capability,
id-CE-ModeBRestricted
FROM S1AP-Constants;
@ -570,7 +572,8 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
...
}
@ -789,7 +792,8 @@ PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
...
}
@ -990,7 +994,7 @@ E-RABModifyRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory }|
{ ID id-uEaggregateMaximumBitrate CRITICALITY reject TYPE UEAggregateMaximumBitrate PRESENCE optional }|
{ ID id-E-RABToBeModifiedListBearerModReq CRITICALITY reject TYPE E-RABToBeModifiedListBearerModReq PRESENCE mandatory }|
{ ID id-SecondaryRATusageDataRequst CRITICALITY ignore TYPE SecondaryRATusageDataRequst PRESENCE optional },
{ ID id-SecondaryRATDataUsageRequest CRITICALITY ignore TYPE SecondaryRATDataUsageRequest PRESENCE optional },
...
}
@ -1034,7 +1038,7 @@ E-RABModifyResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-E-RABModifyListBearerModRes CRITICALITY ignore TYPE E-RABModifyListBearerModRes PRESENCE optional }|
{ ID id-E-RABFailedToModifyList CRITICALITY ignore TYPE E-RABList PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
}
@ -1106,7 +1110,7 @@ E-RABReleaseResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
}
@ -1154,7 +1158,7 @@ E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-E-RABReleasedList CRITICALITY ignore TYPE E-RABList PRESENCE mandatory }|
-- Extension for Release 12 to support User Location Information --
{ ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
}
-- **************************************************************
@ -1201,7 +1205,8 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
{ ID id-UESidelinkAggregateMaximumBitrate CRITICALITY ignore TYPE UESidelinkAggregateMaximumBitrate PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional},
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
...
}
@ -1327,7 +1332,9 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
{ ID id-Paging-eDRXInformation CRITICALITY ignore TYPE Paging-eDRXInformation PRESENCE optional}|
{ ID id-extended-UEIdentityIndexValue CRITICALITY ignore TYPE Extended-UEIdentityIndexValue PRESENCE optional}|
{ ID id-NB-IoT-Paging-eDRXInformation CRITICALITY ignore TYPE NB-IoT-Paging-eDRXInformation PRESENCE optional}|
{ ID id-NB-IoT-UEIdentityIndexValue CRITICALITY ignore TYPE NB-IoT-UEIdentityIndexValue PRESENCE optional},
{ ID id-NB-IoT-UEIdentityIndexValue CRITICALITY ignore TYPE NB-IoT-UEIdentityIndexValue PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
...
}
@ -1371,7 +1378,7 @@ UEContextReleaseRequest-IEs 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-GWContextReleaseIndication CRITICALITY reject TYPE GWContextReleaseIndication PRESENCE optional }|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
}
@ -1413,7 +1420,7 @@ UEContextReleaseComplete-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-InformationOnRecommendedCellsAndENBsForPaging CRITICALITY ignore TYPE InformationOnRecommendedCellsAndENBsForPaging PRESENCE optional}|
-- Extension for Release 13 to support coverage enhancement paging -
{ ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional}|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
}
@ -1559,7 +1566,9 @@ DownlinkNASTransport-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional}|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional}|
{ ID id-DLNASPDUDeliveryAckRequest CRITICALITY ignore TYPE DLNASPDUDeliveryAckRequest PRESENCE optional}|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional},
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
...
}
@ -1683,6 +1692,8 @@ NASDeliveryIndication ::= SEQUENCE {
}
NASDeliveryIndicationIEs 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},
...
}
@ -2653,7 +2664,7 @@ E-RABModificationIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-CSGMembershipInfo CRITICALITY reject TYPE CSGMembershipInfo PRESENCE optional}|
-- Extension for Release 11 to support BBAI --
{ ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
}
@ -2815,7 +2826,7 @@ UEContextSuspendRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-InformationOnRecommendedCellsAndENBsForPaging CRITICALITY ignore TYPE InformationOnRecommendedCellsAndENBsForPaging PRESENCE optional}|
{ ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional}|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional },
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional },
...
}
@ -2954,7 +2965,8 @@ ConnectionEstablishmentIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional }|
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional }|
{ ID id-DL-CP-SecurityInformation CRITICALITY ignore TYPE DL-CP-SecurityInformation PRESENCE optional },
{ ID id-DL-CP-SecurityInformation CRITICALITY ignore TYPE DL-CP-SecurityInformation PRESENCE optional }|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional},
...
}
@ -3035,19 +3047,19 @@ MMECPRelocationIndicationIEs S1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
-- Secondary RAT Report
-- Secondary RAT Data Usage Report
--
-- **************************************************************
SecondaryRATReport ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { SecondaryRATReportIEs} },
SecondaryRATDataUsageReport ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { SecondaryRATDataUsageReportIEs} },
...
}
SecondaryRATReportIEs S1AP-PROTOCOL-IES ::= {
SecondaryRATDataUsageReportIEs S1AP-PROTOCOL-IES ::= {
{ ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-SecondaryRATusageReportList CRITICALITY ignore TYPE SecondaryRATusageReportList PRESENCE optional}|
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional}|
{ ID id-HandoverFlag CRITICALITY ignore TYPE HandoverFlag PRESENCE optional},
...
}

14
epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
--
@ -117,7 +117,7 @@ FROM S1AP-CommonDataTypes
UEInformationTransfer,
ENBCPRelocationIndication,
MMECPRelocationIndication,
SecondaryRATReport
SecondaryRATDataUsageReport
FROM S1AP-PDU-Contents
@ -184,7 +184,7 @@ FROM S1AP-PDU-Contents
id-UEInformationTransfer,
id-eNBCPRelocationIndication,
id-MMECPRelocationIndication,
id-SecondaryRATReport
id-SecondaryRATDataUsageReport
FROM S1AP-Constants;
@ -323,7 +323,7 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
uEInformationTransfer |
eNBCPRelocationIndication |
mMECPRelocationIndication |
secondaryRATReport
secondaryRATDataUsageReport
}
-- **************************************************************
@ -732,9 +732,9 @@ mMECPRelocationIndication S1AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY reject
}
secondaryRATReport S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SecondaryRATReport
PROCEDURE CODE id-SecondaryRATReport
secondaryRATDataUsageReport S1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SecondaryRATDataUsageReport
PROCEDURE CODE id-SecondaryRATDataUsageReport
CRITICALITY ignore
}

2
epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.0.0 (2017-12)
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- B.2 ASN.1 definition
-- **************************************************************
--

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

@ -10,7 +10,7 @@
*
* Based on the RANAP dissector
*
* References: 3GPP TS 36.413 V15.0.0 (2017-12)
* References: 3GPP TS 36.413 V15.1.0 (2018-03)
*/
#include "config.h"

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

@ -1227,7 +1227,7 @@ id-RetrieveUEInformation ProcedureCode
id-UEInformationTransfer ProcedureCode
id-eNBCPRelocationIndication ProcedureCode
id-MMECPRelocationIndication ProcedureCode
id-SecondaryRATReport ProcedureCode
id-SecondaryRATDataUsageReport ProcedureCode
# ProtocolIE-ID
id-MME-UE-S1AP-ID ProtocolIE-ID
@ -1319,7 +1319,6 @@ id-E-RABFailedToBeReleasedList ProtocolIE-ID
id-Source-ToTarget-TransparentContainer ProtocolIE-ID
id-ServedGUMMEIs ProtocolIE-ID
id-SubscriberProfileIDforRFP ProtocolIE-ID
id-UESecurityCapabilities ProtocolIE-ID
id-CSFallbackIndicator ProtocolIE-ID
id-CNDomain ProtocolIE-ID
@ -1476,12 +1475,14 @@ id-extended-uEaggregateMaximumBitRateUL ProtocolIE-ID
id-NRrestriction ProtocolIE-ID
id-UEAppLayerMeasConfig ProtocolIE-ID
id-UE-Application-Layer-Measurement-Capability ProtocolIE-ID
id-SecondaryRATusageReportList ProtocolIE-ID
id-SecondaryRATusageReportItem ProtocolIE-ID
id-SecondaryRATDataUsageReportList ProtocolIE-ID
id-SecondaryRATDataUsageReportItem ProtocolIE-ID
id-HandoverFlag ProtocolIE-ID
id-E-RABUsageReportItem ProtocolIE-ID
id-SecondaryRATusageDataRequst ProtocolIE-ID
id-SecondaryRATDataUsageRequest ProtocolIE-ID
id-NRUESecurityCapabilities ProtocolIE-ID
id-UnlicensedSpectrumRestriction ProtocolIE-ID
id-CE-ModeBRestricted ProtocolIE-ID
#.END
#.REGISTER
@ -1688,13 +1689,14 @@ DL-CP-SecurityInformation N s1ap.ies id-DL-CP-SecurityInfo
E-RABLevelQoSParameters N s1ap.ies id-UE-Level-QoS-Parameters
UL-CP-SecurityInformation N s1ap.ies id-UL-CP-SecurityInformation
E-RABUsageReportItem N s1ap.ies id-E-RABUsageReportItem
SecondaryRATusageReportItem N s1ap.ies id-SecondaryRATusageReportItem
SecondaryRATDataUsageReportItem N s1ap.ies id-SecondaryRATDataUsageReportItem
NRUESecurityCapabilities N s1ap.ies id-NRUESecurityCapabilities
SecondaryRATusageDataRequst N s1ap.ies id-SecondaryRATusageDataRequst
SecondaryRATusageReportList N s1ap.ies id-SecondaryRATusageReportList
SecondaryRATDataUsageRequest N s1ap.ies id-SecondaryRATDataUsageRequest
SecondaryRATDataUsageReportList N s1ap.ies id-SecondaryRATDataUsageReportList
UE-Application-Layer-Measurement-Capability N s1ap.ies id-UE-Application-Layer-Measurement-Capability
HandoverFlag N s1ap.ies id-HandoverFlag
EmergencyAreaIDListForRestart N s1ap.ies id-EmergencyAreaIDListForRestart
CE-ModeBRestricted N s1ap.ies id-CE-ModeBRestricted
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@ -1744,6 +1746,7 @@ NRrestriction N s1ap.extension id-NRrestriction
UEAppLayerMeasConfig N s1ap.extension id-UEAppLayerMeasConfig
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateDL
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateUL
UnlicensedSpectrumRestriction N s1ap.extension id-UnlicensedSpectrumRestriction
#S1AP-ELEMENTARY-PROCEDURE
HandoverRequired N s1ap.proc.imsg id-HandoverPreparation
@ -1900,7 +1903,7 @@ ENBCPRelocationIndication N s1ap.proc.imsg id-eNBCPRelocationIndic
MMECPRelocationIndication N s1ap.proc.imsg id-MMECPRelocationIndication
SecondaryRATReport N s1ap.proc.imsg id-SecondaryRATReport
SecondaryRATDataUsageReport N s1ap.proc.imsg id-SecondaryRATDataUsageReport
#.FN_HDR HandoverRequired
@ -2087,8 +2090,8 @@ SecondaryRATReport N s1ap.proc.imsg id-SecondaryRATReport
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBCPRelocationIndication");
#.FN_HDR MMECPRelocationIndication
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MMECPRelocationIndication");
#.FN_HDR SecondaryRATReport
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATReport");
#.FN_HDR SecondaryRATDataUsageReport
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATDataUsageReport");
#.END
# Whenever a Cause appears, look up the reason and show it in the Info column

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

File diff suppressed because it is too large Load Diff