packetgen 3.3.3 → 4.1.0

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

@@ -11,10 +11,11 @@ module PacketGen
     class IPv6
       # @!parse
       #  # Option for {HopByHop} IPv6 extension header.
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
+      #  # @since 2.4.0
+      #  # @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
@@ -23,6 +24,7 @@ module PacketGen
           5 => 'router_alert'
         }.freeze
 
+        # Get human-readable string
         # @return [String]
         def to_human
           case type
@@ -35,13 +37,16 @@ module PacketGen
       end
       Option.define_type_enum Option::TYPES.invert
 
-      # Special option pad1, for {HopByHop} IPv6 extension header
+      # Special option pad1 (one-byte option), for {HopByHop} IPv6 extension header
       # @author Sylvain Daubert
-      class Pad1 < Types::Fields
+      # @since 2.4.0
+      class Pad1 < BinStruct::Struct
         # @!attribute pad
-        # @return [Integer]
-        define_field :pad, Types::Int8, default: 0
+        #   Pad1 option type
+        #   @return [Integer]
+        define_attr :pad, BinStruct::Int8, default: 0
 
+        # Get human-readable string
         # @return [String]
         def to_human
           'pad1'
@@ -50,7 +55,8 @@ module PacketGen
 
       # Array of {Option}, for {HopByHop} IPv6 extension header
       # @author Sylvain Daubert
-      class Options < Types::Array
+      # @since 2.4.0
+      class Options < BinStruct::Array
         set_of Option
 
         # Get options as a binary string. Add padding if needed.
@@ -96,18 +102,31 @@ module PacketGen
       #  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       #
       # Hop-by-hop IPv6 extension header consists of:
-      # * a {#next} header field ({Types::Int8}),
-      # * a {#length} field ({Types::Int8}),
+      # * a {#next #next} header field (+BinStruct::Int8+),
+      # * a {#length #length} field (+BinStruct::Int8+),
       # * an {#options} field ({Options}),
-      # * and a {#body}, containing next header.
+      # * and a {#body #body}, containing next header.
+      # @example
+      #  pkt = PacketGen.gen('Eth').add('IPv6').add('IPv6::HopByHop').add('ICMPv6')
+      #  pkt.ipv6_hopbyhop.options << { type: 'router_alert', value: "\x00\x00".b }
       # @author Sylvain Daubert
+      # @since 2.4.0
       class HopByHop < Extension
         # redefine options field
-        remove_field :options
+        remove_attr :options
         # @!attribute options
-        #  Specific options of extension header
+        #  Specific HopByHop options
         #  @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 }) }
+
+        # Generate binary string. Add padding if needed in {#options}, and update {#length} accordingly.
+        # @return [String]
+        # @since 2.4.0
+        # @since 4.1.0 Set {Extension#length}.
+        def to_s
+          calc_length
+          super
+        end
       end
     end
 

data/lib/packetgen/header/ipv6.rb

@@ -37,26 +37,27 @@ module PacketGen
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     #
     # A IPv6 header consists of:
-    # * a first 32-bit word ({#u32}, of {Types::Int32} type) composed of:
+    # * a first 32-bit word ({#u32}, of +BinStruct::Int32+ type) composed of:
     #   * a 4-bit {#version} field,
     #   * a 8-bit {#traffic_class} field,
     #   * a 20-bit {#flow_label} field,
-    # * a payload length field ({#length}, {Types::Int16} type}),
-    # * a next header field ({#next}, {Types::Int8} type),
-    # * a hop-limit field ({#hop}, +Int8+ type),
+    # * a payload length field ({#length}, +BinStruct::Int16+ type}),
+    # * a next header field ({#next}, +BinStruct::Int8+ type),
+    # * a hop-limit field ({#hop}, +BinStruct::Int8+ type),
     # * a source address field ({#src}, {IPv6::Addr} type),
-    # * a destination address field ({#dst}, +IPv6::Addr+ type),
-    # * and a {#body} ({Types::String} type).
+    # * a destination address field ({#dst}, {IPv6::Addr} type),
+    # * and a {#body} (+BinStruct::String+ type).
     #
-    # == Create a IPv6 header
+    # @example Create a IPv6 header
     #  # standalone
     #  ipv6 = PacketGen::Header::IPv6.new
     #  # in a packet
     #  pkt = PacketGen.gen('IPv6')
     #  # access to IPv6 header
