packetgen 3.3.3 → 4.1.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,28 +11,28 @@ 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
         end
 
         # Read RR section from a string
-        # @param [String] str binary string
+        # @param [String] str binary binary string
         # @return [RRSection] self
         def read(str)
           clear
           return self if str.nil?
 
-          PacketGen.force_binary str
+          str = str.b unless str.encoding == Encoding::BINARY
           while !str.empty? && (self.size < @counter.to_i)
             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

@@ -33,70 +33,77 @@ module PacketGen
     # * {#ns}, authoritary section,
     # * {#ar}, additional information section.
     #
-    # == Create a DNS header
-    #  # standalone
-    #  dns = PacketGen::Header::DNS.new
-    #  # in a IP packet
-    #  pkt = PacketGen.gen('IP').add('DNS')
-    #  # access to DNS header
-    #  pkt.dns   # => PacketGen::Header::DNS
+    # @example Create a DNS header
+    #   # standalone
+    #   dns = PacketGen::Header::DNS.new
+    #   # in a IP packet
+    #   pkt = PacketGen.gen('IP').add('UDP').add('DNS')
+    #   # access to DNS header
+    #   pkt.dns.class   # => PacketGen::Header::DNS
     #
-    # == DNS attributes
-    #  dns.id = 0x1234
-    #  dns.qr = false
-    #  # opcode may be set as an Integer (all values are possible)
-    #  # or as a String (only keys from PacketGen::Header::DNS::OPCODES)
-    #  dns.opcode = 0xe       # set as integer, value not defined in standard
-    #  dns.opcode = 'query'   # set as string
-    #  dns.aa = dns.tc = dns.rd = dns.ra = false
-    #  # rcode may be set as an Integer (all values are possible)
-    #  # or as a String (only keys from PacketGen::Header::DNS::RCODES)
-    #  dns.rcode = 11
-    #  dns.rcode = 'refused'
-    #  dns.qdcount = 123
-    #  dns.ancount = 0x1234
-    #  dns.nscount = 1
-    #  dns.arcount = 0
-    # One can also access to DNS sections:
-    #  dns.qd   # => PacketGen::Header::DNS::QDSection
-    #  dns.an   # => PacketGen::Header::DNS::RRSection
-    #  dns.ns   # => PacketGen::Header::DNS::RRSection
-    #  dns.ar   # => PacketGen::Header::DNS::RRSection
+    # @example DNS attributes
+    #   dns = PacketGen::Header::DNS.new
+    #   dns.id = 0x1234
+    #   dns.qr = false
+    #   # opcode may be set as an Integer (all values are possible)
+    #   # or as a String (only keys from PacketGen::Header::DNS::OPCODES)
+    #   dns.opcode = 0xe       # set as integer, value not defined in standard
+    #   dns.opcode = 'query'   # set as string
+    #   # Set flags
+    #   dns.aa = dns.tc = dns.rd = dns.ra = false
+    #   # rcode may be set as an Integer (all values are possible)
+    #   # or as a String (only keys from PacketGen::Header::DNS::RCODES)
+    #   dns.rcode = 11
+    #   dns.rcode = 'refused'
+    #   # Section counts may be set by hand. They also be set automatically when adding
+    #   # an element to a section.
+    #   dns.qdcount = 123
+    #   dns.ancount = 0x1234
+    #   dns.nscount = 1
+    #   dns.arcount = 0
+    #   # Access to DNS sections:
+    #   dns.qd.class   # => PacketGen::Header::DNS::QDSection
+    #   dns.an.class   # => PacketGen::Header::DNS::RRSection
+    #   dns.ns.class   # => PacketGen::Header::DNS::RRSection
+    #   dns.ar.class   # => PacketGen::Header::DNS::RRSection
     #
-    # == Add a question to DNS question section
-    # Adding a {Question} with {QDSection#<<} automagically increments {#qdcount}.
-    # To not modify +qdcount+, use {QDSection#push}.
-    #  # add a question about example.net IP address. Increment qdcount
-    #  dns.qd << PacketGen::Header::DNS::Question.new(dns, name: 'example.net')
-    #  # or
-    #  dns.qd << { rtype: 'Question', name: 'example.net' }
-    #  # add a question about example.net IPv6 address. Dot not modify qdcount
-    #  dns.qd.push PacketGen::Header::DNS::Question.new(dns, name: 'example.net', type: 'AAAA')
-    #  # or
-    #  dns.qd.push({ rtype: 'Question', name: 'example.net', type: 'AAAA' })
+    # @example Add a question to DNS question section
+    #   dns = PacketGen::Header::DNS.new
+    #   # add a question about example.net IP address. Increment qdcount
+    #   dns.qd << PacketGen::Header::DNS::Question.new(dns, name: 'example.net')
+    #   # or
+    #   dns.qd << { rtype: 'Question', name: 'example.net' }
+    #   dns.qdcount    #=> 2
+    #   # add a question about example.net IPv6 address. Dot not modify qdcount
+    #   dns.qd.push(PacketGen::Header::DNS::Question.new(dns, name: 'example.net', type: 'AAAA'))
+    #   # or
+    #   dns.qd.push(rtype: 'Question', name: 'example.net', type: 'AAAA')
+    #   dns.qdcount    #=> 2
     #
