SBc-AP:Update to 3GPP TS 29.168 V15.1.0 (2018-09).

Change-Id: Ie1418deda58046e48419be252a41c4e1cf9593b8
Reviewed-on: https://code.wireshark.org/review/33144
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

epan/dissectors/asn1/sbc-ap/SBC-AP-CommonDataTypes.asn

@@ -1,6 +1,6 @@
 -- SBC-AP-CommonDataTypes.asn
 --
--- Taken from 3GPP TS 29.168 V14.2.0 (2017-12)
+-- Taken from 3GPP TS 29.168 V15.1.0 (2018-09)
 -- http://www.3gpp.org/ftp/Specs/archive/29_series/29.168/29168-930.zip
 --
 -- 4.4.6	Common Definitions
@@ -20,16 +20,16 @@ DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
-Criticality		::= ENUMERATED { reject, ignore, notify }
+Criticality	::= ENUMERATED { reject, ignore, notify }
 
-Presence		::= ENUMERATED { optional, conditional, mandatory }
+Presence	::= ENUMERATED { optional, conditional, mandatory }
 
-ProcedureCode		::= INTEGER (0..255)
+ProcedureCode	::= INTEGER (0..255)
 
 ProtocolExtensionID	::= INTEGER (0..65535)
 
-ProtocolIE-ID		::= INTEGER (0..65535)
+ProtocolIE-ID	::= INTEGER (0..65535)
 
-TriggeringMessage		::= ENUMERATED {initiating-message, successful-outcome, unsuccessful-outcome, outcome}
+TriggeringMessage	::= ENUMERATED {initiating-message, successful-outcome, unsuccessful-outcome, outcome}
 
 END

epan/dissectors/asn1/sbc-ap/SBC-AP-Constants.asn

@@ -1,6 +1,6 @@
 -- SBC-AP-Constants.asn
 --
--- Taken from 3GPP TS 29.168 V14.2.0 (2017-12)
+-- Taken from 3GPP TS 29.168 V15.1.0 (2018-09)
 -- http://www.3gpp.org/ftp/Specs/archive/29_series/29.168/29168-930.zip
 --
 -- 4.4.7	Constant Definitions
@@ -25,13 +25,13 @@ BEGIN
 --
 -- **************************************************************
 
-id-Write-Replace-Warning 			INTEGER ::= 0 
+id-Write-Replace-Warning 	INTEGER ::= 0 
-id-Stop-Warning 					INTEGER ::= 1 
+id-Stop-Warning 		INTEGER ::= 1 
-id-Error-Indication 				INTEGER ::= 2
+id-Error-Indication 	INTEGER ::= 2
 id-Write-Replace-Warning-Indication	INTEGER ::= 3
-id-Stop-Warning-Indication			INTEGER ::= 4
+id-Stop-Warning-Indication	INTEGER ::= 4
-id-PWS-Restart-Indication			INTEGER ::= 5 
+id-PWS-Restart-Indication	INTEGER ::= 5 
-id-PWS-Failure-Indication			INTEGER ::= 6
+id-PWS-Failure-Indication	INTEGER ::= 6
 
 -- **************************************************************
 --
@@ -39,40 +39,54 @@ id-PWS-Failure-Indication			INTEGER ::= 6
 --
 -- **************************************************************
 
-id-Broadcast-Message-Content		INTEGER ::= 0
+id-Broadcast-Message-Content	INTEGER ::= 0
-id-Cause 				INTEGER ::= 1
+id-Cause 	INTEGER ::= 1
 id-Criticality-Diagnostics	INTEGER ::=2
-id-Data-Coding-Scheme 			INTEGER ::= 3
+id-Data-Coding-Scheme 	INTEGER ::= 3
-id-Failure-List 			INTEGER ::= 4
+id-Failure-List 	INTEGER ::= 4
-id-Message-Identifier 			INTEGER ::= 5
+id-Message-Identifier 	INTEGER ::= 5
 id-Number-of-Broadcasts-Completed-List 	INTEGER ::= 6
-id-Number-of-Broadcasts-Requested 		INTEGER ::= 7
+id-Number-of-Broadcasts-Requested 	INTEGER ::= 7
-id-Radio-Resource-Loading-List 		INTEGER ::= 8
+id-Radio-Resource-Loading-List 	INTEGER ::= 8
-id-Recovery-Indication 			INTEGER ::= 9
+id-Recovery-Indication 	INTEGER ::= 9
-id-Repetition-Period 			INTEGER ::= 10
+id-Repetition-Period 	INTEGER ::= 10
-id-Serial-Number 			INTEGER ::= 11
+id-Serial-Number 	INTEGER ::= 11
-id-Service-Areas-List 			INTEGER ::= 12
+id-Service-Areas-List 	INTEGER ::= 12
-id-TypeOfError					INTEGER ::= 13
+id-TypeOfError		INTEGER ::= 13
-id-List-of-TAIs					INTEGER ::= 14
+id-List-of-TAIs		INTEGER ::= 14
-id-Warning-Area-List 			INTEGER ::= 15
+id-Warning-Area-List 	INTEGER ::= 15
-id-Warning-Message-Content		INTEGER ::= 16
+id-Warning-Message-Content	INTEGER ::= 16
 id-Warning-Security-Information	INTEGER ::= 17
-id-Warning-Type					INTEGER ::= 18 
+id-Warning-Type		INTEGER ::= 18 
-id-Omc-Id 						INTEGER ::= 19 
+id-Omc-Id 		INTEGER ::= 19 
 id-Concurrent-Warning-Message-Indicator INTEGER ::= 20 
 id-Extended-Repetition-Period	INTEGER ::= 21
 id-Unknown-Tracking-Area-List	INTEGER ::= 22 
 id-Broadcast-Scheduled-Area-List	INTEGER ::= 23
 id-Send-Write-Replace-Warning-Indication INTEGER ::= 24
-id-Broadcast-Cancelled-Area-List		INTEGER ::= 25
+id-Broadcast-Cancelled-Area-List	INTEGER ::= 25
-id-Send-Stop-Warning-Indication		INTEGER ::= 26
+id-Send-Stop-Warning-Indication	INTEGER ::= 26
-id-Stop-All-Indicator			INTEGER ::= 27 
+id-Stop-All-Indicator	INTEGER ::= 27 
-id-Global-ENB-ID					INTEGER ::= 28
+id-Global-ENB-ID		INTEGER ::= 28
-id-Broadcast-Empty-Area-List		INTEGER ::= 29
+id-Broadcast-Empty-Area-List	INTEGER ::= 29
-id-Restarted-Cell-List			INTEGER ::= 30
+id-Restarted-Cell-List	INTEGER ::= 30
-id-List-of-TAIs-Restart			INTEGER ::= 31
+id-List-of-TAIs-Restart	INTEGER ::= 31
-id-List-of-EAIs-Restart			INTEGER ::= 32 
+id-List-of-EAIs-Restart	INTEGER ::= 32 
-id-Failed-Cell-List				INTEGER ::= 33
+id-Failed-Cell-List	INTEGER ::= 33
+id-List-of-5GS-TAIs	INTEGER ::= 34
+id-Warning-Area-List-5GS	INTEGER ::= 35
+id-Global-RAN-Node-ID	INTEGER ::= 36
+id-Global-GNB-ID	INTEGER ::= 37
+id-RAT-Selector-5GS		INTEGER ::= 38
+id-Unknown-5GS-Tracking-Area-List	INTEGER ::= 39
+id-Broadcast-Scheduled-Area-List-5GS	INTEGER ::= 40
+id-Broadcast-Cancelled-Area-List-5GS	INTEGER ::= 41
+id-Broadcast-Empty-Area-List-5GS	INTEGER ::= 42
+id-Restarted-Cell-List-NR	INTEGER ::= 43
+id-Failed-Cell-List-NR	INTEGER ::= 44
+id-List-of-5GS-TAI-for-Restart	INTEGER ::= 45
+id-Warning-Area-Coordinates	INTEGER ::= 46
+
 
 
 -- **************************************************************
@@ -87,20 +101,27 @@ id-Failed-Cell-List				INTEGER ::= 33
 --
 -- **************************************************************
 
-maxNrOfErrors				INTEGER ::= 256 
+maxNrOfErrors	INTEGER ::= 256 
-maxnoofCellID				INTEGER	::= 65535 
+maxnoofCellID	INTEGER	::= 65535 
-maxnoofCellinEAI			INTEGER ::= 65535
+maxnoofCellinEAI	INTEGER ::= 65535
-maxnoofCellinTAI			INTEGER ::= 65535
+maxnoofCellinTAI	INTEGER ::= 65535
-maxNrOfTAIs					INTEGER ::= 65535
+maxNrOfTAIs		INTEGER ::= 65535
-maxnoofEmergencyAreaID		INTEGER	::= 65535
+maxnoofEmergencyAreaID	INTEGER	::= 65535
-maxnoofTAIforWarning		INTEGER ::= 65535
+maxnoofTAIforWarning	INTEGER ::= 65535
+
+maxProtocolExtensions 	INTEGER ::= 65535
+maxProtocolIEs	INTEGER ::= 65535 
+maxnoofeNBIds	INTEGER ::= 256
+maxnoofRestartedCells	INTEGER ::= 256
+maxnoofRestartTAIs	INTEGER ::= 2048
+maxnoofRestartEAIs	INTEGER ::= 256 
+maxnoofFailedCells	INTEGER ::= 256
+maxnoof5GSTAIs	INTEGER ::= 2048
+maxnoofCellsingNB	INTEGER ::= 16384
+maxnoofCellsin5GS	INTEGER ::= 16776960
+maxnoofCellsin5GSTAI	INTEGER ::= 65535
+maxnoofRANNodes	INTEGER ::= 65535
+maxnoofRestart5GSTAIs	INTEGER ::= 2048maxnoofCellsforRestartNR 	INTEGER ::= 16384
 
-maxProtocolExtensions 			INTEGER ::= 65535
-maxProtocolIEs				INTEGER ::= 65535 
-maxnoofeNBIds				INTEGER ::= 256
-maxnoofRestartedCells		INTEGER ::= 256
-maxnoofRestartTAIs			INTEGER ::= 2048
-maxnoofRestartEAIs			INTEGER ::= 256 
-maxnoofFailedCells			INTEGER ::= 256
 
 END

epan/dissectors/asn1/sbc-ap/SBC-AP-Containers.asn

@@ -1,6 +1,6 @@
 -- SBC-AP-Containers.asn
 --
--- Taken from 3GPP TS 29.168 V14.2.0 (2017-12)
+-- Taken from 3GPP TS 29.168 V15.1.0 (2018-09)
 -- http://www.3gpp.org/ftp/Specs/archive/29_series/29.168/29168-930.zip
 --
 -- 4.4.8	Container Definitions
@@ -44,16 +44,16 @@ FROM SBC-AP-Constants;
 -- **************************************************************
 
 SBC-AP-PROTOCOL-IES ::= CLASS {
-	&id				ProtocolIE-ID 		UNIQUE,
+	&id	ProtocolIE-ID 	UNIQUE,
-	&criticality			Criticality		DEFAULT ignore,
+	&criticality	Criticality	DEFAULT ignore,
 	&Value,
-	&presence			Presence
+	&presence	Presence
 }
 WITH SYNTAX {
-	ID				&id
+	ID	&id
-	CRITICALITY			&criticality
+	CRITICALITY	&criticality
-	TYPE				&Value
+	TYPE	&Value
-	PRESENCE			&presence
+	PRESENCE	&presence
 }
 
 -- **************************************************************
