diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 2b94172200e2187641efd8d9bb64ce11bed2d264..2d4e982e514a65fd3758d1ebd6771374e9b6a5c8 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) version16(16)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version17(17)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,8 +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) version16(16)} - +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -29,6 +28,7 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } + -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -100,18 +100,19 @@ RequestMessage ::= SEQUENCE maxHits [4] INTEGER OPTIONAL, -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered - -- In case of maxHit a responseFailed message is sent and no data is sent + -- In case of maxHit a responseFailed message is sent and no data is sent -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements -- or to transmit a warrant. ..., - maxRecordsPerBatch [6] INTEGER OPTIONAL + maxRecordsPerBatch [6] INTEGER OPTIONAL, -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not -- contain more records than specified. (see clause 6.3.3.3) - - + requestedData [7] SEQUENCE OF UTF8String OPTIONAL + -- only to use in case of selective requests, it contains + -- the path to the selected parameter in XPATH notation } DeliveryPointHIB ::= UTF8String @@ -152,7 +153,7 @@ RequestAcknowledgement ::= SEQUENCE -- Definitions of Response message and acknowledgement -- =================================================== -ResponseMessage ::= SEQUENCE +ResponseMessage ::= SEQUENCE { responseStatus [1] ResponseStatus, responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, @@ -186,9 +187,9 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -204,25 +205,25 @@ AdditionalInformation ::= SEQUENCE RetainedDataRecord ::= CHOICE { telephonyRecord [1] TelephonyRecord, - -- Details are defined in Annex B + -- Details are defined in Annex B messageRecord [2] MessageRecord, - -- Details are defined in Annex C + -- Details are defined in Annex C networkAccess [3] NetworkAccessRecord, - -- Details are defined in Annex E + -- Details are defined in Annex E ..., multimediaRecord [4] MultimediaRecord - -- Details are defined in Annex D + -- Details are defined in Annex D -- Other services will be included (as they are implemented) } ResponseAcknowledgement ::= CHOICE { -- Acknowledges a response has been sent - acknowledgeCompleteResults [1] NULL, - acknowledgePartialResults [2] NULL, + acknowledgeCompleteResults [1] NULL, + acknowledgePartialResults [2] NULL, ..., - acknowledgePartialResultsNumber [3] INTEGER - -- number to acknowledge a specific resultMessage within parallel multi-part delivery + acknowledgePartialResultsNumber [3] INTEGER + -- number to acknowledge a specific resultMessage within parallel multi-part delivery } -- ================================================== @@ -231,13 +232,12 @@ ResponseAcknowledgement ::= CHOICE FurtherInformation ::= SEQUENCE { - information [1] UTF8String, - contactInformation [2] UTF8String OPTIONAL, + information [1] UTF8String, + contactInformation [2] UTF8String OPTIONAL, ..., categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4 } - CategorisedErrorDescription ::= SEQUENCE { value [1] INTEGER, @@ -245,10 +245,6 @@ CategorisedErrorDescription ::= SEQUENCE ... } - - - - -- =================================================== -- Definitions of a cancel message and acknowledgement -- =================================================== @@ -314,7 +310,7 @@ NationalRequestParameters ::= SEQUENCE -- In case a given country wants to use additional national parameters according to its law, -- these national parameters should be defined using the ASN.1 syntax and added after the -- extension marker (...). - -- It is recommended that an version indicator is included in the national parameters + -- It is recommended that an version indicator is included in the national parameters -- definition. } @@ -334,13 +330,13 @@ NationalRecordPayload ::= SEQUENCE SupplementaryRequest ::= CHOICE { - nationalSupplementaryRequest [1] NationalSupplementaryRequest, + nationalSupplementaryRequest [1] NationalSupplementaryRequest, ... } SupplementaryResponse ::= CHOICE { - nationalSupplementaryResponse [1] NationalSupplementaryResponse, + nationalSupplementaryResponse [1] NationalSupplementaryResponse, ... } @@ -367,6 +363,7 @@ NationalSupplementaryResponse ::= SEQUENCE -- extension marker (...). -- It is recommended that a version indicator is included. } + TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -415,8 +412,6 @@ OrganizationInfo ::= SEQUENCE -- time that subscriber account was created modifiedDate [14] GeneralizedTime OPTIONAL -- date that subscriber account was modified - - } IndividualInfo ::= SEQUENCE @@ -437,7 +432,6 @@ IndividualInfo ::= SEQUENCE otherAddresses [8] SEQUENCE OF OtherAddress OPTIONAL, createTime [9] GeneralizedTime OPTIONAL -- time that subscriber account was created - } PersonName ::= SEQUENCE @@ -473,26 +467,29 @@ ContactDetails ::= SEQUENCE AddressInformation ::= SEQUENCE { - flatNumber [1] UTF8String OPTIONAL, - buildingName [2] UTF8String OPTIONAL, - buildingNumber [3] UTF8String OPTIONAL, - streetName [4] UTF8String OPTIONAL, - poBox [5] UTF8String OPTIONAL, + flatNumber [1] UTF8String OPTIONAL, + buildingName [2] UTF8String OPTIONAL, + buildingNumber [3] UTF8String OPTIONAL, + streetName [4] UTF8String OPTIONAL, + poBox [5] UTF8String OPTIONAL, -- PO box or Response number - postalCode [6] UTF8String OPTIONAL, + postalCode [6] UTF8String OPTIONAL, -- Postal code. Example: 2289AC - region [7] UTF8String OPTIONAL, - province [8] UTF8String OPTIONAL, - language [9] UTF8String OPTIONAL, - city [10] UTF8String OPTIONAL, - country [11] CountryCode OPTIONAL, + region [7] UTF8String OPTIONAL, + province [8] UTF8String OPTIONAL, + language [9] UTF8String OPTIONAL, + city [10] UTF8String OPTIONAL, + country [11] CountryCode OPTIONAL, -- Country code as defined in ISO 3166-1 [4] - validity [12] TimeSpan OPTIONAL, + validity [12] TimeSpan OPTIONAL, -- time from which the address was registered - ... + ..., + relatedOrganizationInfo [13] OrganizationInfo OPTIONAL, + relatedPersonName [14] PersonName OPTIONAL, + otherInformation [15] UTF8String OPTIONAL + -- additional information in cases of divergent addresses } - OtherAddress ::= SEQUENCE { address [1] AddressInformation OPTIONAL, @@ -503,7 +500,6 @@ OtherAddress ::= SEQUENCE ... } - AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, @@ -531,14 +527,16 @@ BankAccount ::= SEQUENCE nationalBankNumber [5] UTF8String OPTIONAL, -- To be used in case that the account holding bank has neither IBAN nor BIC bankName [6] UTF8String OPTIONAL, - ... + ..., + sepaRefNumber [7] UTF8String OPTIONAL + -- To be used for referenceNumber of a SEPA direct debit mandate } -IBAN ::= UTF8String +IBAN ::= UTF8String -- International Banking Account Number -- format as per ISO 13616-1:2007 [28] -BIC ::= UTF8String +BIC ::= UTF8String -- Business Identifier Code -- format as per ISO 9362:2009 [29] @@ -549,6 +547,7 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -575,7 +574,7 @@ TelephonySubscriber ::= SEQUENCE -- a subscriber (or account) may have more than one service listed against them ..., nationalTelephonySubscriberInfo [5] NationalTelephonySubscriberInfo OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -592,6 +591,40 @@ TelephonySubscriberId ::= UTF8String TelephonySubscriberInfo ::= NULL -- Reserved +PartyNumberInfo ::= SEQUENCE +{ + partyNumber [1] PartyNumber OPTIONAL, + -- referenced partyNumber for the additional information in this type + timeSpan [2] TimeSpan OPTIONAL, + -- start and end date if applicable in which the number was active + disableReason [3] UTF8String OPTIONAL, + -- reason of temporarily disable procedure - if applicable + ... +} + +ICCIDInfo ::= SEQUENCE +{ + iCCID [1] UTF8String OPTIONAL, + timeSpan [2] TimeSpan OPTIONAL, + -- activation- and deactivation-date if applicable in which the ICCID was active + ... +} + +LoginInfo ::= SEQUENCE +{ + login [1] UTF8String OPTIONAL, + -- login used for authentication, usually a username or email address + password [2] UTF8String OPTIONAL, + serviceName [3] UTF8String OPTIONAL, + -- short description of the kind of service the login / password is used for + needsAdditionalAuthentication [4] BOOLEAN OPTIONAL, + -- true if additional authentication methods are required, like security questions or + -- e-tokens + timeSpan [5] TimeSpan OPTIONAL, + -- timespan when the login / password was valid + ... +} + SubscribedTelephonyServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -607,7 +640,7 @@ SubscribedTelephonyServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -618,17 +651,32 @@ SubscribedTelephonyServices ::= SEQUENCE pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, - -- To be defined on a national basis + 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, + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [19] AddressInformation OPTIONAL, resellerAddress [20] AddressInformation OPTIONAL, - otherAddresses [21] SEQUENCE OF OtherAddress 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, + -- in cases of MultiSIM card contracts + loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL + -- e.g. login information according a VMS/UMS account +} +SubscriptionType ::= ENUMERATED +{ + unknown(0), + postpay(1), + prepay(2), + other(3), + ... } + -- Describes the nature of the subscription NationalTelephonySubscriptionInfo ::= SEQUENCE { @@ -637,19 +685,6 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE ... } - -SubscriptionType ::= ENUMERATED -- Describes the nature of the subscription - { - unknown(0), - postpay(1), - prepay(2), - other(3), - ... - } - - - - TelephonyBillingDetails ::= SEQUENCE { subscriberID [1] TelephonySubscriberId OPTIONAL, @@ -659,7 +694,7 @@ TelephonyBillingDetails ::= SEQUENCE billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, ..., nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -682,16 +717,16 @@ BillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card, etc. ..., nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, - -- To be defined on a national basis + -- 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, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis transactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -717,7 +752,7 @@ TelephonyServiceType ::= ENUMERATED TelephonyServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -732,9 +767,12 @@ TelephonyServiceUsage ::= SEQUENCE ringDuration [8] INTEGER OPTIONAL, ..., mmsInformation [9] MmsInformation OPTIONAL, - nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL - -- To be defined on a national basis + nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL, + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + operatorSpecificCallDetails [11] UTF8String OPTIONAL + -- CSP specific value which indicates the nature of a call + -- (e.g. "CallIndicator: GPR, CallActionCode: 2") } NationalTelephonyServiceUsage ::= SEQUENCE @@ -746,7 +784,7 @@ NationalTelephonyServiceUsage ::= SEQUENCE TelephonyPartyInformation ::= SEQUENCE { - partyRole [1] TelephonyPartyRole OPTIONAL, + partyRole [1] TelephonyPartyRole OPTIONAL, partyNumber [2] PartyNumber OPTIONAL, subscriberID [3] TelephonySubscriberId OPTIONAL, deviceID [4] TelephonyDeviceID OPTIONAL, @@ -758,16 +796,16 @@ TelephonyPartyInformation ::= SEQUENCE natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" forwardedTransferredNumber [10] PartyNumber OPTIONAL, - terminatingTransferredNumber [11] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, ..., emailAddress [12] UTF8String OPTIONAL, -- used for MMS that supports also the use of E-Mail addresses (RFC 5322 [24]) iMEI [13] IMEI OPTIONAL, detailedLocation [14] TelephonyNetworkElement OPTIONAL, - -- In the case detailed location information per call and party is available + -- In the case detailed location information per call and party is available -- (e.g. the geoCoordinates for this partyNumber) nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements partyType [16] TelephonyPartyType OPTIONAL, dialledDigits [17] UTF8String OPTIONAL @@ -893,11 +931,11 @@ MmsInformation ::= SEQUENCE TelephonyEventInformation ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, + time [1] GeneralizedTime OPTIONAL, -- time when the event occurred - type [2] TelephonyEventType OPTIONAL, + type [2] TelephonyEventType OPTIONAL, -- type of event - party [3] TelephonyPartyRole OPTIONAL, + party [3] TelephonyPartyRole OPTIONAL, -- party to which the event is related location [4] TelephonyLocation OPTIONAL, ... @@ -912,7 +950,7 @@ TelephonyEventType ::= CHOICE prepayServiceEventType [5] PrepayServiceEventType, ..., nationalTelephonyEventType [6] NationalTelephonyEventType - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1015,12 +1053,11 @@ TelephonyLocation ::= SEQUENCE -- Time span that this location was valid for ..., nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - detailedLocation [4] TelephonyNetworkElement OPTIONAL + detailedLocation [4] TelephonyNetworkElement OPTIONAL -- The extended information for this network element as it was at the time of the - -- communication - + -- communication } NationalTelephonyLocation ::= SEQUENCE @@ -1071,10 +1108,10 @@ TelephonyDevice ::= SEQUENCE -- Unique identifier for this telephony device according to type of identifier ..., subscriberID [3] TelephonySubscriberId OPTIONAL, - -- Identifier for a known user of this equipment. + -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1086,7 +1123,7 @@ NationalTelephonyDevice ::= SEQUENCE } TelephonyDeviceID ::= OCTET STRING - -- A unique identifier for the telephony device. For example, the IMEI number + -- A unique identifier for the telephony device. For example, the IMEI number -- of a mobile handset -- ======================== @@ -1097,11 +1134,11 @@ TelephonyNetworkElement ::= SEQUENCE { telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, cellInformation [2] Location OPTIONAL, - -- The Location information id - validity [3] TimeSpan OPTIONAL, + -- The Location information id + validity [3] TimeSpan OPTIONAL, ..., nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements transmitterDetails [5] TransmitterDetails OPTIONAL } @@ -1150,7 +1187,6 @@ TransmitterTechnology ::= ENUMERATED vIRTUAL(6) -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the -- enumeration values (0 to 6) are not. - } NationalTransmitterDetails ::= SEQUENCE @@ -1166,44 +1202,43 @@ NationalTransmitterDetails ::= SEQUENCE Location ::= SEQUENCE { - 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, + 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]) - rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, + 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 -- last 6 octets are used) - gsmLocation [4] GSMLocation OPTIONAL, - umtsLocation [5] UMTSLocation OPTIONAL, - sAI [6] OCTET STRING (SIZE (7)) 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, + -- 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, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.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] ..., - postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL, + 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 - tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + 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 + 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] - } GSMLocation ::= CHOICE { - geoCoordinates [1] SEQUENCE + geoCoordinates [1] SEQUENCE { latitude [1] UTF8String (SIZE(7..10)) OPTIONAL, -- format: XDDMMSS.SS @@ -1215,22 +1250,22 @@ GSMLocation ::= CHOICE ... }, -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- MM : minutes (numeric characters) - -- SS.SS : seconds, the second part (.SS) is optional + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optional -- Example: - -- latitude (short form) N502312 - -- longitude (long form) E1122312.18 + -- latitude (short form) N502312 + -- longitude (long form) E1122312.18 utmCoordinates [2] SEQUENCE { utm-Zone [1] UTF8String (SIZE(3)) OPTIONAL, - utm-East [2] UTF8String (SIZE(6)) OPTIONAL, - utm-North [3] UTF8String (SIZE(7)) OPTIONAL, + utm-East [2] UTF8String (SIZE(6)) OPTIONAL, + utm-North [3] UTF8String (SIZE(7)) OPTIONAL, -- Universal Transverse Mercator -- example utm-Zone 32U - -- utm-East 439955 - -- utm-North 5540736 + -- utm-East 439955 + -- utm-North 5540736 mapDatum [4] MapDatum OPTIONAL, azimuth [5] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north @@ -1252,17 +1287,17 @@ GSMLocation ::= CHOICE -- squareID PU -- numericalLocationEasting 9129 -- mumericalLocationNorthing 4045 - -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used + -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used -- because of their similarity to the digits one and zero. - mapDatum [6] MapDatum OPTIONAL, - azimuth [7] INTEGER (0..359) OPTIONAL, + mapDatum [6] MapDatum OPTIONAL, + azimuth [7] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north ... }, - wGS84Coordinates [4] OCTET STRING, + wGS84Coordinates [4] OCTET STRING, -- format is as defined in 3GPP TS 03.32 [12] ..., - geoCoordinatesDec [5] SEQUENCE + geoCoordinatesDec [5] SEQUENCE { latitudeDec [1] UTF8String (SIZE(3..12)) OPTIONAL, -- format: XDD.nnnnnnnn @@ -1274,12 +1309,12 @@ GSMLocation ::= CHOICE ... } -- format: XDD.nnnnnnnn (on latitudes) or XDDD.nnnnnnnn (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- nnnnnnnn : post decimal positions (numeric characters) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- nnnnnnnn : post decimal positions (numeric characters) -- Example: - -- latitude N50.38666667 - -- longitude E112.38671670 + -- latitude N50.38666667 + -- longitude E112.38671670 } MapDatum ::= ENUMERATED @@ -1390,7 +1425,7 @@ Route ::= SEQUENCE ... } -HorizontalExtent ::= INTEGER +HorizontalExtent ::= INTEGER -- metres -- =================== @@ -1399,6 +1434,7 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format + MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1440,17 +1476,17 @@ MsgStore ::= SEQUENCE } MsgStoreID ::= OCTET STRING - -- Unique identifier of the message store. Since not all IDs will necessarily be human - -- readable, a generic byte string is used + -- Unique identifier of the message store. Since not all IDs will necessarily be human + -- readable, a generic byte string is used MsgAddress ::= UTF8String - -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail - -- this will be an RFC822-style address - -- NOTE – as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail + -- this will be an RFC822-style address + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String MsgProviderID ::= UTF8String -- Unique identifier for a service provider, e.g. company name - -- NOTE – as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String -- ==================================== -- Definitions of Message Service Usage @@ -1553,7 +1589,7 @@ MsgBillingDetails ::= SEQUENCE billingIdentifier [4] MsgBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -1579,14 +1615,14 @@ MsgBillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card etc. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., msgTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis mgsTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded" etc.) -- Details to be defined on a national bases } @@ -1596,6 +1632,7 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } + MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1610,17 +1647,16 @@ MultimediaRecord ::= CHOICE MultimediaSubscriber ::= SEQUENCE { - subscriberID [1] MultimediaSubscriberID OPTIONAL, + subscriberID [1] MultimediaSubscriberID OPTIONAL, -- unique identifier for this subscriber, e.g. account number - genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, -- generic personal information about this subscriber - multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, + multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, -- service-specific information about this subscriber - subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, + subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them ..., - multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL - + multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL } MultimediaSubscriberInfo ::= SEQUENCE @@ -1632,25 +1668,21 @@ MultimediaSubscriberInfo ::= SEQUENCE MultimediaSubscriberID ::= UTF8String -- unique identifier for this subscriber, e.g. account number - MultimediaServiceRegistrationInfo ::= SEQUENCE { - emailAddress [1] UTF8String OPTIONAL, + emailAddress [1] UTF8String OPTIONAL, -- subscriber email address in RFC2822 format - languageAtRegistration [2] UTF8String OPTIONAL, + languageAtRegistration [2] UTF8String OPTIONAL, -- subscriber language as in ISO 639 accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation - accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, + accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, -- subscriber country as specified in ISO 3166-2 clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version ... } - - - SubscribedMultimediaServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -1666,7 +1698,7 @@ SubscribedMultimediaServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -1677,7 +1709,7 @@ SubscribedMultimediaServices ::= SEQUENCE -- national extension ..., paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [15] AddressInformation OPTIONAL, resellerAddress [16] AddressInformation OPTIONAL, @@ -1686,8 +1718,6 @@ SubscribedMultimediaServices ::= SEQUENCE -- 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 - - } MultimediaServiceType ::= ENUMERATED @@ -1707,7 +1737,7 @@ MultimediaServiceType ::= ENUMERATED MultimediaServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF MultimediaPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -1721,7 +1751,7 @@ MultimediaServiceUsage ::= SEQUENCE callID [8] MultimediaCallID OPTIONAL, originalCallID [9] MultimediaCallID OPTIONAL, callState [10] ENUMERATED - { + { bNotReached(1), bAlert(2), bAnswered(3), @@ -1740,13 +1770,11 @@ MultimediaServiceUsage ::= SEQUENCE relayIP [20] IPAddress OPTIONAL, vmLength [21] INTEGER OPTIONAL, -- number of seconds reason [22] UTF8String OPTIONAL - - } MultimediaPartyInformation ::= SEQUENCE { - partyRole [1] MultimediaPartyRole OPTIONAL, + partyRole [1] MultimediaPartyRole OPTIONAL, partyIdentity [2] PartyIdentity OPTIONAL, subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, @@ -1790,7 +1818,7 @@ MultimediaPartyRole ::= ENUMERATED broadcastReceiver(8), broadcastSender(9), ..., - originalCalling (10) + originalCalling(10) } MultimediaBearerService ::= ENUMERATED @@ -1826,11 +1854,11 @@ ImsInformation ::= SEQUENCE ImsServiceInfo ::= SEQUENCE { - serviceData [1] OCTET STRING OPTIONAL, + serviceData [1] OCTET STRING OPTIONAL, -- service data - serviceType [2] INTEGER OPTIONAL, + serviceType [2] INTEGER OPTIONAL, -- service type - ... + ... } MediaComponent ::= SEQUENCE @@ -1856,11 +1884,10 @@ MultimediaBillingDetails ::= SEQUENCE billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, - -- To be defined on a national basis + -- 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 ::= SEQUENCE @@ -1871,7 +1898,6 @@ MultimediaBillingAddress ::= SEQUENCE ... } - NationalMultimediaBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1891,16 +1917,16 @@ MultimediaBillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card etc. nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... , + ..., multimediaTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis multimediaTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -1956,6 +1982,7 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1986,13 +2013,12 @@ NASubscriber ::= SEQUENCE naSubscriptions [3] SEQUENCE OF NAServiceSubscription OPTIONAL, -- List of all known services subscribed to by this user allocatedDeviceIDs [4] SEQUENCE OF NADeviceId OPTIONAL, - -- List of all known devices allocated to this user. - subscriber [5] GenericSubscriberInfo OPTIONAL , + -- List of all known devices allocated to this user. + subscriber [5] GenericSubscriberInfo OPTIONAL, -- Name, address and other generic subscriber information ..., allocatedDevices [6] SEQUENCE OF NADevice OPTIONAL -- If present, contains device details for all elements from allocatedDeviceIDs - } NAServiceSubscription ::= SEQUENCE @@ -2000,14 +2026,14 @@ NAServiceSubscription ::= SEQUENCE { validity [1] TimeSpan OPTIONAL, naServiceID [2] UTF8String OPTIONAL, - -- Identifier for the service, e.g. account plan name. + -- Identifier for the service, e.g. account plan name. naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription - installationAddress [6] AddressInformation OPTIONAL, + installationAddress [6] AddressInformation OPTIONAL, fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address imsi [8] IMSI OPTIONAL, @@ -2042,14 +2068,14 @@ NationalNASubscription ::= SEQUENCE NAServiceUsage ::= SEQUENCE { - naAccessTime [1] GeneralizedTime OPTIONAL, + naAccessTime [1] GeneralizedTime OPTIONAL, -- Time of connection to the NAS - naAuthID [2] NAAuthID OPTIONAL, + 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 + naStatus [4] ENUMERATED { unknown(0), succeeded(1), @@ -2060,104 +2086,107 @@ NAServiceUsage ::= SEQUENCE -- Rejected by the CSP (e.g. usage limits exceeded) ... } OPTIONAL, - interval [5] TimeSpan OPTIONAL, - -- Start time and end time (duration) of network access. - naDeviceId [6] NADeviceId OPTIONAL, + interval [5] TimeSpan OPTIONAL, + -- 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 [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, - endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL, + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL, + endReason [14] NAEndReason 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, - -- contains extended information about the NAT or PAT operations carried out within this - -- service usage session - naDevice [19] NADevice 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 + -- List of additional locations and optional access time during the network access service + -- usage } - +TimedLocation ::= SEQUENCE +{ + location [1] Location, + naAccessTime [2] GeneralizedTime OPTIONAL, + ... +} WifiInformation ::= SEQUENCE { - bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, -- The Basic Service Set Identification for the connection. - -- This is also the MAC address of the access point (the present document assumes + -- This is also the MAC address of the access point (the present document assumes -- that records are for infrastructure mode, not ad-hoc mode). - -- The MAC address of the user is given in the naDeviceID in the structure (one level up) - sSID [2] UTF8String OPTIONAL, + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, -- The human-readable Service Set Identifier - -- It should be noted that this is typically only available on the air interface and so + -- It should be noted that this is typically only available on the air interface and so -- is not likely to be logged by CSPs (though may be recorded at a more local level). -- Therefore requesting organizations should not expect this to be populated typically. -- It is not guaranteed to be unique. - username [3] UTF8String OPTIONAL, - locationOfAccessPoint [4] Location OPTIONAL, - -- Location of the Access Point as lat/long, grid reference or postal address. - -- Requesting organizations should be aware that Access Points can be moved, sometimes - -- without the knowledge of the CSP - authenticationType [5] AuthenticationType OPTIONAL, - additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, + username [3] UTF8String OPTIONAL, + locationOfAccessPoint [4] Location OPTIONAL, + -- Location of the Access Point as lat/long, grid reference or postal address. + -- Requesting organizations should be aware that Access Points can be moved, sometimes + -- without the knowledge of the CSP + authenticationType [5] AuthenticationType OPTIONAL, + additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, ..., - - accessPointIPAddress [7] IPAddress OPTIONAL, - accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL, - -- Informal description of location, category or type of access point, + accessPointIPAddress [7] IPAddress OPTIONAL, + accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL, + -- Informal description of location, category or type of access point, -- or a name of the network to which the access point belongs. - accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL -- For WiFi, there may be other parties involved in hosting or owning the -- Access Points, e.g. access point provider or partner providers - } - AuthenticationType ::= ENUMERATED { - authenticationBySMS (1), - -- Used if authentication arranged through a code sent to mobile + authenticationBySMS(1), + -- Used if authentication arranged through a code sent to mobile -- additionalAuthenticationInformation shall contain the phone number - authenticationByCookie (2), - -- If authentication was granted on the basis of a cookie left from a previous visit to a + authenticationByCookie(2), + -- If authentication was granted on the basis of a cookie left from a previous visit to a -- site. -- No other mandatory addtionalAuthenticationInformation - authenticationByMACAddress (3), + authenticationByMACAddress(3), -- If authentication was granted because the MAC address of the UE was recognised due - -- to a previous visit. - -- additionalAuthenticationInformation shall contain the MAC Address unless it is already + -- to a previous visit. + -- additionalAuthenticationInformation shall contain the MAC Address unless it is already -- populated as NADeviceID in this record. - authenticationByEAPSIM (4), - -- If authenticated by EAP SIM see TS 33.234 [X] + authenticationByEAPSIM(4), + -- If authenticated by EAP SIM see TS 33.234 [36] -- additionalAuthenticationInformation shall contain the IMSI - -- Other varieties of EAP could be added here later, together with any extra information they - -- could provide. - authenticationByUsernameAndPassword (5), + -- Other varieties of EAP could be added here later, together with any extra information + -- they could provide. + authenticationByUsernameAndPassword(5), -- additionalAuthenticationInformation should contain username and password if appropriate - authenticationByPaymentOrVoucher (6), - -- additionalAuthenticationInformation should contain Voucher or Payment details - -- if appropriate. + authenticationByPaymentOrVoucher(6), + -- additionalAuthenticationInformation should contain Voucher or Payment details + -- if appropriate. ... } AdditionalAuthenticationInformation ::= SEQUENCE { - phoneNumber [1] PartyNumber OPTIONAL, - -- e.g. number to which an SMS was sent + phoneNumber [1] PartyNumber OPTIONAL, + -- e.g. number to which an SMS was sent mACAddress [2] OCTET STRING (SIZE (6)) OPTIONAL, iMSI [3] IMSI OPTIONAL, - username [4] UTF8String OPTIONAL, + username [4] UTF8String OPTIONAL, -- Names supplied are unlikely to be verified password [5] UTF8String OPTIONAL, -- Only to be populated if it is both appropriate and available @@ -2166,30 +2195,29 @@ AdditionalAuthenticationInformation ::= SEQUENCE ... } - - AddressTranslationRecord ::= SEQUENCE { - validity [1] TimeSpan OPTIONAL, + validity [1] TimeSpan OPTIONAL, -- time at which the address translation started and/or ended - privateIPAddress [2] IPAddress OPTIONAL, + privateIPAddress [2] IPAddress OPTIONAL, -- the private IP of the host - privatePort [3] INTEGER OPTIONAL, + privatePort [3] INTEGER OPTIONAL, -- the private port of the host publicIPAddress [4] IPAddress OPTIONAL, - -- the translated IP of the host, i.e. the address known by the remote host + -- the translated IP of the host, i.e. the address known by the remote host publicPort [5] AddressTranslationPortAssignment OPTIONAL, - -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if applicable + -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if + -- applicable destinationIPAddress [6] IPAddress OPTIONAL, -- the IP address of the remote host destinationPort [7] INTEGER OPTIONAL, -- the port of the remote host connectionType [8] ENUMERATED { - udp (0), - tcp (1), - sctp (2), - other (3), + udp(0), + tcp(1), + sctp(2), + other(3), ... } OPTIONAL, ... @@ -2235,19 +2263,20 @@ NwAccessType ::= ENUMERATED -- Cable access lAN(4), -- LAN access - wirelessLAN(5), + wirelessLAN(5), -- Wireless LAN access (e.g. hotspot) wimax(6), - mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. + mobilePacketData(7), + -- Network access over GSM/3GPP GPRS, UMTS, etc. ... } DialUpInformation ::= SEQUENCE { - diallingNumber [1] PartyNumber OPTIONAL, + diallingNumber [1] PartyNumber OPTIONAL, -- Telephone number used for dial-up access dialledNumber [2] PartyNumber OPTIONAL, - callback [3] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, -- Call back number used for dial-up access ... } @@ -2256,26 +2285,26 @@ GprsInformation ::= SEQUENCE { iMSI [1] IMSI OPTIONAL, mSISDN [2] PartyNumber OPTIONAL, - sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, - ggsnAddress [4] IPAddress OPTIONAL, + sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, + ggsnAddress [4] IPAddress OPTIONAL, pDP-address-allocated [5] IPAddress OPTIONAL, aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, - -- format as per TS 101 671 [6] + -- format as per TS 101 671 [6] ..., gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] -- Tag [9] was used in the past and shall not be reused. } -GPRSEvent ::= ENUMERATED +GPRSEvent ::= ENUMERATED { pDPContextActivation(1), pDPContextDeactivation(4), gPRSAttach(5), gPRSDetach(6), - locationInfoUpdate(10), - -- sMS ommited from 3GPP TS 33.108 [11], + locationInfoUpdate(10), + -- sMS ommited from 3GPP TS 33.108 [11] pDPContextModification(11), servingSystem(12), ... @@ -2283,69 +2312,66 @@ GPRSEvent ::= ENUMERATED EPSInformation ::= SEQUENCE { - iMSI [1] IMSI OPTIONAL, - iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, - mSISDN [3] PartyNumber OPTIONAL, - iMEISV [4] IMEI OPTIONAL, + iMSI [1] IMSI 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, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, - -- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34 + -- PDN/PDP Type number as defined in 3GPP TS 29.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, - -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 + -- 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, + -- 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 clause 8.17 - ePSEvent [15] EPSEvent OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255), + -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17 + ePSEvent [15] EPSEvent OPTIONAL, ... } IMSIUnauthenticatedFlag ::= BOOLEAN --- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI + -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI P-GWPLMN-ID ::= OCTET STRING (SIZE (3)) --- This is a copy from the Tracking Area Identity (TAI) IE --- specified in TS 29.274 clause 8.21.4: --- Bits 8 7 6 5 4 3 2 1 --- 1st OCTET MCC digit 2 MCC digit 1 --- 2nd OCTET MNC digit 3 MCC digit 3 --- 3rd OCTET MNC digit 2 MNC digit 1 + -- This is a copy from the Tracking Area Identity (TAI) IE + -- specified in TS 29.274 [32] clause 8.21.4: + -- Bits 8 7 6 5 4 3 2 1 + -- 1st OCTET MCC digit 2 MCC digit 1 + -- 2nd OCTET MNC digit 3 MCC digit 3 + -- 3rd OCTET MNC digit 2 MNC digit 1 AccessPointNameNI ::= IA5String (SIZE(1..63)) --- Network Identifier part of APN in dot representation. --- For example, if the complete APN is --- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs' --- NI is 'apn1a.apn1b.apn1c' + -- Network Identifier part of APN in dot representation. + -- For example, if the complete APN is "apn1a.apn1b.apn1c.mnc022.mcc111.gprs" + -- NI is "apn1a.apn1b.apn1c" DynamicAddressFlag ::= BOOLEAN --- TRUE if the PDP/PDN address is dynamic. --- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 + -- TRUE if the PDP/PDN address is dynamic. + -- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 DynamicAddressFlagExt ::= BOOLEAN --- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated --- during IP CAN bearer activation, initial attach and UE requested --- PDN connectivity with PDP/PDN type IPv4v6. --- FALSE if IPv4 address is static. + -- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated during IP CAN bearer activation, + -- initial attach and UE requested PDN connectivity with PDP/PDN type IPv4v6. + -- FALSE if IPv4 address is static. - -EPSEvent ::= ENUMERATED --- The list of “EPSEvent” below is partly taken from 3GPP TS 33.108 --- EpsHI2Operations from the “EPSEvent ::=ENUMERATED” module +EPSEvent ::= ENUMERATED + -- The list of "EPSEvent" below is partly taken from 3GPP TS 33.108 [11] EpsHI2Operations + -- from the "EPSEvent ::=ENUMERATED" module { - e-UTRANAttach (16), - e-UTRANDetach (17), - bearerActivation (18), - bearerModification (20), - bearerDeactivation (21), - trackingAreaUpdate (25), - servingEvolvedPacketSystem (26), + e-UTRANAttach(16), + e-UTRANDetach(17), + bearerActivation(18), + bearerModification(20), + bearerDeactivation(21), + trackingAreaUpdate(25), + servingEvolvedPacketSystem(26), ... } @@ -2358,7 +2384,7 @@ NADeviceId ::= UTF8String NADevice ::= SEQUENCE { naDeviceId [1] NADeviceId OPTIONAL, - -- Identifier of this device. + -- Identifier of this device. description [2] UTF8String OPTIONAL, -- Human readable description of device location [3] Location OPTIONAL, @@ -2370,12 +2396,12 @@ NADevice ::= SEQUENCE subscriberID [7] NaSubscriberID OPTIONAL } -IMEI ::= OCTET STRING (SIZE(8)) +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 + -- 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. -IMSI ::= OCTET STRING (SIZE(3..8)) +IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] -- ====================================== @@ -2392,7 +2418,7 @@ NANwElement ::= SEQUENCE naNwElementID [2] NANwElementID OPTIONAL, -- Unique ID of this NAS (Network Access Server) naProviderID [3] NAProviderID OPTIONAL, - -- Unique identifier of the provider managing this NAS. + -- Unique identifier of the provider managing this NAS. supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, location [5] Location OPTIONAL, ... @@ -2411,7 +2437,7 @@ NAAssignedAddress ::= SEQUENCE addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, portNumber [2] INTEGER OPTIONAL, -- populated with the outbound port number - addressType [3] ENUMERATED + addressType [3] ENUMERATED { unknown(0), internal(1), @@ -2421,10 +2447,10 @@ NAAssignedAddress ::= SEQUENCE assignedTime [4] TimeSpan OPTIONAL, ..., destinationAddress [5] IPAddress OPTIONAL, - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them destinationPort [6] INTEGER OPTIONAL - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them } @@ -2435,7 +2461,7 @@ IPAddressSetOrRangeOrMask ::= CHOICE mask [2] IPMask } -IPRange ::= SEQUENCE +IPRange ::= SEQUENCE -- Things like 172.16.10.0/26 { prefix [0] IPAddress, @@ -2449,7 +2475,7 @@ IPMask ::= SEQUENCE mask [1] IPAddress } -NABillingDetails ::= SEQUENCE +NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, serviceID [2] UTF8String OPTIONAL, @@ -2461,8 +2487,9 @@ NABillingDetails ::= SEQUENCE -- Unique reference for this transaction/billing record -- Details to be defined on a national basis naTransactionStatus [7] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national basis } END -- end of RDMessage + diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 2ec34b420c9d4032ad32b7611127a94566d54006..0c02a6985697499cdf563cc057139151b17bd19d 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.17.1 @@ -491,6 +491,9 @@ + + + @@ -588,10 +591,11 @@ - - - - + + + + + @@ -648,6 +652,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -689,6 +718,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1032,6 +1082,7 @@ + @@ -1931,10 +1982,24 @@ + + + + + + + + + + + + + + @@ -2217,9 +2282,16 @@ - + - + + + + + + + + diff --git a/102657/portal/RDMessagever16.txt b/102657/portal/RDMessagever17.txt similarity index 81% rename from 102657/portal/RDMessagever16.txt rename to 102657/portal/RDMessagever17.txt index 2b94172200e2187641efd8d9bb64ce11bed2d264..2d4e982e514a65fd3758d1ebd6771374e9b6a5c8 100644 --- a/102657/portal/RDMessagever16.txt +++ b/102657/portal/RDMessagever17.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version17(17)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,8 +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) version16(16)} - +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -29,6 +28,7 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } + -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -100,18 +100,19 @@ RequestMessage ::= SEQUENCE maxHits [4] INTEGER OPTIONAL, -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered - -- In case of maxHit a responseFailed message is sent and no data is sent + -- In case of maxHit a responseFailed message is sent and no data is sent -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements -- or to transmit a warrant. ..., - maxRecordsPerBatch [6] INTEGER OPTIONAL + maxRecordsPerBatch [6] INTEGER OPTIONAL, -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not -- contain more records than specified. (see clause 6.3.3.3) - - + requestedData [7] SEQUENCE OF UTF8String OPTIONAL + -- only to use in case of selective requests, it contains + -- the path to the selected parameter in XPATH notation } DeliveryPointHIB ::= UTF8String @@ -152,7 +153,7 @@ RequestAcknowledgement ::= SEQUENCE -- Definitions of Response message and acknowledgement -- =================================================== -ResponseMessage ::= SEQUENCE +ResponseMessage ::= SEQUENCE { responseStatus [1] ResponseStatus, responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, @@ -186,9 +187,9 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -204,25 +205,25 @@ AdditionalInformation ::= SEQUENCE RetainedDataRecord ::= CHOICE { telephonyRecord [1] TelephonyRecord, - -- Details are defined in Annex B + -- Details are defined in Annex B messageRecord [2] MessageRecord, - -- Details are defined in Annex C + -- Details are defined in Annex C networkAccess [3] NetworkAccessRecord, - -- Details are defined in Annex E + -- Details are defined in Annex E ..., multimediaRecord [4] MultimediaRecord - -- Details are defined in Annex D + -- Details are defined in Annex D -- Other services will be included (as they are implemented) } ResponseAcknowledgement ::= CHOICE { -- Acknowledges a response has been sent - acknowledgeCompleteResults [1] NULL, - acknowledgePartialResults [2] NULL, + acknowledgeCompleteResults [1] NULL, + acknowledgePartialResults [2] NULL, ..., - acknowledgePartialResultsNumber [3] INTEGER - -- number to acknowledge a specific resultMessage within parallel multi-part delivery + acknowledgePartialResultsNumber [3] INTEGER + -- number to acknowledge a specific resultMessage within parallel multi-part delivery } -- ================================================== @@ -231,13 +232,12 @@ ResponseAcknowledgement ::= CHOICE FurtherInformation ::= SEQUENCE { - information [1] UTF8String, - contactInformation [2] UTF8String OPTIONAL, + information [1] UTF8String, + contactInformation [2] UTF8String OPTIONAL, ..., categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4 } - CategorisedErrorDescription ::= SEQUENCE { value [1] INTEGER, @@ -245,10 +245,6 @@ CategorisedErrorDescription ::= SEQUENCE ... } - - - - -- =================================================== -- Definitions of a cancel message and acknowledgement -- =================================================== @@ -314,7 +310,7 @@ NationalRequestParameters ::= SEQUENCE -- In case a given country wants to use additional national parameters according to its law, -- these national parameters should be defined using the ASN.1 syntax and added after the -- extension marker (...). - -- It is recommended that an version indicator is included in the national parameters + -- It is recommended that an version indicator is included in the national parameters -- definition. } @@ -334,13 +330,13 @@ NationalRecordPayload ::= SEQUENCE SupplementaryRequest ::= CHOICE { - nationalSupplementaryRequest [1] NationalSupplementaryRequest, + nationalSupplementaryRequest [1] NationalSupplementaryRequest, ... } SupplementaryResponse ::= CHOICE { - nationalSupplementaryResponse [1] NationalSupplementaryResponse, + nationalSupplementaryResponse [1] NationalSupplementaryResponse, ... } @@ -367,6 +363,7 @@ NationalSupplementaryResponse ::= SEQUENCE -- extension marker (...). -- It is recommended that a version indicator is included. } + TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -415,8 +412,6 @@ OrganizationInfo ::= SEQUENCE -- time that subscriber account was created modifiedDate [14] GeneralizedTime OPTIONAL -- date that subscriber account was modified - - } IndividualInfo ::= SEQUENCE @@ -437,7 +432,6 @@ IndividualInfo ::= SEQUENCE otherAddresses [8] SEQUENCE OF OtherAddress OPTIONAL, createTime [9] GeneralizedTime OPTIONAL -- time that subscriber account was created - } PersonName ::= SEQUENCE @@ -473,26 +467,29 @@ ContactDetails ::= SEQUENCE AddressInformation ::= SEQUENCE { - flatNumber [1] UTF8String OPTIONAL, - buildingName [2] UTF8String OPTIONAL, - buildingNumber [3] UTF8String OPTIONAL, - streetName [4] UTF8String OPTIONAL, - poBox [5] UTF8String OPTIONAL, + flatNumber [1] UTF8String OPTIONAL, + buildingName [2] UTF8String OPTIONAL, + buildingNumber [3] UTF8String OPTIONAL, + streetName [4] UTF8String OPTIONAL, + poBox [5] UTF8String OPTIONAL, -- PO box or Response number - postalCode [6] UTF8String OPTIONAL, + postalCode [6] UTF8String OPTIONAL, -- Postal code. Example: 2289AC - region [7] UTF8String OPTIONAL, - province [8] UTF8String OPTIONAL, - language [9] UTF8String OPTIONAL, - city [10] UTF8String OPTIONAL, - country [11] CountryCode OPTIONAL, + region [7] UTF8String OPTIONAL, + province [8] UTF8String OPTIONAL, + language [9] UTF8String OPTIONAL, + city [10] UTF8String OPTIONAL, + country [11] CountryCode OPTIONAL, -- Country code as defined in ISO 3166-1 [4] - validity [12] TimeSpan OPTIONAL, + validity [12] TimeSpan OPTIONAL, -- time from which the address was registered - ... + ..., + relatedOrganizationInfo [13] OrganizationInfo OPTIONAL, + relatedPersonName [14] PersonName OPTIONAL, + otherInformation [15] UTF8String OPTIONAL + -- additional information in cases of divergent addresses } - OtherAddress ::= SEQUENCE { address [1] AddressInformation OPTIONAL, @@ -503,7 +500,6 @@ OtherAddress ::= SEQUENCE ... } - AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, @@ -531,14 +527,16 @@ BankAccount ::= SEQUENCE nationalBankNumber [5] UTF8String OPTIONAL, -- To be used in case that the account holding bank has neither IBAN nor BIC bankName [6] UTF8String OPTIONAL, - ... + ..., + sepaRefNumber [7] UTF8String OPTIONAL + -- To be used for referenceNumber of a SEPA direct debit mandate } -IBAN ::= UTF8String +IBAN ::= UTF8String -- International Banking Account Number -- format as per ISO 13616-1:2007 [28] -BIC ::= UTF8String +BIC ::= UTF8String -- Business Identifier Code -- format as per ISO 9362:2009 [29] @@ -549,6 +547,7 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -575,7 +574,7 @@ TelephonySubscriber ::= SEQUENCE -- a subscriber (or account) may have more than one service listed against them ..., nationalTelephonySubscriberInfo [5] NationalTelephonySubscriberInfo OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -592,6 +591,40 @@ TelephonySubscriberId ::= UTF8String TelephonySubscriberInfo ::= NULL -- Reserved +PartyNumberInfo ::= SEQUENCE +{ + partyNumber [1] PartyNumber OPTIONAL, + -- referenced partyNumber for the additional information in this type + timeSpan [2] TimeSpan OPTIONAL, + -- start and end date if applicable in which the number was active + disableReason [3] UTF8String OPTIONAL, + -- reason of temporarily disable procedure - if applicable + ... +} + +ICCIDInfo ::= SEQUENCE +{ + iCCID [1] UTF8String OPTIONAL, + timeSpan [2] TimeSpan OPTIONAL, + -- activation- and deactivation-date if applicable in which the ICCID was active + ... +} + +LoginInfo ::= SEQUENCE +{ + login [1] UTF8String OPTIONAL, + -- login used for authentication, usually a username or email address + password [2] UTF8String OPTIONAL, + serviceName [3] UTF8String OPTIONAL, + -- short description of the kind of service the login / password is used for + needsAdditionalAuthentication [4] BOOLEAN OPTIONAL, + -- true if additional authentication methods are required, like security questions or + -- e-tokens + timeSpan [5] TimeSpan OPTIONAL, + -- timespan when the login / password was valid + ... +} + SubscribedTelephonyServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -607,7 +640,7 @@ SubscribedTelephonyServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -618,17 +651,32 @@ SubscribedTelephonyServices ::= SEQUENCE pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, - -- To be defined on a national basis + 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, + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [19] AddressInformation OPTIONAL, resellerAddress [20] AddressInformation OPTIONAL, - otherAddresses [21] SEQUENCE OF OtherAddress 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, + -- in cases of MultiSIM card contracts + loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL + -- e.g. login information according a VMS/UMS account +} +SubscriptionType ::= ENUMERATED +{ + unknown(0), + postpay(1), + prepay(2), + other(3), + ... } + -- Describes the nature of the subscription NationalTelephonySubscriptionInfo ::= SEQUENCE { @@ -637,19 +685,6 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE ... } - -SubscriptionType ::= ENUMERATED -- Describes the nature of the subscription - { - unknown(0), - postpay(1), - prepay(2), - other(3), - ... - } - - - - TelephonyBillingDetails ::= SEQUENCE { subscriberID [1] TelephonySubscriberId OPTIONAL, @@ -659,7 +694,7 @@ TelephonyBillingDetails ::= SEQUENCE billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, ..., nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -682,16 +717,16 @@ BillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card, etc. ..., nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, - -- To be defined on a national basis + -- 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, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis transactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -717,7 +752,7 @@ TelephonyServiceType ::= ENUMERATED TelephonyServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -732,9 +767,12 @@ TelephonyServiceUsage ::= SEQUENCE ringDuration [8] INTEGER OPTIONAL, ..., mmsInformation [9] MmsInformation OPTIONAL, - nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL - -- To be defined on a national basis + nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL, + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + operatorSpecificCallDetails [11] UTF8String OPTIONAL + -- CSP specific value which indicates the nature of a call + -- (e.g. "CallIndicator: GPR, CallActionCode: 2") } NationalTelephonyServiceUsage ::= SEQUENCE @@ -746,7 +784,7 @@ NationalTelephonyServiceUsage ::= SEQUENCE TelephonyPartyInformation ::= SEQUENCE { - partyRole [1] TelephonyPartyRole OPTIONAL, + partyRole [1] TelephonyPartyRole OPTIONAL, partyNumber [2] PartyNumber OPTIONAL, subscriberID [3] TelephonySubscriberId OPTIONAL, deviceID [4] TelephonyDeviceID OPTIONAL, @@ -758,16 +796,16 @@ TelephonyPartyInformation ::= SEQUENCE natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" forwardedTransferredNumber [10] PartyNumber OPTIONAL, - terminatingTransferredNumber [11] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, ..., emailAddress [12] UTF8String OPTIONAL, -- used for MMS that supports also the use of E-Mail addresses (RFC 5322 [24]) iMEI [13] IMEI OPTIONAL, detailedLocation [14] TelephonyNetworkElement OPTIONAL, - -- In the case detailed location information per call and party is available + -- In the case detailed location information per call and party is available -- (e.g. the geoCoordinates for this partyNumber) nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements partyType [16] TelephonyPartyType OPTIONAL, dialledDigits [17] UTF8String OPTIONAL @@ -893,11 +931,11 @@ MmsInformation ::= SEQUENCE TelephonyEventInformation ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, + time [1] GeneralizedTime OPTIONAL, -- time when the event occurred - type [2] TelephonyEventType OPTIONAL, + type [2] TelephonyEventType OPTIONAL, -- type of event - party [3] TelephonyPartyRole OPTIONAL, + party [3] TelephonyPartyRole OPTIONAL, -- party to which the event is related location [4] TelephonyLocation OPTIONAL, ... @@ -912,7 +950,7 @@ TelephonyEventType ::= CHOICE prepayServiceEventType [5] PrepayServiceEventType, ..., nationalTelephonyEventType [6] NationalTelephonyEventType - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1015,12 +1053,11 @@ TelephonyLocation ::= SEQUENCE -- Time span that this location was valid for ..., nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - detailedLocation [4] TelephonyNetworkElement OPTIONAL + detailedLocation [4] TelephonyNetworkElement OPTIONAL -- The extended information for this network element as it was at the time of the - -- communication - + -- communication } NationalTelephonyLocation ::= SEQUENCE @@ -1071,10 +1108,10 @@ TelephonyDevice ::= SEQUENCE -- Unique identifier for this telephony device according to type of identifier ..., subscriberID [3] TelephonySubscriberId OPTIONAL, - -- Identifier for a known user of this equipment. + -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1086,7 +1123,7 @@ NationalTelephonyDevice ::= SEQUENCE } TelephonyDeviceID ::= OCTET STRING - -- A unique identifier for the telephony device. For example, the IMEI number + -- A unique identifier for the telephony device. For example, the IMEI number -- of a mobile handset -- ======================== @@ -1097,11 +1134,11 @@ TelephonyNetworkElement ::= SEQUENCE { telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, cellInformation [2] Location OPTIONAL, - -- The Location information id - validity [3] TimeSpan OPTIONAL, + -- The Location information id + validity [3] TimeSpan OPTIONAL, ..., nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements transmitterDetails [5] TransmitterDetails OPTIONAL } @@ -1150,7 +1187,6 @@ TransmitterTechnology ::= ENUMERATED vIRTUAL(6) -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the -- enumeration values (0 to 6) are not. - } NationalTransmitterDetails ::= SEQUENCE @@ -1166,44 +1202,43 @@ NationalTransmitterDetails ::= SEQUENCE Location ::= SEQUENCE { - 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, + 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]) - rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, + 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 -- last 6 octets are used) - gsmLocation [4] GSMLocation OPTIONAL, - umtsLocation [5] UMTSLocation OPTIONAL, - sAI [6] OCTET STRING (SIZE (7)) 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, + -- 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, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.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] ..., - postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL, + 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 - tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + 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 + 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] - } GSMLocation ::= CHOICE { - geoCoordinates [1] SEQUENCE + geoCoordinates [1] SEQUENCE { latitude [1] UTF8String (SIZE(7..10)) OPTIONAL, -- format: XDDMMSS.SS @@ -1215,22 +1250,22 @@ GSMLocation ::= CHOICE ... }, -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- MM : minutes (numeric characters) - -- SS.SS : seconds, the second part (.SS) is optional + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optional -- Example: - -- latitude (short form) N502312 - -- longitude (long form) E1122312.18 + -- latitude (short form) N502312 + -- longitude (long form) E1122312.18 utmCoordinates [2] SEQUENCE { utm-Zone [1] UTF8String (SIZE(3)) OPTIONAL, - utm-East [2] UTF8String (SIZE(6)) OPTIONAL, - utm-North [3] UTF8String (SIZE(7)) OPTIONAL, + utm-East [2] UTF8String (SIZE(6)) OPTIONAL, + utm-North [3] UTF8String (SIZE(7)) OPTIONAL, -- Universal Transverse Mercator -- example utm-Zone 32U - -- utm-East 439955 - -- utm-North 5540736 + -- utm-East 439955 + -- utm-North 5540736 mapDatum [4] MapDatum OPTIONAL, azimuth [5] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north @@ -1252,17 +1287,17 @@ GSMLocation ::= CHOICE -- squareID PU -- numericalLocationEasting 9129 -- mumericalLocationNorthing 4045 - -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used + -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used -- because of their similarity to the digits one and zero. - mapDatum [6] MapDatum OPTIONAL, - azimuth [7] INTEGER (0..359) OPTIONAL, + mapDatum [6] MapDatum OPTIONAL, + azimuth [7] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north ... }, - wGS84Coordinates [4] OCTET STRING, + wGS84Coordinates [4] OCTET STRING, -- format is as defined in 3GPP TS 03.32 [12] ..., - geoCoordinatesDec [5] SEQUENCE + geoCoordinatesDec [5] SEQUENCE { latitudeDec [1] UTF8String (SIZE(3..12)) OPTIONAL, -- format: XDD.nnnnnnnn @@ -1274,12 +1309,12 @@ GSMLocation ::= CHOICE ... } -- format: XDD.nnnnnnnn (on latitudes) or XDDD.nnnnnnnn (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- nnnnnnnn : post decimal positions (numeric characters) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- nnnnnnnn : post decimal positions (numeric characters) -- Example: - -- latitude N50.38666667 - -- longitude E112.38671670 + -- latitude N50.38666667 + -- longitude E112.38671670 } MapDatum ::= ENUMERATED @@ -1390,7 +1425,7 @@ Route ::= SEQUENCE ... } -HorizontalExtent ::= INTEGER +HorizontalExtent ::= INTEGER -- metres -- =================== @@ -1399,6 +1434,7 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format + MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1440,17 +1476,17 @@ MsgStore ::= SEQUENCE } MsgStoreID ::= OCTET STRING - -- Unique identifier of the message store. Since not all IDs will necessarily be human - -- readable, a generic byte string is used + -- Unique identifier of the message store. Since not all IDs will necessarily be human + -- readable, a generic byte string is used MsgAddress ::= UTF8String - -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail - -- this will be an RFC822-style address - -- NOTE – as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail + -- this will be an RFC822-style address + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String MsgProviderID ::= UTF8String -- Unique identifier for a service provider, e.g. company name - -- NOTE – as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String -- ==================================== -- Definitions of Message Service Usage @@ -1553,7 +1589,7 @@ MsgBillingDetails ::= SEQUENCE billingIdentifier [4] MsgBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -1579,14 +1615,14 @@ MsgBillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card etc. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., msgTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis mgsTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded" etc.) -- Details to be defined on a national bases } @@ -1596,6 +1632,7 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } + MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1610,17 +1647,16 @@ MultimediaRecord ::= CHOICE MultimediaSubscriber ::= SEQUENCE { - subscriberID [1] MultimediaSubscriberID OPTIONAL, + subscriberID [1] MultimediaSubscriberID OPTIONAL, -- unique identifier for this subscriber, e.g. account number - genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, -- generic personal information about this subscriber - multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, + multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, -- service-specific information about this subscriber - subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, + subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them ..., - multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL - + multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL } MultimediaSubscriberInfo ::= SEQUENCE @@ -1632,25 +1668,21 @@ MultimediaSubscriberInfo ::= SEQUENCE MultimediaSubscriberID ::= UTF8String -- unique identifier for this subscriber, e.g. account number - MultimediaServiceRegistrationInfo ::= SEQUENCE { - emailAddress [1] UTF8String OPTIONAL, + emailAddress [1] UTF8String OPTIONAL, -- subscriber email address in RFC2822 format - languageAtRegistration [2] UTF8String OPTIONAL, + languageAtRegistration [2] UTF8String OPTIONAL, -- subscriber language as in ISO 639 accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation - accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, + accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, -- subscriber country as specified in ISO 3166-2 clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version ... } - - - SubscribedMultimediaServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -1666,7 +1698,7 @@ SubscribedMultimediaServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -1677,7 +1709,7 @@ SubscribedMultimediaServices ::= SEQUENCE -- national extension ..., paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [15] AddressInformation OPTIONAL, resellerAddress [16] AddressInformation OPTIONAL, @@ -1686,8 +1718,6 @@ SubscribedMultimediaServices ::= SEQUENCE -- 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 - - } MultimediaServiceType ::= ENUMERATED @@ -1707,7 +1737,7 @@ MultimediaServiceType ::= ENUMERATED MultimediaServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF MultimediaPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -1721,7 +1751,7 @@ MultimediaServiceUsage ::= SEQUENCE callID [8] MultimediaCallID OPTIONAL, originalCallID [9] MultimediaCallID OPTIONAL, callState [10] ENUMERATED - { + { bNotReached(1), bAlert(2), bAnswered(3), @@ -1740,13 +1770,11 @@ MultimediaServiceUsage ::= SEQUENCE relayIP [20] IPAddress OPTIONAL, vmLength [21] INTEGER OPTIONAL, -- number of seconds reason [22] UTF8String OPTIONAL - - } MultimediaPartyInformation ::= SEQUENCE { - partyRole [1] MultimediaPartyRole OPTIONAL, + partyRole [1] MultimediaPartyRole OPTIONAL, partyIdentity [2] PartyIdentity OPTIONAL, subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, @@ -1790,7 +1818,7 @@ MultimediaPartyRole ::= ENUMERATED broadcastReceiver(8), broadcastSender(9), ..., - originalCalling (10) + originalCalling(10) } MultimediaBearerService ::= ENUMERATED @@ -1826,11 +1854,11 @@ ImsInformation ::= SEQUENCE ImsServiceInfo ::= SEQUENCE { - serviceData [1] OCTET STRING OPTIONAL, + serviceData [1] OCTET STRING OPTIONAL, -- service data - serviceType [2] INTEGER OPTIONAL, + serviceType [2] INTEGER OPTIONAL, -- service type - ... + ... } MediaComponent ::= SEQUENCE @@ -1856,11 +1884,10 @@ MultimediaBillingDetails ::= SEQUENCE billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, - -- To be defined on a national basis + -- 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 ::= SEQUENCE @@ -1871,7 +1898,6 @@ MultimediaBillingAddress ::= SEQUENCE ... } - NationalMultimediaBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1891,16 +1917,16 @@ MultimediaBillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card etc. nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... , + ..., multimediaTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis multimediaTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -1956,6 +1982,7 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1986,13 +2013,12 @@ NASubscriber ::= SEQUENCE naSubscriptions [3] SEQUENCE OF NAServiceSubscription OPTIONAL, -- List of all known services subscribed to by this user allocatedDeviceIDs [4] SEQUENCE OF NADeviceId OPTIONAL, - -- List of all known devices allocated to this user. - subscriber [5] GenericSubscriberInfo OPTIONAL , + -- List of all known devices allocated to this user. + subscriber [5] GenericSubscriberInfo OPTIONAL, -- Name, address and other generic subscriber information ..., allocatedDevices [6] SEQUENCE OF NADevice OPTIONAL -- If present, contains device details for all elements from allocatedDeviceIDs - } NAServiceSubscription ::= SEQUENCE @@ -2000,14 +2026,14 @@ NAServiceSubscription ::= SEQUENCE { validity [1] TimeSpan OPTIONAL, naServiceID [2] UTF8String OPTIONAL, - -- Identifier for the service, e.g. account plan name. + -- Identifier for the service, e.g. account plan name. naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription - installationAddress [6] AddressInformation OPTIONAL, + installationAddress [6] AddressInformation OPTIONAL, fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address imsi [8] IMSI OPTIONAL, @@ -2042,14 +2068,14 @@ NationalNASubscription ::= SEQUENCE NAServiceUsage ::= SEQUENCE { - naAccessTime [1] GeneralizedTime OPTIONAL, + naAccessTime [1] GeneralizedTime OPTIONAL, -- Time of connection to the NAS - naAuthID [2] NAAuthID OPTIONAL, + 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 + naStatus [4] ENUMERATED { unknown(0), succeeded(1), @@ -2060,104 +2086,107 @@ NAServiceUsage ::= SEQUENCE -- Rejected by the CSP (e.g. usage limits exceeded) ... } OPTIONAL, - interval [5] TimeSpan OPTIONAL, - -- Start time and end time (duration) of network access. - naDeviceId [6] NADeviceId OPTIONAL, + interval [5] TimeSpan OPTIONAL, + -- 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 [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, - endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL, + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL, + endReason [14] NAEndReason 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, - -- contains extended information about the NAT or PAT operations carried out within this - -- service usage session - naDevice [19] NADevice 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 + -- List of additional locations and optional access time during the network access service + -- usage } - +TimedLocation ::= SEQUENCE +{ + location [1] Location, + naAccessTime [2] GeneralizedTime OPTIONAL, + ... +} WifiInformation ::= SEQUENCE { - bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, -- The Basic Service Set Identification for the connection. - -- This is also the MAC address of the access point (the present document assumes + -- This is also the MAC address of the access point (the present document assumes -- that records are for infrastructure mode, not ad-hoc mode). - -- The MAC address of the user is given in the naDeviceID in the structure (one level up) - sSID [2] UTF8String OPTIONAL, + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, -- The human-readable Service Set Identifier - -- It should be noted that this is typically only available on the air interface and so + -- It should be noted that this is typically only available on the air interface and so -- is not likely to be logged by CSPs (though may be recorded at a more local level). -- Therefore requesting organizations should not expect this to be populated typically. -- It is not guaranteed to be unique. - username [3] UTF8String OPTIONAL, - locationOfAccessPoint [4] Location OPTIONAL, - -- Location of the Access Point as lat/long, grid reference or postal address. - -- Requesting organizations should be aware that Access Points can be moved, sometimes - -- without the knowledge of the CSP - authenticationType [5] AuthenticationType OPTIONAL, - additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, + username [3] UTF8String OPTIONAL, + locationOfAccessPoint [4] Location OPTIONAL, + -- Location of the Access Point as lat/long, grid reference or postal address. + -- Requesting organizations should be aware that Access Points can be moved, sometimes + -- without the knowledge of the CSP + authenticationType [5] AuthenticationType OPTIONAL, + additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, ..., - - accessPointIPAddress [7] IPAddress OPTIONAL, - accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL, - -- Informal description of location, category or type of access point, + accessPointIPAddress [7] IPAddress OPTIONAL, + accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL, + -- Informal description of location, category or type of access point, -- or a name of the network to which the access point belongs. - accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL -- For WiFi, there may be other parties involved in hosting or owning the -- Access Points, e.g. access point provider or partner providers - } - AuthenticationType ::= ENUMERATED { - authenticationBySMS (1), - -- Used if authentication arranged through a code sent to mobile + authenticationBySMS(1), + -- Used if authentication arranged through a code sent to mobile -- additionalAuthenticationInformation shall contain the phone number - authenticationByCookie (2), - -- If authentication was granted on the basis of a cookie left from a previous visit to a + authenticationByCookie(2), + -- If authentication was granted on the basis of a cookie left from a previous visit to a -- site. -- No other mandatory addtionalAuthenticationInformation - authenticationByMACAddress (3), + authenticationByMACAddress(3), -- If authentication was granted because the MAC address of the UE was recognised due - -- to a previous visit. - -- additionalAuthenticationInformation shall contain the MAC Address unless it is already + -- to a previous visit. + -- additionalAuthenticationInformation shall contain the MAC Address unless it is already -- populated as NADeviceID in this record. - authenticationByEAPSIM (4), - -- If authenticated by EAP SIM see TS 33.234 [X] + authenticationByEAPSIM(4), + -- If authenticated by EAP SIM see TS 33.234 [36] -- additionalAuthenticationInformation shall contain the IMSI - -- Other varieties of EAP could be added here later, together with any extra information they - -- could provide. - authenticationByUsernameAndPassword (5), + -- Other varieties of EAP could be added here later, together with any extra information + -- they could provide. + authenticationByUsernameAndPassword(5), -- additionalAuthenticationInformation should contain username and password if appropriate - authenticationByPaymentOrVoucher (6), - -- additionalAuthenticationInformation should contain Voucher or Payment details - -- if appropriate. + authenticationByPaymentOrVoucher(6), + -- additionalAuthenticationInformation should contain Voucher or Payment details + -- if appropriate. ... } AdditionalAuthenticationInformation ::= SEQUENCE { - phoneNumber [1] PartyNumber OPTIONAL, - -- e.g. number to which an SMS was sent + phoneNumber [1] PartyNumber OPTIONAL, + -- e.g. number to which an SMS was sent mACAddress [2] OCTET STRING (SIZE (6)) OPTIONAL, iMSI [3] IMSI OPTIONAL, - username [4] UTF8String OPTIONAL, + username [4] UTF8String OPTIONAL, -- Names supplied are unlikely to be verified password [5] UTF8String OPTIONAL, -- Only to be populated if it is both appropriate and available @@ -2166,30 +2195,29 @@ AdditionalAuthenticationInformation ::= SEQUENCE ... } - - AddressTranslationRecord ::= SEQUENCE { - validity [1] TimeSpan OPTIONAL, + validity [1] TimeSpan OPTIONAL, -- time at which the address translation started and/or ended - privateIPAddress [2] IPAddress OPTIONAL, + privateIPAddress [2] IPAddress OPTIONAL, -- the private IP of the host - privatePort [3] INTEGER OPTIONAL, + privatePort [3] INTEGER OPTIONAL, -- the private port of the host publicIPAddress [4] IPAddress OPTIONAL, - -- the translated IP of the host, i.e. the address known by the remote host + -- the translated IP of the host, i.e. the address known by the remote host publicPort [5] AddressTranslationPortAssignment OPTIONAL, - -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if applicable + -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if + -- applicable destinationIPAddress [6] IPAddress OPTIONAL, -- the IP address of the remote host destinationPort [7] INTEGER OPTIONAL, -- the port of the remote host connectionType [8] ENUMERATED { - udp (0), - tcp (1), - sctp (2), - other (3), + udp(0), + tcp(1), + sctp(2), + other(3), ... } OPTIONAL, ... @@ -2235,19 +2263,20 @@ NwAccessType ::= ENUMERATED -- Cable access lAN(4), -- LAN access - wirelessLAN(5), + wirelessLAN(5), -- Wireless LAN access (e.g. hotspot) wimax(6), - mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. + mobilePacketData(7), + -- Network access over GSM/3GPP GPRS, UMTS, etc. ... } DialUpInformation ::= SEQUENCE { - diallingNumber [1] PartyNumber OPTIONAL, + diallingNumber [1] PartyNumber OPTIONAL, -- Telephone number used for dial-up access dialledNumber [2] PartyNumber OPTIONAL, - callback [3] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, -- Call back number used for dial-up access ... } @@ -2256,26 +2285,26 @@ GprsInformation ::= SEQUENCE { iMSI [1] IMSI OPTIONAL, mSISDN [2] PartyNumber OPTIONAL, - sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, - ggsnAddress [4] IPAddress OPTIONAL, + sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, + ggsnAddress [4] IPAddress OPTIONAL, pDP-address-allocated [5] IPAddress OPTIONAL, aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, - -- format as per TS 101 671 [6] + -- format as per TS 101 671 [6] ..., gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] -- Tag [9] was used in the past and shall not be reused. } -GPRSEvent ::= ENUMERATED +GPRSEvent ::= ENUMERATED { pDPContextActivation(1), pDPContextDeactivation(4), gPRSAttach(5), gPRSDetach(6), - locationInfoUpdate(10), - -- sMS ommited from 3GPP TS 33.108 [11], + locationInfoUpdate(10), + -- sMS ommited from 3GPP TS 33.108 [11] pDPContextModification(11), servingSystem(12), ... @@ -2283,69 +2312,66 @@ GPRSEvent ::= ENUMERATED EPSInformation ::= SEQUENCE { - iMSI [1] IMSI OPTIONAL, - iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, - mSISDN [3] PartyNumber OPTIONAL, - iMEISV [4] IMEI OPTIONAL, + iMSI [1] IMSI 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, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, - -- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34 + -- PDN/PDP Type number as defined in 3GPP TS 29.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, - -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 + -- 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, + -- 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 clause 8.17 - ePSEvent [15] EPSEvent OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255), + -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17 + ePSEvent [15] EPSEvent OPTIONAL, ... } IMSIUnauthenticatedFlag ::= BOOLEAN --- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI + -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI P-GWPLMN-ID ::= OCTET STRING (SIZE (3)) --- This is a copy from the Tracking Area Identity (TAI) IE --- specified in TS 29.274 clause 8.21.4: --- Bits 8 7 6 5 4 3 2 1 --- 1st OCTET MCC digit 2 MCC digit 1 --- 2nd OCTET MNC digit 3 MCC digit 3 --- 3rd OCTET MNC digit 2 MNC digit 1 + -- This is a copy from the Tracking Area Identity (TAI) IE + -- specified in TS 29.274 [32] clause 8.21.4: + -- Bits 8 7 6 5 4 3 2 1 + -- 1st OCTET MCC digit 2 MCC digit 1 + -- 2nd OCTET MNC digit 3 MCC digit 3 + -- 3rd OCTET MNC digit 2 MNC digit 1 AccessPointNameNI ::= IA5String (SIZE(1..63)) --- Network Identifier part of APN in dot representation. --- For example, if the complete APN is --- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs' --- NI is 'apn1a.apn1b.apn1c' + -- Network Identifier part of APN in dot representation. + -- For example, if the complete APN is "apn1a.apn1b.apn1c.mnc022.mcc111.gprs" + -- NI is "apn1a.apn1b.apn1c" DynamicAddressFlag ::= BOOLEAN --- TRUE if the PDP/PDN address is dynamic. --- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 + -- TRUE if the PDP/PDN address is dynamic. + -- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 DynamicAddressFlagExt ::= BOOLEAN --- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated --- during IP CAN bearer activation, initial attach and UE requested --- PDN connectivity with PDP/PDN type IPv4v6. --- FALSE if IPv4 address is static. + -- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated during IP CAN bearer activation, + -- initial attach and UE requested PDN connectivity with PDP/PDN type IPv4v6. + -- FALSE if IPv4 address is static. - -EPSEvent ::= ENUMERATED --- The list of “EPSEvent” below is partly taken from 3GPP TS 33.108 --- EpsHI2Operations from the “EPSEvent ::=ENUMERATED” module +EPSEvent ::= ENUMERATED + -- The list of "EPSEvent" below is partly taken from 3GPP TS 33.108 [11] EpsHI2Operations + -- from the "EPSEvent ::=ENUMERATED" module { - e-UTRANAttach (16), - e-UTRANDetach (17), - bearerActivation (18), - bearerModification (20), - bearerDeactivation (21), - trackingAreaUpdate (25), - servingEvolvedPacketSystem (26), + e-UTRANAttach(16), + e-UTRANDetach(17), + bearerActivation(18), + bearerModification(20), + bearerDeactivation(21), + trackingAreaUpdate(25), + servingEvolvedPacketSystem(26), ... } @@ -2358,7 +2384,7 @@ NADeviceId ::= UTF8String NADevice ::= SEQUENCE { naDeviceId [1] NADeviceId OPTIONAL, - -- Identifier of this device. + -- Identifier of this device. description [2] UTF8String OPTIONAL, -- Human readable description of device location [3] Location OPTIONAL, @@ -2370,12 +2396,12 @@ NADevice ::= SEQUENCE subscriberID [7] NaSubscriberID OPTIONAL } -IMEI ::= OCTET STRING (SIZE(8)) +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 + -- 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. -IMSI ::= OCTET STRING (SIZE(3..8)) +IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] -- ====================================== @@ -2392,7 +2418,7 @@ NANwElement ::= SEQUENCE naNwElementID [2] NANwElementID OPTIONAL, -- Unique ID of this NAS (Network Access Server) naProviderID [3] NAProviderID OPTIONAL, - -- Unique identifier of the provider managing this NAS. + -- Unique identifier of the provider managing this NAS. supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, location [5] Location OPTIONAL, ... @@ -2411,7 +2437,7 @@ NAAssignedAddress ::= SEQUENCE addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, portNumber [2] INTEGER OPTIONAL, -- populated with the outbound port number - addressType [3] ENUMERATED + addressType [3] ENUMERATED { unknown(0), internal(1), @@ -2421,10 +2447,10 @@ NAAssignedAddress ::= SEQUENCE assignedTime [4] TimeSpan OPTIONAL, ..., destinationAddress [5] IPAddress OPTIONAL, - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them destinationPort [6] INTEGER OPTIONAL - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them } @@ -2435,7 +2461,7 @@ IPAddressSetOrRangeOrMask ::= CHOICE mask [2] IPMask } -IPRange ::= SEQUENCE +IPRange ::= SEQUENCE -- Things like 172.16.10.0/26 { prefix [0] IPAddress, @@ -2449,7 +2475,7 @@ IPMask ::= SEQUENCE mask [1] IPAddress } -NABillingDetails ::= SEQUENCE +NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, serviceID [2] UTF8String OPTIONAL, @@ -2461,8 +2487,9 @@ NABillingDetails ::= SEQUENCE -- Unique reference for this transaction/billing record -- Details to be defined on a national basis naTransactionStatus [7] UTF8String OPTIONAL - -- Status of the transaction (i.e. “declined”, “succeeded” etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national basis } END -- end of RDMessage + diff --git a/102657/portal/RDMessagever16.xsd b/102657/portal/RDMessagever17.xsd similarity index 97% rename from 102657/portal/RDMessagever16.xsd rename to 102657/portal/RDMessagever17.xsd index 2ec34b420c9d4032ad32b7611127a94566d54006..0c02a6985697499cdf563cc057139151b17bd19d 100644 --- a/102657/portal/RDMessagever16.xsd +++ b/102657/portal/RDMessagever17.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.17.1 @@ -491,6 +491,9 @@ + + + @@ -588,10 +591,11 @@ - - - - + + + + + @@ -648,6 +652,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -689,6 +718,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1032,6 +1082,7 @@ + @@ -1931,10 +1982,24 @@ + + + + + + + + + + + + + + @@ -2217,9 +2282,16 @@ - + - + + + + + + + +