packetgen 3.3.3 → 4.0.0

data/lib/packetgen/header/igmpv3.rb

@@ -18,12 +18,12 @@ module PacketGen
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     #
     # A IGMP header consists of:
-    # * a {#type} field ({Types::Int8Enum} type),
-    # * a {#max_resp_time} field ({Types::Int8} type),
-    # * a {#checksum} field ({Types::Int16} type),
+    # * a {#type} field ({BinStruct::Int8Enum} type),
+    # * a {#max_resp_time} field ({BinStruct::Int8} type),
+    # * a {#checksum} field ({BinStruct::Int16} type),
     # * and a {#body}, containing more fields (see below).
     #
-    # A IGMPv3 header may have additionnal fields. These fields are handled by
+    # A IGMPv3 header may have additionnal fields. These attributes.are handled by
     # additional headers (see {IGMPv3::MQ}).
     #
     # == Create a IGMPv3 header
@@ -50,14 +50,14 @@ module PacketGen
     #   igmp.max_resp_code   #=> 9728  error due to encoding as a floating point value
     #
     # === IGMPv3 Membership Query
-    # With IGMPv3, a Membership Query packet has more fields than with IGMPv2. To
+    # With IGMPv3, a Membership Query packet has more attributes.than with IGMPv2. To
     # handle those fields, an additional header should be used:
     #   pkt = PacketGen.gen('IP').add('IGMPv3', type: 'MembershipQuery').add('IGMPv3::MQ')
     #   pkt.igmpv3      #=> PacketGen::Header::IGMPv3
     #   pkt.igmpv3_mq   #=> PacketGen::Header::IGMPv3::MQ
     #
     # === IGMPv3 Membership Report
-    # With IGMPv3, a Membership Report packet has more fields than with IGMPv2. To
+    # With IGMPv3, a Membership Report packet has more attributes.than with IGMPv2. To
     # handle those fields, an additional header should be used:
     #   pkt =  PacketGen.gen('IP').add('IGMPv3', type: 'MembershipQuery').add('IGMPv3::MR')
     #   pkt.igmpv3      #=> PacketGen::Header::IGMPv3
@@ -71,7 +71,7 @@ module PacketGen
         'MembershipReport' => 0x22,
       }.freeze
 
-      remove_field :group_addr
+      remove_attr :group_addr
 
       # Encode value for IGMPv3 Max Resp Code and QQIC.
       # Value may be encoded as a float, so some error may occur.

data/lib/packetgen/header/ip/addr.rb

@@ -11,23 +11,23 @@ module PacketGen
     class IP
       # IP address, as a group of 4 bytes
       # @author Sylvain Daubert
-      class Addr < Types::Fields
-        include Types::Fieldable
+      class Addr < BinStruct::Struct
+        include BinStruct::Structable
 
         # @!attribute a1
         #  @return [Integer] IP address first byte
-        define_field :a1, Types::Int8
+        define_attr :a1, BinStruct::Int8
         # @!attribute a2
         #  @return [Integer] IP address seconf byte
-        define_field :a2, Types::Int8
+        define_attr :a2, BinStruct::Int8
         # @!attribute a3
         #  @return [Integer] IP address third byte
-        define_field :a3, Types::Int8
+        define_attr :a3, BinStruct::Int8
         # @!attribute a4
         #  @return [Integer] IP address fourth byte
-        define_field :a4, Types::Int8
+        define_attr :a4, BinStruct::Int8
 
-        IPV4_ADDR_REGEX = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.freeze
+        IPV4_ADDR_REGEX = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/
 
         # Read a dotted address
         # @param [String] str
@@ -37,10 +37,10 @@ module PacketGen
 
           m = str.match(IPV4_ADDR_REGEX)
           if m
-            self[:a1].read m[1].to_i
-            self[:a2].read m[2].to_i
-            self[:a3].read m[3].to_i
-            self[:a4].read m[4].to_i
+            self[:a1].from_human(m[1].to_i)
+            self[:a2].from_human(m[2].to_i)
+            self[:a3].from_human(m[3].to_i)
+            self[:a4].from_human(m[4].to_i)
           end
           self
         end
@@ -48,7 +48,7 @@ module PacketGen
         # Addr in human readable form (dotted format)
         # @return [String]
         def to_human
-          fields.map { |f| self[f].to_i.to_s }.join('.')
+          attributes.map { |f| self[f].to_i.to_s }.join('.')
         end
 
         # Addr as an integer
