osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

S1AP: upgrade dissector to v15.3.0 

Change-Id: I949665dd7b26775f3f9a3e704f7e8b815a419165
Reviewed-on: https://code.wireshark.org/review/29824
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Pascal Quantin 2018-09-25 14:52:45 +02:00 committed by Anders Broman
parent dcdb36c575
commit 74957d4f07
10 changed files with 856 additions and 148 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.2.0 (2018-06)
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 9.3.5 Common Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 9.3.6 Constant Definitions
-- **************************************************************
--
@ -124,7 +124,7 @@ maxnoofEPLMNsPlusOne INTEGER ::= 16
maxnoofForbLACs INTEGER ::= 4096
maxnoofForbTACs INTEGER ::= 4096
maxnoofIndividualS1ConnectionsToReset INTEGER ::= 256
maxnoofCells INTEGER ::= 16
maxnoofCellsinUEHistoryInfo INTEGER ::= 16
maxnoofCellsineNB INTEGER ::= 256
maxnoofTAIforWarning INTEGER ::= 65535
maxnoofCellID INTEGER ::= 65535
@ -152,6 +152,8 @@ maxnooftimeperiods INTEGER ::= 2
maxnoofCellIDforQMC INTEGER ::= 32
maxnoofTAforQMC INTEGER ::= 8
maxnoofPLMNforQMC INTEGER ::= 16
maxnoofBluetoothName INTEGER ::= 4
maxnoofWLANName INTEGER ::= 4
@ -434,7 +436,7 @@ id-extended-e-RAB-GuaranteedBitrateDL ProtocolIE-ID ::= 257
id-extended-e-RAB-GuaranteedBitrateUL ProtocolIE-ID ::= 258
id-extended-uEaggregateMaximumBitRateDL ProtocolIE-ID ::= 259
id-extended-uEaggregateMaximumBitRateUL ProtocolIE-ID ::= 260
id-NRrestriction ProtocolIE-ID ::= 261
id-NRrestrictioninEPSasSecondaryRAT ProtocolIE-ID ::= 261
id-UEAppLayerMeasConfig ProtocolIE-ID ::= 262
id-UE-Application-Layer-Measurement-Capability ProtocolIE-ID ::= 263
id-SecondaryRATDataUsageReportList ProtocolIE-ID ::= 264
@ -451,11 +453,16 @@ id-UplinkPacketLossRate ProtocolIE-ID ::= 274
id-UECapabilityInfoRequest ProtocolIE-ID ::= 275
id-serviceType ProtocolIE-ID ::= 276
id-AerialUEsubscriptionInformation ProtocolIE-ID ::= 277
id-Subscription-Based-UE-DifferentiationInfo ProtocolIE-ID ::= 278
--WS extension
id-Unknown-278 ProtocolIE-ID ::= 278
id-Unknown-279 ProtocolIE-ID ::= 279
id-EndIndication ProtocolIE-ID ::= 280
id-EndIndication ProtocolIE-ID ::= 280
id-EDT-Session ProtocolIE-ID ::= 281
id-CNTypeRestrictions ProtocolIE-ID ::= 282
id-PendingDataIndication ProtocolIE-ID ::= 283
id-BluetoothMeasurementConfiguration ProtocolIE-ID ::= 284
id-WLANMeasurementConfiguration ProtocolIE-ID ::= 285
id-WarningAreaCoordinates ProtocolIE-ID ::= 286
id-NRrestrictionin5GS ProtocolIE-ID ::= 287
END

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 9.3.7 Container Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.1.0 (2018-03)
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 9.3.4 Information Element Definitions
-- **************************************************************
--
@ -36,7 +36,8 @@ IMPORTS
id-eNBIndirectX2TransportLayerAddresses,
id-Muting-Availability-Indication,
id-Muting-Pattern-Information,
id-NRrestriction,
id-NRrestrictioninEPSasSecondaryRAT,
id-NRrestrictionin5GS,
id-Synchronisation-Information,
id-uE-HistoryInformationFromTheUE,
id-LoggedMBSFNMDT,
@ -63,6 +64,8 @@ IMPORTS
id-UnlicensedSpectrumRestriction,
id-CNTypeRestrictions, id-DownlinkPacketLossRate,
id-UplinkPacketLossRate,
id-BluetoothMeasurementConfiguration,
id-WLANMeasurementConfiguration,
maxnoofCSGs,
maxnoofE-RABs,
maxnoofErrors,
@ -73,7 +76,7 @@ IMPORTS
maxnoofEPLMNsPlusOne,
maxnoofForbLACs,
maxnoofForbTACs,
maxnoofCells,
maxnoofCellsinUEHistoryInfo,
maxnoofCellID,
maxnoofDCNs,
maxnoofEmergencyAreaID,
@ -100,7 +103,10 @@ IMPORTS
maxnooftimeperiods,
maxnoofCellIDforQMC,
maxnoofTAforQMC,
maxnoofPLMNforQMC
maxnoofPLMNforQMC,
maxnoofBluetoothName,
maxnoofWLANName
@ -234,6 +240,24 @@ BearerType ::= ENUMERATED {
BitRate ::= INTEGER (0..10000000000)
BluetoothMeasurementConfiguration ::= SEQUENCE {
bluetoothMeasConfig BluetoothMeasConfig,
bluetoothMeasConfigNameList BluetoothMeasConfigNameList OPTIONAL,
bt-rssi ENUMERATED {true, ...} OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { BluetoothMeasurementConfiguration-ExtIEs } } OPTIONAL,
...
}
BluetoothMeasurementConfiguration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
BluetoothMeasConfigNameList ::= SEQUENCE (SIZE(1..maxnoofBluetoothName)) OF BluetoothName
BluetoothMeasConfig::= ENUMERATED {setup,...}
BluetoothName ::= OCTET STRING (SIZE (1..248))
BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
BroadcastCancelledAreaList ::= CHOICE {
@ -1080,9 +1104,10 @@ HandoverRestrictionList ::= SEQUENCE {
}
HandoverRestrictionList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRrestriction CRITICALITY ignore EXTENSION NRrestriction PRESENCE optional}|
{ ID id-NRrestrictioninEPSasSecondaryRAT CRITICALITY ignore EXTENSION NRrestrictioninEPSasSecondaryRAT PRESENCE optional}|
{ ID id-UnlicensedSpectrumRestriction CRITICALITY ignore EXTENSION UnlicensedSpectrumRestriction PRESENCE optional}|
{ ID id-CNTypeRestrictions CRITICALITY ignore EXTENSION CNTypeRestrictions PRESENCE optional},
{ ID id-CNTypeRestrictions CRITICALITY ignore EXTENSION CNTypeRestrictions PRESENCE optional}|
{ ID id-NRrestrictionin5GS CRITICALITY ignore EXTENSION NRrestrictionin5GS PRESENCE optional},
...
}
@ -1123,7 +1148,9 @@ ImmediateMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-M5Configuration CRITICALITY ignore EXTENSION M5Configuration PRESENCE conditional}|
{ ID id-MDT-Location-Info CRITICALITY ignore EXTENSION MDT-Location-Info PRESENCE optional}|
{ ID id-M6Configuration CRITICALITY ignore EXTENSION M6Configuration PRESENCE conditional}|
{ ID id-M7Configuration CRITICALITY ignore EXTENSION M7Configuration PRESENCE conditional},
{ ID id-M7Configuration CRITICALITY ignore EXTENSION M7Configuration PRESENCE conditional}|
{ ID id-BluetoothMeasurementConfiguration CRITICALITY ignore EXTENSION BluetoothMeasurementConfiguration PRESENCE optional}|
{ ID id-WLANMeasurementConfiguration CRITICALITY ignore EXTENSION WLANMeasurementConfiguration PRESENCE optional},
...
}
@ -1173,7 +1200,8 @@ LastVisitedCell-Item ::= CHOICE {
e-UTRAN-Cell LastVisitedEUTRANCellInformation,
uTRAN-Cell LastVisitedUTRANCellInformation,
gERAN-Cell LastVisitedGERANCellInformation,
...
...,
nG-RAN-Cell LastVisitedNGRANCellInformation
}
LastVisitedEUTRANCellInformation ::= SEQUENCE {
global-Cell-ID EUTRAN-CGI,
@ -1188,6 +1216,9 @@ LastVisitedEUTRANCellInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-HO-Cause CRITICALITY ignore EXTENSION Cause PRESENCE optional},
...
}
LastVisitedNGRANCellInformation ::= OCTET STRING
LastVisitedUTRANCellInformation ::= OCTET STRING
LastVisitedGERANCellInformation ::= CHOICE {
@ -1223,6 +1254,8 @@ LoggedMDT ::= SEQUENCE {
}
LoggedMDT-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
{ ID id-BluetoothMeasurementConfiguration CRITICALITY ignore EXTENSION BluetoothMeasurementConfiguration PRESENCE optional}|
{ ID id-WLANMeasurementConfiguration CRITICALITY ignore EXTENSION WLANMeasurementConfiguration PRESENCE optional},
...
}
@ -1464,8 +1497,13 @@ NextPagingAreaScope ::= ENUMERATED {
NRencryptionAlgorithms ::= BIT STRING (SIZE (16,...))
NRintegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...))
NRrestriction ::= ENUMERATED {
nRrestricted,
NRrestrictioninEPSasSecondaryRAT ::= ENUMERATED {
nRrestrictedinEPSasSecondaryRAT,
...
}
NRrestrictionin5GS ::= ENUMERATED {
nRrestrictedin5GS,
...
}
@ -1565,6 +1603,11 @@ PDCP-SNExtended ::= INTEGER (0..32767)
PDCP-SNlength18 ::= INTEGER (0..262143)
PendingDataIndication ::= ENUMERATED {
true,
...
}
M1PeriodicReporting ::= SEQUENCE {
reportInterval ReportIntervalMDT,
reportAmount ReportAmountMDT,
@ -2006,6 +2049,33 @@ ServedPLMNs ::= SEQUENCE (SIZE(1.. maxnoofPLMNsPerMME)) OF PLMNidentity
SubscriberProfileIDforRFP ::= INTEGER (1..256)
Subscription-Based-UE-DifferentiationInfo ::= SEQUENCE {
periodicCommunicationIndicator ENUMERATED {periodically, ondemand, ...} OPTIONAL,
periodicTime INTEGER (1..3600, ...) OPTIONAL,
scheduledCommunicationTime ScheduledCommunicationTime OPTIONAL,
stationaryIndication ENUMERATED {stationary, mobile, ...} OPTIONAL,
trafficProfile ENUMERATED {single-packet, dual-packets, multiple-packets, ...} OPTIONAL,
batteryIndication ENUMERATED {battery-powered, battery-powered-not-rechargeable-or-replaceable, not-battery-powered, ...} OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { Subscription-Based-UE-DifferentiationInfo-ExtIEs} } OPTIONAL,
...
}
Subscription-Based-UE-DifferentiationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
ScheduledCommunicationTime ::= SEQUENCE {
dayofWeek BIT STRING (SIZE(7)) OPTIONAL,
timeofDayStart INTEGER (0..86399, ...) OPTIONAL,
timeofDayEnd INTEGER (0..86399, ...) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { ScheduledCommunicationTime-ExtIEs}} OPTIONAL,
...
}
ScheduledCommunicationTime-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
SupportedTAs ::= SEQUENCE (SIZE(1.. maxnoofTACs)) OF SupportedTAs-Item
SupportedTAs-Item ::= SEQUENCE {
@ -2158,9 +2228,8 @@ TargetID ::= CHOICE {
targeteNB-ID TargeteNB-ID,
targetRNC-ID TargetRNC-ID,
cGI CGI,
targetgNgRanNode-ID TargetNgRanNode-ID,
...
...,
targetgNgRanNode-ID TargetNgRanNode-ID
}
TargeteNB-ID ::= SEQUENCE {
@ -2412,7 +2481,7 @@ UE-associatedLogicalS1-ConnectionItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
UEIdentityIndexValue ::= BIT STRING (SIZE (10))
UE-HistoryInformation ::= SEQUENCE (SIZE(1..maxnoofCells)) OF LastVisitedCell-Item
UE-HistoryInformation ::= SEQUENCE (SIZE(1..maxnoofCellsinUEHistoryInfo)) OF LastVisitedCell-Item
UE-HistoryInformationFromTheUE ::= OCTET STRING
-- This IE is a transparent container and shall be encoded as the VisitedCellInfoList field contained in the UEInformationResponse message as defined in TS 36.331 [16]
@ -2533,6 +2602,8 @@ PedestrianUE ::= ENUMERATED {
-- W
WarningAreaCoordinates ::= OCTET STRING (SIZE(1..1024))
WarningAreaList ::= CHOICE {
cellIDList ECGIList,
trackingAreaListforWarning TAIListforWarning,
@ -2548,6 +2619,24 @@ WarningSecurityInfo ::= OCTET STRING (SIZE (50))
WarningMessageContents ::= OCTET STRING (SIZE(1..9600))
WLANMeasurementConfiguration ::= SEQUENCE {
wlanMeasConfig WLANMeasConfig,
wlanMeasConfigNameList WLANMeasConfigNameList OPTIONAL,
wlan-rssi ENUMERATED {true, ...} OPTIONAL,
wlan-rtt ENUMERATED {true, ...} OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { WLANMeasurementConfiguration-ExtIEs } } OPTIONAL,
...
}
WLANMeasurementConfiguration-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
...
}
WLANMeasConfigNameList ::= SEQUENCE (SIZE(1..maxnoofWLANName)) OF WLANName
WLANMeasConfig::= ENUMERATED {setup,...}
WLANName ::= OCTET STRING (SIZE (1..32))
-- X

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@ -177,7 +177,10 @@ IMPORTS
EndIndication,
EDT-Session,
LTE-M-Indication,
AerialUEsubscriptionInformation
AerialUEsubscriptionInformation,
PendingDataIndication,
WarningAreaCoordinates,
Subscription-Based-UE-DifferentiationInfo
@ -425,7 +428,10 @@ FROM S1AP-Containers
id-UECapabilityInfoRequest,
id-EndIndication,
id-EDT-Session,
id-LTE-M-Indication
id-LTE-M-Indication,
id-PendingDataIndication,
id-WarningAreaCoordinates,
id-Subscription-Based-UE-DifferentiationInfo
@ -591,7 +597,9 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
...
}
@ -812,7 +820,9 @@ PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
...
}
@ -1226,7 +1236,9 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional}|
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
{ ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
...
}
@ -1591,7 +1603,9 @@ DownlinkNASTransport-IEs S1AP-PROTOCOL-IES ::= {
{ ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-UECapabilityInfoRequest CRITICALITY ignore TYPE UECapabilityInfoRequest PRESENCE optional}|
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional},
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
...
}
@ -2363,7 +2377,8 @@ WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
{ ID id-WarningSecurityInfo CRITICALITY ignore TYPE WarningSecurityInfo PRESENCE optional }|
{ ID id-DataCodingScheme CRITICALITY ignore TYPE DataCodingScheme PRESENCE optional }|
{ ID id-WarningMessageContents CRITICALITY ignore TYPE WarningMessageContents PRESENCE optional }|
{ ID id-ConcurrentWarningMessageIndicator CRITICALITY reject TYPE ConcurrentWarningMessageIndicator PRESENCE optional },
{ ID id-ConcurrentWarningMessageIndicator CRITICALITY reject TYPE ConcurrentWarningMessageIndicator PRESENCE optional }|
{ ID id-WarningAreaCoordinates CRITICALITY ignore TYPE WarningAreaCoordinates PRESENCE optional },
...
}
-- **************************************************************
@ -2933,7 +2948,8 @@ UEContextResumeResponseIEs S1AP-PROTOCOL-IES ::= {
{ ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}|
{ ID id-E-RABFailedToResumeListResumeRes CRITICALITY reject TYPE E-RABFailedToResumeListResumeRes PRESENCE optional}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
{ ID id-SecurityContext CRITICALITY reject TYPE SecurityContext PRESENCE optional},
{ ID id-SecurityContext CRITICALITY reject TYPE SecurityContext PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional},
...
}
@ -2992,7 +3008,8 @@ ConnectionEstablishmentIndicationIEs S1AP-PROTOCOL-IES ::= {
{ ID id-EnhancedCoverageRestricted CRITICALITY ignore TYPE EnhancedCoverageRestricted PRESENCE optional }|
{ ID id-DL-CP-SecurityInformation CRITICALITY ignore TYPE DL-CP-SecurityInformation PRESENCE optional }|
{ ID id-CE-ModeBRestricted CRITICALITY ignore TYPE CE-ModeBRestricted PRESENCE optional}|
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional},
{ ID id-EndIndication CRITICALITY ignore TYPE EndIndication PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
...
}
@ -3027,7 +3044,8 @@ UEInformationTransfer ::= SEQUENCE {
UEInformationTransferIEs S1AP-PROTOCOL-IES ::= {
{ ID id-S-TMSI CRITICALITY reject TYPE S-TMSI PRESENCE mandatory}|
{ ID id-UE-Level-QoS-Parameters CRITICALITY ignore TYPE E-RABLevelQoSParameters PRESENCE optional}|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional},
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
...
}
@ -3085,7 +3103,7 @@ SecondaryRATDataUsageReport ::= SEQUENCE {
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-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE optional}|
{ ID id-SecondaryRATDataUsageReportList CRITICALITY ignore TYPE SecondaryRATDataUsageReportList PRESENCE mandatory}|
{ ID id-HandoverFlag CRITICALITY ignore TYPE HandoverFlag PRESENCE optional},
...
}

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.2.0 (2018-06)
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 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.2.0 (2018-03)
* References: 3GPP TS 36.413 V15.3.0 (2018-09)
*/
#include "config.h"

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