-    #  pkt.ipv6   # => PacketGen::Header::IPv6
+    #  pkt.ipv6.class   # => PacketGen::Header::IPv6
     #
-    # == IPv6 attributes
+    # @example IPv6 attributes
+    #  ipv6 = PacketGen::Header::IPv6.new
     #  ipv6.u32 = 0x60280001
     #  # the same as
     #  ipv6.version = 6
@@ -68,9 +69,9 @@ module PacketGen
     #  ipv6.next = 6
     #  ipv6.src = '::1'
     #  ipv6.src                # => "::1"
-    #  ipv6[:src]              # => PacketGen::Header::IPv6::Addr
+    #  ipv6[:src].class        # => PacketGen::Header::IPv6::Addr
     #  ipv6.dst = '2001:1234:5678:abcd::123'
-    #  ipv6.body.read 'this is a body'
+    #  ipv6.body ='this is a body'
     #
     # == Add IPv6 extensions
     # In IPv6, optional extensions are encoded in separate headers that
@@ -84,6 +85,7 @@ module PacketGen
     #  # Add another header
     #  pkt.add('UDP')
     # @author Sylvain Daubert
+    # @author LemonTree55
     class IPv6 < Base; end
 
     require_relative 'ipv6/addr'
@@ -95,40 +97,42 @@ module PacketGen
       # @!attribute u32
       #  First 32-bit word of IPv6 header
       #  @return [Integer]
-      define_field :u32, Types::Int32, default: 0x6000_0000
+      # @!attribute version
+      #   4-bit version attribute
+      #   @return [Integer]
+      # @!attribute traffic_class
+      #   8-bit traffic_class attribute
+      #   @return [Integer]
+      # @!attribute flow_label
+      #    20-bit flow_label attribute
+      #   @return [Integer]
+      define_bit_attr :u32, default: 0x60000000, version: 4, traffic_class: 8, flow_label: 20
       # @!attribute length
       #  16-bit word of IPv6 payload length
       #  @return [Integer]
-      define_field :length, Types::Int16
+      define_attr :length, BinStruct::Int16
       # @!attribute next
       #  8-bit IPv6 next payload value
       #  @return [Integer]
-      define_field :next, Types::Int8
+      define_attr :next, BinStruct::Int8
       # @!attribute hop
       #  8-bit IPv6 hop limit
       #  @return [Integer]
-      define_field :hop, Types::Int8, default: 64
+      define_attr :hop, BinStruct::Int8, default: 64
       # @!attribute src
       #  IPv6 source address
       #  @return [Addr]
-      define_field :src, Addr, default: '::1'
+      define_attr :src, Addr, default: '::1'
       # @!attribute dst
       #  IPv6 destination address
       #  @return [Addr]
-      define_field :dst, Addr, default: '::1'
+      define_attr :dst, Addr, default: '::1'
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
-
-      # @!attribute version
-      #   @return [Integer] 4-bit version attribute
-      # @!attribute traffic_class
-      #   @return [Integer] 8-bit traffic_class attribute
-      # @!attribute flow_label
-      #   @return [Integer] 20-bit flow_label attribute
-      define_bit_fields_on :u32, :version, 4, :traffic_class, 8, :flow_label, 20
+      #  IPv6 body
+      #  @return [BinStruct::String,Headerable]
+      define_attr :body, BinStruct::String
 
-      # Compute length and set +len+ field
+      # Compute length and set {#length} field
       # @return [Integer]
       def calc_length
         Base.calculate_and_set_length self, header_in_size: false
@@ -143,14 +147,14 @@ module PacketGen
         sum
       end
 