@@ -66,7 +66,7 @@ module PacketGen
 
         def ==(other)
           other.is_a?(self.class) &&
-            fields.all? { |attr| self[attr].value == other[attr].value }
+            attributes.all? { |attr| self[attr].value == other[attr].value }
         end
       end
     end

data/lib/packetgen/header/ip/option.rb

@@ -11,7 +11,7 @@ module PacketGen
     class IP
       # Class to handle series of IP addresses
       # @author Sylvain Daubert
-      class ArrayOfAddr < Types::Array
+      class ArrayOfAddr < BinStruct::Array
         set_of IP::Addr
 
         # Push a IP address to the array
@@ -20,14 +20,14 @@ module PacketGen
         #   array << '192.168.1.12'
         def push(addr)
           addr = Addr.new.from_human(addr) unless addr.is_a?(Addr)
-          super(addr)
+          super
         end
       end
 
       # Base class for IP options
       # @author Sylvain Daubert
-      class Option < Types::Fields
-        include Types::Fieldable
+      class Option < BinStruct::Struct
+        include BinStruct::Structable
 
         # EOL option type
         EOL_TYPE = 0x00
@@ -47,20 +47,9 @@ module PacketGen
         # @!attribute type
         #  8-bit option type
         # @return [Integer]
-        define_field :type, Types::Int8
-        # @!attribute length
-        #  8-bit option length. If 0, there is no +length+ field in option
-        # @return [Integer]
-        define_field :length, Types::Int8, default: 0, optional: ->(h) { h.type > 1 }
-        # @!attribute data
-        #  option data
-        # @return [String]
-        define_field :data, Types::String, optional: ->(h) { h.length > 2 },
-                                           builder: ->(h, t) { t.new(length_from: -> { h.length - 2 }) }
-
         # @!attribute copied
         #  1-bit copied flag from {#type} field
-        #  @return [Boolean]
+        #  @return [Integer]
         # @!attribute option_class
         #  2-bit option class (0: control, 2: debug and measurement, 1 and 3:
         #  reserved) from {#type} field
@@ -68,7 +57,16 @@ module PacketGen
         # !@attribute number
         #  5-bit option number from {#type} field
         #  @return [Integer]
-        define_bit_fields_on :type, :copied, :option_class, 2, :number, 5
+        define_bit_attr :type, copied: 1, option_class: 2, number: 5
+        # @!attribute length
+        #  8-bit option length. If 0, there is no +length+ field in option
+        # @return [Integer]
+        define_attr :length, BinStruct::Int8, default: 0, optional: ->(h) { h.type > 1 }
+        # @!attribute data
+        #  option data
+        # @return [String]
+        define_attr :data, BinStruct::String, optional: ->(h) { h.length > 2 },
+                                              builder: ->(h, t) { t.new(length_from: -> { h.length - 2 }) }
 
         # @return [Hash]
         def self.types
@@ -76,7 +74,7 @@ module PacketGen
 
           @types = {}
           Option.constants.each do |cst|
-            next unless cst.to_s.end_with? '_TYPE'
+            next unless cst.to_s.end_with?('_TYPE')
 
             optname = cst.to_s.sub('_TYPE', '')
             @types[optname] = Option.const_get(cst)
@@ -109,14 +107,14 @@ module PacketGen
         # Get binary string. Set {#length} field.
         # @return [String]
         def to_s
-          self.length = super.size if respond_to? :length
+          self.length = super.size if respond_to?(:length)
           super
         end
 
         # Get a human readable string
         # @return [String]
         def to_human
-          str = self.instance_of?(Option) ? +"unk-#{type}" : self.class.to_s.sub(/.*::/, '')
+          str = self.instance_of?(Option) ? "unk-#{type}" : self.class.to_s.sub(/.*::/, '')
           str << ":#{self[:data].to_s.inspect}" if respond_to?(:length) && (length > 2) && !self[:data].to_s.empty?
           str
         end
@@ -124,8 +122,8 @@ module PacketGen
         private
 
         def class2type
-          opt_name = self.class.to_s.gsub(/.*::/, '')
-          Option.const_get(:"#{opt_name}_TYPE") if Option.const_defined? :"#{opt_name}_TYPE"
+          opt_sym = :"#{self.class.to_s.gsub(/.*::/, '')}_TYPE"
+          Option.const_get(opt_sym) if Option.const_defined?(opt_sym)
         end
 
         def initialize_length_if_needed(options)