-    # == Add a ressource record to a DNS section
-    # Adding a {RR} with {RRSection#<< RRSection#<<} automagically increments section counter.
-    # To not modify it, use {RRSection#push RRSection#push}
-    #  # add a RR to answer section. Increment ancount
-    #  dns.an << PacketGen::Header::DNS::RR.new(dns, name: 'example.net', rdata: IPAddr.new('1.2.3.4').hton)
-    #  # or
-    #  dns.an << { rtype: 'RR', name: 'example.net', rdata: IPAddr.new('1.2.3.4').hton }
-    #  # add a RR to NS section. Dot not modify nscount
-    #  rdata = PacketGen::Header::DNS::Name.new(dns).parse('dns.net')
-    #  dns.ns.push PacketGen::Header::DNS::RR.new(dns, name: 'example.net', type: 'NS', rdata: rdata)
-    #  # or
-    #  dns.ns.push(rtype: 'RR', name: 'example.net', type: 'NS', rdata: rdata)
+    # @example Add a ressource record to a DNS section
+    #   dns = PacketGen::Header::DNS.new
+    #   # add a RR to answer section. Increment ancount
+    #   dns.an << PacketGen::Header::DNS::RR.new(dns, name: 'example.net', rdata: IPAddr.new('1.2.3.4').hton)
+    #   # or
+    #   dns.an << { rtype: 'RR', name: 'example.net', rdata: IPAddr.new('1.2.3.4').hton }
+    #   dns.ancount   #=> 2
+    #   # add a RR to NS section. Dot not modify nscount
+    #   rdata = PacketGen::Header::DNS::Name.new(dns: dns).from_human('dns.net')
+    #   dns.ns.push(PacketGen::Header::DNS::RR.new(dns, name: 'example.net', type: 'NS', rdata: rdata))
+    #   # or
+    #   dns.ns.push(rtype: 'RR', name: 'example.net', type: 'NS', rdata: rdata)
+    #   dns.nscount   #=> 0
     #
-    # == Extended DNS EDNS(0)
-    #  # Add an OPT to ar section
-    #  dns.ar << PacketGen::Header::DNS::OPT.new(dns, udp_size: 4096, ext_rcode: 43)
-    #  # or
-    #  dns.ar << { rtype: 'OPT', udp_size: 4096, ext_rcode: 43 }
-    #  # add an option to OPT record
-    #  dns.ar.last.options << PacketGen::Header::DNS::Option.new(code: 48, data: '12')
-    #  # or
-    #  dns.ar.last.options << { code: 48, data: '12' }
+    # @example Extended DNS (EDNS(0)) options
+    #   dns = PacketGen::Header::DNS.new
+    #   # Add an OPT to ar section
+    #   dns.ar << PacketGen::Header::DNS::OPT.new(dns, udp_size: 4096, ext_rcode: 43)
+    #   # or
+    #   dns.ar << { rtype: 'OPT', udp_size: 4096, ext_rcode: 43 }
+    #   # add an option to OPT record
+    #   dns.ar.last.options << PacketGen::Header::DNS::Option.new(code: 48, data: '12')
+    #   # or
+    #   dns.ar.last.options << { code: 48, data: '12' }
     # @author Sylvain Daubert
     # @since 1.3.0
     class DNS < Base
@@ -140,36 +147,11 @@ module PacketGen
       }.freeze
 
       # @!attribute id
+      #  16-bit identifier to match up replies and queries
       #  @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 +170,42 @@ 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
+      #  Number of entries in {#qd question section}
+      #  @return [Integer]
+      define_attr :qdcount, BinStruct::Int16
+      # @!attribute ancount
+      #  Number of ressource recors in {#an answer section}
+      #  @return [Integer]
+      define_attr :ancount, BinStruct::Int16
+      # @!attribute nscount
+      #  Number of name resource recors in {#ns authority records section}
+      #  @return [Integer]
+      define_attr :nscount, BinStruct::Int16
+      # @!attribute arcount
+      #  Number of ressources recors in {#ar additional records section}
+      #  @return [Integer]
+      define_attr :arcount, BinStruct::Int16
+      # @!attribute qd
+      #  Question section
+      #  @return [QDSection]
+      define_attr :qd, QDSection, builder: ->(h, t) { t.new(h, h[:qdcount]) }
+      # @!attribute an
+      #  Answer section
+      #  @return [RRSection]
+      define_attr :an, RRSection, builder: ->(h, t) { t.new(h, h[:ancount]) }
+      # @!attribute ns
+      #  Authority records section
+      #  @return [RRSection]
+      define_attr :ns, RRSection, builder: ->(h, t) { t.new(h, h[:nscount]) }
+      # @!attribute ar
+      #  Additional record section
+      #  @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

@@ -12,16 +12,16 @@ module PacketGen
     class Dot11
       # IEEE 802.11 control frame header
       #
-      # This class make a {Dot11} header with {#type} set to +1+
+      # This class makes a {Dot11} header with {#type} set to +1+
       # (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 {Headerable} 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,24 @@ 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 {#mac1} ({Eth::MacAddr}),
       # * 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 {Headerable} 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,34 +46,34 @@ 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
 
-        # Get destination MAC address
+        # Get destination MAC address. {#from_ds} and {#to_ds} must be set before using these method.
         # @return [String]
         def dst
           _src_mac, dst_mac = src_dst_from_mac
           self.send(dst_mac)
         end
 
-        # Set destination MAC address
+        # Set destination MAC address. {#from_ds} and {#to_ds} must be set before using these method.
         # @param [String] mac MAC address to set
         # @return [String]
         def dst=(mac)
@@ -80,14 +81,14 @@ module PacketGen
           self.send(:"#{dst_mac}=", mac)
         end
 
-        # Get source MAC address
+        # Get source MAC address. {#from_ds} and {#to_ds} must be set before using these method.
         # @return [String]
         def src
           src_mac, = src_dst_from_mac
           self.send(src_mac)
         end
 
-        # Set source MAC address
+        # Set source MAC address. {#from_ds} and {#to_ds} must be set before using these method.
         # @param [String] mac MAC address to set
         # @return [String]
         def src=(mac)
@@ -111,19 +112,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