packetgen 3.3.2 → 4.0.0

data/lib/packetgen/header/dns/rr.rb

@@ -11,19 +11,55 @@ module PacketGen
     class DNS
       # DNS Ressource Record
       # @author Sylvain Daubert
+      # @author LemonTree55
       class RR < Question
         # @!attribute ttl
         #  32-bit time to live
         #  @return [Integer]
-        define_field :ttl, Types::Int32
+        define_attr :ttl, BinStruct::Int32
         # @!attribute rdlength
         #  16-bit {#rdata} length
         #  @return [Integer]
-        define_field :rdlength, Types::Int16
+        define_attr :rdlength, BinStruct::Int16
         # @!attribute rdata
-        #  @return [Types::String]
-        define_field :rdata, Types::String,
-                     builder: ->(rr, t) { t.new(length_from: rr[:rdlength]) }
+        #  @return [BinStruct::String]
+        define_attr :rdata, BinStruct::String,
+                    builder: ->(rr, t) { t.new(length_from: rr[:rdlength]) }
+
+        # @private RData struct
+        class RData < BinStruct::Struct
+          attr_accessor :dns
+
+          def initialize(options={})
+            @dns = options.delete(:dns)
+            super
+          end
+        end
+
+        # @private MX struct
+        class MX < RData
+          define_attr :pref, BinStruct::Int16
+          define_attr :exchange, Name, builder: ->(h, t) { t.new(dns: h.dns) }
+        end
+
+        # @private SOA struct
+        class SOA < RData
+          define_attr :mname, Name, builder: ->(h, t) { t.new(dns: h.dns) }
+          define_attr :rname, Name, builder: ->(h, t) { t.new(dns: h.dns) }
+          define_attr :serial, BinStruct::Int32
+          define_attr :refresh, BinStruct::Int32
+          define_attr :retryi, BinStruct::Int32
+          define_attr :expire, BinStruct::Int32
+          define_attr :minimum, BinStruct::Int32
+        end
+
+        # @private SRV struct
+        class SRV < RData
+          define_attr :priority, BinStruct::Int16
+          define_attr :weight, BinStruct::Int16
+          define_attr :port, BinStruct::Int16
+          define_attr :target, Name, builder: ->(h, t) { t.new(dns: h.dns) }
+        end
 
         # @param [DNS] dns
         # @param [Hash] options
@@ -47,8 +83,8 @@ module PacketGen
         # @param [String] data
         # @return [void]
         def rdata=(data)
-          self[:rdlength].read data.size
-          self[:rdata].read data
+          self[:rdlength].from_human(data.size)
+          self[:rdata].read(data)
         end
 
         # rubocop:disable Metrics/AbcSize
@@ -60,8 +96,7 @@ module PacketGen
 
           case type
           when TYPES['NS'], TYPES['PTR'], TYPES['CNAME']
-            name = Name.new
-            name.dns = self[:name].dns
+            name = Name.new(dns: self[:name].dns)
             str = name.read(self[:rdata]).to_human
           when TYPES['SOA']
             str = human_soa_rdata
@@ -78,9 +113,9 @@ module PacketGen
         # Get human readable class
         # @return [String]
         def human_rrclass
-          if self[:name].dns.is_a? MDNS
+          if self[:name].dns.is_a?(MDNS)
             str = self.class::CLASSES.key(self.rrclass & 0x7fff) || '0x%04x' % (self.rrclass & 0x7fff)
-            str += ' CACHE-FLUSH' if (self.rrclass & 0x8000).positive?
+            str += ' CACHE-FLUSH' if self.rrclass.anybits?(0x8000)
             str
           else
             self.class::CLASSES.key(self.rrclass) || '0x%04x' % self.rrclass
@@ -100,49 +135,27 @@ module PacketGen
 
           case type
           when TYPES['A'], TYPES['AAAA']
-            IPAddr.new_ntoh(self[:rdata]).to_s
+            IPAddr.new_ntoh(self[:rdata].string).to_s
           end
         end
 
         def human_mx_data