@@ -133,7 +131,7 @@ module PacketGen
         end
 
         def initialize_data_if_needed(options)
-          return unless fields.include?(:data) && self[:data].respond_to?(:from_human) && options.key?(:data)
+          return unless attributes.include?(:data) && self[:data].respond_to?(:from_human) && options.key?(:data)
 
           # Force data if data is set in options but not length
           self.length += options[:data].size
@@ -143,8 +141,8 @@ module PacketGen
 
       # End-of-option-List IP option
       class EOL < Option
-        remove_field :length
-        remove_field :data
+        remove_attr :length
+        remove_attr :data
       end
 
       # No OPeration IP option
@@ -152,16 +150,16 @@ module PacketGen
 
       # Loose Source and Record Route IP option
       class LSRR < Option
-        remove_field :data
+        remove_attr :data
 
         # @!attribute pointer
         #  8-bit pointer on next address
         #  @return [Integer]
-        define_field :pointer, Types::Int8, default: 4
+        define_attr :pointer, BinStruct::Int8, default: 4
         # @!attribute data
         #  Array of IP addresses
-        #  @return [Types::Array<IP::Addr>]
-        define_field :data, ArrayOfAddr, builder: ->(h, t) { t.new(length_from: -> { h.length - 3 }) }
+        #  @return [BinStruct::Array<IP::Addr>]
+        define_attr :data, ArrayOfAddr, builder: ->(h, t) { t.new(length_from: -> { h.length - 3 }) }
 
         # Get IP address pointer by {#pointer}
         # @return [Addr]
@@ -185,12 +183,12 @@ module PacketGen
 
       # Stream Identifier IP option
       class SI < Option
-        remove_field :data
+        remove_attr :data
 
         # @!attribute id
         #  16-bit stream ID
         #  @return [Integer]
-        define_field :id, Types::Int16
+        define_attr :id, BinStruct::Int16
 
         def to_human
           super << ":#{self.id}"
@@ -199,12 +197,12 @@ module PacketGen
 
       # Router Alert IP option
       class RA < Option
-        remove_field :data
+        remove_attr :data
 
         # @!attribute value
         #  16-bit value. Should be 0.
         #  @return [Integer]
-        define_field :value, Types::Int16, default: 0
+        define_attr :value, BinStruct::Int16, default: 0
 
         def to_human
           super << ":#{self.value}"

data/lib/packetgen/header/ip/options.rb

@@ -11,7 +11,7 @@ module PacketGen
     class IP
       # Class to handle IP options
       # @author Sylvain Daubert
-      class Options < Types::Array
+      class Options < BinStruct::Array
         set_of Option
 
         HUMAN_SEPARATOR = ';'

data/lib/packetgen/header/ip.rb

@@ -27,11 +27,11 @@ module PacketGen
     #   |                    Options                    |    Padding    |
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     # A IP header consists of:
-    # * a first byte ({#u8} of {Types::Int8} type) composed of:
+    # * a first byte ({#u8} of {BinStruct::Int8} type) composed of:
     #   * a 4-bit {#version} field,
     #   * a 4-bit IP header length ({#ihl}) field,
-    # * a Type of Service field ({#tos}, {Types::Int8} type),
-    # * a total length ({#length}, {Types::Int16} type),
+    # * a Type of Service field ({#tos}, {BinStruct::Int8} type),
+    # * a total length ({#length}, {BinStruct::Int16} type),
     # * a ID ({#id}, +Int16+ type),
     # * a {#frag} worg (+Int16+) composed of:
     #   * 3 1-bit flags ({#flag_rsv}, {#flag_df} and {#flag_mf}),
@@ -42,7 +42,7 @@ module PacketGen
     # * a source IP address ({#src}, {Addr} type),
     # * a destination IP address ({#dst}, +Addr+ type),
     # * an optional {#options} field ({Options} type),
-    # * and a {#body} ({Types::String} type).
+    # * and a {#body} ({BinStruct::String} type).
     #
     # == Create a IP header
     #  # standalone
@@ -100,58 +100,54 @@ module PacketGen
       # @!attribute u8
       #  First byte of IP header. May be accessed through {#version} and {#ihl}.
       #  @return [Integer] first byte of IP header.
