diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 12b1295d59b37b83a390c736669685113a0904d6..09d6d9089a670d641b946226c5b14fbb5521c26d 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) version11(11)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version12(12)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,8 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version12(12)} + -- ====================================== -- Top level definitions for RDHI wrapper @@ -565,7 +566,17 @@ SubscribedTelephonyServices ::= SEQUENCE 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 + paymentDetails [17] PaymentDetails OPTIONAL, + subscriptionType [18] ENUMERATED + { + unknown(0), + postpay(1), + prepay(2), + other(3), + ... + } OPTIONAL + -- Describes the nature of the subscription + } NationalTelephonySubscriptionInfo ::= SEQUENCE @@ -939,9 +950,13 @@ TelephonyLocation ::= SEQUENCE timeSpan [2] TimeSpan OPTIONAL, -- Time span that this location was valid for ..., - nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL + nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, -- 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 + -- The extended information for this network element as it was at the time of the + -- communication + } NationalTelephonyLocation ::= SEQUENCE @@ -1923,7 +1938,8 @@ NAServiceUsage ::= SEQUENCE endReason [14] NAEndReason OPTIONAL, subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL } NAEndReason ::= ENUMERATED @@ -2063,6 +2079,45 @@ EPSEvent ::= ENUMERATED ... } + +WifiInformation ::= SEQUENCE +{ + 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 + -- 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 human-readable Service Set Identifier + username [3] UTF8String OPTIONAL, + protocol [4] ENUMERATED + { + iEEE80211 (1), + iEEE80211a (2), + iEEE80211b (3), + iEEE80211g (4), + iEEE80211n (5), + iEEE80211ac (6), + iEEE80211ad (7), + ... + } OPTIONAL, + securityMode [5] ENUMERATED + { + wEP (0), + wPA (1), + wPA2 (2), + ... + } OPTIONAL, + authenticationTelephoneNumber [6] PartyNumber OPTIONAL, + -- if authentication arranged through a code sent to mobile, this is the number + -- to which the code was sent + authenticationPaymentReference [7] UTF8String OPTIONAL, + -- For example, the number of a voucher that was used in authentication + ... +} + + + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2180,3 +2235,16 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage + +Please consider the environment before printing this email. + +This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately. + +Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. + +The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm. + +Detica Limited is a BAE Systems company trading as BAE Systems Detica. +Detica Limited is registered in England and Wales under No: 1337451. +Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England. + diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 36a743f5a0aa42ddbfe8457d8c60460952719279..e530860a78e160c43726e7631dc74cdd0fa7187c 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.11.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.12.1 @@ -645,6 +645,19 @@ + + + + + + + + + + + + + @@ -761,6 +774,7 @@ + @@ -1824,10 +1838,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/102657/portal/RDMessage,ver11.txt b/102657/portal/RDMessage,ver12 (MSC).txt similarity index 96% rename from 102657/portal/RDMessage,ver11.txt rename to 102657/portal/RDMessage,ver12 (MSC).txt index 12b1295d59b37b83a390c736669685113a0904d6..09d6d9089a670d641b946226c5b14fbb5521c26d 100644 --- a/102657/portal/RDMessage,ver11.txt +++ b/102657/portal/RDMessage,ver12 (MSC).txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version11(11)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version12(12)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,8 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version12(12)} + -- ====================================== -- Top level definitions for RDHI wrapper @@ -565,7 +566,17 @@ SubscribedTelephonyServices ::= SEQUENCE 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 + paymentDetails [17] PaymentDetails OPTIONAL, + subscriptionType [18] ENUMERATED + { + unknown(0), + postpay(1), + prepay(2), + other(3), + ... + } OPTIONAL + -- Describes the nature of the subscription + } NationalTelephonySubscriptionInfo ::= SEQUENCE @@ -939,9 +950,13 @@ TelephonyLocation ::= SEQUENCE timeSpan [2] TimeSpan OPTIONAL, -- Time span that this location was valid for ..., - nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL + nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, -- 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 + -- The extended information for this network element as it was at the time of the + -- communication + } NationalTelephonyLocation ::= SEQUENCE @@ -1923,7 +1938,8 @@ NAServiceUsage ::= SEQUENCE endReason [14] NAEndReason OPTIONAL, subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL } NAEndReason ::= ENUMERATED @@ -2063,6 +2079,45 @@ EPSEvent ::= ENUMERATED ... } + +WifiInformation ::= SEQUENCE +{ + 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 + -- 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 human-readable Service Set Identifier + username [3] UTF8String OPTIONAL, + protocol [4] ENUMERATED + { + iEEE80211 (1), + iEEE80211a (2), + iEEE80211b (3), + iEEE80211g (4), + iEEE80211n (5), + iEEE80211ac (6), + iEEE80211ad (7), + ... + } OPTIONAL, + securityMode [5] ENUMERATED + { + wEP (0), + wPA (1), + wPA2 (2), + ... + } OPTIONAL, + authenticationTelephoneNumber [6] PartyNumber OPTIONAL, + -- if authentication arranged through a code sent to mobile, this is the number + -- to which the code was sent + authenticationPaymentReference [7] UTF8String OPTIONAL, + -- For example, the number of a voucher that was used in authentication + ... +} + + + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2180,3 +2235,16 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage + +Please consider the environment before printing this email. + +This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately. + +Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. + +The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm. + +Detica Limited is a BAE Systems company trading as BAE Systems Detica. +Detica Limited is registered in England and Wales under No: 1337451. +Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England. + diff --git a/102657/portal/RDMessage,ver11.xsd b/102657/portal/RDMessage,ver12 (MSC).xsd similarity index 97% rename from 102657/portal/RDMessage,ver11.xsd rename to 102657/portal/RDMessage,ver12 (MSC).xsd index 36a743f5a0aa42ddbfe8457d8c60460952719279..e530860a78e160c43726e7631dc74cdd0fa7187c 100644 --- a/102657/portal/RDMessage,ver11.xsd +++ b/102657/portal/RDMessage,ver12 (MSC).xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.11.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.12.1 @@ -645,6 +645,19 @@ + + + + + + + + + + + + + @@ -761,6 +774,7 @@ + @@ -1824,10 +1838,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +