Commit c035d69c authored by Ben Beeston's avatar Ben Beeston
Browse files

Addition of TCPPortList and UDPPortList

parent e762b619
Loading
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ TCPPortRange ::= SEQUENCE
    end   [1] TCPPort
}

TCPPortList ::= SEQUENCE OF TCPPort

UDPPort ::= INTEGER (0..65535)

UDPPortRange ::= SEQUENCE
@@ -27,6 +29,8 @@ UDPPortRange ::= SEQUENCE
    end   [1] UDPPort
}

UDPPortList ::= SEQUENCE OF UDPPort

Port ::= CHOICE
{
    tCPPort [0] TCPPort,
+22 −0
Original line number Diff line number Diff line
@@ -307,6 +307,17 @@
      ],
      "additionalProperties": false
    },
    "TCPPortList": {
      "type": "object",
      "properties": {
        "TCPPortList": {
          "type": "array",
          "items": { "$ref": "#/$defs/TCPPort" }
        }
      },
      "required": ["TCPPortList"],
      "additionalProperties": false
    },
    "UDPPortRange": {
      "type": "object",
      "properties": {
@@ -323,6 +334,17 @@
      ],
      "additionalProperties": false
    },
    "UDPPortList": {
      "type": "object",
      "properties": {
        "UDPPortList": {
          "type": "array",
          "items": { "$ref": "#/$defs/UDPPort" }
        }
      },
      "required": ["UDPPortList"],
      "additionalProperties": false
    },
    "Port": {
      "oneOf": [
        {
+10 −0
Original line number Diff line number Diff line
@@ -104,6 +104,11 @@
            <xs:element name="end" type="TCPPort"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="TCPPortList">
        <xs:sequence>
            <xs:element name="TCPPort" type="TCPPort" minOccurs="0" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:simpleType name="UDPPort">
        <xs:restriction base="xs:integer">
            <xs:minInclusive value="0"/>
@@ -116,6 +121,11 @@
            <xs:element name="end" type="UDPPort"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="UDPPortList">
        <xs:sequence>
            <xs:element name="UDPPort" type="UDPPort" minOccurs="0" maxOccurs="unbounded"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="Port">
        <xs:choice>
            <xs:element name="TCPPort" type="TCPPort"/>