Commit 60d9a104 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 103 280 v2.1.1 (2017-08-04) agreed at LI#45 (Tallinn, 2017-06-20)

parent f835c49b

103280/TS_103_280.asn1

+42 −2
Original line number Diff line number Diff line 
Common-Parameters

{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}

{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN



-- Object Identifier definitions



commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}

commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}



-- Common Parameter: LIID (as defined in clause 6)



LIID ::= OCTET STRING (SIZE (1..25))



-- Common Parameter: TCPPort (as defined in clause 6)



TCPPort ::= INTEGER (1..65535)



-- Common Parameter: TCPPortRange (as defined in clause 6)



TCPPortRange ::= SEQUENCE

{

    start [0] TCPPort,

    end   [1] TCPPort

}



-- Common Parameter: UDPPort (as defined in clause 6)



UDPPort ::= INTEGER (0..65535)



-- Common Parameter: UDPPortRange (as defined in clause 6)



UDPPortRange ::= SEQUENCE

{

    start [0] UDPPort,

    end   [1] UDPPort

}



-- Common Parameter: Port (as defined in clause 6)



Port ::= CHOICE

{

    tCPPort [0] TCPPort,

    uDPPort [1] UDPPort

}



-- Common Parameter: PortRange (as defined clause 6)



PortRange ::= CHOICE

{

    tCPPortRange [0] TCPPortRange,

    uDPPortRange [1] UDPPortRange

}



END

103280/TS_103_280.xsd

+18 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2015/08" targetNamespace="http://uri.etsi.org/03280/common/2015/08" version="1.1.1" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.1.1" elementFormDefault="qualified">

    <xs:simpleType name="ShortString">

        <xs:restriction base="xs:string">

            <xs:maxLength value="255"/>
@@ -42,7 +42,7 @@ 
    </xs:simpleType>

    <xs:simpleType name="IMSI">

        <xs:restriction base="xs:token">

            <xs:pattern value="[0-9]{15}"/>

            <xs:pattern value="[0-9]{6,15}"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="IMEI">
@@ -155,4 +155,14 @@ 
            <xs:pattern value="[A-Z]{2}"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="SIPURI">

        <xs:restriction base="xs:anyURI">

            <xs:pattern value="sips?:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="TELURI">

        <xs:restriction base="xs:anyURI">

            <xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>

        </xs:restriction>

    </xs:simpleType>

</xs:schema>

103280/portal/TS_103_280_v010201.asn1

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
Common-Parameters

{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN



-- Object Identifier definitions



commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}



-- Common Parameter: LIID (as defined in clause 6)



LIID ::= OCTET STRING (SIZE (1..25))



END

103280/portal/TS_103_280_v020101.asn1

0 → 100644
+54 −0
Original line number Diff line number Diff line 
Common-Parameters

{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN



-- Object Identifier definitions



commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}



-- Common Parameter: LIID (as defined in clause 6)



LIID ::= OCTET STRING (SIZE (1..25))



-- Common Parameter: TCPPort (as defined in clause 6)



TCPPort ::= INTEGER (1..65535)



-- Common Parameter: TCPPortRange (as defined in clause 6)



TCPPortRange ::= SEQUENCE

{

    start [0] TCPPort,

    end   [1] TCPPort

}



-- Common Parameter: UDPPort (as defined in clause 6)



UDPPort ::= INTEGER (0..65535)



-- Common Parameter: UDPPortRange (as defined in clause 6)



UDPPortRange ::= SEQUENCE

{

    start [0] UDPPort,

    end   [1] UDPPort

}



-- Common Parameter: Port (as defined in clause 6)



Port ::= CHOICE

{

    tCPPort [0] TCPPort,

    uDPPort [1] UDPPort

}



-- Common Parameter: PortRange (as defined clause 6)



PortRange ::= CHOICE

{

    tCPPortRange [0] TCPPortRange,

    uDPPortRange [1] UDPPortRange

}



END

103280/portal/TS_103_280_v010101.xsd→103280/portal/TS_103_280_v020101.xsd

+18 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2015/08" targetNamespace="http://uri.etsi.org/03280/common/2015/08" version="1.1.1" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.1.1" elementFormDefault="qualified">

    <xs:simpleType name="ShortString">

        <xs:restriction base="xs:string">

            <xs:maxLength value="255"/>
@@ -42,7 +42,7 @@ 
    </xs:simpleType>

    <xs:simpleType name="IMSI">

        <xs:restriction base="xs:token">

            <xs:pattern value="[0-9]{15}"/>

            <xs:pattern value="[0-9]{6,15}"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="IMEI">
@@ -155,4 +155,14 @@ 
            <xs:pattern value="[A-Z]{2}"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="SIPURI">

        <xs:restriction base="xs:anyURI">

            <xs:pattern value="sips?:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="TELURI">

        <xs:restriction base="xs:anyURI">

            <xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>

        </xs:restriction>

    </xs:simpleType>

</xs:schema>