Resolving merge conflict (29c6e532) · Commits · SA3 / SA3 LI

33128/r18/TS33128Payloads.asn

+45 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,10 @@ XIRIEvent ::= CHOICE

		--AMF events, see 6.2.2.2.Cl1, continued from tag 114
		aMFUEConfigurationUpdate [4581] AMFUEConfigurationUpdate

		-- HSS events, see clause 7.2.3.3
		hSSServingSystemMessage [199] HSSServingSystemMessage,
		hSSStartOfInterceptionWithRegisteredTarget [200] HSSStartOfInterceptionWithRegisteredTarget
		}

		-- ==============
		@@ -430,6 +434,10 @@ IRIEvent ::= CHOICE

		--AMF events, see 6.2.2.3, continued from tag 114
		aMFUEConfigurationUpdate [4581] AMFUEConfigurationUpdate

		-- HSS events, see clause 7.2.3.4
		hSSServingSystemMessage [199] HSSServingSystemMessage,
		hSSStartOfInterceptionWithRegisteredTarget [200] HSSStartOfInterceptionWithRegisteredTarget
		}

		IRITargetIdentifier ::= SEQUENCE
		@@ -4668,6 +4676,37 @@ SeparatedLocationReporting ::= SEQUENCE
		rATType [8] RATType OPTIONAL
		}

		-- =======================
		-- HSS definitions
		-- =======================

		HSSServingSystemMessage ::= SEQUENCE
		{
		iMSI [1] IMSI,
		oldPLMNID [2] PLMNID,
		newPLMNID [3] PLMNID,
		roamingIndicator [4] RoamingIndicator,
		responseCodes [5] UTF8String
		}

		HSSStartOfInterceptionWithRegisteredTarget ::= SEQUENCE
		{
		hSSIdentities [1] HSSIdentities,
		subscriptionDataSets [2] SubscriptionDataSets,
		pSUserState [3] SBIType
		}

		HSSIdentities ::= SEQUENCE
		{
		ePSSubscriberIDs [1] EPSSubscriberIDs OPTIONAL,
		iMSSubscriberIDs [2] IMSSubscriberIDs OPTIONAL
		}

		SubscriptionDataSets ::= CHOICE
		{
		iMSSubscriptionData [1] SBIType
		}

		-- =================
		-- Common Parameters
		-- =================
		@@ -4954,6 +4993,12 @@ IMSI ::= NumericString (SIZE(6..15))

		IMSIUnauthenticatedIndication ::= BOOLEAN

		IMSSubscriberIDs ::= CHOICE
		{
		iMPI [1] IMPI,
		iMPU [2] IMPU
		}

		Initiator ::= ENUMERATED
		{
		uE(1),