Commit 12c450cc authored by tepelmann's avatar tepelmann
Browse files

Reverted of type change for DHCPv6 options. 

Check variant in getter functions.
parent bb1fb14c

ttcn/LibDhcp/LibIpv6_CommonRfcsDhcp_TypesAndValues.ttcn

+3 −9
Original line number Diff line number Diff line
@@ -100,15 +100,15 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.1

     */

    type record DHCPv6OptionRaw {

//      UInt8            optionCode,

//      UInt16           optionLen,

      UInt8            optionCode,

      UInt16           optionLen,

      octetstring      optionData

    }

    

    /**

     * @desc Collection of option datas defined in several RFCs.

     */

    type union DHCPv6OptionData {

    type union DHCPv6Option {

      //RFC 3315

      ClientIdentifierOption    clientIdentifer,

      ServerIdentifierOption    serverIdentifier,
@@ -138,12 +138,6 @@ 
      DHCPv6OptionRaw           raw

    }

    

    type record DHCPv6Option {

        OptionCode          optionCode,

        UInt16              optionLen,

        DHCPv6OptionData    optionData

    }

    

    /**

     * @desc List of options collected from different RFCs.

     */

ttcn/LibDhcp/LibIpv6_Rfc3315Dhcp_TypesAndValues.ttcn

+38 −38
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.2

     */

    type record ClientIdentifierOption {

//      OptionCode        optionCode(e_OPTION_CLIENTID),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_CLIENTID),

      UInt16            optionLen,

      DUID              optionData

    }
@@ -32,8 +32,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.3

     */

    type record ServerIdentifierOption {

//      OptionCode        optionCode(e_OPTION_SERVERID),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_SERVERID),

      UInt16            optionLen,

      DUID              optionData

    }
@@ -42,8 +42,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.4

     */

    type record IA_NAOption {

//      OptionCode        optionCode(e_OPTION_IA_NA),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_IA_NA),

      UInt16            optionLen,

      UInt32            iaid,

      TimeStamp         t1,

      TimeStamp         t2,
@@ -55,8 +55,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.5

     */

    type record IA_TAOption {

//      OptionCode        optionCode(e_OPTION_IA_TA),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_IA_TA),

      UInt16            optionLen,

      UInt32            iaid,

      DHCPv6Options     iA_TA_options

    }
@@ -66,8 +66,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.6

     */

    type record IA_AddressOption {

//      OptionCode        optionCode(e_OPTION_IAADDR),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_IAADDR),

      UInt16            optionLen,

      Ipv6Address       ipv6Address,

      TimeStamp         preferredLifetime,

      TimeStamp         validLifetime,
@@ -79,8 +79,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.7

     */

    type record OptionRequestOption {

//      OptionCode        optionCode(e_OPTION_ORO),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_ORO),

      UInt16            optionLen,

      set of OptionCode requestedOptionCodes

    }
@@ -89,8 +89,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.8

     */

    type record PreferenceOption {

//      OptionCode        optionCode(e_OPTION_PREFERENCE),

//      UInt16            optionLen(1),

      OptionCode        optionCode(e_OPTION_PREFERENCE),

      UInt16            optionLen(1),

      UInt8             prefValue

    }
@@ -99,8 +99,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.9

     */

    type record ElapsedTimeOption {

//      OptionCode        optionCode(e_OPTION_ELAPSED_TIME),

//      UInt16            optionLen(2),

      OptionCode        optionCode(e_OPTION_ELAPSED_TIME),

      UInt16            optionLen(2),

      UInt16            elapsedTime

    }
@@ -109,8 +109,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.10

     */

    type record RelayMessageOption {

//      OptionCode        optionCode(e_OPTION_RELAY_MSG),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_RELAY_MSG),

      UInt16            optionLen,

      DHCPv6Msg         dhcpRelayMessage

    }
@@ -119,8 +119,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.11

     */

    type record AuthenticationOption {

//      OptionCode        optionCode(e_OPTION_AUTH),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_AUTH),

      UInt16            optionLen,

      UInt8             protocol,

      UInt8             algorithm,

      UInt8             rDM,
@@ -133,8 +133,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.12

     */

    type record ServerUnicastOption {

//      OptionCode        optionCode(e_OPTION_UNICAST),

//      UInt16            optionLen(16),

      OptionCode        optionCode(e_OPTION_UNICAST),

      UInt16            optionLen(16),

      Ipv6Address       serverAddress

    }
@@ -143,8 +143,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.13

     */

    type record StatusCodeOption {

//      OptionCode        optionCode(e_OPTION_STATUS_CODE),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_STATUS_CODE),

      UInt16            optionLen,

      StatusCode        statusCode,

      charstring        statusMessage

    }
@@ -154,8 +154,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.14

     */

    type record RapidCommitOption {

//      OptionCode        optionCode(e_OPTION_RAPID_COMMIT),

//      UInt16            optionLen(0)

      OptionCode        optionCode(e_OPTION_RAPID_COMMIT),

      UInt16            optionLen(0)

    }

    

    /**
@@ -163,8 +163,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.15

     */

    type record UserClassOption {

//      OptionCode        optionCode(e_OPTION_USER_CLASS),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_USER_CLASS),

      UInt16            optionLen,

      record {

        UInt16          userClassLen,

        octetstring     opaqueData
@@ -176,8 +176,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.16

     */

    type record VendorClassOption {

//      OptionCode        optionCode(e_OPTION_VENDOR_CLASS),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_VENDOR_CLASS),

      UInt16            optionLen,

      UInt32            enterpriseNumber,

      record {

        UInt16          vendorClassLen,
@@ -190,8 +190,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.17

     */

    type record VendorSpecificInfoOption {

//      OptionCode        optionCode(e_OPTION_VENDOR_OPTS),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_VENDOR_OPTS),

      UInt16            optionLen,

      UInt32            enterpriseNumber,

      DHCPv6OptionRaw   optionData

    }
@@ -201,8 +201,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.18

     */

    type record InterfaceIdOption {

//      OptionCode        optionCode(e_OPTION_INTERFACE_ID),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_INTERFACE_ID),

      UInt16            optionLen,

      octetstring       interfaceId

    }
@@ -211,8 +211,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.19

     */

    type record ReconfigureMsgOption {

//      OptionCode        optionCode(e_OPTION_RECONF_MSG),

//      UInt16            optionLen(1),

      OptionCode        optionCode(e_OPTION_RECONF_MSG),

      UInt16            optionLen(1),

      MsgType           msgType(e_RENEW, e_INFORMATION_REQUEST)

    }
@@ -221,8 +221,8 @@ 
     * @reference http://tools.ietf.org/html/rfc3315#section-22.20

     */

    type record ReconfigureAcceptOption {

//      OptionCode        optionCode(e_OPTION_RECONF_ACCEPT),

//      UInt16            optionLen(0)

      OptionCode        optionCode(e_OPTION_RECONF_ACCEPT),

      UInt16            optionLen(0)

    }

    

  } //end group dhcpOptions

ttcn/LibDhcp/LibIpv6_Rfc3646Dhcp_TypesAndValues.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
     * @reference https://tools.ietf.org/html/rfc3646 cl.3

     */

    type record DnsRecursiveNameOption {

//      OptionCode        optionCode(e_OPTION_DNS_SERVERS),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_DNS_SERVERS),

      UInt16            optionLen,

      Ipv6AddressList   dnsRecursiveNameServerList

    }

ttcn/LibDhcp/LibIpv6_Rfc6334Dhcp_TypesAndValues.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
     * @reference https://tools.ietf.org/html/rfc6334#section-3

     */

    type record AFTRNameOption {

//      OptionCode        optionCode(e_OPTION_AFTR_NAME),

//      UInt16            optionLen,

      OptionCode        optionCode(e_OPTION_AFTR_NAME),

      UInt16            optionLen,

      DomainName        tunnelEndpointName

    }