From d4191bdc6ab8ce28bea349a59977e6211030e159 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:51 +0100 Subject: [PATCH] TS 102 657 v1.10.1 (2012-09-28) agreed at LI#31 (Split, 2012-09-25) --- 102657/RDMessage.asn | 63 +++++++++++++------ 102657/RDMessage.xsd | 52 ++++++++++++--- ...RDMessage,ver9.txt => RDMessage,ver10.txt} | 63 +++++++++++++------ ...RDMessage,ver9.xsd => RDMessage,ver10.xsd} | 52 ++++++++++++--- 4 files changed, 180 insertions(+), 50 deletions(-) rename 102657/portal/{RDMessage,ver9.txt => RDMessage,ver10.txt} (97%) rename 102657/portal/{RDMessage,ver9.xsd => RDMessage,ver10.xsd} (98%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 9ca87ae..9bc7dd6 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) version9(9)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version9(9)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version10(10)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -28,7 +28,6 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } - -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -81,7 +80,9 @@ RetainedDataPayload ::= CHOICE getstatusMessage [8] GetStatusMessage, statusMessage [9] StatusMessage, getResultsMessage [10] GetResultsMessage, - ... + ..., + supplementaryRequest [11] SupplementaryRequest, + supplementaryResponse [12] SupplementaryResponse } -- ================================================== @@ -312,6 +313,41 @@ NationalRecordPayload ::= SEQUENCE ... } +SupplementaryRequest ::= CHOICE +{ + nationalSupplementaryRequest [1] NationalSupplementaryRequest, + ... +} + +SupplementaryResponse ::= CHOICE +{ + nationalSupplementaryResponse [1] NationalSupplementaryResponse, + ... +} + +NationalSupplementaryRequest ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- 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 a version indicator is included. +} + +NationalSupplementaryResponse ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- 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 a version indicator is included. +} TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -457,7 +493,6 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } - TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -644,8 +679,6 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1061,7 +1094,7 @@ Location ::= SEQUENCE -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 23.003 [30]) + -- (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 @@ -1270,7 +1303,6 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format - MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1449,7 +1481,7 @@ MsgBillingRecords ::= 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. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements @@ -1468,7 +1500,6 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } - MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1585,8 +1616,6 @@ MultimediaPartyInformation ::= SEQUENCE subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [5] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [6] IMSI OPTIONAL, natureOfAddress [7] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1780,7 +1809,6 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } - NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1902,7 +1930,7 @@ NAEndReason ::= ENUMERATED userDisconnect(2), -- e.g. user logs off networkDisconnect(3), - -- e.g. user’s time/credits have been used up + -- e.g. user's time/credits have been used up networkError(4), ... } @@ -1946,10 +1974,9 @@ GprsInformation ::= SEQUENCE pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] ..., - gPRSEvent [8] GPRSEvent OPTIONAL, + gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] - iCCID [9] UTF8String OPTIONAL - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + -- Tag [9] was used in the past and shall not be reused. } GPRSEvent ::= ENUMERATED diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index e1e1f7c..04f9a72 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.9.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1 @@ -792,7 +792,6 @@ - @@ -1780,7 +1779,6 @@ - @@ -2060,6 +2058,8 @@ + + @@ -2192,7 +2192,6 @@ - @@ -2442,5 +2441,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/102657/portal/RDMessage,ver9.txt b/102657/portal/RDMessage,ver10.txt similarity index 97% rename from 102657/portal/RDMessage,ver9.txt rename to 102657/portal/RDMessage,ver10.txt index 9ca87ae..9bc7dd6 100644 --- a/102657/portal/RDMessage,ver9.txt +++ b/102657/portal/RDMessage,ver10.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version9(9)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version9(9)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version10(10)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -28,7 +28,6 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } - -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -81,7 +80,9 @@ RetainedDataPayload ::= CHOICE getstatusMessage [8] GetStatusMessage, statusMessage [9] StatusMessage, getResultsMessage [10] GetResultsMessage, - ... + ..., + supplementaryRequest [11] SupplementaryRequest, + supplementaryResponse [12] SupplementaryResponse } -- ================================================== @@ -312,6 +313,41 @@ NationalRecordPayload ::= SEQUENCE ... } +SupplementaryRequest ::= CHOICE +{ + nationalSupplementaryRequest [1] NationalSupplementaryRequest, + ... +} + +SupplementaryResponse ::= CHOICE +{ + nationalSupplementaryResponse [1] NationalSupplementaryResponse, + ... +} + +NationalSupplementaryRequest ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- 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 a version indicator is included. +} + +NationalSupplementaryResponse ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- 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 a version indicator is included. +} TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -457,7 +493,6 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } - TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -644,8 +679,6 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1061,7 +1094,7 @@ Location ::= SEQUENCE -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 23.003 [30]) + -- (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 @@ -1270,7 +1303,6 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format - MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1449,7 +1481,7 @@ MsgBillingRecords ::= 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. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements @@ -1468,7 +1500,6 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } - MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1585,8 +1616,6 @@ MultimediaPartyInformation ::= SEQUENCE subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [5] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [6] IMSI OPTIONAL, natureOfAddress [7] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1780,7 +1809,6 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } - NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1902,7 +1930,7 @@ NAEndReason ::= ENUMERATED userDisconnect(2), -- e.g. user logs off networkDisconnect(3), - -- e.g. user’s time/credits have been used up + -- e.g. user's time/credits have been used up networkError(4), ... } @@ -1946,10 +1974,9 @@ GprsInformation ::= SEQUENCE pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] ..., - gPRSEvent [8] GPRSEvent OPTIONAL, + gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] - iCCID [9] UTF8String OPTIONAL - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + -- Tag [9] was used in the past and shall not be reused. } GPRSEvent ::= ENUMERATED diff --git a/102657/portal/RDMessage,ver9.xsd b/102657/portal/RDMessage,ver10.xsd similarity index 98% rename from 102657/portal/RDMessage,ver9.xsd rename to 102657/portal/RDMessage,ver10.xsd index e1e1f7c..04f9a72 100644 --- a/102657/portal/RDMessage,ver9.xsd +++ b/102657/portal/RDMessage,ver10.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.9.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1 @@ -792,7 +792,6 @@ - @@ -1780,7 +1779,6 @@ - @@ -2060,6 +2058,8 @@ + + @@ -2192,7 +2192,6 @@ - @@ -2442,5 +2441,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- GitLab