Commit 0f8d0600 authored by markc's avatar markc

TS 102 657 v1.12.1 (2013-08-13) agreed at LI#33 (Joensuu, 2013-06-11)

parent 077813cd
Pipeline #4025 failed with stage
in 6 seconds
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.
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
xmlns="http://uri.etsi.org/02657/v1.12.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.12.1#/RetainedData"
elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
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
</xsd:documentation>
</xsd:annotation>
......@@ -645,6 +645,19 @@
<xsd:element name="iMEI" minOccurs="0" type="IMEI"/>
<xsd:element name="nationalTelephonySubscriptionInfo" minOccurs="0" type="NationalTelephonySubscriptionInfo"/>
<xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>
<xsd:element name="subscriptionType" minOccurs="0">
<xsd:complexType>
<xsd:choice>
<xsd:element name="unknown" type="NULL"/>
<xsd:element name="postpay" type="NULL"/>
<xsd:element name="prepay" type="NULL"/>
<xsd:element name="other" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -761,6 +774,7 @@
<xsd:element name="telephonyNetworkID" minOccurs="0" type="TelephonyNetworkID"/>
<xsd:element name="timeSpan" minOccurs="0" type="TimeSpan"/>
<xsd:element name="nationalTelephonyLocation" minOccurs="0" type="NationalTelephonyLocation"/>
<xsd:element name="detailedLocation" minOccurs="0" type="TelephonyNetworkElement"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -1824,6 +1838,48 @@
<xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>
<xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
<xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
<xsd:element name="wifiInformation" minOccurs="0" type="WifiInformation"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="WifiInformation">
<xsd:sequence>
<xsd:element name="bSSID" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:hexBinary">
<xsd:length value="6"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="sSID" minOccurs="0" type="xsd:string"/>
<xsd:element name="username" minOccurs="0" type="xsd:string"/>
<xsd:element name="protocol" minOccurs="0">
<xsd:complexType>
<xsd:choice>
<xsd:element name="iEEE80211" type="NULL"/>
<xsd:element name="iEEE80211a" type="NULL"/>
<xsd:element name="iEEE80211b" type="NULL"/>
<xsd:element name="iEEE80211g" type="NULL"/>
<xsd:element name="iEEE80211n" type="NULL"/>
<xsd:element name="iEEE80211ac" type="NULL"/>
<xsd:element name="iEEE80211ad" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:element name="securityMode" minOccurs="0">
<xsd:complexType>
<xsd:choice>
<xsd:element name="wEP" type="NULL"/>
<xsd:element name="wPA" type="NULL"/>
<xsd:element name="wPA2" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:element name="authenticationTelephoneNumber" minOccurs="0" type="PartyNumber"/>
<xsd:element name="authenticationPaymentReference" minOccurs="0" type="xsd:string"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......
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.
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.11.1#/RetainedData"
xmlns="http://uri.etsi.org/02657/v1.12.1#/RetainedData"
targetNamespace="http://uri.etsi.org/02657/v1.12.1#/RetainedData"
elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
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
</xsd:documentation>
</xsd:annotation>
......@@ -645,6 +645,19 @@
<xsd:element name="iMEI" minOccurs="0" type="IMEI"/>
<xsd:element name="nationalTelephonySubscriptionInfo" minOccurs="0" type="NationalTelephonySubscriptionInfo"/>
<xsd:element name="paymentDetails" minOccurs="0" type="PaymentDetails"/>
<xsd:element name="subscriptionType" minOccurs="0">
<xsd:complexType>
<xsd:choice>
<xsd:element name="unknown" type="NULL"/>
<xsd:element name="postpay" type="NULL"/>
<xsd:element name="prepay" type="NULL"/>
<xsd:element name="other" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -761,6 +774,7 @@
<xsd:element name="telephonyNetworkID" minOccurs="0" type="TelephonyNetworkID"/>
<xsd:element name="timeSpan" minOccurs="0" type="TimeSpan"/>
<xsd:element name="nationalTelephonyLocation" minOccurs="0" type="NationalTelephonyLocation"/>
<xsd:element name="detailedLocation" minOccurs="0" type="TelephonyNetworkElement"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......@@ -1824,6 +1838,48 @@
<xsd:element name="endReason" minOccurs="0" type="NAEndReason"/>
<xsd:element name="subscriberID" minOccurs="0" type="NaSubscriberID"/>
<xsd:element name="ePSInformation" minOccurs="0" type="EPSInformation"/>
<xsd:element name="wifiInformation" minOccurs="0" type="WifiInformation"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="WifiInformation">
<xsd:sequence>
<xsd:element name="bSSID" minOccurs="0">
<xsd:simpleType>
<xsd:restriction base="xsd:hexBinary">
<xsd:length value="6"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="sSID" minOccurs="0" type="xsd:string"/>
<xsd:element name="username" minOccurs="0" type="xsd:string"/>
<xsd:element name="protocol" minOccurs="0">
<xsd:complexType>
<xsd:choice>
<xsd:element name="iEEE80211" type="NULL"/>
<xsd:element name="iEEE80211a" type="NULL"/>
<xsd:element name="iEEE80211b" type="NULL"/>
<xsd:element name="iEEE80211g" type="NULL"/>
<xsd:element name="iEEE80211n" type="NULL"/>
<xsd:element name="iEEE80211ac" type="NULL"/>
<xsd:element name="iEEE80211ad" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:element name="securityMode" minOccurs="0">
<xsd:complexType>
<xsd:choice>
<xsd:element name="wEP" type="NULL"/>
<xsd:element name="wPA" type="NULL"/>
<xsd:element name="wPA2" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/>
</xsd:choice>
</xsd:complexType>
</xsd:element>
<xsd:element name="authenticationTelephoneNumber" minOccurs="0" type="PartyNumber"/>
<xsd:element name="authenticationPaymentReference" minOccurs="0" type="xsd:string"/>
<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment