diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index e51ec5f373f221123ec2909d374dc8ccc5e98ca7..b7f660b63cff740c355ad4194d8f50f00f6d9097 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)}
DEFINITIONS IMPLICIT TAGS ::=
@@ -12,7 +12,7 @@ BEGIN
retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
-- rdHeader
-rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version21(21)}
-- ======================================
-- Top level definitions for RDHI wrapper
@@ -20,7 +20,7 @@ rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)
RetainedDataMessage ::= SEQUENCE
{
- rdHeaderId [0] OBJECT IDENTIFIER,
+ rdHeaderId [0] OBJECT IDENTIFIER,
retainedDataHeader [1] RetainedDataHeader,
retainedDataPayload [2] RetainedDataPayload,
retainedDataDigest [3] OCTET STRING OPTIONAL,
@@ -57,8 +57,8 @@ RequestFlag ::= UTF8String
RequestID ::= SEQUENCE
{
- countryCode [1] CountryCode,
- authorisedOrganisationID [2] AuthorisedOrganisationID,
+ countryCode [1] CountryCode,
+ authorisedOrganisationID [2] AuthorisedOrganisationID,
requestNumber [3] RequestNumber OPTIONAL,
-- all messages except GetStatusMessage and StatusMessage have a request number
-- (see clause 6.1.2)
@@ -396,6 +396,16 @@ TimeSpan ::= SEQUENCE
-- duration in seconds
}
+File ::= SEQUENCE
+{
+ mediaType [1] UTF8String,
+ -- Media type of the file, e.g. image/jpeg, application/pdf
+ -- Media types (formerly known as MIME types) are assigned and listed by the IANA
+ content [2] OCTET STRING,
+ -- Content of the file
+ ...
+}
+
-- ==============================================
-- Definitions for Generic Subscriber Information
-- ==============================================
@@ -525,14 +535,19 @@ OtherAddress ::= SEQUENCE
AuthenticationInfo ::= SEQUENCE
{
- authenticationType [1] UTF8String OPTIONAL,
- authenticationNumber [2] UTF8String OPTIONAL,
+ authenticationType [1] UTF8String OPTIONAL,
+
+ authenticationNumber [2] UTF8String OPTIONAL,
+
...,
- issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL,
- issuingOrganization [4] UTF8String OPTIONAL,
- nationality [5] UTF8String OPTIONAL
+ issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL,
+ issuingOrganization [4] UTF8String OPTIONAL,
+ nationality [5] UTF8String OPTIONAL,
+ authenticationDocument [6] SEQUENCE OF File OPTIONAL
+
}
+
PaymentDetails ::= SEQUENCE
{
billingMethod [1] BillingMethod OPTIONAL,
@@ -637,9 +652,12 @@ ICCIDInfo ::= SEQUENCE
-- PUK code associated with the ICCID
pUK2 [4] UTF8String OPTIONAL,
-- PUK2 code associated with the ICCID
- iMSI [5] IMSI OPTIONAL
+ iMSI [5] IMSI OPTIONAL,
+ sUPI [6] SUPI OPTIONAL,
+ gPSI [7] GPSI OPTIONAL
}
+
LoginInfo ::= SEQUENCE
{
login [1] UTF8String OPTIONAL,
@@ -663,41 +681,43 @@ SubscribedTelephonyServices ::= SEQUENCE
-- Unique identifier for the service provider
timeSpan [3] TimeSpan OPTIONAL,
-- Start and end data, if applicable, of the subscription
- registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL,
+ registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL,
-- The set of telephone numbers registered for this service
- registeredICCID [5] UTF8String OPTIONAL,
+ registeredICCID [5] UTF8String OPTIONAL,
serviceType [6] TelephonyServiceType OPTIONAL,
- installationAddress [7] AddressInformation OPTIONAL,
+ installationAddress [7] AddressInformation OPTIONAL,
-- installation address, if different from the registered address
- connectionDate [8] GeneralizedTime OPTIONAL,
+ connectionDate [8] GeneralizedTime OPTIONAL,
-- Date the subscriber was actually connected
-- (May differ from the start of subscription)
iMSI [9] IMSI OPTIONAL,
- carrierPreselect [10] BOOLEAN OPTIONAL,
+ carrierPreselect [10] BOOLEAN OPTIONAL,
lineStatus [11] UTF8String OPTIONAL,
-- CSP-specific description of current line status, e.g. "Active", "Ceased", etc.
...,
- allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL,
+ allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL,
pUKCode [13] UTF8String OPTIONAL,
pUK2Code [14] UTF8String OPTIONAL,
iMEI [15] SEQUENCE OF IMEI OPTIONAL,
- nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL,
+ nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
- paymentDetails [17] PaymentDetails OPTIONAL,
- subscriptionType [18] SubscriptionType OPTIONAL,
+ paymentDetails [17] PaymentDetails OPTIONAL,
+ subscriptionType [18] SubscriptionType OPTIONAL,
-- Describes the nature of the subscription
- deliveryAddress [19] AddressInformation OPTIONAL,
- resellerAddress [20] AddressInformation OPTIONAL,
- otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL,
- registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL,
+ deliveryAddress [19] AddressInformation OPTIONAL,
+ resellerAddress [20] AddressInformation OPTIONAL,
+ otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL,
+ registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL,
-- information about timespan of the active number and deactivation events
- registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL,
+ registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL,
-- in cases of MultiSIM card contracts
- loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL
+ loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL,
-- e.g. login information according a VMS/UMS account
+ paymentTransactions [25] SEQUENCE OF BillingRecords OPTIONAL
}
+
SubscriptionType ::= ENUMERATED
{
unknown(0),
@@ -749,17 +769,19 @@ BillingRecords ::= SEQUENCE
method [5] UTF8String OPTIONAL,
-- i.e. credit card, etc.
...,
- nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL,
+ nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
- transactionID [7] UTF8String OPTIONAL,
+ transactionID [7] UTF8String OPTIONAL,
-- Unique reference for this transaction/billing record
-- Details to be defined on a national basis
- transactionStatus [8] UTF8String OPTIONAL
+ transactionStatus [8] UTF8String OPTIONAL,
-- Status of the transaction (i.e. "declined", "succeeded", etc.)
-- Details to be defined on a national bases
+ copyOfBill [9] SEQUENCE OF File OPTIONAL
}
+
NationalTelephonyBillingRecords ::= SEQUENCE
{
countryCode [1] UTF8String (SIZE (2)),
@@ -1232,48 +1254,60 @@ NationalTransmitterDetails ::= SEQUENCE
Location ::= SEQUENCE
{
- e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL,
+ e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL,
-- Coded in the same format as the ISUP location number (parameter field)
- -- of the ISUP (see EN 300 356 [7])
- globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL,
- -- See MAP format (see 3GPP TS 09.02 [8])
+ -- of the ISUP (see ETSI EN 300 356 [7])
+ globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL,
+ -- See MAP format (see ETSI TS 100 974 [8])
rAI [3] OCTET STRING (SIZE (6)) OPTIONAL,
-- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with
- -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the
+ -- ETSI TS 124 008 [9] without the Routing Area Identification IEI (only the
-- last 6 octets are used)
- gsmLocation [4] GSMLocation OPTIONAL,
- umtsLocation [5] UMTSLocation OPTIONAL,
+ gsmLocation [4] GSMLocation OPTIONAL,
+ umtsLocation [5] UMTSLocation OPTIONAL,
sAI [6] OCTET STRING (SIZE (7)) OPTIONAL,
-- format: PLMN-ID 3 octets (no. 1-3)
-- LAC 2 octets (no. 4-5)
-- SAC 2 octets (no. 6-7)
- -- (according to 3GPP TS 25.413 [31])
- oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL,
+ -- (according to ETSI TS 125 413 [31])
+ oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL,
-- the "Routeing Area Identifier" in the old SGSN is coded in accordance with
- -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI
+ -- ETSI TS 124 008 [9] without the Routing Area Identification IEI
-- (only the last 6 octets are used)
- -- This parameter is duplicated from 3GPP TS 33.108 [11]
+ -- This parameter is duplicated from ETSI TS 133 108 [11]
...,
- postalLocation [8] AddressInformation OPTIONAL,
- extendedLocation [9] ExtendedLocation OPTIONAL,
- userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL,
- -- coded according to 3GPP TS 29.274 [32]; the type IE is not included
+ postalLocation [8] AddressInformation OPTIONAL,
+ extendedLocation [9] ExtendedLocation OPTIONAL,
+ userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL,
+ -- coded according to ETSI TS 129 274 [32]; the type IE is not included
tAI [11] OCTET STRING (SIZE (6)) OPTIONAL,
- -- Only applicable to the CS traffic cases, such as SMS over SGs, according to
- -- 3GPP TS 23.272 [35]
- eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL,
- -- Only applicable to the CS traffic cases, such as SMS over SGs, according to
- -- 3GPP TS 23.272 [35]
- maritimeTransport [13] MaritimeTransport OPTIONAL,
- -- Information about the mobile cells embarked on ships using
+ eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL,
+ maritimeTransport [13] MaritimeTransport OPTIONAL,
+ -- Information about the mobile cells embarked on ships using
-- satellite transponder backhaul
- airTransport [14] AirTransport OPTIONAL,
+ airTransport [14] AirTransport OPTIONAL,
-- Information about the mobile cells embarked on aircraft using
-- satellite transponder backhaul
- bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL
+ bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL,
-- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID
+ nCGI [16] NCGI OPTIONAL,
+ -- format as specified in 3GPP TS 38.413 [42].
+ n3gaLocation [17] OCTET STRING (SIZE (4)) OPTIONAL,
+ -- format as specified in 3GPP TS 29.571 [43]
+ trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL
+ -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or
+ -- TAC (5G) = 3 octets and without length indicator
+}
+
+NCGI ::= SEQUENCE
+{
+ pLMNID [1] PLMNID,
+ nRCellID [2] NRCellID
}
+NRCellID ::= BIT STRING (SIZE(36))
+-- TS 38.413 [23], clause 9.3.1.7
+
GSMLocation ::= CHOICE
{
geoCoordinates [1] SEQUENCE
@@ -1378,10 +1412,13 @@ MapDatum ::= ENUMERATED
iTM(12),
-- Irish Transverse Mercator
...,
- cH1903(13)
+ cH1903(13),
-- Swiss reference system
+ cH1903Plus(14)
+ -- New Swiss reference system
}
+
UMTSLocation ::= CHOICE
{
point [1] GA-Point,
@@ -1653,16 +1690,18 @@ MessageID ::= UTF8String
MsgBillingDetails ::= SEQUENCE
{
subscriberID [1] MsgSubscriberID OPTIONAL,
- serviceID [2] UTF8String OPTIONAL,
+ serviceID [2] UTF8String OPTIONAL,
billingAddress [3] ContactDetails OPTIONAL,
billingIdentifier [4] MsgBillingIdentifier OPTIONAL,
billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL,
- nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL,
+ nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
- ...
+ ...,
+ copyOfBill [7] SEQUENCE OF File OPTIONAL
}
+
NationalMsgBillingDetails ::= SEQUENCE
{
countryCode [1] UTF8String (SIZE (2)),
@@ -1761,39 +1800,41 @@ SubscribedMultimediaServices ::= SEQUENCE
-- Unique identifier for the service provider
timeSpan [3] TimeSpan OPTIONAL,
-- Start and end data, if applicable, of the subscription
- registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL,
+ registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL,
-- The set of identifiers registered for this service
- registeredICCID [5] UTF8String OPTIONAL,
+ registeredICCID [5] UTF8String OPTIONAL,
serviceType [6] MultimediaServiceType OPTIONAL,
- installationAddress [7] AddressInformation OPTIONAL,
+ installationAddress [7] AddressInformation OPTIONAL,
-- installation address, if different from the registered address
- connectionDate [8] GeneralizedTime OPTIONAL,
+ connectionDate [8] GeneralizedTime OPTIONAL,
-- Date the subscriber was actually connected
-- (May differ from the start of subscription)
iMSI [9] IMSI OPTIONAL,
- carrierPreselect [10] BOOLEAN OPTIONAL,
+ carrierPreselect [10] BOOLEAN OPTIONAL,
lineStatus [11] UTF8String OPTIONAL,
-- CSP-specific description of current line status,
-- e.g. "Active", "Ceased", etc.
- nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL,
+ nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL,
-- national extension
...,
- paymentDetails [13] PaymentDetails OPTIONAL,
- subscriptionType [14] SubscriptionType OPTIONAL,
+ paymentDetails [13] PaymentDetails OPTIONAL,
+ subscriptionType [14] SubscriptionType OPTIONAL,
-- Describes the nature of the subscription
- deliveryAddress [15] AddressInformation OPTIONAL,
- resellerAddress [16] AddressInformation OPTIONAL,
- otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL,
- multimediaServiceType [18] UTF8String OPTIONAL,
+ deliveryAddress [15] AddressInformation OPTIONAL,
+ resellerAddress [16] AddressInformation OPTIONAL,
+ otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL,
+ multimediaServiceType [18] UTF8String OPTIONAL,
-- Service name used by the service provider which may be proprietary
- orderTime [19] GeneralizedTime OPTIONAL,
- -- Time when the subscribed service was ordered by the user
- iMEIs [20] SEQUENCE OF IMEI OPTIONAL,
- registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
- privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL,
- allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL
+ orderTime [19] GeneralizedTime OPTIONAL,
+ -- Time when the subscribed service was ordered by the user
+ iMEIs [20] SEQUENCE OF IMEI OPTIONAL,
+ registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
+ privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL,
+ allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL,
+ paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL
}
+
MultimediaServiceType ::= ENUMERATED
{
private(0),
@@ -2004,17 +2045,19 @@ PaniHeaderInfo ::= SEQUENCE
MultimediaBillingDetails ::= SEQUENCE
{
subscriberID [1] MultimediaSubscriberID OPTIONAL,
- serviceID [2] UTF8String OPTIONAL,
+ serviceID [2] UTF8String OPTIONAL,
billingAddress [3] ContactDetails OPTIONAL,
billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL,
billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL,
- nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL,
+ nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
...,
- multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL
+ multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL,
+ copyOfBill [8] SEQUENCE OF File OPTIONAL
}
+
MultimediaBillingAddress ::= SEQUENCE
{
addressSuppliedTime [1] GeneralizedTime OPTIONAL,
@@ -2185,38 +2228,42 @@ NASubscriber ::= SEQUENCE
NAServiceSubscription ::= SEQUENCE
-- Description of the subscription to a Network Access service
{
- validity [1] TimeSpan OPTIONAL,
- naServiceID [2] UTF8String OPTIONAL,
+ validity [1] TimeSpan OPTIONAL,
+ naServiceID [2] UTF8String OPTIONAL,
-- Identifier for the service, e.g. account plan name.
- naProviderID [3] NAProviderID OPTIONAL,
+ naProviderID [3] NAProviderID OPTIONAL,
-- Unique identifier for the provider of the service, e.g. company name
- naAuthID [4] NAAuthID OPTIONAL,
+ naAuthID [4] NAAuthID OPTIONAL,
-- Unique identifier for this subscription, e.g. logon name
- options [5] UTF8String OPTIONAL,
+ options [5] UTF8String OPTIONAL,
-- Human readable text with restrictions or options to the subscription
- installationAddress [6] AddressInformation OPTIONAL,
- fixIpAddress [7] IPAddress OPTIONAL,
+ installationAddress [6] AddressInformation OPTIONAL,
+ fixIpAddress [7] IPAddress OPTIONAL,
-- fix assigned IP address
- imsi [8] IMSI OPTIONAL,
+ imsi [8] IMSI OPTIONAL,
...,
- allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL,
- naServiceStatus [10] UTF8String OPTIONAL,
+ allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL,
+ naServiceStatus [10] UTF8String OPTIONAL,
-- CSP-specific description of current service status, e.g. "Active", "Ceased", etc.
- registeredICCID [11] UTF8String OPTIONAL,
- nationalNASubscription [12] NationalNASubscription OPTIONAL,
- paymentDetails [13] PaymentDetails OPTIONAL,
- additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,
- subscriptionType [15] SubscriptionType OPTIONAL,
+ registeredICCID [11] UTF8String OPTIONAL,
+ nationalNASubscription [12] NationalNASubscription OPTIONAL,
+ paymentDetails [13] PaymentDetails OPTIONAL,
+ additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,
+ subscriptionType [15] SubscriptionType OPTIONAL,
-- Describes the nature of the subscription
- deliveryAddress [16] AddressInformation OPTIONAL,
- resellerAddress [17] AddressInformation OPTIONAL,
- otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL,
- allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL,
+ deliveryAddress [16] AddressInformation OPTIONAL,
+ resellerAddress [17] AddressInformation OPTIONAL,
+ otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL,
+ allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL,
-- If present, contains device details for all elements from allocatedDeviceIDs
- mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL,
- registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL
+ mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL,
+ registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
+ paymentTransactions [22] SEQUENCE OF BillingRecords OPTIONAL,
+ sUPI [23] SUPI OPTIONAL,
+ gPSI [24] GPSI OPTIONAL
}
+
NationalNASubscription ::= SEQUENCE
-- Description of the subscription to a Network Access service
{
@@ -2231,11 +2278,11 @@ NationalNASubscription ::= SEQUENCE
NAServiceUsage ::= SEQUENCE
{
- naAccessTime [1] GeneralizedTime OPTIONAL,
+ naAccessTime [1] GeneralizedTime OPTIONAL,
-- Time of connection to the NAS
naAuthID [2] NAAuthID OPTIONAL,
-- Username used to obtain network access
- nwAccessType [3] NwAccessType OPTIONAL,
+ nwAccessType [3] NwAccessType OPTIONAL,
-- Type of network access attempted. If not undefined(0), this should be one of the types
-- supported by the NAS (identified below by naNwElementID)
naStatus [4] ENUMERATED
@@ -2253,32 +2300,36 @@ NAServiceUsage ::= SEQUENCE
-- Start time and end time (duration) of network access.
naDeviceId [6] NADeviceId OPTIONAL,
-- Device used to access the service
- naNwElementID [7] NANwElementID OPTIONAL,
+ naNwElementID [7] NANwElementID OPTIONAL,
-- Network element (NAS) onto which the naDevice is connected
- naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL,
+ naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL,
-- IP address assigned by the network access service. May be fixed or dynamic
location [9] Location OPTIONAL,
-- Location of the access (for e.g. GPRS handsets)
- dialUpInformation [10] DialUpInformation OPTIONAL,
- gprsInformation [11] GprsInformation OPTIONAL,
+ dialUpInformation [10] DialUpInformation OPTIONAL,
+ gprsInformation [11] GprsInformation OPTIONAL,
...,
- octetsDownloaded [12] INTEGER OPTIONAL,
- octetsUploaded [13] INTEGER OPTIONAL,
+ octetsDownloaded [12] INTEGER OPTIONAL,
+ octetsUploaded [13] INTEGER OPTIONAL,
endReason [14] NAEndReason OPTIONAL,
- subscriberID [15] NaSubscriberID OPTIONAL,
+ subscriberID [15] NaSubscriberID OPTIONAL,
-- Identifier for a known user of this network access
- ePSInformation [16] EPSInformation OPTIONAL,
- wifiInformation [17] WifiInformation OPTIONAL,
- addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL,
+ ePSInformation [16] EPSInformation OPTIONAL,
+ wifiInformation [17] WifiInformation OPTIONAL,
+ addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL,
-- contains extended information about the NAT or PAT operations carried out within this
-- service usage session
naDevice [19] NADevice OPTIONAL,
-- If present, contains the device details for the device referenced in naDeviceID
- additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL
+ additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL,
-- List of additional locations and optional access time during the network access service
-- usage
+ sNSSAI [21] OCTET STRING (SIZE(4)) OPTIONAL,
+ notifyUri [22] OCTET STRING (SIZE(3..8)) OPTIONAL,
+ fiveGSInformation [23] FIVEGSInformation OPTIONAL
}
+
TimedLocation ::= SEQUENCE
{
location [1] Location,
@@ -2476,29 +2527,31 @@ GPRSEvent ::= ENUMERATED
EPSInformation ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
- iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL,
+ iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL,
mSISDN [3] PartyNumber OPTIONAL,
iMEISV [4] IMEI OPTIONAL,
s-GWAddress [5] IPAddress OPTIONAL,
p-GWAddress [6] IPAddress OPTIONAL,
- p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL,
- aPNNetworkID [8] AccessPointNameNI OPTIONAL,
+ p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL,
+ aPNNetworkID [8] AccessPointNameNI OPTIONAL,
pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL,
- -- PDN/PDP Type number as defined in 3GPP TS 29.274 [32] clause 8.34
- pDP-PDNAddress [10] IPAddress OPTIONAL,
+ -- PDN/PDP Type number as defined in ETSI TS 129 274 [32] clause 8.34
+ pDP-PDNAddress [10] IPAddress OPTIONAL,
-- IP address allocated to the PDP context / PDN connection
-- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix
-- when PDP/PDN Type is IPv6 or IPv4v6.
- pDP-PDNAddressExtension [11] IPAddress OPTIONAL,
+ pDP-PDNAddressExtension [11] IPAddress OPTIONAL,
-- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6
- dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL,
- dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL,
- rATType [14] INTEGER (0..255),
- -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17
+ dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL,
+ dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL,
+ rATType [14] INTEGER (0..255) OPTIONAL,
+ -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17
+ -- NOTE - as of v1.23.1 of the present document, this field has changed to optional
ePSEvent [15] EPSEvent OPTIONAL,
...
}
+
IMSIUnauthenticatedFlag ::= BOOLEAN
-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI
@@ -2538,6 +2591,61 @@ EPSEvent ::= ENUMERATED
...
}
+FIVEGSInformation ::= SEQUENCE
+{
+ sUPI [1] SUPI OPTIONAL,
+ dNN [2] UTF8String OPTIONAL,
+ gPSI [3] GPSI OPTIONAL,
+ pEI [4] PEI OPTIONAL,
+ pDUSessionID [6] INTEGER (0..255) OPTIONAL,
+ sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL,
+ pDUIpv4Address [8] IPAddress OPTIONAL,
+ pDUIpv6Address [9] IPAddress OPTIONAL,
+ pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL,
+ rFSPIndex [11] INTEGER (1..255) OPTIONAL,
+ applicationId [12] UTF8String OPTIONAL,
+ applicationServiceProviderIdentity [13] UTF8String OPTIONAL,
+ serviceId [14] INTEGER OPTIONAL,
+ chargingId [15] UTF8String OPTIONAL,
+ pDUType [16] PDUSessionType OPTIONAL,
+ sSCMode [17] SSCMode OPTIONAL,
+ vPLMNId [18] PLMNID OPTIONAL,
+ hPLMNId [19] PLMNID OPTIONAL,
+ chargingCharacteristics [20] UTF8String OPTIONAL,
+ chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL,
+ pDUSessionStartTime [22] GeneralizedTime OPTIONAL,
+ pDUSessionStopTime [23] GeneralizedTime OPTIONAL,
+ lowPriorityIndicator [24] BOOLEAN OPTIONAL,
+ dataOffStatus [25] BOOLEAN OPTIONAL,
+ diagnostics [26] INTEGER OPTIONAL,
+ uETimeZone [27] UTF8String OPTIONAL,
+ uPFAddress [28] IPAddress OPTIONAL,
+ aMFAddress [29] IPAddress OPTIONAL,
+ uDMAddress [30] IPAddress OPTIONAL,
+ sMFAddress [31] IPAddress OPTIONAL,
+ uPFId [32] UUID OPTIONAL,
+ aMFIdentifier [33] AMFID OPTIONAL,
+ uDMIdentifier [34] UUID OPTIONAL,
+ sMFIdentifier [35] UUID OPTIONAL,
+ uPFPDNAddress [36] IPAddress OPTIONAL,
+ uPFPDNAddressExtension [37] IPAddress OPTIONAL,
+ dynamicAddressFlag [38] BOOLEAN OPTIONAL,
+ dynamicAddressFlagExt [39] BOOLEAN OPTIONAL,
+ rAT5Type [40] RAT5Type OPTIONAL,
+ flowQosInfo [41] OCTET STRING OPTIONAL,
+ serviceID [42] INTEGER OPTIONAL
+
+}
+
+PDUSessionType ::= ENUMERATED
+{
+ iPv4(1),
+ iPv6(2),
+ iPv4v6(3),
+ unstructured(4),
+ ethernet(5)
+}
+
-- ====================================
-- Definitions of Network Access Device
-- ====================================
@@ -2559,14 +2667,38 @@ NADevice ::= SEQUENCE
subscriberID [7] NaSubscriberID OPTIONAL
}
+SUPI ::= CHOICE
+{
+ iMSI [1] IMSI,
+ nAI [2] NAI,
+ ...
+}
+
+GPSI ::= CHOICE
+{
+ mSISDN [1] PartyNumber,
+ nAI [2] NAI,
+ ...
+}
+
+PEI ::= CHOICE
+{
+ iMEI [1] IMEI,
+ iMEISV [2] IMEISV
+}
+
IMEI ::= OCTET STRING (SIZE(8))
-- format as per 3GPP TS 09.02 [8]
-- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even
-- if the checksum or software version digits are different or not present.
+IMEISV ::= NumericString (SIZE(16))
+
IMSI ::= OCTET STRING (SIZE(3..8))
-- format as per 3GPP TS 09.02 [8]
+NAI ::= UTF8String
+
-- ======================================
-- Definitions of Message Network element
-- ======================================
@@ -2641,7 +2773,7 @@ IPMask ::= SEQUENCE
NABillingDetails ::= SEQUENCE
{
subscriberID [1] NaSubscriberID OPTIONAL,
- serviceID [2] UTF8String OPTIONAL,
+ serviceID [2] UTF8String OPTIONAL,
billingAddress [3] ContactDetails OPTIONAL,
billingIdentifier [4] BillingIdentifier OPTIONAL,
billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL,
@@ -2654,5 +2786,40 @@ NABillingDetails ::= SEQUENCE
-- Details to be defined on a national basis
}
+SSCMode ::= ENUMERATED
+{
+ sSCMode1(1),
+ sSCMode2(2),
+ sSCMode3MultiPDUSession(3),
+ sSCMode3Multihome(4),
+ ...
+}
+
+PLMNID ::= OCTET STRING (SIZE(3))
+
+UUID ::= OCTET STRING (SIZE(16))
+
+RAT5Type ::= ENUMERATED
+{
+ nr(1),
+ eutra(2),
+ wlan(3),
+ virtual(4),
+ ...
+}
+
+AMFID ::= SEQUENCE
+{
+ aMFRegionID [1] AMFRegionID,
+ aMFSetID [2] AMFSetID,
+ aMFPointer [3] AMFPointer
+}
+
+AMFRegionID ::= INTEGER (0..255)
+
+AMFSetID ::= INTEGER (0..63)
+
+AMFPointer ::= INTEGER (0..1023)
+
END -- end of RDMessage
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 19961bd0ec8b58f8eda59c751e4f0c2d0fc7013b..98b86bfe93dda100c15f69f19137c007a946fe18 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -1,2903 +1,3175 @@
-
-
-
- XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1
+
+
+
+ XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
A country code as per ISO 3166-1 [4]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/102657/portal/RDMessagever20.xsd b/102657/portal/RDMessagever20.xsd
deleted file mode 100644
index 19961bd0ec8b58f8eda59c751e4f0c2d0fc7013b..0000000000000000000000000000000000000000
--- a/102657/portal/RDMessagever20.xsd
+++ /dev/null
@@ -1,2903 +0,0 @@
-
-
-
-
- XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- A country code as per ISO 3166-1 [4]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/102657/portal/RDMessagever20.txt b/102657/portal/RDMessagever21.txt
similarity index 87%
rename from 102657/portal/RDMessagever20.txt
rename to 102657/portal/RDMessagever21.txt
index e51ec5f373f221123ec2909d374dc8ccc5e98ca7..b7f660b63cff740c355ad4194d8f50f00f6d9097 100644
--- a/102657/portal/RDMessagever20.txt
+++ b/102657/portal/RDMessagever21.txt
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)}
DEFINITIONS IMPLICIT TAGS ::=
@@ -12,7 +12,7 @@ BEGIN
retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
-- rdHeader
-rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version21(21)}
-- ======================================
-- Top level definitions for RDHI wrapper
@@ -20,7 +20,7 @@ rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)
RetainedDataMessage ::= SEQUENCE
{
- rdHeaderId [0] OBJECT IDENTIFIER,
+ rdHeaderId [0] OBJECT IDENTIFIER,
retainedDataHeader [1] RetainedDataHeader,
retainedDataPayload [2] RetainedDataPayload,
retainedDataDigest [3] OCTET STRING OPTIONAL,
@@ -57,8 +57,8 @@ RequestFlag ::= UTF8String
RequestID ::= SEQUENCE
{
- countryCode [1] CountryCode,
- authorisedOrganisationID [2] AuthorisedOrganisationID,
+ countryCode [1] CountryCode,
+ authorisedOrganisationID [2] AuthorisedOrganisationID,
requestNumber [3] RequestNumber OPTIONAL,
-- all messages except GetStatusMessage and StatusMessage have a request number
-- (see clause 6.1.2)
@@ -396,6 +396,16 @@ TimeSpan ::= SEQUENCE
-- duration in seconds
}
+File ::= SEQUENCE
+{
+ mediaType [1] UTF8String,
+ -- Media type of the file, e.g. image/jpeg, application/pdf
+ -- Media types (formerly known as MIME types) are assigned and listed by the IANA
+ content [2] OCTET STRING,
+ -- Content of the file
+ ...
+}
+
-- ==============================================
-- Definitions for Generic Subscriber Information
-- ==============================================
@@ -525,14 +535,19 @@ OtherAddress ::= SEQUENCE
AuthenticationInfo ::= SEQUENCE
{
- authenticationType [1] UTF8String OPTIONAL,
- authenticationNumber [2] UTF8String OPTIONAL,
+ authenticationType [1] UTF8String OPTIONAL,
+
+ authenticationNumber [2] UTF8String OPTIONAL,
+
...,
- issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL,
- issuingOrganization [4] UTF8String OPTIONAL,
- nationality [5] UTF8String OPTIONAL
+ issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL,
+ issuingOrganization [4] UTF8String OPTIONAL,
+ nationality [5] UTF8String OPTIONAL,
+ authenticationDocument [6] SEQUENCE OF File OPTIONAL
+
}
+
PaymentDetails ::= SEQUENCE
{
billingMethod [1] BillingMethod OPTIONAL,
@@ -637,9 +652,12 @@ ICCIDInfo ::= SEQUENCE
-- PUK code associated with the ICCID
pUK2 [4] UTF8String OPTIONAL,
-- PUK2 code associated with the ICCID
- iMSI [5] IMSI OPTIONAL
+ iMSI [5] IMSI OPTIONAL,
+ sUPI [6] SUPI OPTIONAL,
+ gPSI [7] GPSI OPTIONAL
}
+
LoginInfo ::= SEQUENCE
{
login [1] UTF8String OPTIONAL,
@@ -663,41 +681,43 @@ SubscribedTelephonyServices ::= SEQUENCE
-- Unique identifier for the service provider
timeSpan [3] TimeSpan OPTIONAL,
-- Start and end data, if applicable, of the subscription
- registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL,
+ registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL,
-- The set of telephone numbers registered for this service
- registeredICCID [5] UTF8String OPTIONAL,
+ registeredICCID [5] UTF8String OPTIONAL,
serviceType [6] TelephonyServiceType OPTIONAL,
- installationAddress [7] AddressInformation OPTIONAL,
+ installationAddress [7] AddressInformation OPTIONAL,
-- installation address, if different from the registered address
- connectionDate [8] GeneralizedTime OPTIONAL,
+ connectionDate [8] GeneralizedTime OPTIONAL,
-- Date the subscriber was actually connected
-- (May differ from the start of subscription)
iMSI [9] IMSI OPTIONAL,
- carrierPreselect [10] BOOLEAN OPTIONAL,
+ carrierPreselect [10] BOOLEAN OPTIONAL,
lineStatus [11] UTF8String OPTIONAL,
-- CSP-specific description of current line status, e.g. "Active", "Ceased", etc.
...,
- allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL,
+ allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL,
pUKCode [13] UTF8String OPTIONAL,
pUK2Code [14] UTF8String OPTIONAL,
iMEI [15] SEQUENCE OF IMEI OPTIONAL,
- nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL,
+ nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
- paymentDetails [17] PaymentDetails OPTIONAL,
- subscriptionType [18] SubscriptionType OPTIONAL,
+ paymentDetails [17] PaymentDetails OPTIONAL,
+ subscriptionType [18] SubscriptionType OPTIONAL,
-- Describes the nature of the subscription
- deliveryAddress [19] AddressInformation OPTIONAL,
- resellerAddress [20] AddressInformation OPTIONAL,
- otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL,
- registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL,
+ deliveryAddress [19] AddressInformation OPTIONAL,
+ resellerAddress [20] AddressInformation OPTIONAL,
+ otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL,
+ registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL,
-- information about timespan of the active number and deactivation events
- registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL,
+ registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL,
-- in cases of MultiSIM card contracts
- loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL
+ loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL,
-- e.g. login information according a VMS/UMS account
+ paymentTransactions [25] SEQUENCE OF BillingRecords OPTIONAL
}
+
SubscriptionType ::= ENUMERATED
{
unknown(0),
@@ -749,17 +769,19 @@ BillingRecords ::= SEQUENCE
method [5] UTF8String OPTIONAL,
-- i.e. credit card, etc.
...,
- nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL,
+ nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
- transactionID [7] UTF8String OPTIONAL,
+ transactionID [7] UTF8String OPTIONAL,
-- Unique reference for this transaction/billing record
-- Details to be defined on a national basis
- transactionStatus [8] UTF8String OPTIONAL
+ transactionStatus [8] UTF8String OPTIONAL,
-- Status of the transaction (i.e. "declined", "succeeded", etc.)
-- Details to be defined on a national bases
+ copyOfBill [9] SEQUENCE OF File OPTIONAL
}
+
NationalTelephonyBillingRecords ::= SEQUENCE
{
countryCode [1] UTF8String (SIZE (2)),
@@ -1232,48 +1254,60 @@ NationalTransmitterDetails ::= SEQUENCE
Location ::= SEQUENCE
{
- e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL,
+ e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL,
-- Coded in the same format as the ISUP location number (parameter field)
- -- of the ISUP (see EN 300 356 [7])
- globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL,
- -- See MAP format (see 3GPP TS 09.02 [8])
+ -- of the ISUP (see ETSI EN 300 356 [7])
+ globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL,
+ -- See MAP format (see ETSI TS 100 974 [8])
rAI [3] OCTET STRING (SIZE (6)) OPTIONAL,
-- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with
- -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the
+ -- ETSI TS 124 008 [9] without the Routing Area Identification IEI (only the
-- last 6 octets are used)
- gsmLocation [4] GSMLocation OPTIONAL,
- umtsLocation [5] UMTSLocation OPTIONAL,
+ gsmLocation [4] GSMLocation OPTIONAL,
+ umtsLocation [5] UMTSLocation OPTIONAL,
sAI [6] OCTET STRING (SIZE (7)) OPTIONAL,
-- format: PLMN-ID 3 octets (no. 1-3)
-- LAC 2 octets (no. 4-5)
-- SAC 2 octets (no. 6-7)
- -- (according to 3GPP TS 25.413 [31])
- oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL,
+ -- (according to ETSI TS 125 413 [31])
+ oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL,
-- the "Routeing Area Identifier" in the old SGSN is coded in accordance with
- -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI
+ -- ETSI TS 124 008 [9] without the Routing Area Identification IEI
-- (only the last 6 octets are used)
- -- This parameter is duplicated from 3GPP TS 33.108 [11]
+ -- This parameter is duplicated from ETSI TS 133 108 [11]
...,
- postalLocation [8] AddressInformation OPTIONAL,
- extendedLocation [9] ExtendedLocation OPTIONAL,
- userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL,
- -- coded according to 3GPP TS 29.274 [32]; the type IE is not included
+ postalLocation [8] AddressInformation OPTIONAL,
+ extendedLocation [9] ExtendedLocation OPTIONAL,
+ userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL,
+ -- coded according to ETSI TS 129 274 [32]; the type IE is not included
tAI [11] OCTET STRING (SIZE (6)) OPTIONAL,
- -- Only applicable to the CS traffic cases, such as SMS over SGs, according to
- -- 3GPP TS 23.272 [35]
- eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL,
- -- Only applicable to the CS traffic cases, such as SMS over SGs, according to
- -- 3GPP TS 23.272 [35]
- maritimeTransport [13] MaritimeTransport OPTIONAL,
- -- Information about the mobile cells embarked on ships using
+ eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL,
+ maritimeTransport [13] MaritimeTransport OPTIONAL,
+ -- Information about the mobile cells embarked on ships using
-- satellite transponder backhaul
- airTransport [14] AirTransport OPTIONAL,
+ airTransport [14] AirTransport OPTIONAL,
-- Information about the mobile cells embarked on aircraft using
-- satellite transponder backhaul
- bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL
+ bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL,
-- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID
+ nCGI [16] NCGI OPTIONAL,
+ -- format as specified in 3GPP TS 38.413 [42].
+ n3gaLocation [17] OCTET STRING (SIZE (4)) OPTIONAL,
+ -- format as specified in 3GPP TS 29.571 [43]
+ trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL
+ -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or
+ -- TAC (5G) = 3 octets and without length indicator
+}
+
+NCGI ::= SEQUENCE
+{
+ pLMNID [1] PLMNID,
+ nRCellID [2] NRCellID
}
+NRCellID ::= BIT STRING (SIZE(36))
+-- TS 38.413 [23], clause 9.3.1.7
+
GSMLocation ::= CHOICE
{
geoCoordinates [1] SEQUENCE
@@ -1378,10 +1412,13 @@ MapDatum ::= ENUMERATED
iTM(12),
-- Irish Transverse Mercator
...,
- cH1903(13)
+ cH1903(13),
-- Swiss reference system
+ cH1903Plus(14)
+ -- New Swiss reference system
}
+
UMTSLocation ::= CHOICE
{
point [1] GA-Point,
@@ -1653,16 +1690,18 @@ MessageID ::= UTF8String
MsgBillingDetails ::= SEQUENCE
{
subscriberID [1] MsgSubscriberID OPTIONAL,
- serviceID [2] UTF8String OPTIONAL,
+ serviceID [2] UTF8String OPTIONAL,
billingAddress [3] ContactDetails OPTIONAL,
billingIdentifier [4] MsgBillingIdentifier OPTIONAL,
billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL,
- nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL,
+ nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
- ...
+ ...,
+ copyOfBill [7] SEQUENCE OF File OPTIONAL
}
+
NationalMsgBillingDetails ::= SEQUENCE
{
countryCode [1] UTF8String (SIZE (2)),
@@ -1761,39 +1800,41 @@ SubscribedMultimediaServices ::= SEQUENCE
-- Unique identifier for the service provider
timeSpan [3] TimeSpan OPTIONAL,
-- Start and end data, if applicable, of the subscription
- registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL,
+ registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL,
-- The set of identifiers registered for this service
- registeredICCID [5] UTF8String OPTIONAL,
+ registeredICCID [5] UTF8String OPTIONAL,
serviceType [6] MultimediaServiceType OPTIONAL,
- installationAddress [7] AddressInformation OPTIONAL,
+ installationAddress [7] AddressInformation OPTIONAL,
-- installation address, if different from the registered address
- connectionDate [8] GeneralizedTime OPTIONAL,
+ connectionDate [8] GeneralizedTime OPTIONAL,
-- Date the subscriber was actually connected
-- (May differ from the start of subscription)
iMSI [9] IMSI OPTIONAL,
- carrierPreselect [10] BOOLEAN OPTIONAL,
+ carrierPreselect [10] BOOLEAN OPTIONAL,
lineStatus [11] UTF8String OPTIONAL,
-- CSP-specific description of current line status,
-- e.g. "Active", "Ceased", etc.
- nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL,
+ nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL,
-- national extension
...,
- paymentDetails [13] PaymentDetails OPTIONAL,
- subscriptionType [14] SubscriptionType OPTIONAL,
+ paymentDetails [13] PaymentDetails OPTIONAL,
+ subscriptionType [14] SubscriptionType OPTIONAL,
-- Describes the nature of the subscription
- deliveryAddress [15] AddressInformation OPTIONAL,
- resellerAddress [16] AddressInformation OPTIONAL,
- otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL,
- multimediaServiceType [18] UTF8String OPTIONAL,
+ deliveryAddress [15] AddressInformation OPTIONAL,
+ resellerAddress [16] AddressInformation OPTIONAL,
+ otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL,
+ multimediaServiceType [18] UTF8String OPTIONAL,
-- Service name used by the service provider which may be proprietary
- orderTime [19] GeneralizedTime OPTIONAL,
- -- Time when the subscribed service was ordered by the user
- iMEIs [20] SEQUENCE OF IMEI OPTIONAL,
- registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
- privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL,
- allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL
+ orderTime [19] GeneralizedTime OPTIONAL,
+ -- Time when the subscribed service was ordered by the user
+ iMEIs [20] SEQUENCE OF IMEI OPTIONAL,
+ registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
+ privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL,
+ allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL,
+ paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL
}
+
MultimediaServiceType ::= ENUMERATED
{
private(0),
@@ -2004,17 +2045,19 @@ PaniHeaderInfo ::= SEQUENCE
MultimediaBillingDetails ::= SEQUENCE
{
subscriberID [1] MultimediaSubscriberID OPTIONAL,
- serviceID [2] UTF8String OPTIONAL,
+ serviceID [2] UTF8String OPTIONAL,
billingAddress [3] ContactDetails OPTIONAL,
billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL,
billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL,
- nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL,
+ nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL,
-- To be defined on a national basis
-- Only to be used in case the present document cannot fulfil the national requirements
...,
- multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL
+ multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL,
+ copyOfBill [8] SEQUENCE OF File OPTIONAL
}
+
MultimediaBillingAddress ::= SEQUENCE
{
addressSuppliedTime [1] GeneralizedTime OPTIONAL,
@@ -2185,38 +2228,42 @@ NASubscriber ::= SEQUENCE
NAServiceSubscription ::= SEQUENCE
-- Description of the subscription to a Network Access service
{
- validity [1] TimeSpan OPTIONAL,
- naServiceID [2] UTF8String OPTIONAL,
+ validity [1] TimeSpan OPTIONAL,
+ naServiceID [2] UTF8String OPTIONAL,
-- Identifier for the service, e.g. account plan name.
- naProviderID [3] NAProviderID OPTIONAL,
+ naProviderID [3] NAProviderID OPTIONAL,
-- Unique identifier for the provider of the service, e.g. company name
- naAuthID [4] NAAuthID OPTIONAL,
+ naAuthID [4] NAAuthID OPTIONAL,
-- Unique identifier for this subscription, e.g. logon name
- options [5] UTF8String OPTIONAL,
+ options [5] UTF8String OPTIONAL,
-- Human readable text with restrictions or options to the subscription
- installationAddress [6] AddressInformation OPTIONAL,
- fixIpAddress [7] IPAddress OPTIONAL,
+ installationAddress [6] AddressInformation OPTIONAL,
+ fixIpAddress [7] IPAddress OPTIONAL,
-- fix assigned IP address
- imsi [8] IMSI OPTIONAL,
+ imsi [8] IMSI OPTIONAL,
...,
- allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL,
- naServiceStatus [10] UTF8String OPTIONAL,
+ allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL,
+ naServiceStatus [10] UTF8String OPTIONAL,
-- CSP-specific description of current service status, e.g. "Active", "Ceased", etc.
- registeredICCID [11] UTF8String OPTIONAL,
- nationalNASubscription [12] NationalNASubscription OPTIONAL,
- paymentDetails [13] PaymentDetails OPTIONAL,
- additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,
- subscriptionType [15] SubscriptionType OPTIONAL,
+ registeredICCID [11] UTF8String OPTIONAL,
+ nationalNASubscription [12] NationalNASubscription OPTIONAL,
+ paymentDetails [13] PaymentDetails OPTIONAL,
+ additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL,
+ subscriptionType [15] SubscriptionType OPTIONAL,
-- Describes the nature of the subscription
- deliveryAddress [16] AddressInformation OPTIONAL,
- resellerAddress [17] AddressInformation OPTIONAL,
- otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL,
- allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL,
+ deliveryAddress [16] AddressInformation OPTIONAL,
+ resellerAddress [17] AddressInformation OPTIONAL,
+ otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL,
+ allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL,
-- If present, contains device details for all elements from allocatedDeviceIDs
- mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL,
- registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL
+ mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL,
+ registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL,
+ paymentTransactions [22] SEQUENCE OF BillingRecords OPTIONAL,
+ sUPI [23] SUPI OPTIONAL,
+ gPSI [24] GPSI OPTIONAL
}
+
NationalNASubscription ::= SEQUENCE
-- Description of the subscription to a Network Access service
{
@@ -2231,11 +2278,11 @@ NationalNASubscription ::= SEQUENCE
NAServiceUsage ::= SEQUENCE
{
- naAccessTime [1] GeneralizedTime OPTIONAL,
+ naAccessTime [1] GeneralizedTime OPTIONAL,
-- Time of connection to the NAS
naAuthID [2] NAAuthID OPTIONAL,
-- Username used to obtain network access
- nwAccessType [3] NwAccessType OPTIONAL,
+ nwAccessType [3] NwAccessType OPTIONAL,
-- Type of network access attempted. If not undefined(0), this should be one of the types
-- supported by the NAS (identified below by naNwElementID)
naStatus [4] ENUMERATED
@@ -2253,32 +2300,36 @@ NAServiceUsage ::= SEQUENCE
-- Start time and end time (duration) of network access.
naDeviceId [6] NADeviceId OPTIONAL,
-- Device used to access the service
- naNwElementID [7] NANwElementID OPTIONAL,
+ naNwElementID [7] NANwElementID OPTIONAL,
-- Network element (NAS) onto which the naDevice is connected
- naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL,
+ naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL,
-- IP address assigned by the network access service. May be fixed or dynamic
location [9] Location OPTIONAL,
-- Location of the access (for e.g. GPRS handsets)
- dialUpInformation [10] DialUpInformation OPTIONAL,
- gprsInformation [11] GprsInformation OPTIONAL,
+ dialUpInformation [10] DialUpInformation OPTIONAL,
+ gprsInformation [11] GprsInformation OPTIONAL,
...,
- octetsDownloaded [12] INTEGER OPTIONAL,
- octetsUploaded [13] INTEGER OPTIONAL,
+ octetsDownloaded [12] INTEGER OPTIONAL,
+ octetsUploaded [13] INTEGER OPTIONAL,
endReason [14] NAEndReason OPTIONAL,
- subscriberID [15] NaSubscriberID OPTIONAL,
+ subscriberID [15] NaSubscriberID OPTIONAL,
-- Identifier for a known user of this network access
- ePSInformation [16] EPSInformation OPTIONAL,
- wifiInformation [17] WifiInformation OPTIONAL,
- addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL,
+ ePSInformation [16] EPSInformation OPTIONAL,
+ wifiInformation [17] WifiInformation OPTIONAL,
+ addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL,
-- contains extended information about the NAT or PAT operations carried out within this
-- service usage session
naDevice [19] NADevice OPTIONAL,
-- If present, contains the device details for the device referenced in naDeviceID
- additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL
+ additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL,
-- List of additional locations and optional access time during the network access service
-- usage
+ sNSSAI [21] OCTET STRING (SIZE(4)) OPTIONAL,
+ notifyUri [22] OCTET STRING (SIZE(3..8)) OPTIONAL,
+ fiveGSInformation [23] FIVEGSInformation OPTIONAL
}
+
TimedLocation ::= SEQUENCE
{
location [1] Location,
@@ -2476,29 +2527,31 @@ GPRSEvent ::= ENUMERATED
EPSInformation ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
- iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL,
+ iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL,
mSISDN [3] PartyNumber OPTIONAL,
iMEISV [4] IMEI OPTIONAL,
s-GWAddress [5] IPAddress OPTIONAL,
p-GWAddress [6] IPAddress OPTIONAL,
- p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL,
- aPNNetworkID [8] AccessPointNameNI OPTIONAL,
+ p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL,
+ aPNNetworkID [8] AccessPointNameNI OPTIONAL,
pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL,
- -- PDN/PDP Type number as defined in 3GPP TS 29.274 [32] clause 8.34
- pDP-PDNAddress [10] IPAddress OPTIONAL,
+ -- PDN/PDP Type number as defined in ETSI TS 129 274 [32] clause 8.34
+ pDP-PDNAddress [10] IPAddress OPTIONAL,
-- IP address allocated to the PDP context / PDN connection
-- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix
-- when PDP/PDN Type is IPv6 or IPv4v6.
- pDP-PDNAddressExtension [11] IPAddress OPTIONAL,
+ pDP-PDNAddressExtension [11] IPAddress OPTIONAL,
-- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6
- dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL,
- dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL,
- rATType [14] INTEGER (0..255),
- -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17
+ dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL,
+ dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL,
+ rATType [14] INTEGER (0..255) OPTIONAL,
+ -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17
+ -- NOTE - as of v1.23.1 of the present document, this field has changed to optional
ePSEvent [15] EPSEvent OPTIONAL,
...
}
+
IMSIUnauthenticatedFlag ::= BOOLEAN
-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI
@@ -2538,6 +2591,61 @@ EPSEvent ::= ENUMERATED
...
}
+FIVEGSInformation ::= SEQUENCE
+{
+ sUPI [1] SUPI OPTIONAL,
+ dNN [2] UTF8String OPTIONAL,
+ gPSI [3] GPSI OPTIONAL,
+ pEI [4] PEI OPTIONAL,
+ pDUSessionID [6] INTEGER (0..255) OPTIONAL,
+ sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL,
+ pDUIpv4Address [8] IPAddress OPTIONAL,
+ pDUIpv6Address [9] IPAddress OPTIONAL,
+ pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL,
+ rFSPIndex [11] INTEGER (1..255) OPTIONAL,
+ applicationId [12] UTF8String OPTIONAL,
+ applicationServiceProviderIdentity [13] UTF8String OPTIONAL,
+ serviceId [14] INTEGER OPTIONAL,
+ chargingId [15] UTF8String OPTIONAL,
+ pDUType [16] PDUSessionType OPTIONAL,
+ sSCMode [17] SSCMode OPTIONAL,
+ vPLMNId [18] PLMNID OPTIONAL,
+ hPLMNId [19] PLMNID OPTIONAL,
+ chargingCharacteristics [20] UTF8String OPTIONAL,
+ chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL,
+ pDUSessionStartTime [22] GeneralizedTime OPTIONAL,
+ pDUSessionStopTime [23] GeneralizedTime OPTIONAL,
+ lowPriorityIndicator [24] BOOLEAN OPTIONAL,
+ dataOffStatus [25] BOOLEAN OPTIONAL,
+ diagnostics [26] INTEGER OPTIONAL,
+ uETimeZone [27] UTF8String OPTIONAL,
+ uPFAddress [28] IPAddress OPTIONAL,
+ aMFAddress [29] IPAddress OPTIONAL,
+ uDMAddress [30] IPAddress OPTIONAL,
+ sMFAddress [31] IPAddress OPTIONAL,
+ uPFId [32] UUID OPTIONAL,
+ aMFIdentifier [33] AMFID OPTIONAL,
+ uDMIdentifier [34] UUID OPTIONAL,
+ sMFIdentifier [35] UUID OPTIONAL,
+ uPFPDNAddress [36] IPAddress OPTIONAL,
+ uPFPDNAddressExtension [37] IPAddress OPTIONAL,
+ dynamicAddressFlag [38] BOOLEAN OPTIONAL,
+ dynamicAddressFlagExt [39] BOOLEAN OPTIONAL,
+ rAT5Type [40] RAT5Type OPTIONAL,
+ flowQosInfo [41] OCTET STRING OPTIONAL,
+ serviceID [42] INTEGER OPTIONAL
+
+}
+
+PDUSessionType ::= ENUMERATED
+{
+ iPv4(1),
+ iPv6(2),
+ iPv4v6(3),
+ unstructured(4),
+ ethernet(5)
+}
+
-- ====================================
-- Definitions of Network Access Device
-- ====================================
@@ -2559,14 +2667,38 @@ NADevice ::= SEQUENCE
subscriberID [7] NaSubscriberID OPTIONAL
}
+SUPI ::= CHOICE
+{
+ iMSI [1] IMSI,
+ nAI [2] NAI,
+ ...
+}
+
+GPSI ::= CHOICE
+{
+ mSISDN [1] PartyNumber,
+ nAI [2] NAI,
+ ...
+}
+
+PEI ::= CHOICE
+{
+ iMEI [1] IMEI,
+ iMEISV [2] IMEISV
+}
+
IMEI ::= OCTET STRING (SIZE(8))
-- format as per 3GPP TS 09.02 [8]
-- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even
-- if the checksum or software version digits are different or not present.
+IMEISV ::= NumericString (SIZE(16))
+
IMSI ::= OCTET STRING (SIZE(3..8))
-- format as per 3GPP TS 09.02 [8]
+NAI ::= UTF8String
+
-- ======================================
-- Definitions of Message Network element
-- ======================================
@@ -2641,7 +2773,7 @@ IPMask ::= SEQUENCE
NABillingDetails ::= SEQUENCE
{
subscriberID [1] NaSubscriberID OPTIONAL,
- serviceID [2] UTF8String OPTIONAL,
+ serviceID [2] UTF8String OPTIONAL,
billingAddress [3] ContactDetails OPTIONAL,
billingIdentifier [4] BillingIdentifier OPTIONAL,
billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL,
@@ -2654,5 +2786,40 @@ NABillingDetails ::= SEQUENCE
-- Details to be defined on a national basis
}
+SSCMode ::= ENUMERATED
+{
+ sSCMode1(1),
+ sSCMode2(2),
+ sSCMode3MultiPDUSession(3),
+ sSCMode3Multihome(4),
+ ...
+}
+
+PLMNID ::= OCTET STRING (SIZE(3))
+
+UUID ::= OCTET STRING (SIZE(16))
+
+RAT5Type ::= ENUMERATED
+{
+ nr(1),
+ eutra(2),
+ wlan(3),
+ virtual(4),
+ ...
+}
+
+AMFID ::= SEQUENCE
+{
+ aMFRegionID [1] AMFRegionID,
+ aMFSetID [2] AMFSetID,
+ aMFPointer [3] AMFPointer
+}
+
+AMFRegionID ::= INTEGER (0..255)
+
+AMFSetID ::= INTEGER (0..63)
+
+AMFPointer ::= INTEGER (0..1023)
+
END -- end of RDMessage
diff --git a/102657/portal/RDMessagever21.xsd b/102657/portal/RDMessagever21.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..98b86bfe93dda100c15f69f19137c007a946fe18
--- /dev/null
+++ b/102657/portal/RDMessagever21.xsd
@@ -0,0 +1,3175 @@
+
+
+
+
+ XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A country code as per ISO 3166-1 [4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+