-          name = Name.new
-          name.dns = self[:name].dns
-
-          pref = Types::Int16.new.read(self[:rdata][0, 2])
-          exchange = name.read(self[:rdata][2..]).to_human
-
-          '%u %s' % [pref.to_i, exchange]
+          mx = MX.new(dns: self[:name].dns).read(self[:rdata])
+          "#{mx.pref} #{mx.exchange}"
         end
 
-        # rubocop:disable Metrics/AbcSize
+        # /rubocop:disable Metrics/AbcSize
         def human_soa_rdata
-          name = Name.new
-          name.dns = self[:name].dns
-          mname = name.read(self[:rdata]).dup
-          rname = name.read(self[:rdata][mname.sz..])
-
-          serial = Types::Int32.new.read(self[:rdata][mname.sz + rname.sz, 4])
-          refresh = Types::Int32.new.read(self[:rdata][mname.sz + rname.sz + 4, 4])
-          retryi = Types::Int32.new.read(self[:rdata][mname.sz + rname.sz + 8, 4])
-          expire = Types::Int32.new.read(self[:rdata][mname.sz + rname.sz + 12, 4])
-          minimum = Types::Int32.new.read(self[:rdata][mname.sz + rname.sz + 16, 4])
-
-          "#{mname.to_human} #{rname.to_human} #{serial.to_i} #{refresh.to_i} " \
-            "#{retryi.to_i} #{expire.to_i} #{minimum.to_i}"
+          soa = SOA.new(dns: self[:name].dns).read(self[:rdata])
+
+          "#{soa.mname} #{soa.rname} #{soa.serial} #{soa.refresh} " \
+            "#{soa.retryi} #{soa.expire} #{soa.minimum}"
         end
 
         def human_srv_data
-          name = Name.new
-          name.dns = self[:name].dns
-
-          priority = Types::Int16.new.read(self[:rdata][0, 2])
-          weight = Types::Int16.new.read(self[:rdata][2, 2])
-          port = Types::Int16.new.read(self[:rdata][4, 2])
-          target = name.read(self[:rdata][6, self[:rdata].size]).to_human
-
-          "#{priority.to_i} #{weight.to_i} #{port.to_i} #{target}"
+          srv = SRV.new(dns: self[:name].dns).read(self[:rdata])
+          "#{srv.priority} #{srv.weight} #{srv.port} #{srv.target}"
         end
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/packetgen/header/dns/rrsection.rb

@@ -11,10 +11,10 @@ module PacketGen
     class DNS
       # Define a DNS Ressource Record Section
       # @author Sylvain Daubert
-      class RRSection < Types::Array
+      class RRSection < BinStruct::Array
         # @api private
         # @param [DNS] dns
-        # @param [Types::Int] counter
+        # @param [BinStruct::Int] counter
         def initialize(dns, counter)
           super(counter: counter)
           @dns = dns
@@ -32,7 +32,7 @@ module PacketGen
             rr = RR.new(@dns).read(str)
             rr = OPT.new(@dns).read(str) if rr.type?('OPT')
             str.slice!(0, rr.sz)
-            push rr
+            push(rr)
           end
           self
         end
@@ -40,7 +40,7 @@ module PacketGen
         private
 
         def record_from_hash(hsh)
-          if hsh.key? :rtype
+          if hsh.key?(:rtype)
             case hsh.delete(:rtype)
             when 'Question'
               Question.new(@dns, hsh)

data/lib/packetgen/header/dns.rb

@@ -141,35 +141,9 @@ module PacketGen
 
       # @!attribute id
       #  @return [Integer]
-      define_field :id, Types::Int16
+      define_attr :id, BinStruct::Int16
       # @!attribute u16
       #  @return [Integer]