@@ -63,16 +63,16 @@ WITH SYNTAX {
 -- **************************************************************
 
 SBC-AP-PROTOCOL-EXTENSION ::= CLASS {
-	&id				ProtocolExtensionID 	UNIQUE,
+	&id	ProtocolExtensionID 	UNIQUE,
-	&criticality			Criticality		DEFAULT ignore,
+	&criticality	Criticality	DEFAULT ignore,
 	&Extension,
-	&presence		Presence
+	&presence	Presence
 }
 WITH SYNTAX {
-	ID				&id
+	ID	&id
-	CRITICALITY			&criticality
+	CRITICALITY	&criticality
-	EXTENSION			&Extension
+	EXTENSION	&Extension
-	PRESENCE			&presence
+	PRESENCE	&presence
 }
 
 -- **************************************************************
@@ -86,9 +86,9 @@ ProtocolIE-Container {SBC-AP-PROTOCOL-IES : IEsSetParam} ::=
 	ProtocolIE-Field {{IEsSetParam}}
 
 ProtocolIE-Field {SBC-AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
-	id				SBC-AP-PROTOCOL-IES.&id				({IEsSetParam}),
+	id	SBC-AP-PROTOCOL-IES.&id	({IEsSetParam}),
-	criticality			SBC-AP-PROTOCOL-IES.&criticality			({IEsSetParam}{@id}),
+	criticality	SBC-AP-PROTOCOL-IES.&criticality	({IEsSetParam}{@id}),
-	value				SBC-AP-PROTOCOL-IES.&Value	        	({IEsSetParam}{@id})
+	value	SBC-AP-PROTOCOL-IES.&Value	        	({IEsSetParam}{@id})
 }
 
 -- **************************************************************
@@ -112,9 +112,9 @@ ProtocolExtensionContainer {SBC-AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
 	ProtocolExtensionField {{ExtensionSetParam}}
 
 ProtocolExtensionField {SBC-AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENCE {
-	id				SBC-AP-PROTOCOL-EXTENSION.&id			({ExtensionSetParam}),
+	id	SBC-AP-PROTOCOL-EXTENSION.&id	({ExtensionSetParam}),
-	criticality			SBC-AP-PROTOCOL-EXTENSION.&criticality		({ExtensionSetParam}{@id}),
+	criticality	SBC-AP-PROTOCOL-EXTENSION.&criticality	({ExtensionSetParam}{@id}),
-	extensionValue			SBC-AP-PROTOCOL-EXTENSION.&Extension		({ExtensionSetParam}{@id})
+	extensionValue	SBC-AP-PROTOCOL-EXTENSION.&Extension	({ExtensionSetParam}{@id})
 }
 
 

epan/dissectors/asn1/sbc-ap/SBC-AP-IEs.asn

@@ -1,6 +1,6 @@
 -- SBC-AP-IEs.asn
 --
--- Taken from 3GPP TS 29.168 V14.2.0 (2017-12)
+-- Taken from 3GPP TS 29.168 V15.1.0 (2018-09)
 -- http://www.3gpp.org/ftp/Specs/archive/29_series/29.168/29168-930.zip
 --
 -- 4.4.5	Information Element Definitions
@@ -34,7 +34,14 @@ IMPORTS
 	maxnoofRestartTAIs,
 	maxnoofRestartEAIs,
 	maxnoofRestartedCells,
-	maxnoofFailedCells
+	maxnoofFailedCells,
+	maxnoof5GSTAIs,
+	maxnoofCellsingNB,
+	maxnoofCellsin5GS,
+	maxnoofCellsforRestartNR,
+	maxnoofRANNodes,
+	maxnoofRestart5GSTAIs,
+	maxnoofCellsin5GSTAI
 
 FROM SBC-AP-Constants
 
@@ -58,7 +65,7 @@ Broadcast-Scheduled-Area-List ::= SEQUENCE {
 	cellId-Broadcast-List           CellId-Broadcast-List           OPTIONAL,
     tAI-Broadcast-List              TAI-Broadcast-List              OPTIONAL,
     emergencyAreaID-Broadcast-List  EmergencyAreaID-Broadcast-List  OPTIONAL,
-	iE-Extensions			   ProtocolExtensionContainer {{Broadcast-Scheduled-Area-List-ExtIEs}} OPTIONAL,
+	iE-Extensions	   ProtocolExtensionContainer {{Broadcast-Scheduled-Area-List-ExtIEs}} OPTIONAL,
     ...
 }
 
@@ -66,11 +73,23 @@ Broadcast-Scheduled-Area-List-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Broadcast-Scheduled-Area-List-5GS ::= SEQUENCE {
+	cellId-Broadcast-List-5GS       CellId-Broadcast-List-5GS       OPTIONAL,
+    tAI-Broadcast-List-5GS          TAI-Broadcast-List-5GS          OPTIONAL,
+    emergencyAreaID-Broadcast-List  EmergencyAreaID-Broadcast-List  OPTIONAL,
+	iE-Extensions	   ProtocolExtensionContainer {{Broadcast-Scheduled-Area-List-5GS-ExtIEs}} OPTIONAL,
+    ...
+}
+
+Broadcast-Scheduled-Area-List-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Broadcast-Cancelled-Area-List ::= SEQUENCE {
-	cellID-Cancelled-List			CellID-Cancelled-List			OPTIONAL,
+	cellID-Cancelled-List	CellID-Cancelled-List	OPTIONAL,
-	tAI-Cancelled-List				TAI-Cancelled-List				OPTIONAL,
+	tAI-Cancelled-List	TAI-Cancelled-List	OPTIONAL,
 	emergencyAreaID-Cancelled-List	EmergencyAreaID-Cancelled-List	OPTIONAL,
-	iE-Extensions		ProtocolExtensionContainer {{Broadcast-Cancelled-Area-List-ExtIEs}} OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer {{Broadcast-Cancelled-Area-List-ExtIEs}} OPTIONAL,
 	...
 }
 
@@ -78,17 +97,32 @@ Broadcast-Cancelled-Area-List-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Broadcast-Cancelled-Area-List-5GS ::= SEQUENCE {
+	cellID-Cancelled-List-5GS	CellID-Cancelled-List-5GS	OPTIONAL,
+	tAI-Cancelled-List-5GS	TAI-Cancelled-List-5GS	OPTIONAL,
+	emergencyAreaID-Cancelled-List	EmergencyAreaID-Cancelled-List	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer {{Broadcast-Cancelled-Area-List-5GS-ExtIEs}} OPTIONAL,
+	...
+}
+
+Broadcast-Cancelled-Area-List-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 Broadcast-Empty-Area-List	::= SEQUENCE (SIZE (1.. maxnoofeNBIds)) OF Global-ENB-ID
 
+Broadcast-Empty-Area-List-5GS	::= SEQUENCE (SIZE (1.. maxnoofRANNodes)) OF Global-RAN-Node-ID
+
 
 -- C
 
 CancelledCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CancelledCellinEAI-Item
 
 CancelledCellinEAI-Item ::= SEQUENCE {
-	eCGI					EUTRAN-CGI,
+	eCGI		EUTRAN-CGI,
-	numberOfBroadcasts		NumberOfBroadcasts,
+	numberOfBroadcasts	NumberOfBroadcasts,
-	iE-Extensions			ProtocolExtensionContainer { {CancelledCellinEAI-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {CancelledCellinEAI-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -98,9 +132,9 @@ CancelledCellinEAI-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 CancelledCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF CancelledCellinTAI-Item
 
 CancelledCellinTAI-Item ::= SEQUENCE{
-	eCGI				EUTRAN-CGI,
+	eCGI	EUTRAN-CGI,
 	numberOfBroadcasts	NumberOfBroadcasts,
-	iE-Extensions		ProtocolExtensionContainer { {CancelledCellinTAI-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {CancelledCellinTAI-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -108,33 +142,45 @@ CancelledCellinTAI-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-Cause 					::= INTEGER {
+CancelledCellinTAI-5GS ::= SEQUENCE (SIZE(1..maxnoofCellsin5GSTAI)) OF
-	message-accepted									(0),
+	SEQUENCE{
-	parameter-not-recognised							(1),
+	nR-CGI	NR-CGI,
-	parameter-value-invalid								(2),
+	numberOfBroadcasts	NumberOfBroadcasts,
-	valid-message-not-identified 						(3),
+	iE-Extensions	ProtocolExtensionContainer { {CancelledCellinTAI-5GS-ExtIEs} } OPTIONAL,
-	tracking-area-not-valid			 					(4),
+	...
-	unrecognised-message 								(5),
+}
-	missing-mandatory-element 							(6),
+
-	mME-capacity-exceeded 								(7),
+CancelledCellinTAI-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
-	mME-memory-exceeded 								(8),
+	...
-	warning-broadcast-not-supported		 				(9),
+}
-	warning-broadcast-not-operational 					(10),
+
-	message-reference-already-used 						(11),
+Cause 		::= INTEGER {
-	unspecifed-error 									(12),
+	message-accepted			(0),
-	transfer-syntax-error								(13),
+	parameter-not-recognised		(1),
-	semantic-error										(14),
+	parameter-value-invalid		(2),
-	message-not-compatible-with-receiver-state			(15),
+	valid-message-not-identified 		(3),
-	abstract-syntax-error-reject						(16),
+	tracking-area-not-valid	 		(4),
-	abstract-syntax-error-ignore-and-notify				(17),
+	unrecognised-message 		(5),
+	missing-mandatory-element 		(6),
+	mME-capacity-exceeded 		(7),
+	mME-memory-exceeded 		(8),
+	warning-broadcast-not-supported	 	(9),
+	warning-broadcast-not-operational 		(10),
+	message-reference-already-used 		(11),
+	unspecifed-error 			(12),
+	transfer-syntax-error		(13),
+	semantic-error			(14),
+	message-not-compatible-with-receiver-state	(15),
+	abstract-syntax-error-reject		(16),
+	abstract-syntax-error-ignore-and-notify	(17),
 	abstract-syntax-error-falsely-constructed-message	(18)
 } (0..255)
 
 CellId-Broadcast-List ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellId-Broadcast-List-Item
 
 CellId-Broadcast-List-Item ::= SEQUENCE {
-	eCGI				EUTRAN-CGI,
+	eCGI	EUTRAN-CGI,
-	iE-Extensions		ProtocolExtensionContainer { {CellId-Broadcast-List-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {CellId-Broadcast-List-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -142,12 +188,23 @@ CellId-Broadcast-List-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+CellId-Broadcast-List-5GS ::= SEQUENCE (SIZE(1..maxnoofCellsin5GS)) OF 
+	SEQUENCE {
+	nR-CGI	NR-CGI,
+	iE-Extensions	ProtocolExtensionContainer { {CellId-Broadcast-List-5GS-ExtIEs} } OPTIONAL,
+	...
+}
+
+CellId-Broadcast-List-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 CellID-Cancelled-List ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Cancelled-Item
 
 CellID-Cancelled-Item ::= SEQUENCE {
-	eCGI				EUTRAN-CGI,
+	eCGI	EUTRAN-CGI,
 	numberOfBroadcasts	NumberOfBroadcasts,
-	iE-Extensions		ProtocolExtensionContainer { {CellID-Cancelled-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {CellID-Cancelled-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -155,16 +212,30 @@ CellID-Cancelled-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-CellIdentity			::= BIT STRING (SIZE (28))
+CellID-Cancelled-List-5GS ::= SEQUENCE (SIZE(1..maxnoofCellsin5GS)) OF 
+	SEQUENCE {
+	nR-CGI	NR-CGI,
+	numberOfBroadcasts	NumberOfBroadcasts,
+	iE-Extensions	ProtocolExtensionContainer { {CellID-Cancelled-5GS-ExtIEs} } OPTIONAL,
+	...
+}
+
+CellID-Cancelled-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+
+CellIdentity	::= BIT STRING (SIZE (28))
 
 Concurrent-Warning-Message-Indicator ::= ENUMERATED {true}
 
-Criticality-Diagnostics			::= SEQUENCE {
+Criticality-Diagnostics	::= SEQUENCE {
-	procedureCode			ProcedureCode			OPTIONAL,
+	procedureCode	ProcedureCode	OPTIONAL,
-	triggeringMessage		TriggeringMessage		OPTIONAL,
+	triggeringMessage	TriggeringMessage	OPTIONAL,
-	procedureCriticality		Criticality			OPTIONAL,
+	procedureCriticality	Criticality	OPTIONAL,
-	iE-CriticalityDiagnostics		CriticalityDiagnostics-IE-List 	OPTIONAL,
+	iE-CriticalityDiagnostics	CriticalityDiagnostics-IE-List 	OPTIONAL,
-	iE-Extensions			ProtocolExtensionContainer { {CriticalityDiagnostics-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {CriticalityDiagnostics-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -174,10 +245,10 @@ CriticalityDiagnostics-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 
 CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
 	SEQUENCE {
-		iECriticality		Criticality,
+	iECriticality	Criticality,
-		iE-ID				ProtocolIE-ID,
+	iE-ID	ProtocolIE-ID,
-		typeOfError 			TypeOfError,
+	typeOfError 	TypeOfError,
-		iE-Extensions			ProtocolExtensionContainer {{CriticalityDiagnostics-IE-Item-ExtIEs}} OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer {{CriticalityDiagnostics-IE-Item-ExtIEs}} OPTIONAL,
 	...
 }
 
@@ -189,22 +260,22 @@ CriticalityDiagnostics-IE-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 
 -- D
 
-Data-Coding-Scheme			::= BIT STRING (SIZE (8))
+Data-Coding-Scheme	::= BIT STRING (SIZE (8))
 
 -- E
 
-ECGIList					::= SEQUENCE (SIZE(1..maxnoofCellID)) OF EUTRAN-CGI
+ECGIList		::= SEQUENCE (SIZE(1..maxnoofCellID)) OF EUTRAN-CGI
 
-Emergency-Area-ID-List		::=	SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF Emergency-Area-ID
+Emergency-Area-ID-List	::=	SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF Emergency-Area-ID
 
-Emergency-Area-ID			::=	OCTET STRING (SIZE (3)) 
+Emergency-Area-ID	::=	OCTET STRING (SIZE (3)) 
 
 EmergencyAreaID-Broadcast-List ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID-Broadcast-List-Item
 
 EmergencyAreaID-Broadcast-List-Item ::= SEQUENCE {
-	emergencyAreaID			Emergency-Area-ID,
+	emergencyAreaID	Emergency-Area-ID,
-	scheduledCellinEAI		ScheduledCellinEAI,
+	scheduledCellinEAI	ScheduledCellinEAI,
-	iE-Extensions			ProtocolExtensionContainer { {EmergencyAreaID-Broadcast-List-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {EmergencyAreaID-Broadcast-List-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -215,9 +286,9 @@ EmergencyAreaID-Broadcast-List-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 EmergencyAreaID-Cancelled-List ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID-Cancelled-Item
 
 EmergencyAreaID-Cancelled-Item ::= SEQUENCE {
-	emergencyAreaID			Emergency-Area-ID,
+	emergencyAreaID	Emergency-Area-ID,
-	cancelledCellinEAI		CancelledCellinEAI,
+	cancelledCellinEAI	CancelledCellinEAI,
-	iE-Extensions			ProtocolExtensionContainer { {EmergencyAreaID-Cancelled-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {EmergencyAreaID-Cancelled-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -226,9 +297,9 @@ EmergencyAreaID-Cancelled-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 }
 
 EUTRAN-CGI ::= SEQUENCE {
-	pLMNidentity			PLMNidentity,
+	pLMNidentity	PLMNidentity,
-	cell-ID					CellIdentity,
+	cell-ID		CellIdentity,
-	iE-Extensions			ProtocolExtensionContainer { {EUTRAN-CGI-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {EUTRAN-CGI-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -239,8 +310,8 @@ EUTRAN-CGI-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 Extended-Repetition-Period ::= INTEGER (4096..131071)
 
 ENB-ID ::= CHOICE {
-	macroENB-ID			BIT STRING (SIZE(20)),
+	macroENB-ID	BIT STRING (SIZE(20)),
-	homeENB-ID			BIT STRING (SIZE(28)),
+	homeENB-ID	BIT STRING (SIZE(28)),
 	...,
 	short-macroENB-ID 	BIT STRING (SIZE(18)),
 	long-macroENB-ID	BIT STRING (SIZE(21))
@@ -249,14 +320,16 @@ ENB-ID ::= CHOICE {
 
 -- F
 
-Failed-Cell-List			::= SEQUENCE (SIZE(1..maxnoofFailedCells)) OF EUTRAN-CGI  
+Failed-Cell-List	::= SEQUENCE (SIZE(1..maxnoofFailedCells)) OF EUTRAN-CGI
+
+Failed-Cell-List-NR	::= SEQUENCE (SIZE(1..maxnoofCellsingNB)) OF NR-CGI  
 
 -- G
 
 Global-ENB-ID ::= SEQUENCE {
-	pLMNidentity			PLMNidentity,
+	pLMNidentity	PLMNidentity,
-	eNB-ID					ENB-ID,
+	eNB-ID		ENB-ID,
-	iE-Extensions			ProtocolExtensionContainer { {GlobalENB-ID-ExtIEs} }		OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {GlobalENB-ID-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -264,6 +337,40 @@ GlobalENB-ID-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Global-RAN-Node-ID 	::= CHOICE {
+	global-GNB-ID	Global-GNB-ID,
+	global-NgENB-ID	Global-NgENB-ID,
+	...
+}
+
+Global-GNB-ID 	::= SEQUENCE {
+	pLMNidentity	PLMNidentity,
+	gNB-ID	GNB-ID,
+	iE-Extensions	ProtocolExtensionContainer { {Global-GNB-ID-ExtIEs} } OPTIONAL,
+	...
+}
+
+Global-GNB-ID-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+GNB-ID 	::= CHOICE {
+	gNB-ID	BIT STRING (SIZE(22..32)),
+	...
+}
+Global-NgENB-ID	::= SEQUENCE {
+	pLMNidentity	PLMNidentity,
+	ngENB-ID	ENB-ID,
+	iE-Extensions	ProtocolExtensionContainer { {Global-NgENB-ID-ExtIEs} } OPTIONAL,
+	...
+}
+
+Global-NgENB-ID-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+
 -- H
 
 -- I
@@ -274,19 +381,25 @@ GlobalENB-ID-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 
 -- L
 
-List-of-TAIs			::= SEQUENCE (SIZE (1..maxNrOfTAIs)) OF
+List-of-TAIs	::= SEQUENCE (SIZE (1..maxNrOfTAIs)) OF
 	SEQUENCE {
-	tai					TAI
+	tai		TAI
 }
 
 List-of-TAIs-Restart	::= SEQUENCE (SIZE (1..maxnoofRestartTAIs)) OF
 	SEQUENCE {
-	tai					TAI
+	tai		TAI
 }
 
 
 List-of-EAIs-Restart	::= SEQUENCE (SIZE(1..maxnoofRestartEAIs)) OF Emergency-Area-ID
 
+List-of-5GS-TAIs	::= SEQUENCE (SIZE (1..maxnoof5GSTAIs)) OF TAI-5GS
+
+List-of-5GS-Cells-for-Failure ::= SEQUENCE ( SIZE(1..maxnoofCellsingNB)) OF NR-CGI
+
+List-of-5GS-TAI-for-Restart ::= SEQUENCE (SIZE (1..maxnoofRestart5GSTAIs)) OF TAI-5GS
+
 
 -- M
 
@@ -294,7 +407,7 @@ Message-Identifier ::= BIT STRING (SIZE (16))
 
 -- N
 
-Number-of-Broadcasts-Requested		::= INTEGER (0..65535)
+Number-of-Broadcasts-Requested	::= INTEGER (0..65535)
 
 -- For Number-of-Broadcasts-Requested = 0 and Repetition-Period = 0, then eNB action is no broadcast
 --  for ETWS Secondary and CMAS.
@@ -312,18 +425,40 @@ Number-of-Broadcasts-Requested		::= INTEGER (0..65535)
 
 NumberOfBroadcasts ::= INTEGER (0..65535)
 
+NR-CGIList ::= SEQUENCE (SIZE(1..maxnoofCellsingNB)) OF NR-CGI
+
+NR-CGI ::= SEQUENCE {
+	pLMNidentity	PLMNidentity,
+	nRCellIdentity	NRCellIdentity,
+	iE-Extensions	ProtocolExtensionContainer { {NR-CGI-ExtIEs} } OPTIONAL,
+	...
+}
+
+NR-CGI-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NRCellIdentity 	::= BIT STRING (SIZE(36))
+
+NgENB-ID 	::= CHOICE {
+	macroNgENB-ID	BIT STRING (SIZE(20)),
+	shortMacroNgENB-ID 	BIT STRING (SIZE(18)),
+	longMacroNgENB-ID	BIT STRING (SIZE(21)),
+	...
+}
+
 -- O 
-Omc-Id						::=	OCTET STRING (SIZE (1..20))
+Omc-Id		::=	OCTET STRING (SIZE (1..20))
 
 
 -- P
-PLMNidentity 				::= TBCD-STRING 
+PLMNidentity 	::= TBCD-STRING 
 
 -- Q
 
 -- R
 
-Repetition-Period			::= INTEGER (0..4096)
+Repetition-Period	::= INTEGER (0..4096)
 -- 1 to 4096: Each unit represents a repetition of one second to a maximum of
 -- once per 4096 seconds (~1 hour). 
 -- 0: no repetition
@@ -335,15 +470,21 @@ Repetition-Period			::= INTEGER (0..4096)
 -- set to 4096, the MME shall set the Repetition Period IE to the maximum value 4095 supported on   
 -- the S1-MME interface as defined in [7] before forwarding to the selected eNBs. 
 
-Restarted-Cell-List			::= SEQUENCE (SIZE(1.. maxnoofRestartedCells)) OF EUTRAN-CGI  
+Restarted-Cell-List	::= SEQUENCE (SIZE(1.. maxnoofRestartedCells)) OF EUTRAN-CGI
+
+RAT-Selector-5GS ::= ENUMERATED {true}
+
+Restarted-Cell-List-NR ::= SEQUENCE (SIZE(1.. maxnoofCellsforRestartNR)) OF NR-CGI
+
+  
  
 -- S
 
 ScheduledCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF ScheduledCellinEAI-Item
 
 ScheduledCellinEAI-Item ::= SEQUENCE {
-	eCGI					EUTRAN-CGI,
+	eCGI		EUTRAN-CGI,
-	iE-Extensions			ProtocolExtensionContainer { {ScheduledCellinEAI-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {ScheduledCellinEAI-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -354,8 +495,8 @@ ScheduledCellinEAI-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 ScheduledCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF ScheduledCellinTAI-Item
 
 ScheduledCellinTAI-Item ::= SEQUENCE{
-	eCGI				EUTRAN-CGI,
+	eCGI	EUTRAN-CGI,
-	iE-Extensions		ProtocolExtensionContainer { {ScheduledCellinTAI-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {ScheduledCellinTAI-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -363,11 +504,22 @@ ScheduledCellinTAI-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+ScheduledCellinTAI-5GS ::= SEQUENCE (SIZE(1..maxnoofCellsin5GSTAI)) OF 
+	SEQUENCE{
+	nR-CGI	NR-CGI,
+	iE-Extensions	ProtocolExtensionContainer { {ScheduledCellinTAI-5GS-ExtIEs} } OPTIONAL,
+	...
+}
+
+ScheduledCellinTAI-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Send-Write-Replace-Warning-Indication ::= ENUMERATED {true}
 
 Send-Stop-Warning-Indication ::= ENUMERATED {true}
 
-Serial-Number				::= BIT STRING (SIZE (16))
+Serial-Number	::= BIT STRING (SIZE (16))
 
 Stop-All-Indicator ::= ENUMERATED {true}
 
@@ -375,12 +527,14 @@ Stop-All-Indicator ::= ENUMERATED {true}
 
 TAC ::= OCTET STRING (SIZE (2)) 
 
+TAC-5GS ::= OCTET STRING (SIZE (3)) 
+
 TAI-Broadcast-List ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Broadcast-List-Item
 
 TAI-Broadcast-List-Item ::= SEQUENCE {
-	tAI					TAI,
+	tAI		TAI,
 	scheduledCellinTAI	ScheduledCellinTAI,
-	iE-Extensions		ProtocolExtensionContainer { {TAI-Broadcast-List-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {TAI-Broadcast-List-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -388,12 +542,25 @@ TAI-Broadcast-List-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+TAI-Broadcast-List-5GS ::= SEQUENCE (SIZE(1..maxnoof5GSTAIs)) OF 
+	SEQUENCE {
+	tAI-5GS		TAI-5GS,
+	scheduledCellinTAI-5GS	ScheduledCellinTAI-5GS,
+	iE-Extensions	ProtocolExtensionContainer { {TAI-Broadcast-List-5GS-ExtIEs} } OPTIONAL,
+	...
+}
+
+TAI-Broadcast-List-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 TAI-Cancelled-List ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Cancelled-List-Item
 
 TAI-Cancelled-List-Item ::= SEQUENCE {
-	tAI					TAI,
+	tAI		TAI,
 	cancelledCellinTAI	CancelledCellinTAI,
-	iE-Extensions		ProtocolExtensionContainer { {TAI-Cancelled-List-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {TAI-Cancelled-List-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -401,12 +568,24 @@ TAI-Cancelled-List-Item-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+TAI-Cancelled-List-5GS ::= SEQUENCE (SIZE(1..maxnoof5GSTAIs)) OF 
+	SEQUENCE {
+	tAI-5GS		TAI-5GS,
+	cancelledCellinTAI-5GS	CancelledCellinTAI-5GS,
+	iE-Extensions	ProtocolExtensionContainer { {TAI-Cancelled-List-5GS-ExtIEs} } OPTIONAL,
+	...
+}
+
+TAI-Cancelled-List-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 TAI-List-for-Warning	::= SEQUENCE (SIZE(1.. maxnoofTAIforWarning)) OF TAI
 
 TAI ::= SEQUENCE {
-	pLMNidentity			PLMNidentity,
+	pLMNidentity	PLMNidentity,
-	tAC						TAC,
+	tAC		TAC,
-	iE-Extensions			ProtocolExtensionContainer { {TAI-ExtIEs} } OPTIONAL
+	iE-Extensions	ProtocolExtensionContainer { {TAI-ExtIEs} } OPTIONAL
 }
 
 TAI-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
@@ -420,25 +599,49 @@ TypeOfError ::= ENUMERATED {
 	missing,
 	...
 }
+TAI-5GS ::= SEQUENCE {
+	pLMNidentity	PLMNidentity,
+	tAC-5GS		TAC-5GS,
+	iE-Extensions	ProtocolExtensionContainer { {TAI-5GS-ExtIEs} } OPTIONAL
+}
+
+TAI-5GS-ExtIEs SBC-AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
 -- U
--- Ws change, not used?
+
--- Unknown-Tracking-Area-List		::= SEQUENCE (SIZE(1.. maxNrOfTAIs)) OF TAI
+Unknown-Tracking-Area-List	::= SEQUENCE (SIZE(1.. maxNrOfTAIs)) OF TAI
+
+Unknown-5GS-Tracking-Area-List	::= SEQUENCE (SIZE(1.. maxnoof5GSTAIs)) OF TAI-5GS
+
 
 -- V
 
 -- W
 
-Warning-Area-List				::= CHOICE {
+Warning-Area-List	::= CHOICE {
-	cell-ID-List				ECGIList,
+	cell-ID-List	ECGIList,
-	tracking-Area-List-for-Warning					TAI-List-for-Warning,
+	tracking-Area-List-for-Warning		TAI-List-for-Warning,
-	emergency-Area-ID-List		Emergency-Area-ID-List,
+	emergency-Area-ID-List	Emergency-Area-ID-List,
 	...
 }
 
-Warning-Message-Content			::= OCTET STRING (SIZE (1..9600))
+Warning-Message-Content	::= OCTET STRING (SIZE (1..9600)) 
+Warning-Area-Coordinates	::= OCTET STRING (SIZE (1..1024))
 Warning-Security-Information	::= OCTET STRING (SIZE (50)) 
-Warning-Type					::=  OCTET STRING (SIZE (2))
+Warning-Type		::=  OCTET STRING (SIZE (2))
+
+Warning-Area-List-5GS	::= CHOICE {
+	cell-ID-List		ECGIList,
+	nR-CGIList		NR-CGIList,
+	tAIList-5GS		TAI-5GS,
+	emergencyAreaIDList	Emergency-Area-ID-List,
+	...
+}
+
+
 
 -- X
 

epan/dissectors/asn1/sbc-ap/SBC-AP-PDU-Contents.asn

@@ -1,6 +1,6 @@
 -- SBC-AP-PDU-Contents.asn
 --
--- Taken from 3GPP TS 29.168 V14.2.0 (2017-12)
+-- Taken from 3GPP TS 29.168  V15.1.0 (2018-09)
 -- http://www.3gpp.org/ftp/Specs/archive/29_series/29.168/29168-930.zip
 --
 -- 4.4.4	PDU Definitions
@@ -43,6 +43,7 @@ IMPORTS
 	Warning-Type,
 	Warning-Security-Information,
 	Warning-Message-Content,
+	Warning-Area-Coordinates,
 	Send-Write-Replace-Warning-Indication,
 	Broadcast-Scheduled-Area-List,
 	Unknown-Tracking-Area-List,
@@ -54,7 +55,20 @@ IMPORTS
 	Global-ENB-ID,
 	List-of-TAIs-Restart,
 	List-of-EAIs-Restart,
-	Failed-Cell-List
+	Failed-Cell-List,
+	List-of-5GS-TAIs,
+	Warning-Area-List-5GS,
+	Global-RAN-Node-ID,
+	Global-GNB-ID,
+	RAT-Selector-5GS,
+	Unknown-5GS-Tracking-Area-List,
+	Broadcast-Scheduled-Area-List-5GS,
+	Broadcast-Cancelled-Area-List-5GS,
+	Broadcast-Empty-Area-List-5GS,
+	Restarted-Cell-List-NR,
+	Failed-Cell-List-NR,
+	List-of-5GS-TAI-for-Restart
+
 FROM SBC-AP-IEs
 
 	ProtocolExtensionContainer{},
@@ -77,7 +91,8 @@ FROM SBC-AP-Containers
 	id-Repetition-Period, 
 	id-Extended-Repetition-Period,
 	id-Warning-Area-List,
-	id-Warning-Message-Content,
+	id-Warning-Message-Content, 
+	id-Warning-Area-Coordinates,
 	id-Warning-Security-Information,
 	id-Warning-Type, 
 	id-Send-Write-Replace-Warning-Indication,
@@ -91,7 +106,20 @@ FROM SBC-AP-Containers
 	id-Restarted-Cell-List,
 	id-List-of-TAIs-Restart,
 	id-List-of-EAIs-Restart,
-	id-Failed-Cell-List
+	id-Failed-Cell-List,
+	id-List-of-5GS-TAIs,
+	id-Warning-Area-List-5GS,
+	id-Global-RAN-Node-ID,
+	id-Global-GNB-ID,
+	id-RAT-Selector-5GS,
+	id-Unknown-5GS-Tracking-Area-List,
+	id-Broadcast-Scheduled-Area-List-5GS,
+	id-Broadcast-Cancelled-Area-List-5GS,
+	id-Broadcast-Empty-Area-List-5GS,
+	id-Restarted-Cell-List-NR,
+	id-Failed-Cell-List-NR,
+	id-List-of-5GS-TAI-for-Restart
+
 FROM SBC-AP-Constants;
 
 -- **************************************************************
@@ -101,34 +129,39 @@ FROM SBC-AP-Constants;
 -- **************************************************************
 
 Write-Replace-Warning-Request ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container      { {Write-Replace-Warning-Request-IEs} },
+	protocolIEs	ProtocolIE-Container      { {Write-Replace-Warning-Request-IEs} },
-	protocolExtensions		ProtocolExtensionContainer { {Write-Replace-Warning-Request-Extensions} } OPTIONAL,
+	protocolExtensions	ProtocolExtensionContainer { {Write-Replace-Warning-Request-Extensions} } OPTIONAL,
 	...
 }
 
 Write-Replace-Warning-Request-IEs SBC-AP-PROTOCOL-IES ::= {
-	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier		PRESENCE mandatory } |
+	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier	PRESENCE mandatory } |
-	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number		PRESENCE mandatory } |
+	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number	PRESENCE mandatory } |
-	{ ID id-List-of-TAIs		CRITICALITY reject	TYPE List-of-TAIs		PRESENCE optional } |
+	{ ID id-List-of-TAIs	CRITICALITY reject	TYPE List-of-TAIs	PRESENCE optional } |
-	{ ID id-Warning-Area-List	CRITICALITY ignore	TYPE Warning-Area-List		PRESENCE optional } |
+	{ ID id-Warning-Area-List	CRITICALITY ignore	TYPE Warning-Area-List	PRESENCE optional } |
-	{ ID id-Repetition-Period	CRITICALITY reject	TYPE Repetition-Period		PRESENCE mandatory  } |
+	{ ID id-Repetition-Period	CRITICALITY reject	TYPE Repetition-Period	PRESENCE mandatory  } |
-	{ ID id-Extended-Repetition-Period	CRITICALITY reject	TYPE Extended-Repetition-Period		PRESENCE optional  } |
+	{ ID id-Extended-Repetition-Period	CRITICALITY reject	TYPE Extended-Repetition-Period	PRESENCE optional  } |
 
 	{ ID id-Number-of-Broadcasts-Requested
-					CRITICALITY reject	TYPE Number-of-Broadcasts-Requested	PRESENCE mandatory } |
+		CRITICALITY reject	TYPE Number-of-Broadcasts-Requested	PRESENCE mandatory } |
-	{ ID id-Warning-Type		CRITICALITY ignore	TYPE Warning-Type		PRESENCE optional } |
+	{ ID id-Warning-Type	CRITICALITY ignore	TYPE Warning-Type	PRESENCE optional } |
-	{ ID id-Warning-Security-Information		CRITICALITY ignore	TYPE Warning-Security-Information		PRESENCE optional } |
+	{ ID id-Warning-Security-Information	CRITICALITY ignore	TYPE Warning-Security-Information	PRESENCE optional } |
-	{ ID id-Data-Coding-Scheme	CRITICALITY ignore	TYPE Data-Coding-Scheme		PRESENCE optional } |
+	{ ID id-Data-Coding-Scheme	CRITICALITY ignore	TYPE Data-Coding-Scheme	PRESENCE optional } |
 	{ ID id-Warning-Message-Content
-					CRITICALITY ignore	TYPE Warning-Message-Content	PRESENCE optional } |
+		CRITICALITY ignore	TYPE Warning-Message-Content	PRESENCE optional } |
 	{ ID id-Omc-Id  CRITICALITY ignore TYPE Omc-Id PRESENCE optional } |
 	{ ID id-Concurrent-Warning-Message-Indicator  CRITICALITY reject TYPE Concurrent-Warning-Message-Indicator PRESENCE optional }	|
 	{ ID id-Send-Write-Replace-Warning-Indication	CRITICALITY ignore	TYPE Send-Write-Replace-Warning-Indication	PRESENCE optional }	|
 	{ ID id-Global-ENB-ID	CRITICALITY ignore	TYPE Global-ENB-ID	PRESENCE optional },
-	...
+	... ,
+	{ID id-Warning-Area-Coordinates	CRITICALITY ignore TYPE Warning-Area-Coordinates PRESENCE optional}
 }
 
 Write-Replace-Warning-Request-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-List-of-5GS-TAIs	CRITICALITY ignore	EXTENSION List-of-5GS-TAIs	PRESENCE optional }|
+	{ ID id-Warning-Area-List-5GS	CRITICALITY ignore	EXTENSION Warning-Area-List-5GS	PRESENCE optional }|
+	{ ID id-Global-RAN-Node-ID	CRITICALITY ignore	EXTENSION Global-RAN-Node-ID	PRESENCE optional }|
+	{ ID id-RAT-Selector-5GS	CRITICALITY ignore	EXTENSION RAT-Selector-5GS	PRESENCE optional },
 	...
 }
 
@@ -139,21 +172,22 @@ Write-Replace-Warning-Request-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 Write-Replace-Warning-Response ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {Write-Replace-Warning-Response-IEs} },
+	protocolIEs	ProtocolIE-Container       { {Write-Replace-Warning-Response-IEs} },
-	protocolExtensions		ProtocolExtensionContainer { {Write-Replace-Warning-Response-Extensions} } OPTIONAL,
+	protocolExtensions	ProtocolExtensionContainer { {Write-Replace-Warning-Response-Extensions} } OPTIONAL,
 	...
 }
 
 Write-Replace-Warning-Response-IEs SBC-AP-PROTOCOL-IES ::= {
-	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier		PRESENCE mandatory } |
+	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier	PRESENCE mandatory } |
-	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number		PRESENCE mandatory } |
+	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number	PRESENCE mandatory } |
-	{ ID id-Cause				CRITICALITY reject	TYPE Cause					PRESENCE mandatory }	|
+	{ ID id-Cause	CRITICALITY reject	TYPE Cause		PRESENCE mandatory }	|
-	{ ID id-Criticality-Diagnostics		CRITICALITY ignore	TYPE Criticality-Diagnostics	PRESENCE optional } |
+	{ ID id-Criticality-Diagnostics	CRITICALITY ignore	TYPE Criticality-Diagnostics	PRESENCE optional } |
 	{ ID id-Unknown-Tracking-Area-List CRITICALITY ignore	TYPE List-of-TAIs	PRESENCE optional },
 	...
 }
 
 Write-Replace-Warning-Response-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Unknown-5GS-Tracking-Area-List	CRITICALITY ignore	EXTENSION Unknown-5GS-Tracking-Area-List	PRESENCE optional },
 	...
 }
 
@@ -164,23 +198,25 @@ Write-Replace-Warning-Response-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 Stop-Warning-Request ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container      { {Stop-Warning-Request-IEs} },
+	protocolIEs	ProtocolIE-Container      { {Stop-Warning-Request-IEs} },
-	protocolExtensions		ProtocolExtensionContainer { {Stop-Warning-Request-Extensions} } OPTIONAL,
+	protocolExtensions	ProtocolExtensionContainer { {Stop-Warning-Request-Extensions} } OPTIONAL,
 	...
 }
 
 Stop-Warning-Request-IEs SBC-AP-PROTOCOL-IES ::= {
-	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier		PRESENCE mandatory } |
+	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier	PRESENCE mandatory } |
-	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number		PRESENCE mandatory } |
+	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number	PRESENCE mandatory } |
-	{ ID id-List-of-TAIs		CRITICALITY reject	TYPE List-of-TAIs		PRESENCE optional } |
+	{ ID id-List-of-TAIs	CRITICALITY reject	TYPE List-of-TAIs	PRESENCE optional } |
-	{ ID id-Warning-Area-List	CRITICALITY ignore	TYPE Warning-Area-List		PRESENCE optional }|
+	{ ID id-Warning-Area-List	CRITICALITY ignore	TYPE Warning-Area-List	PRESENCE optional }|
 	{ ID id-Omc-Id  CRITICALITY ignore TYPE Omc-Id PRESENCE optional } |
 	{ ID id-Send-Stop-Warning-Indication	CRITICALITY ignore	TYPE Send-Stop-Warning-Indication	PRESENCE optional } |
 	{ ID id-Stop-All-Indicator	CRITICALITY reject 	TYPE Stop-All-Indicator	PRESENCE optional},
-...	
+	...	
 }
 
 Stop-Warning-Request-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-List-of-5GS-TAIs	CRITICALITY ignore	EXTENSION List-of-5GS-TAIs	PRESENCE optional }|
+	{ ID id-Warning-Area-List-5GS	CRITICALITY ignore	EXTENSION Warning-Area-List-5GS	PRESENCE optional } |	{ ID id-RAT-Selector-5GS	CRITICALITY ignore	EXTENSION RAT-Selector-5GS	PRESENCE optional },
 	...
 }
 
@@ -191,21 +227,22 @@ Stop-Warning-Request-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 Stop-Warning-Response ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {Stop-Warning-Response-IEs} },
+	protocolIEs	ProtocolIE-Container       { {Stop-Warning-Response-IEs} },
-	protocolExtensions		ProtocolExtensionContainer { {Stop-Warning-Response-Extensions} } OPTIONAL,
+	protocolExtensions	ProtocolExtensionContainer { {Stop-Warning-Response-Extensions} } OPTIONAL,
 	...
 }
 
 Stop-Warning-Response-IEs SBC-AP-PROTOCOL-IES ::= {
-	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier		PRESENCE mandatory } |
+	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier	PRESENCE mandatory } |
-	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number		PRESENCE mandatory } |
+	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number	PRESENCE mandatory } |
-	{ ID id-Cause				CRITICALITY reject	TYPE Cause					PRESENCE mandatory }	|
+	{ ID id-Cause	CRITICALITY reject	TYPE Cause		PRESENCE mandatory }	|
-	{ ID id-Criticality-Diagnostics		CRITICALITY ignore	TYPE Criticality-Diagnostics	PRESENCE optional } |
+	{ ID id-Criticality-Diagnostics	CRITICALITY ignore	TYPE Criticality-Diagnostics	PRESENCE optional } |
 	{ ID id-Unknown-Tracking-Area-List CRITICALITY ignore	TYPE List-of-TAIs	PRESENCE optional },
 	...
 }
 
 Stop-Warning-Response-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Unknown-5GS-Tracking-Area-List	CRITICALITY ignore	EXTENSION Unknown-5GS-Tracking-Area-List	PRESENCE optional },
 	...
 }
 
@@ -216,19 +253,21 @@ Stop-Warning-Response-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 Write-Replace-Warning-Indication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {Write-Replace-Warning-Indication-IEs} },
+	protocolIEs	ProtocolIE-Container       { {Write-Replace-Warning-Indication-IEs} },
-	protocolExtensions		ProtocolExtensionContainer { {Write-Replace-Warning-Indication-Extensions} } OPTIONAL,
+	protocolExtensions	ProtocolExtensionContainer { {Write-Replace-Warning-Indication-Extensions} } OPTIONAL,
 	...
 }
 
 Write-Replace-Warning-Indication-IEs SBC-AP-PROTOCOL-IES ::= {
-	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier		PRESENCE mandatory } |
+	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier	PRESENCE mandatory } |
-	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number		PRESENCE mandatory } |
+	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number	PRESENCE mandatory } |
-	{ ID id-Broadcast-Scheduled-Area-List		CRITICALITY reject	TYPE Broadcast-Scheduled-Area-List	PRESENCE optional },
+	{ ID id-Broadcast-Scheduled-Area-List	CRITICALITY reject	TYPE Broadcast-Scheduled-Area-List	PRESENCE optional },
 	...
 }
 
 Write-Replace-Warning-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Broadcast-Scheduled-Area-List-5GS	CRITICALITY ignore	EXTENSION Broadcast-Scheduled-Area-List-5GS	PRESENCE optional },
+
 	...
 }
 
@@ -239,20 +278,22 @@ Write-Replace-Warning-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 Stop-Warning-Indication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {Stop-Warning-Indication-IEs} },
+	protocolIEs	ProtocolIE-Container       { {Stop-Warning-Indication-IEs} },
 	protocolExtensions	ProtocolExtensionContainer { {Stop-Warning-Indication-Extensions} } OPTIONAL,
 	...
 }
 
 Stop-Warning-Indication-IEs SBC-AP-PROTOCOL-IES ::= {
-	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier		PRESENCE mandatory } |
+	{ ID id-Message-Identifier	CRITICALITY reject	TYPE Message-Identifier	PRESENCE mandatory } |
-	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number		PRESENCE mandatory } |
+	{ ID id-Serial-Number	CRITICALITY reject	TYPE Serial-Number	PRESENCE mandatory } |
-	{ ID id-Broadcast-Cancelled-Area-List		CRITICALITY reject	TYPE Broadcast-Cancelled-Area-List	PRESENCE optional }|
+	{ ID id-Broadcast-Cancelled-Area-List	CRITICALITY reject	TYPE Broadcast-Cancelled-Area-List	PRESENCE optional }|
 	{ ID id-Broadcast-Empty-Area-List	CRITICALITY ignore	TYPE Broadcast-Empty-Area-List	PRESENCE optional },
 	...
 }
 
 Stop-Warning-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Broadcast-Cancelled-Area-List-5GS	CRITICALITY ignore	EXTENSION Broadcast-Cancelled-Area-List-5GS	PRESENCE optional }|
+	{ ID id-Broadcast-Empty-Area-List-5GS	CRITICALITY ignore	EXTENSION Broadcast-Empty-Area-List-5GS	PRESENCE optional },
 	...
 }
 
@@ -263,7 +304,7 @@ Stop-Warning-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PWS-Restart-Indication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {PWS-Restart-Indication-IEs} },
+	protocolIEs	ProtocolIE-Container       { {PWS-Restart-Indication-IEs} },
 	protocolExtensions	ProtocolExtensionContainer { {PWS-Restart-Indication-Extensions} } OPTIONAL,
 	...
 }
@@ -277,6 +318,9 @@ PWS-Restart-Indication-IEs SBC-AP-PROTOCOL-IES ::= {
 }
 
 PWS-Restart-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Restarted-Cell-List-NR	CRITICALITY ignore	EXTENSION Restarted-Cell-List-NR	PRESENCE optional }|
+	{ ID id-List-of-5GS-TAI-for-Restart	CRITICALITY ignore	EXTENSION List-of-5GS-TAI-for-Restart	PRESENCE optional }|
+{ ID id-Global-GNB-ID	CRITICALITY ignore	EXTENSION Global-GNB-ID	PRESENCE optional },
 	...
 }
 
@@ -287,7 +331,7 @@ PWS-Restart-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PWS-Failure-Indication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {PWS-Failure-Indication-IEs} },
+	protocolIEs	ProtocolIE-Container       { {PWS-Failure-Indication-IEs} },
 	protocolExtensions	ProtocolExtensionContainer { {PWS-Failure-Indication-Extensions} } OPTIONAL,
 	...
 }
@@ -299,6 +343,8 @@ PWS-Failure-Indication-IEs SBC-AP-PROTOCOL-IES ::= {
 }
 
 PWS-Failure-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Failed-Cell-List-NR	CRITICALITY ignore	EXTENSION Failed-Cell-List-NR	PRESENCE optional }|
+	{ ID id-Global-GNB-ID	CRITICALITY ignore	EXTENSION Global-GNB-ID	PRESENCE optional },
 	...
 }
 
@@ -315,13 +361,13 @@ PWS-Failure-Indication-Extensions SBC-AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 Error-Indication ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{ErrorIndicationIEs}},
+	protocolIEs	ProtocolIE-Container       {{ErrorIndicationIEs}},
 	...
 }
 
 ErrorIndicationIEs SBC-AP-PROTOCOL-IES ::= {
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE optional	} |
+	{ ID id-Cause		CRITICALITY ignore	TYPE Cause		PRESENCE optional	} |
-	{ ID id-Criticality-Diagnostics		CRITICALITY ignore	TYPE Criticality-Diagnostics		PRESENCE optional	} ,
+	{ ID id-Criticality-Diagnostics	CRITICALITY ignore	TYPE Criticality-Diagnostics	PRESENCE optional	} ,
 	...
 }
 

