Commit 3e85cc2b authored by canterburym's avatar canterburym
Browse files

Fixing merge conflict

parents a91756d6 1bbc5202
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ XIRIEvent ::= CHOICE
    iMSCCUnavailable                                    [3140] IMSCCUnavailable
    -- AMF events, see 6.2.2.2.X
    positioningInfoTransfer                             [329] AMFPositioningInfoTransfer
    -- MME Events, see clause 6.3.2.2.X
    mMEPositioningInfoTransfer                          [0328] MMEPositioningInfoTransfer

}

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

    -- MME Events, see clause 6.3.2.2.X
    mMEPositioningInfoTransfer                          [328] MMEPositioningInfoTransfer

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

@@ -3257,6 +3262,18 @@ MMEUnsuccessfulProcedure ::= SEQUENCE
    location            [7] Location OPTIONAL
}

-- See clause 6.3.2.2.X for details of this structure
MMEPositioningInfoTransfer ::= SEQUENCE
{
    iMSI                [1] IMSI,
    iMEI                [2] IMEI OPTIONAL,
    mSISDN              [3] MSISDN OPTIONAL,
    gUTI                [4] GUTI OPTIONAL,
    lPPaMessage         [5] OCTET STRING OPTIONAL,
    lPPMessage          [6] OCTET STRING OPTIONAL,
    mMELCSCorrelationId [7] OCTET STRING (SIZE(4))
}

-- ==================
-- EPS MME parameters
-- ==================