-      define_field :u16, Types::Int16
-      # @!attribute qdcount
-      #  @return [Integer]
-      define_field :qdcount, Types::Int16
-      # @!attribute ancount
-      #  @return [Integer]
-      define_field :ancount, Types::Int16
-      # @!attribute nscount
-      #  @return [Integer]
-      define_field :nscount, Types::Int16
-      # @!attribute arcount
-      #  @return [Integer]
-      define_field :arcount, Types::Int16
-      # @!attribute qd
-      #  @return [QDSection]
-      define_field :qd, QDSection, builder: ->(h, t) { t.new(h, h[:qdcount]) }
-      # @!attribute an
-      #  @return [RRSection]
-      define_field :an, RRSection, builder: ->(h, t) { t.new(h, h[:ancount]) }
-      # @!attribute ns
-      #  @return [RRSection]
-      define_field :ns, RRSection, builder: ->(h, t) { t.new(h, h[:nscount]) }
-      # @!attribute ar
-      #  @return [RRSection]
-      define_field :ar, RRSection, builder: ->(h, t) { t.new(h, h[:arcount]) }
-
       # @!attribute qr
       #   @return [Boolean] query (+false+) or response (+true+)
       # @!attribute opcode
@@ -188,11 +162,34 @@ module PacketGen
       #   @return [Boolean] Checking Disabled
       # @!attribute rcode
       #   @return [Integer] Response code. See {RCODES}.
-      define_bit_fields_on :u16, :qr, :opcode, 4, :aa, :tc, :rd, :ra, :z,
-                           :ad, :cd, :rcode, 4
-
+      define_bit_attr :u16, qr: 1, opcode: 4, aa: 1, tc: 1, rd: 1, ra: 1, z: 1, ad: 1, cd: 1, rcode: 4
       undef opcode=, rcode=
 
+      # @!attribute qdcount
+      #  @return [Integer]
+      define_attr :qdcount, BinStruct::Int16
+      # @!attribute ancount
+      #  @return [Integer]
+      define_attr :ancount, BinStruct::Int16
+      # @!attribute nscount
+      #  @return [Integer]
+      define_attr :nscount, BinStruct::Int16
+      # @!attribute arcount
+      #  @return [Integer]
+      define_attr :arcount, BinStruct::Int16
+      # @!attribute qd
+      #  @return [QDSection]
+      define_attr :qd, QDSection, builder: ->(h, t) { t.new(h, h[:qdcount]) }
+      # @!attribute an
+      #  @return [RRSection]
+      define_attr :an, RRSection, builder: ->(h, t) { t.new(h, h[:ancount]) }
+      # @!attribute ns
+      #  @return [RRSection]
+      define_attr :ns, RRSection, builder: ->(h, t) { t.new(h, h[:nscount]) }
+      # @!attribute ar
+      #  @return [RRSection]
+      define_attr :ar, RRSection, builder: ->(h, t) { t.new(h, h[:arcount]) }
+
       # Set opcode
       # @param [Integer,String] value
       # @return [Integer]

data/lib/packetgen/header/dot11/control.rb

@@ -16,12 +16,12 @@ module PacketGen
       # (control frame).
       #
       # A IEEE 802.11 control header consists of:
-      # * a {#frame_ctrl} ({Types::Int16}),
-      # * a {#id}/duration ({Types::Int16le}),
+      # * a {#frame_ctrl} ({BinStruct::Int16}),
+      # * a {#id}/duration ({BinStruct::Int16le}),
       # * a {#mac1} ({Eth::MacAddr}).
       # * sometimes a {#mac2} ({Eth::MacAddr}),
-      # * a {#body} (a {Types::String} or another {Base} class),
-      # * and a Frame check sequence ({#fcs}, of type {Types::Int32le}).
+      # * a {#body} (a {BinStruct::String} or another {Base} class),
+      # * and a Frame check sequence ({#fcs}, of type {BinStruct::Int32le}).
       # @author Sylvain Daubert
       class Control < Dot11
         # Control subtypes
@@ -44,8 +44,8 @@ module PacketGen
         # @see Base#initialize
         def initialize(options={})
           super({ type: 1 }.merge!(options))
-          @applicable_fields -= %i[mac3 sequence_ctrl mac4 qos_ctrl ht_ctrl]
-          define_applicable_fields
+          @applicable_attributes -= %i[mac3 sequence_ctrl mac4 qos_ctrl ht_ctrl]
+          define_applicable_attributes
         end
 
         # Get human readable subtype