-      define_field :u8, Types::Int8, default: 0x45
+      # @!attribute version
+      #   @return [Integer] 4-bit version attribute
+      # @!attribute ihl
+      #   @return [Integer] 4-bit IP header length attribute
+      define_bit_attr :u8, default: 0x45, version: 4, ihl: 4
       # @!attribute tos
       #   @return [Integer] 8-bit Type of Service self[attr]
-      define_field :tos, Types::Int8, default: 0
+      define_attr :tos, BinStruct::Int8, default: 0
       # @!attribute length
       #   @return [Integer] 16-bit IP total length
-      define_field :length, Types::Int16, default: 20
+      define_attr :length, BinStruct::Int16, default: 20
       # @!attribute id
       #   @return [Integer] 16-bit ID
-      define_field :id, Types::Int16, default: ->(_) { rand(65_535) }
+      define_attr :id, BinStruct::Int16, default: ->(_) { rand(65_535) }
       # @!attribute frag
       #   @return [Integer] 16-bit frag word
-      define_field :frag, Types::Int16, default: 0
+      # @!attribute flag_rsv
+      #   @return [Boolean] reserved bit from flags
+      # @!attribute flag_df
+      #   @return [Boolean] Don't Fragment flag
+      # @!attribute flag_mf
+      #   @return [Boolean] More Fragment flags
+      # @!attribute fragment_offset
+      #   @return [Integer] 13-bit fragment offset
+      define_bit_attr :frag, flag_rsv: 1, flag_df: 1, flag_mf: 1, fragment_offset: 13
       # @!attribute ttl
       #   @return [Integer] 8-bit Time To Live self[attr]
-      define_field :ttl, Types::Int8, default: 64
+      define_attr :ttl, BinStruct::Int8, default: 64
       # @!attribute protocol
       #   @return [Integer] 8-bit upper protocol self[attr]
-      define_field :protocol, Types::Int8
+      define_attr :protocol, BinStruct::Int8
       # @!attribute checksum
       #   @return [Integer] 16-bit IP header checksum
-      define_field :checksum, Types::Int16, default: 0
+      define_attr :checksum, BinStruct::Int16, default: 0
       # @!attribute src
       #   @return [Addr] source IP address
-      define_field :src, Addr, default: '127.0.0.1'
+      define_attr :src, Addr, default: '127.0.0.1'
       # @!attribute dst
       #   @return [Addr] destination IP address
-      define_field :dst, Addr, default: '127.0.0.1'
+      define_attr :dst, Addr, default: '127.0.0.1'
       # @!attribute options
       #  @since 2.2.0
-      #  @return [Types::String]
-      define_field :options, Options, optional: ->(h) { h.ihl > 5 },
-                                      builder: ->(h, t) { t.new(length_from: -> { (h.ihl - 5) * 4 }) }
+      #  @return [BinStruct::String]
+      define_attr :options, Options, optional: ->(h) { h.ihl > 5 },
+                                     builder: ->(h, t) { t.new(length_from: -> { (h.ihl - 5) * 4 }) }
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
-
-      # @!attribute version
-      #   @return [Integer] 4-bit version attribute
-      # @!attribute ihl
-      #   @return [Integer] 4-bit IP header length attribute
-      define_bit_fields_on :u8, :version, 4, :ihl, 4
-
-      # @!attribute flag_rsv
-      #   @return [Boolean] reserved bit from flags
-      # @!attribute flag_df
-      #   @return [Boolean] Don't Fragment flag
-      # @!attribute flag_mf
-      #   @return [Boolean] More Fragment flags
-      # @!attribute fragment_offset
-      #   @return [Integer] 13-bit fragment offset
-      define_bit_fields_on :frag, :flag_rsv, :flag_df, :flag_mf, :fragment_offset, 13
+      #  @return [BinStruct::String,Header::Base]
+      define_attr :body, BinStruct::String
 
       # Helper method to compute sum of 16-bit words. Used to compute IP-style
       # checksums.
@@ -160,7 +156,7 @@ module PacketGen
       # @return [Integer]
       def self.sum16(hdr)
         old_checksum = nil
-        if hdr.respond_to? :checksum=
+        if hdr.respond_to?(:checksum)
           old_checksum = hdr.checksum
           hdr.checksum = 0
         end
@@ -178,8 +174,8 @@ module PacketGen
       # This method:
       # * checks a checksum is not greater than 0xffff. If it is,
       #   reduces it.