-      # Send IPv6 packet on wire. All fields may be set (even {#version}).
+      # Send IPv6 packet on wire. All attributes may be set (even {#version}).
       # @param [String] _iface interface name (not used)
       # @return [void]
       # @since 3.0.0 no more limitations on +flow_label+, +length+ and +src+ fields.
       def to_w(_iface=nil)
         sock = Socket.new(Socket::AF_INET6, 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
 
@@ -170,7 +174,7 @@ module PacketGen
       end
 
       # Check version field
-      # @see [Base#parse?]
+      # @see Base#parse?
       def parse?
         version == 6
       end
@@ -199,15 +203,18 @@ module PacketGen
   module Header
     class IPv6
       class << self
+        # @private
         alias old_bind bind
 
         # Bind a upper header to IPv6 and its defined extension headers.
         # @see Base.bind
+        # @author LemonTree55
         def bind(header_klass, args={})
-          IPv6.old_bind header_klass, args
-          [IPv6::HopByHop].each do |klass|
-            klass.bind header_klass, args
-          end
+          IPv6.old_bind(header_klass, args)
+          IPv6.constants
+              .map { |cname| IPv6.const_get(cname) }
+              .select { |klass| klass.is_a?(Class) && (klass < Extension) }
+              .each { |klass| klass.bind(header_klass, args) }
         end
       end
     end

data/lib/packetgen/header/llc.rb

@@ -12,25 +12,29 @@ module PacketGen
     # Logical-Link Control header
     #
     # A LLC header consists of:
-    # * a {#dsap} ({Types::Int8}),
-    # * a {#ssap} ({Types::Int8}),
-    # * a {#control} ({Types::Int8}),
-    # * and a {#body} (a {Types::String} or another {Base} class).
+    # * a {#dsap} (+BinStruct::Int8+),
+    # * a {#ssap} (+BinStruct::Int8+),
+    # * a {#control} (+BinStruct::Int8+),
+    # * and a {#body} (a +BinStruct::String+ or another {Headerable} class).
     # @author Sylvain Daubert
     # @since 1.4.0
     class LLC < Base
       # @!attribute dsap
-      #  @return [Integer] 8-bit dsap value
-      define_field :dsap, Types::Int8
+      #  8-bit Destination Service Access Point value
+      #  @return [Integer]
+      define_attr :dsap, BinStruct::Int8
       # @!attribute ssap
-      #  @return [Integer] 8-bit ssap value
-      define_field :ssap, Types::Int8
+      #  8-bit Source Service Access Point value
+      #  @return [Integer]
+      define_attr :ssap, BinStruct::Int8
       # @!attribute control
-      #  @return [Integer] 8-bit control value
-      define_field :control, Types::Int8
+      #  8-bit control value
+      #  @return [Integer]
+      define_attr :control, BinStruct::Int8
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  LLC body
+      #  @return [BinStruct::String,Headerable]
+      define_attr :body, BinStruct::String
     end
     self.add_class LLC
     Dot11::Data.bind LLC, type: 2, wep?: false
@@ -38,21 +42,24 @@ module PacketGen
     # Sub-Network Access Protocol
     #
     # A SNAP header consists of:
-    # * a {#oui} ({Types::OUI}),
-    # * a {#proto_id} ({Types::Int16}),
-    # * and a {#body} (a {Types::String} or another {Base} class).
+    # * a {#oui} (+BinStruct::OUI+),
+    # * a {#proto_id} (+BinStruct::Int16+),
+    # * and a {#body} (a +BinStruct::String+ or another {Headerable} class).
     # @author Sylvain Daubert
     # @since 1.4.0
     class SNAP < Base
       # @!attribute oui
-      #  @return [Types::OUI]
-      define_field :oui, Types::OUI
+      #  If +00:00:00+, {#proto_id} is an EtherType. Else, {#proto_id} is specified by organization specified BY +OUI+.
+      #  @return [BinStruct::OUI]
+      define_attr :oui, BinStruct::OUI
       # @!attribute proto_id
-      #  @return [Integer] 16-bit protocol id
-      define_field :proto_id, Types::Int16
+      #  16-bit protocol id
+      #  @return [Integer]
+      define_attr :proto_id, BinStruct::Int16
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  SNAP header
+      #  @return [BinStruct::String,Headerable]
+      define_attr :body, BinStruct::String
     end
     self.add_class SNAP
     LLC.bind SNAP, dsap: 170, ssap: 170, control: 3

data/lib/packetgen/header/mdns.rb

@@ -21,12 +21,18 @@ module PacketGen
       # Fixup IP header according to RFC 6762:
       # * set ethernet multicast address to +01:00:5E:00:00:FB+ (for IPv4)
       #   or +33:33:00:00:00:FB+ (for IPv6),
-      # * set IPv4 address to 224.0.0.251 or IPv6 address to ff02::fb.
+      # * set IPv4 address to +224.0.0.251+ or IPv6 address to +ff02::fb+.
       # This method may be called as:
       #    # first way
       #    pkt.mdns.mdnsize
       #    # second way
-      #    pkt.mdnsize
+      #    pkt.
+      # @example
+      #   pkt = PacketGen.gen('Eth').add('IP').add('UDP').add('MDNS')
+      #   pkt.mdnsize
+      #   pkt.eth.dst   #=> "01:00:5e:00:00:fb"
+      #   pkt.ip.dst    #=> "224.0.0.251"
+      # @return [void]
       def mdnsize
         iph = ip_header(self)
         case iph
@@ -42,12 +48,13 @@ module PacketGen
       # @api private
       # @note This method is used internally by PacketGen and should not be
       #       directly called
+      # Add +#mdnsize+ method to +packet+. This method calls {#mdnsize}.
       # @since 2.7.0 Set UDP sport according to bindings, only if sport is 0.
       #  Needed by new bind API.
       def added_to_packet(packet)
         mdns_idx = packet.headers.size
         packet.instance_eval "def mdnsize() @headers[#{mdns_idx}].mdnsize; end" # def mdnsize() @headers[4].mdnsize; end
-        return unless packet.is? 'UDP'
+        return unless packet.is?('UDP')
         return unless packet.udp.sport.zero?
 
         packet.udp.sport = UDP_PORT

data/lib/packetgen/header/mld.rb

@@ -8,7 +8,7 @@
 
 module PacketGen
   module Header
-    # This class supports MLDv1 (RFC 2710).
+    # This class supports Multicast Listener Discovery for IPv6 (RFC 2710).
     #
     # From RFC 2710, a MLD header has the following format:
     #    0                   1                   2                   3
@@ -26,47 +26,49 @@ module PacketGen
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     #
     # A MLD header consists of:
-    # * a {#max_resp_delay} field ({Types::Int16} type),
-    # * a {#reserved} field ({Types::Int16} type),
+    # * a {#max_resp_delay} field (+BinStruct::Int16+ type),
+    # * a {#reserved} field (+BinStruct::Int16+ type),
     # * a {#mcast_addr} field ({Header::IPv6::Addr} type),
     # * and a {#body} (unused for MLDv1).
     #
-    # == Create a MLD header
+    # @example Create a MLD header
     #  # standalone
     #  mld = PacketGen::Header::MLD.new
     #  # in a packet
     #  pkt = PacketGen.gen('IPv6').add('ICMPv6').add('MLD')
     #  # access to MLD header
-    #  pkt.mld    # => PacketGen::Header::MLD
+    #  pkt.mld.class    # => PacketGen::Header::MLD
     #
-    # == MLD attributes
-    #  pkt.icmpv6.type = 130       # ICMPv6 type 130 is MLD Multicast Listener Query
+    # @example MLD attributes
+    #  pkt = PacketGen.gen('IPv6').add('ICMPv6').add('MLD')
+    #  pkt.icmpv6.type = 130        # ICMPv6 type 130 is MLD Multicast Listener Query
     #  pkt.mld.max_resp_delay = 20
-    #  pkt.mld.group_addr = '::'
+    #  pkt.mld.mcast_addr = '::'
     # @author Sylvain Daubert
     # @since 2.4.0
     class MLD < Base
       # @!attribute max_resp_delay
       #  16-bit MLD Max Response Delay
       #  @return [Integer]
-      define_field :max_resp_delay, Types::Int16
+      define_attr :max_resp_delay, BinStruct::Int16
       alias max_resp_code max_resp_delay
       alias max_resp_code= max_resp_delay=
       # @!attribute reserved
       #  16-bit Reserved field
       #  @return [Integer]
-      define_field :reserved, Types::Int16
+      define_attr :reserved, BinStruct::Int16
       # @!attribute mcast_addr
       #  IPv6 Multicast address
       #  @return [IPv6::Addr]
-      define_field :mcast_addr, IPv6::Addr, default: '::'
+      define_attr :mcast_addr, IPv6::Addr, default: '::'
       # @!attribute body
-      #  @return [String,Base]
-      define_field :body, Types::String
+      #  @return [String,Headerable]
+      define_attr :body, BinStruct::String
 
       # @api private
       # @note This method is used internally by PacketGen and should not be
       #       directly called
+      # This method adds +#mldize+ method to +packet+. This method calls {#mldize}.
       def added_to_packet(packet)
         mld_idx = packet.headers.size
         packet.instance_eval "def mldize() @headers[#{mld_idx}].mldize; end" # def mldize() @headers[3].mldize; end

data/lib/packetgen/header/mldv2/mcast_address_record.rb

@@ -52,8 +52,8 @@ module PacketGen
       #   |                                                               |
       #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       # @author Sylvain Daubert
-      class McastAddressRecord < Types::Fields
-        include Types::Fieldable
+      class McastAddressRecord < BinStruct::Struct
+        include BinStruct::Structable
 
         # Known record types
         RECORD_TYPES = IGMPv3::GroupRecord::RECORD_TYPES
@@ -61,34 +61,39 @@ module PacketGen
         # @!attribute type
         #  8-bit record type
         #  @return [Integer]
-        define_field :type, Types::Int8Enum, enum: RECORD_TYPES
+        define_attr :type, BinStruct::Int8Enum, enum: RECORD_TYPES
         # @!attribute aux_data_len
         #  8-bit length of of the Auxiliary Data field ({#aux_data}), in unit of
         #  32-bit words
         #  @return [Integer]
-        define_field :aux_data_len, Types::Int8, default: 0
+        define_attr :aux_data_len, BinStruct::Int8, default: 0
         # @!attribute number_of_sources
         #  16-bit Number of source addresses in {#source_addr}
         #  @return [Integer]
-        define_field :number_of_sources, Types::Int16, default: 0
+        define_attr :number_of_sources, BinStruct::Int16, default: 0
         # @!attribute multicast_addr
         #  IP multicast address to which this Multicast Address Record pertains
         #  @return [IPv6::Addr]
-        define_field :multicast_addr, IPv6::Addr, default: '::'
+        define_attr :multicast_addr, IPv6::Addr, default: '::'
         # @!attribute source_addr
         #  Array of source addresses
         #  @return [IPv6::ArrayOfAddr]
-        define_field :source_addr, IPv6::ArrayOfAddr,
-                     builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
+        define_attr :source_addr, IPv6::ArrayOfAddr,
+                    builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
         # @!attribute aux_data
+        #  Auxiliary data
         #  @return [String]
-        define_field :aux_data, Types::String,
-                     builder: ->(h, t) { t.new(length_from: -> { h[:aux_data_len].to_i * 4 }) }
+        define_attr :aux_data, BinStruct::String,
+                    builder: ->(h, t) { t.new(length_from: -> { h[:aux_data_len].to_i * 4 }) }
 
+        # Get human-readable type
+        # @return [String]
         def human_type
           self[:type].to_human
         end
 
+        # Get human-readable description
+        # @return [String]
         def to_human
           "#{human_type}(ma:#{multicast_addr}|src:#{source_addr.to_human})"
         end
@@ -96,10 +101,10 @@ module PacketGen
 
       # Class to handle series of {McastAddressRecord}.
       # @author Sylvain Daubert
-      class McastAddressRecords < Types::Array
+      class McastAddressRecords < BinStruct::Array
         set_of McastAddressRecord
 
-        # Separator used in {#to_human}.
+        # Separator used in +#to_human+.
         HUMAN_SEPARATOR = ';'
       end
     end

data/lib/packetgen/header/mldv2/mlq.rb

@@ -57,54 +57,52 @@ module PacketGen
       #  *                                                               *
       #  |                                                               |
       #  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      # +type+, +code+ and +checksum+ are fields from {ICMPv6} header.
+      # +type+, +code+ and +checksum+ are attributes from {ICMPv6} header.
       #
-      # MLQ fields are:
-      # * {#max_resp_code #max_resp_code} ({Types::Int16}),
-      # * {#reserved #reserved} ({Types::Int16}),
+      # MLQ attributes are:
+      # * {#max_resp_code #max_resp_code} (+BinStruct::Int16+),
+      # * {#reserved #reserved} (+BinStruct::Int16+),
       # * {#mcast_addr #mcast_addr} ({IPv6::Addr}),
-      # * {#flags} ({Types::Int8}), with sub-fields:
+      # * {#flags} (+BinStruct::Int8+), with sub-fields:
       #   * a 4-bit {#flag_resv} field,
       #   * a 1-bit {#flag_s} boolean,
       #   * a 3-bit {#flag_qrv} field,
-      # * {#qqic} ({Types::Int8}),
-      # * {#number_of_sources} ({Types::Int16}),
+      # * {#qqic} (+BinStruct::Int8+),
+      # * {#number_of_sources} (+BinStruct::Int16+),
       # * and {#source_addr}, a {IPv6::ArrayOfAddr}.
       #
       # == Max Resp Delay
       # Max Resp Delay is the real delay value. Max Resp Code is the encoded
-      # delay. So {#max_resp_delay} and {#max_resp_code} attributes reflect this
+      # delay. So {#max_resp_delay} and {#max_resp_code #max_resp_code} attributes reflect this
       # difference.
       # @author Sylvain Daubert
       class MLQ < MLD
         # @!attribute flags
         #  8-bit flags
         #  @return [Integer]
-        define_field_before :body, :flags, Types::Int8
+        # @!attribute flag_resv
+        #   4-bit reserved field in {#flags}
+        #   @return [Integer]
+        # @!attribute flag_s
+        #   S Flag (Suppress Router-Side Processing)
+        #   @return [Integer]
+        # @!attribute flag_qrv
+        #   3-bit QRV (Querier's Robustness Variable)
+        #   @return [Integer]
+        define_bit_attr_before :body, :flags, flag_resv: 4, flag_s: 1, flag_qrv: 3
         # @!attribute qqic
         #  8-bit QQIC
         #  @return [Integer]
-        define_field_before :body, :qqic, Types::Int8
+        define_attr_before :body, :qqic, BinStruct::Int8
         # @!attribute number_of_sources
         #  16-bit number of sources
         #  @return [Integer]
-        define_field_before :body, :number_of_sources, Types::Int16
+        define_attr_before :body, :number_of_sources, BinStruct::Int16
         # @!attribute source_addr
         #  Array of IPv6 source addresses
         #  @return [IPv6::ArrayOfAddr]
-        define_field_before :body, :source_addr, IPv6::ArrayOfAddr,
-                            builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
-
-        # @!attribute flag_resv
-        #   4-bit reserved field in {#flags}
-        #   @return [Integer]
-        # @!attribute flag_s
-        #   S Flag (Suppress Router-Side Processing)
-        #   @return [Boolean]
-        # @!attribute flag_qrv
-        #   3-bit QRV (Querier's Robustness Variable)
-        #   @return [Integer]
-        define_bit_fields_on :flags, :flag_resv, 4, :flag_s, :flag_qrv, 3
+        define_attr_before :body, :source_addr, IPv6::ArrayOfAddr,
+                           builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
 
         # Getter for +max_resp_code+ for MLDv2 packets. Use {MLDv2.decode}.
         # @return [Integer]

data/lib/packetgen/header/mldv2/mlr.rb

@@ -38,28 +38,28 @@ module PacketGen
       #   .                                                               .
       #   |                                                               |
       #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      # +type+, +code+ and +checksum+ are fields from {ICMPv6} header.
+      # +type+, +code+ and +checksum+ are attributes from {ICMPv6} header.
       #
-      # MLR fields are:
-      # * {#reserved} ({Types::Int16}),
-      # * {#number_of_mar} (number of mcast address records, {Types::Int16}),
+      # MLR attributes are:
+      # * {#reserved} (+BinStruct::Int16+),
+      # * {#number_of_mar} (number of mcast address records, +BinStruct::Int16+),
       # * {#records} ({McastAddressRecords}).
       # @author Sylvain Daubert
       class MLR < Base
         # @!attribute reserved
         #  16-bit reserved field
         # @return [Integer]
-        define_field :reserved, Types::Int16, default: 0
+        define_attr :reserved, BinStruct::Int16, default: 0
         # @!attribute number_of_mar
         #  16-bit Number of group records in {#records}
         #  @return [Integer]
-        define_field :number_of_mar, Types::Int16, default: 0
+        define_attr :number_of_mar, BinStruct::Int16, default: 0
 
         # @!attribute records
         #  Array of Mcast Address Records
         #  @return [McastAddressRecords]
-        define_field :records, McastAddressRecords,
-                     builder: ->(h, t) { t.new(counter: h[:number_of_mar]) }
+        define_attr :records, McastAddressRecords,
+                    builder: ->(h, t) { t.new(counter: h[:number_of_mar]) }
       end
     end
 

data/lib/packetgen/header/mldv2.rb

@@ -8,7 +8,7 @@
 
 module PacketGen
   module Header
-    # This module contains all MLDv2 specific classes.
+    # This module contains all Multicast Listener Discovery Version 2 (MLDv2) specific classes.
     # @author Sylvain Daubert
     # @since 2.4.0
     module MLDv2