@@ -56,12 +56,12 @@ module PacketGen
 
         private
 
-        def define_applicable_fields
+        def define_applicable_attributes
           super
-          if @applicable_fields.include? :mac2
-            @applicable_fields -= %i[mac2] unless SUBTYPES_WITH_MAC2.include? self.subtype
-          elsif SUBTYPES_WITH_MAC2.include? self.subtype
-            @applicable_fields[3, 0] = :mac2
+          if @applicable_attributes.include?(:mac2)
+            @applicable_attributes -= %i[mac2] unless SUBTYPES_WITH_MAC2.include?(self.subtype)
+          elsif SUBTYPES_WITH_MAC2.include?(self.subtype)
+            @applicable_attributes[3, 0] = :mac2
           end
         end
       end

data/lib/packetgen/header/dot11/data.rb

@@ -16,23 +16,23 @@ module PacketGen
       # (data frame).
       #
       # A IEEE 802.11 data header consists of:
-      # * a {#frame_ctrl} ({Types::Int16}),
-      # * a {#id}/duration ({Types::Int16le}),
+      # * a {#frame_ctrl} ({BinStruct::Int16}),
+      # * a {#id}/duration ({BinStruct::Int16le}),
       # * a {#mac2} ({Eth::MacAddr}),
       # * a {#mac3} ({Eth::MacAddr}),
-      # * a {#sequence_ctrl} ({Types::Int16}),
+      # * a {#sequence_ctrl} ({BinStruct::Int16}),
       # * sometimes a {#mac4} ({Eth::MacAddr}),
-      # * sometimes a {#qos_ctrl} ({Types::Int16}),
-      # * a {#body} (a {Types::String} or another {Base} class),
-      # * and a Frame check sequence ({#fcs}, of type {Types::Int32le}).
+      # * sometimes a {#qos_ctrl} ({BinStruct::Int16}),
+      # * a {#body} (a {BinStruct::String} or another {Base} class),
+      # * and a Frame check sequence ({#fcs}, of type {BinStruct::Int32le}).
       # @author Sylvain Daubert
       class Data < Dot11
         # @param [Hash] options
         # @see Base#initialize
         def initialize(options={})
           super({ type: 2 }.merge!(options))
-          @applicable_fields -= %i[mac4 qos_ctrl ht_ctrl]
-          define_applicable_fields
+          @applicable_attributes -= %i[mac4 qos_ctrl ht_ctrl]
+          define_applicable_attributes
         end
 
         # Invert source and destination addresses (see Table 8-19 from
@@ -45,22 +45,22 @@ module PacketGen
           case ds
           when 0
             # MAC1: RA/DA, MAC2: TA/SA
-            invert_mac :mac1, :mac2
+            invert_mac(:mac1, :mac2)
           when 1
             # MAC1: RA/BSSID, MAC2: TA/SA, MAC3: DA
-            invert_mac :mac1, :mac2
+            invert_mac(:mac1, :mac2)
             self.to_ds = false
             self.from_ds = true
           when 2
             # MAC1: RA/DA, MAC2: BSSID, MAC3: SA or BSSID
-            invert_mac :mac1, :mac2
+            invert_mac(:mac1, :mac2)
             self.to_ds = true
             self.from_ds = false
           when 3
             # MAC1: RA, MAC2: TA
-            invert_mac :mac1, :mac2
+            invert_mac(:mac1, :mac2)
             # MAC3: DA, MAC4: SA
-            invert_mac :mac3, :mac4
+            invert_mac(:mac3, :mac4)
           end
           self
         end
@@ -111,19 +111,19 @@ module PacketGen
           end
         end
 
-        def define_applicable_fields
+        def define_applicable_attributes
           super
-          if (subtype >= 8) && !@applicable_fields.include?(:qos_ctrl)
+          if (subtype >= 8) && !@applicable_attributes.include?(:qos_ctrl)
             # Insert after mac4, if present
             # else insert after sequence_ctrl
