Commit 939862b1 authored by canterburym's avatar canterburym
Browse files

Fixing merge conflict

parents dcf09449 85cdee1c
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ XIRIEvent ::= CHOICE
    uDMLocationInformationResult                        [904] UDMLocationInformationResult,
    uDMUEInformationResponse                            [905] UDMUEInformationResponse,
    uDMUEAuthenticationResponse                         [906] UDMUEAuthenticationResponse
    iMSCCUnavailable                                    [3140] IMSCCUnavailable
}

-- ==============
@@ -354,6 +355,7 @@ IRIEvent ::= CHOICE
    -- IMS events, see clause 7.11.4.2
    iMSMessage                                          [105] IMSMessage,
    startOfInterceptionForActiveIMSSession              [106] StartOfInterceptionForActiveIMSSession,
    iMSCCUnavailable                                    [3140] IMSCCUnavailable

    -- UDM events, see clause 7.2.2
    uDMLocationInformationResultRecord                  [904] UDMLocationInformationResult,
@@ -2926,6 +2928,13 @@ StartOfInterceptionForActiveIMSSession ::= SEQUENCE
    location              [7] Location OPTIONAL
}

-- See clause 7.12.4.2.X for the details. 
IMSCCUnavailable ::= SEQUENCE
{ 
    cCUnavailableReason   [1] UTF8String,
    sDPState              [2] OCTET STRING OPTIONAL
}

-- ==============
-- IMS parameters
-- ==============