@ -1195,6 +1195,31 @@ M-TMSI TYPE = FT_UINT32 DISPLAY = BASE_DEC_HEX
#.TYPE_ATTR
Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Packet_LossRate_fmt)
#.TYPE_ATTR
BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE
#.FN_BODY BluetoothName VAL_PTR = &parameter_tvb HF_INDEX = -1
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, -1, ENC_UTF_8|ENC_NA);
#.END
#.TYPE_ATTR
WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE
#.FN_BODY WLANName VAL_PTR = &parameter_tvb HF_INDEX = -1
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, -1, ENC_UTF_8|ENC_NA);
#.END
#.TYPE_ATTR
Subscription-Based-UE-DifferentiationInfo/periodicTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
ScheduledCommunicationTime/timeofDayStart DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.ASSIGN_VALUE_TO_TYPE # S1AP does not have constants assigned to types, they are pure INTEGER
# ProcedureCode
@ -1505,7 +1530,7 @@ id-extended-e-RAB-GuaranteedBitrateDL ProtocolIE-ID
id-extended-e-RAB-GuaranteedBitrateUL ProtocolIE-ID
id-extended-uEaggregateMaximumBitRateDL ProtocolIE-ID
id-extended-uEaggregateMaximumBitRateUL ProtocolIE-ID
id-NRrestriction ProtocolIE-ID
id-NRrestrictioninEPSasSecondaryRAT ProtocolIE-ID
id-UEAppLayerMeasConfig ProtocolIE-ID
id-UE-Application-Layer-Measurement-Capability ProtocolIE-ID
id-SecondaryRATDataUsageReportList ProtocolIE-ID
@ -1522,9 +1547,15 @@ id-UplinkPacketLossRate ProtocolIE-ID
id-UECapabilityInfoRequest ProtocolIE-ID
id-serviceType ProtocolIE-ID
id-AerialUEsubscriptionInformation ProtocolIE-ID
id-Subscription-Based-UE-DifferentiationInfo ProtocolIE-ID
id-EndIndication ProtocolIE-ID
id-EDT-Session ProtocolIE-ID
id-CNTypeRestrictions ProtocolIE-ID
id-PendingDataIndication ProtocolIE-ID
id-BluetoothMeasurementConfiguration ProtocolIE-ID
id-WLANMeasurementConfiguration ProtocolIE-ID
id-WarningAreaCoordinates ProtocolIE-ID
id-NRrestrictionin5GS ProtocolIE-ID
#.END
@ -1745,6 +1776,9 @@ UECapabilityInfoRequest N s1ap.ies id-UECapabilityInfoRe
EndIndication N s1ap.ies id-EndIndication
EDT-Session N s1ap.ies id-EDT-Session
LTE-M-Indication N s1ap.ies id-LTE-M-Indication
Subscription-Based-UE-DifferentiationInfo N s1ap.ies id-Subscription-Based-UE-DifferentiationInfo
PendingDataIndication N s1ap.ies id-PendingDataIndication
WarningAreaCoordinates N s1ap.ies id-WarningAreaCoordinates
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@ -1790,7 +1824,7 @@ ExtendedBitRate N s1ap.extension id-extended-e-RAB-Maxim
ExtendedBitRate N s1ap.extension id-extended-e-RAB-MaximumBitrateUL
ExtendedBitRate N s1ap.extension id-extended-e-RAB-GuaranteedBitrateDL
ExtendedBitRate N s1ap.extension id-extended-e-RAB-GuaranteedBitrateUL
NRrestriction N s1ap.extension id-NRrestriction
NRrestrictioninEPSasSecondaryRAT N s1ap.extension id-NRrestrictioninEPSasSecondaryRAT
UEAppLayerMeasConfig N s1ap.extension id-UEAppLayerMeasConfig
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateDL
ExtendedBitRate N s1ap.extension id-extended-uEaggregateMaximumBitRateUL
@ -1799,6 +1833,10 @@ CNTypeRestrictions N s1ap.extension id-CNTypeRestrictions
Packet-LossRate N s1ap.extension id-DownlinkPacketLossRate
Packet-LossRate N s1ap.extension id-UplinkPacketLossRate
ServiceType N s1ap.extension id-serviceType
CNTypeRestrictions N s1ap.extension id-CNTypeRestrictions
BluetoothMeasurementConfiguration N s1ap.extension id-BluetoothMeasurementConfiguration
WLANMeasurementConfiguration N s1ap.extension id-WLANMeasurementConfiguration
NRrestrictionin5GS N s1ap.extension id-NRrestrictionin5GS
#S1AP-ELEMENTARY-PROCEDURE
HandoverRequired N s1ap.proc.imsg id-HandoverPreparation

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

File diff suppressed because it is too large Load Diff