-            if @applicable_fields.include? :mac4
-              idx = @applicable_fields.index(:mac4)
-              @applicable_fields[idx, 0] = :qos_ctrl
+            if @applicable_attributes.include? :mac4
+              idx = @applicable_attributes.index(:mac4)
+              @applicable_attributes[idx, 0] = :qos_ctrl
             else
-              @applicable_fields[6, 0] = :qos_ctrl
+              @applicable_attributes[6, 0] = :qos_ctrl
             end
           elsif subtype < 8
-            @applicable_fields -= %i[qos_ctrl]
+            @applicable_attributes -= %i[qos_ctrl]
           end
         end
 

data/lib/packetgen/header/dot11/element.rb

@@ -15,10 +15,10 @@ module PacketGen
       #  #
       #  # An {Element} is a piece of data contained in a Dot11 management frame.
       #  # @since 1.4.0
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
-      #  class Element < Types::AbstractTLV; end
+      #  # @since 3.1.0 subclass of {BinStruct::AbstractTLV}
+      #  class Element < BinStruct::AbstractTLV; end
       # @private
-      Element = Types::AbstractTLV.create
+      Element = BinStruct::AbstractTLV.create
 
       class Element
         # Known element types
@@ -44,7 +44,7 @@ module PacketGen
 
       # Array of {Element}.
       # @since 3.1.1
-      class ArrayOfElements < Types::Array
+      class ArrayOfElements < BinStruct::Array
         set_of Element
       end
     end

data/lib/packetgen/header/dot11/management.rb

@@ -16,14 +16,14 @@ module PacketGen
       # (management frame).
       #
       # A IEEE 802.11 management header consists of:
-      # * a {#frame_ctrl} ({Types::Int16}),
-      # * a {#id}/duration ({Types::Int16le}),
+      # * a {#frame_ctrl} ({BinStruct::Int16}),
+      # * a {#id}/duration ({BinStruct::Int16le}),
       # * a {#mac1} ({Eth::MacAddr}).
       # * a {#mac2} ({Eth::MacAddr}),
       # * a {#mac3} ({Eth::MacAddr}),
-      # * a {#sequence_ctrl} ({Types::Int16}),
-      # * a {#body} (a {Types::String} or another {Base} class),
-      # * and a Frame check sequence ({#fcs}, of type {Types::Int32le}).
+      # * a {#sequence_ctrl} ({BinStruct::Int16}),
+      # * a {#body} (a {BinStruct::String} or another {Base} class),
+      # * and a Frame check sequence ({#fcs}, of type {BinStruct::Int32le}).
       #
       # Management frames should be constructed with more headers from
       # {SubMngt} subclasses.
@@ -44,8 +44,8 @@ module PacketGen
         # @see Base#initialize
         def initialize(options={})
           super({ type: 0 }.merge!(options))
-          @applicable_fields -= %i[mac4 qos_ctrl ht_ctrl]
-          define_applicable_fields
+          @applicable_attributes -= %i[mac4 qos_ctrl ht_ctrl]
+          define_applicable_attributes
         end
 
         # Add an {Element}
@@ -54,7 +54,7 @@ module PacketGen
         # @return [self]
         # @since 2.1.3
         def add_element(type:, value:)
-          raise FormatError, 'Before adding an Element, you have to add a Dot11::SubMngt subclass instance' unless self[:body].is_a? SubMngt
+          raise FormatError, 'Before adding an Element, you have to add a Dot11::SubMngt subclass instance' unless self[:body].is_a?(SubMngt)
 
           self[:body].elements << { type: type, value: value }
           self

data/lib/packetgen/header/dot11/sub_mngt.rb

@@ -20,21 +20,7 @@ module PacketGen
       # @author Sylvain Daubert
       class SubMngt < Base
         # @return [Array<Element>]
-        define_field :elements, ArrayOfElements
-
-        # Add an {Element} to header
-        # @param [Integer,String] type element type
-        # @param [Object] value element value
-        # @return [self]
-        # @since 2.1.3
-        # @since 3.1.1 #elements in no more an Array but an {ArrayOfElements}
-        # @deprecated Prefer use of +submngt.element << {type: type, value: value}+
-        def add_element(type:, value:)
-          Deprecation.deprecated(self.class, __method__, 'elements')
-          element = Element.new(type: type, value: value)
-          self.elements << element
-          self
-        end
+        define_attr :elements, ArrayOfElements
       end
 
       # IEEE 802.11 Association Request frame