epan/dissectors/asn1/sbc-ap/SBC-AP-PDU-Descriptions.asn

@@ -1,6 +1,6 @@
 -- SBC-AP-PDU-Descriptions.asn
 --
--- Taken from 3GPP TS 29.168 V14.2.0 (2017-12)
+-- Taken from 3GPP TS 29.168 V15.1.0 (2018-09)
 -- http://www.3gpp.org/ftp/Specs/archive/29_series/29.168/29168-930.zip
 --
 -- 4.4.3	Elementary Procedure Definitions
@@ -58,18 +58,18 @@ FROM SBC-AP-Constants;
 -- **************************************************************
 
 SBC-AP-ELEMENTARY-PROCEDURE ::= CLASS {
-	&InitiatingMessage				,
+	&InitiatingMessage	,
-	&SuccessfulOutcome				OPTIONAL,
+	&SuccessfulOutcome	OPTIONAL,
-	&UnsuccessfulOutcome				OPTIONAL,
+	&UnsuccessfulOutcome	OPTIONAL,
-	&procedureCode			ProcedureCode 	UNIQUE,
+	&procedureCode	ProcedureCode 	UNIQUE,
-	&criticality			Criticality 	DEFAULT ignore
+	&criticality	Criticality 	DEFAULT ignore
 }
 WITH SYNTAX {
-	INITIATING MESSAGE		&InitiatingMessage
+	INITIATING MESSAGE	&InitiatingMessage
-	[SUCCESSFUL OUTCOME		&SuccessfulOutcome]
+	[SUCCESSFUL OUTCOME	&SuccessfulOutcome]
 	[UNSUCCESSFUL OUTCOME	&UnsuccessfulOutcome]
-	PROCEDURE CODE			&procedureCode
+	PROCEDURE CODE	&procedureCode
-	[CRITICALITY			&criticality]
+	[CRITICALITY	&criticality]
 }
 
 -- **************************************************************