-      # * inverts reduced self[attr].
-      # * forces self[attr] to 0xffff if computed self[attr] is 0.
+      # * inverts reduced checksum.
+      # * forces checksum to 0xffff if computed checksum is 0.
       # @param [Integer] checksum checksum to reduce
       # @return [Integer] reduced checksum
       def self.reduce_checksum(checksum)
@@ -203,7 +199,7 @@ module PacketGen
       # @return [Integer]
       # @since 3.0.0 add +ihl+ calculation
       def calc_length
-        Base.calculate_and_set_length self
+        Base.calculate_and_set_length(self)
         self.ihl = 5 + self[:options].sz / 4
       end
 
@@ -216,29 +212,17 @@ module PacketGen
 
       # Send IP packet on wire.
       #
-      # When sending packet at IP level, +checksum+ and +length+ fields are set by
+      # When sending packet at IP level, +checksum+ and +length+ attributes are set by
       # kernel, so bad IP packets cannot be sent this way. To do so, use {Eth#to_w}.
       # @param [String,nil] _iface interface name. Not used
       # @return [void]
       def to_w(_iface=nil)
         sock = Socket.new(Socket::AF_INET, Socket::SOCK_RAW, Socket::IPPROTO_RAW)
         sockaddrin = Socket.sockaddr_in(0, dst)
-        sock.send to_s, 0, sockaddrin
+        sock.send(to_s, 0, sockaddrin)
         sock.close
       end
 
-      # @return [String]
-      def inspect
-        super do |attr|
-          case attr
-          when :u8
-            inspect_u8
-          when :frag
-            inspect_frag
-          end
-        end
-      end
-
       # Check version field
       # @see [Base#parse?]
       def parse?
@@ -259,25 +243,6 @@ module PacketGen
         self[:src], self[:dst] = self[:dst], self[:src]
         self
       end
-
-      private
-
-      def inspect_u8
-        shift = Inspect.shift_level
-        str = Inspect.inspect_attribute(:u8, self[:u8])
-        str << shift << Inspect::FMT_ATTR % ['', 'version', version]
-        str << shift << Inspect::FMT_ATTR % ['', 'ihl', ihl]
-      end
-
-      def inspect_frag
-        shift = Inspect.shift_level
-        str = Inspect.inspect_attribute(:frag, self[:frag])
-        flags = %i[rsv df mf].select { |flag| send(:"flag_#{flag}?") }.map(&:upcase)
-        flags_str = flags.empty? ? 'none' : flags.join(',')
-        str << shift << Inspect::FMT_ATTR % ['', 'flags', flags_str]
-        foff = Inspect.int_dec_hex(fragment_offset, 4)
-        str << shift << Inspect::FMT_ATTR % ['', 'frag_offset', foff]
-      end
     end
 
     self.add_class IP

data/lib/packetgen/header/ipv6/addr.rb

@@ -14,41 +14,41 @@ module PacketGen
     class IPv6
       # IPv6 address, as a group of 8 2-byte words
       # @author Sylvain Daubert
-      class Addr < Types::Fields
-        include Types::Fieldable
+      class Addr < BinStruct::Struct
+        include BinStruct::Structable
 
         # @!attribute a1
         #  1st 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a1, Types::Int16
+        define_attr :a1, BinStruct::Int16
         # @!attribute a2
         #  2nd 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a2, Types::Int16
+        define_attr :a2, BinStruct::Int16
         # @!attribute a3
         #  3rd 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a3, Types::Int16
+        define_attr :a3, BinStruct::Int16
         # @!attribute a4
         #  4th 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a4, Types::Int16
+        define_attr :a4, BinStruct::Int16
         # @!attribute a5
         #  5th 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a5, Types::Int16
+        define_attr :a5, BinStruct::Int16
         # @!attribute a6
         #  6th 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a6, Types::Int16
+        define_attr :a6, BinStruct::Int16
         # @!attribute a7
         #  7th 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a7, Types::Int16
+        define_attr :a7, BinStruct::Int16
         # @!attribute a8
         #  8th 2-byte word of IPv6 address
         #  @return [Integer]
-        define_field :a8, Types::Int16
+        define_attr :a8, BinStruct::Int16
 
         # rubocop:disable Metrics/AbcSize
 
@@ -83,7 +83,7 @@ module PacketGen
         # Return an array of address 16-bit words
         # @return [Array<Integer>]
         def to_a
-          @fields.values
+          @attributes.values
         end
 
         # Return true if this address is a multicast one
@@ -94,13 +94,13 @@ module PacketGen
 
         def ==(other)
           other.is_a?(self.class) &&