@@ -42,16 +28,16 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 0.
       #
       # Add fields:
-      # * {#cap} ({Types::Int16le}),
-      # * {#listen_interval} ({Types::Int16le}).
+      # * {#cap} ({BinStruct::Int16le}),
+      # * {#listen_interval} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class AssoReq < SubMngt
         # @!attribute cap
         #  @return [Integer] 16-bit capabillities word
-        define_field_before :elements, :cap, Types::Int16le
+        define_attr_before :elements, :cap, BinStruct::Int16le
         # @!attribute listen_interval
         #  @return [Integer] 16-bit listen interval value
-        define_field_before :elements, :listen_interval, Types::Int16le, default: 0x00c8
+        define_attr_before :elements, :listen_interval, BinStruct::Int16le, default: 0x00c8
       end
       Header.add_class AssoReq
       Management.bind AssoReq, type: 0, subtype: 0
@@ -61,20 +47,20 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 1.
       #
       # Add fields:
-      # * {#cap} ({Types::Int16le}),
-      # * {#status} ({Types::Int16le}),
-      # * {#aid} ({Types::Int16le}).
+      # * {#cap} ({BinStruct::Int16le}),
+      # * {#status} ({BinStruct::Int16le}),
+      # * {#aid} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class AssoResp < SubMngt
         # @!attribute cap
         #  @return [Integer] 16-bit capabillities word
-        define_field_before :elements, :cap, Types::Int16le
+        define_attr_before :elements, :cap, BinStruct::Int16le
         # @!attribute status
         #  @return [Integer] 16-bit status word
-        define_field_before :elements, :status, Types::Int16le
+        define_attr_before :elements, :status, BinStruct::Int16le
         # @!attribute aid
         #  @return [Integer] 16-bit AID word
-        define_field_before :elements, :aid, Types::Int16le
+        define_attr_before :elements, :aid, BinStruct::Int16le
       end
       Header.add_class AssoResp
       Management.bind AssoResp, type: 0, subtype: 1
@@ -84,14 +70,14 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 2.
       #
       # Add fields:
-      # * {#cap} ({Types::Int16le}),
-      # * {#listen_interval} ({Types::Int16le}),
+      # * {#cap} ({BinStruct::Int16le}),
+      # * {#listen_interval} ({BinStruct::Int16le}),
       # * {#current_ap} ({Eth::MacAddr}).
       # @author Sylvain Daubert
       class ReAssoReq < AssoReq
         # @!attribute current_ap
         #  @return [Eth::MAcAddr]
-        define_field_before :elements, :current_ap, Eth::MacAddr
+        define_attr_before :elements, :current_ap, Eth::MacAddr
       end
       Header.add_class ReAssoReq
       Management.bind ReAssoReq, type: 0, subtype: 2
@@ -101,9 +87,9 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 3.
       #
       # Add fields:
-      # * {#cap} ({Types::Int16le}),
-      # * {#status} ({Types::Int16le}),
-      # * {#aid} ({Types::Int16le}).
+      # * {#cap} ({BinStruct::Int16le}),
+      # * {#status} ({BinStruct::Int16le}),
+      # * {#aid} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class ReAssoResp < AssoResp
       end
@@ -126,20 +112,20 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 5.
       #
       # Add fields:
-      # * {#timestamp} ({Types::Int64le}),
-      # * {#beacon_interval} ({Types::Int16le}),
-      # * {#cap} ({Types::Int16le}).
+      # * {#timestamp} ({BinStruct::Int64le}),
+      # * {#beacon_interval} ({BinStruct::Int16le}),
+      # * {#cap} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class ProbeResp < SubMngt
         # @!attribute timestamp
         #  @return [Integer] 64-bit timestamp
