Commit a91756d6 authored by canterburym's avatar canterburym
Browse files

Fixing merge conflict

parents 939862b1 6ace9733
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ XIRIEvent ::= CHOICE
    -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.11.2
    sTIRSHAKENSignatureGeneration                       [103] STIRSHAKENSignatureGeneration,
    sTIRSHAKENSignatureValidation                       [104] STIRSHAKENSignatureValidation,

    -- IMS events, see clause 7.11.4.2
    iMSMessage                                          [105] IMSMessage,
    startOfInterceptionForActiveIMSSession              [106] StartOfInterceptionForActiveIMSSession,
@@ -184,6 +185,9 @@ XIRIEvent ::= CHOICE
    uDMUEInformationResponse                            [905] UDMUEInformationResponse,
    uDMUEAuthenticationResponse                         [906] UDMUEAuthenticationResponse
    iMSCCUnavailable                                    [3140] IMSCCUnavailable
    -- AMF events, see 6.2.2.2.X
    positioningInfoTransfer                             [329] AMFPositioningInfoTransfer

}

-- ==============
@@ -357,6 +361,9 @@ IRIEvent ::= CHOICE
    startOfInterceptionForActiveIMSSession              [106] StartOfInterceptionForActiveIMSSession,
    iMSCCUnavailable                                    [3140] IMSCCUnavailable

    -- AMF events, see 6.2.2.2.X
    positioningInfoTransfer                             [329] AMFPositioningInfoTransfer

    -- UDM events, see clause 7.2.2
    uDMLocationInformationResultRecord                  [904] UDMLocationInformationResult,
    uDMUEInformationResponse                            [905] UDMUEInformationResponse,
@@ -1204,6 +1211,19 @@ AMFUnsuccessfulProcedure ::= SEQUENCE
    location                    [9] Location OPTIONAL
}

-- See clause 6.2.2.2.X on for details of this structure
AMFPositioningInfoTransfer ::= SEQUENCE
{
    sUPI                        [1] SUPI,
    sUCI                        [2] SUCI OPTIONAL,
    pEI                         [3] PEI OPTIONAL,
    gPSI                        [4] GPSI OPTIONAL,
    gUTI                        [5] FiveGGUTI OPTIONAL,
    nRPPaMessage                [6] OCTET STRING OPTIONAL,
    lPPMessage                  [7] OCTET STRING OPTIONAL,
    lcsCorrelationId            [8] UTF8String (SIZE(1..255))
}

-- =================
-- 5G AMF parameters
-- =================