-            fields.all? { |attr| self[attr].value == other[attr].value }
+            attributes.all? { |attr| self[attr].value == other[attr].value }
         end
       end
 
       # Class to handle series of IPv6 addresses
       # @author Sylvain Daubert
-      class ArrayOfAddr < Types::Array
+      class ArrayOfAddr < BinStruct::Array
         set_of IPv6::Addr
 
         # Push a IPv6 address to the array
@@ -109,7 +109,7 @@ module PacketGen
         #   array << '2001:1234::125'
         def push(addr)
           addr = Addr.new.from_human(addr) unless addr.is_a?(Addr)
-          super(addr)
+          super
         end
       end
     end

data/lib/packetgen/header/ipv6/extension.rb

@@ -25,29 +25,29 @@ module PacketGen
       #  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       #
       # Such a header consists of:
-      # * a {#next} header field ({Types::Int8}),
-      # * a {#length} field ({Types::Int8}),
-      # * an {#options} field ({Types::String}),
+      # * a {#next} header field ({BinStruct::Int8}),
+      # * a {#length} field ({BinStruct::Int8}),
+      # * an {#options} field ({BinStruct::String}),
       # * and a {#body}, containing next header.
       # @author Sylvain Daubert
       class Extension < Base
         # @!attribute next
         #  8-bit Next header field
         #  @return [Integer]
-        define_field :next, Types::Int8
+        define_attr :next, BinStruct::Int8
         # @!attribute length
         #  8-bit extension length, in 8-octets units, not including the
         #  first 8 octets.
         #  @return [Integer]
-        define_field :length, Types::Int8
+        define_attr :length, BinStruct::Int8
         # @!attribute options
         #  Specific options of extension header
         #  @return [String]
-        define_field :options, Types::String,
-                     builder: ->(h, t) { t.new(length_from: -> { h.real_length }) }
+        define_attr :options, BinStruct::String,
+                    builder: ->(h, t) { t.new(length_from: -> { h.real_length }) }
         # @!attribute body
         #  @return [String,Base]
-        define_field :body, Types::String
+        define_attr :body, BinStruct::String
 
         # Get real extension header length
         # @return [Integer]

data/lib/packetgen/header/ipv6/hop_by_hop.rb

@@ -11,10 +11,10 @@ module PacketGen
     class IPv6
       # @!parse
       #  # Option for {HopByHop} IPv6 extension header.
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
+      #  # @since 3.1.0 subclass of {BinStruct::AbstractTLV}
       #  class Option <AbstractTLV; end
       # @private
-      Option = Types::AbstractTLV.create
+      Option = BinStruct::AbstractTLV.create
 
       class Option
         # Known option types
@@ -37,10 +37,10 @@ module PacketGen
 
       # Special option pad1, for {HopByHop} IPv6 extension header
       # @author Sylvain Daubert
-      class Pad1 < Types::Fields
+      class Pad1 < BinStruct::Struct
         # @!attribute pad
         # @return [Integer]
-        define_field :pad, Types::Int8, default: 0
+        define_attr :pad, BinStruct::Int8, default: 0
 
         # @return [String]
         def to_human
@@ -50,7 +50,7 @@ module PacketGen
 
       # Array of {Option}, for {HopByHop} IPv6 extension header
       # @author Sylvain Daubert
-      class Options < Types::Array
+      class Options < BinStruct::Array
         set_of Option
 
         # Get options as a binary string. Add padding if needed.
@@ -96,18 +96,18 @@ module PacketGen
       #  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       #
       # Hop-by-hop IPv6 extension header consists of:
-      # * a {#next} header field ({Types::Int8}),
-      # * a {#length} field ({Types::Int8}),
+      # * a {#next} header field ({BinStruct::Int8}),
+      # * a {#length} field ({BinStruct::Int8}),
       # * an {#options} field ({Options}),
       # * and a {#body}, containing next header.
       # @author Sylvain Daubert
       class HopByHop < Extension
         # redefine options field
-        remove_field :options
+        remove_attr :options
         # @!attribute options
         #  Specific options of extension header
         #  @return [Options]
-        define_field_before :body, :options, Options, builder: ->(h, t) { t.new(length_from: -> { h.real_length - 2 }) }
+        define_attr_before :body, :options, Options, builder: ->(h, t) { t.new(length_from: -> { h.real_length - 2 }) }
       end
     end