-        define_field_before :elements, :timestamp, Types::Int64le
+        define_attr_before :elements, :timestamp, BinStruct::Int64le
         # @!attribute beacon_interval
         #  @return [Integer] 16-bit beacon interval value
-        define_field_before :elements, :beacon_interval, Types::Int16le, default: 0x0064
+        define_attr_before :elements, :beacon_interval, BinStruct::Int16le, default: 0x0064
         # @!attribute cap
         #  @return [Integer] 16-bit capabillities word
-        define_field_before :elements, :cap, Types::Int16le
+        define_attr_before :elements, :cap, BinStruct::Int16le
       end
       Header.add_class ProbeResp
       Management.bind ProbeResp, type: 0, subtype: 5
@@ -149,20 +135,20 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 8.
       #
       # Add fields:
-      # * {#timestamp} ({Types::Int64le}),
-      # * {#interval} ({Types::Int16le}),
-      # * {#cap} ({Types::Int16le}).
+      # * {#timestamp} ({BinStruct::Int64le}),
+      # * {#interval} ({BinStruct::Int16le}),
+      # * {#cap} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class Beacon < SubMngt
         # @!attribute timestamp
         #  @return [Integer] 64-bit timestamp
-        define_field_before :elements, :timestamp, Types::Int64le
+        define_attr_before :elements, :timestamp, BinStruct::Int64le
         # @!attribute interval
         #  @return [Integer] 16-bit interval value
-        define_field_before :elements, :interval, Types::Int16le, default: 0x64
+        define_attr_before :elements, :interval, BinStruct::Int16le, default: 0x64
         # @!attribute cap
         #  @return [Integer] 16-bit capabillities word
-        define_field_before :elements, :cap, Types::Int16le
+        define_attr_before :elements, :cap, BinStruct::Int16le
       end
       Header.add_class Beacon
       Management.bind Beacon, type: 0, subtype: 8
@@ -182,12 +168,12 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 10.
       #
       # Add fields:
-      # * {#reason} ({Types::Int16le}).
+      # * {#reason} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class Disas < SubMngt
         # @!attribute reason
         #  @return [Integer] 16-bit reason value
-        define_field_before :elements, :reason, Types::Int16le
+        define_attr_before :elements, :reason, BinStruct::Int16le
       end
       Header.add_class Disas
       Management.bind Disas, type: 0, subtype: 10
@@ -197,20 +183,20 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 11.
       #
       # Add fields:
-      # * {#algo} ({Types::Int16le}),
-      # * {#seqnum} ({Types::Int16le}),
-      # * {#status} ({Types::Int16le}).
+      # * {#algo} ({BinStruct::Int16le}),
+      # * {#seqnum} ({BinStruct::Int16le}),
+      # * {#status} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class Auth < SubMngt
         # @!attribute algo
         #  @return [Integer] 16-bit algo value
-        define_field_before :elements, :algo, Types::Int16le
+        define_attr_before :elements, :algo, BinStruct::Int16le
         # @!attribute seqnum
         #  @return [Integer] 16-bit seqnum value
-        define_field_before :elements, :seqnum, Types::Int16le
+        define_attr_before :elements, :seqnum, BinStruct::Int16le
         # @!attribute status
         #  @return [Integer] 16-bit status word
-        define_field_before :elements, :status, Types::Int16le
+        define_attr_before :elements, :status, BinStruct::Int16le
       end
       Header.add_class Auth
       Management.bind Auth, type: 0, subtype: 11
@@ -220,12 +206,12 @@ module PacketGen
       # Specialize {Dot11::Management} with +subtype+ set to 12.
       #
       # Add fields:
-      # * {#reason} ({Types::Int16le}).
+      # * {#reason} ({BinStruct::Int16le}).
       # @author Sylvain Daubert
       class DeAuth < SubMngt
         # @!attribute reason
         #  @return [Integer] 16-bit reason value
-        define_field_before :elements, :reason, Types::Int16le
+        define_attr_before :elements, :reason, BinStruct::Int16le
       end
       Header.add_class DeAuth
       Management.bind DeAuth, type: 0, subtype: 12