@@ -87,20 +87,20 @@ SBC-AP-PDU ::= CHOICE {
 
 InitiatingMessage ::= SEQUENCE {
 	procedureCode	SBC-AP-ELEMENTARY-PROCEDURE.&procedureCode	({SBC-AP-ELEMENTARY-PROCEDURES}),
-	criticality	SBC-AP-ELEMENTARY-PROCEDURE.&criticality		({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	criticality	SBC-AP-ELEMENTARY-PROCEDURE.&criticality	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		SBC-AP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+	value	SBC-AP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 SuccessfulOutcome ::= SEQUENCE {
 	procedureCode	SBC-AP-ELEMENTARY-PROCEDURE.&procedureCode	({SBC-AP-ELEMENTARY-PROCEDURES}),
-	criticality	SBC-AP-ELEMENTARY-PROCEDURE.&criticality		({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	criticality	SBC-AP-ELEMENTARY-PROCEDURE.&criticality	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		SBC-AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+	value	SBC-AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 UnsuccessfulOutcome ::= SEQUENCE {
 	procedureCode	SBC-AP-ELEMENTARY-PROCEDURE.&procedureCode	({SBC-AP-ELEMENTARY-PROCEDURES}),
-	criticality	SBC-AP-ELEMENTARY-PROCEDURE.&criticality		({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	criticality	SBC-AP-ELEMENTARY-PROCEDURE.&criticality	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-	value		SBC-AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+	value	SBC-AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome	({SBC-AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 -- **************************************************************
@@ -116,8 +116,8 @@ SBC-AP-ELEMENTARY-PROCEDURES SBC-AP-ELEMENTARY-PROCEDURE ::= {
 }
 
 SBC-AP-ELEMENTARY-PROCEDURES-CLASS-1 SBC-AP-ELEMENTARY-PROCEDURE ::= {
-	write-Replace-Warning 		|
+	write-Replace-Warning 	|
-	stop-Warning			,
+	stop-Warning	,
 	...
 }
 
@@ -134,47 +134,46 @@ write-Replace-Warning SBC-AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	Write-Replace-Warning-Request
 	SUCCESSFUL OUTCOME	Write-Replace-Warning-Response
 	
-	PROCEDURE CODE		id-Write-Replace-Warning
+	PROCEDURE CODE	id-Write-Replace-Warning
-	CRITICALITY			reject
+	CRITICALITY	reject
 }
 
 stop-Warning SBC-AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	Stop-Warning-Request
 	SUCCESSFUL OUTCOME	Stop-Warning-Response
 	
-	PROCEDURE CODE		id-Stop-Warning
+	PROCEDURE CODE	id-Stop-Warning
-	CRITICALITY			reject
+	CRITICALITY	reject
 }
 
 error-Indication SBC-AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	Error-Indication
-	PROCEDURE CODE		id-Error-Indication
+	PROCEDURE CODE	id-Error-Indication
-	CRITICALITY			ignore
+	CRITICALITY	ignore
 }
 
 write-Replace-Warning-Indication SBC-AP-ELEMENTARY-PROCEDURE	::= {
 	INITIATING MESSAGE	Write-Replace-Warning-Indication
-	PROCEDURE CODE		id-Write-Replace-Warning-Indication
+	PROCEDURE CODE	id-Write-Replace-Warning-Indication
-	CRITICALITY			ignore
+	CRITICALITY	ignore
 }
 
 stop-Warning-Indication SBC-AP-ELEMENTARY-PROCEDURE	::= {
 	INITIATING MESSAGE	Stop-Warning-Indication
-	PROCEDURE CODE		id-Stop-Warning-Indication
+	PROCEDURE CODE	id-Stop-Warning-Indication
-	CRITICALITY			ignore
+	CRITICALITY	ignore
 }
 
 pws-Restart-Indication SBC-AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	PWS-Restart-Indication
-	PROCEDURE CODE		id-PWS-Restart-Indication
+	PROCEDURE CODE	id-PWS-Restart-Indication
-	CRITICALITY			ignore
+	CRITICALITY	ignore
 }
 
 pws-Failure-Indication SBC-AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	PWS-Failure-Indication
-	PROCEDURE CODE		id-PWS-Failure-Indication
+	PROCEDURE CODE	id-PWS-Failure-Indication
-	CRITICALITY			ignore
+	CRITICALITY	ignore
 }
 
 END
-

epan/dissectors/asn1/sbc-ap/sbc-ap.cnf

@@ -23,6 +23,9 @@ TBCD-STRING
 # Get rid of unused code warnings
 ProtocolIE-ContainerList
 Presence
+Unknown-Tracking-Area-List
+NgENB-ID
+List-of-5GS-Cells-for-Failure
 
 #.TYPE_RENAME
 
@@ -158,6 +161,20 @@ id-List-of-TAIs-Restart						ProtocolIE-ID
 id-List-of-EAIs-Restart						ProtocolIE-ID
 id-Failed-Cell-List							ProtocolIE-ID
 
+id-List-of-5GS-TAIs					ProtocolIE-ID
+id-Warning-Area-List-5GS				ProtocolIE-ID
+id-Global-RAN-Node-ID					ProtocolIE-ID
+id-Global-GNB-ID					ProtocolIE-ID
+id-RAT-Selector-5GS					ProtocolIE-ID
+id-Unknown-5GS-Tracking-Area-List			ProtocolIE-ID
+id-Broadcast-Scheduled-Area-List-5GS			ProtocolIE-ID
+id-Broadcast-Cancelled-Area-List-5GS			ProtocolIE-ID
+id-Broadcast-Empty-Area-List-5GS			ProtocolIE-ID
+id-Restarted-Cell-List-NR				ProtocolIE-ID
+id-Failed-Cell-List-NR					ProtocolIE-ID
+id-List-of-5GS-TAI-for-Restart				ProtocolIE-ID
+id-Warning-Area-Coordinates				ProtocolIE-ID
+
 #.REGISTER
 
 #SBC-AP-PROTOCOL-IES
@@ -197,6 +214,19 @@ List-of-TAIs-Restart                    N sbc_ap.ies id-List-of-TAIs-Restart
 List-of-EAIs-Restart                    N sbc_ap.ies id-List-of-EAIs-Restart
 Failed-Cell-List                        N sbc_ap.ies id-Failed-Cell-List
 
+List-of-5GS-TAIs                        N sbc_ap.extension id-List-of-5GS-TAIs
+Warning-Area-List-5GS                   N sbc_ap.extension id-Warning-Area-List-5GS
+Global-RAN-Node-ID                      N sbc_ap.extension id-Global-RAN-Node-ID
+Global-GNB-ID                           N sbc_ap.extension id-Global-GNB-ID
+RAT-Selector-5GS                        N sbc_ap.extension id-RAT-Selector-5GS
+Unknown-5GS-Tracking-Area-List          N sbc_ap.extension id-Unknown-5GS-Tracking-Area-List
+Broadcast-Scheduled-Area-List-5GS       N sbc_ap.extension id-Broadcast-Scheduled-Area-List-5GS
+Broadcast-Cancelled-Area-List-5GS       N sbc_ap.extension id-Broadcast-Cancelled-Area-List-5GS
+Broadcast-Empty-Area-List-5GS           N sbc_ap.extension id-Broadcast-Empty-Area-List-5GS
+Restarted-Cell-List-NR                  N sbc_ap.extension id-Restarted-Cell-List-NR
+Failed-Cell-List-NR                     N sbc_ap.extension id-Failed-Cell-List-NR
+List-of-5GS-TAI-for-Restart             N sbc_ap.extension id-List-of-5GS-TAI-for-Restart
+Warning-Area-Coordinates                N sbc_ap.ies id-Warning-Area-Coordinates
 
 
 #SBC-AP-ELEMENTARY-PROCEDURE