packetgen 3.3.3 → 4.0.0

data/lib/packetgen/header/eap.rb

@@ -12,15 +12,15 @@ module PacketGen
     # {https://tools.ietf.org/html/rfc3748 RFC 3748}
     #
     # A EAP header has:
-    # * a {#code} field ({Types::Int8Enum}),
-    # * a {#id} field ({Types::Int8}),
-    # * a {#length} field ({Types::Int16}).
+    # * a {#code} field ({BinStruct::Int8Enum}),
+    # * a {#id} field ({BinStruct::Int8}),
+    # * a {#length} field ({BinStruct::Int16}).
     # Request (code 1) and Response (code 2) packets also have:
-    # * a {#type} field (+Types::Int8Enum+).
+    # * a {#type} field (+BinStruct::Int8Enum+).
     # And Expanded Types (type 254) packets also have:
-    # * a {#vendor_id} field ({Types::Int24}),
-    # * a {#vendor_type} field ({Types::Int32}).
-    # Finally, all packets have a {#body} ({Types::String}).
+    # * a {#vendor_id} field ({BinStruct::Int24}),
+    # * a {#vendor_type} field ({BinStruct::Int32}).
+    # Finally, all packets have a {#body} ({BinStruct::String}).
     #
     # == Create EAP headers
     # An EAP header may be created this way:
@@ -82,41 +82,41 @@ module PacketGen
 
       # @!attribute code
       #  @return [Integer] 8-bit EAP code
-      define_field :code, Types::Int8Enum, enum: CODES
+      define_attr :code, BinStruct::Int8Enum, enum: CODES
 
       # @!attribute id
       #  @return [Integer] 8-bit identifier
-      define_field :id, Types::Int8
+      define_attr :id, BinStruct::Int8
 
       # @!attribute length
       #  @return [Integer] 16-bit length of EAP packet
-      define_field :length, Types::Int16, default: 4
+      define_attr :length, BinStruct::Int16, default: 4
 
       # @!attribute type
       #  This field is present only for Request or Response packets,
       #  with type different from Expanded Types (254).
       #  @return [Integer] 8-bit request or response type
-      define_field :type, Types::Int8Enum,
-                   enum: TYPES,
-                   optional: ->(eap) { eap.type? }
+      define_attr :type, BinStruct::Int8Enum,
+                  enum: TYPES,
+                  optional: lambda(&:type?)
 
       # @!attribute vendor_id
       #  This field is present only for Request or Response packets,
       #  with type equal to +Expanded Types+ (254).
       #  @return [Integer] 24-bit vendor ID
-      define_field :vendor_id, Types::Int24,
-                   optional: ->(eap) { eap.type? && (eap.type == 254) }
+      define_attr :vendor_id, BinStruct::Int24,
+                  optional: ->(eap) { eap.type? && (eap.type == 254) }
 
       # @!attribute vendor_type
       #  This field is present only for Request or Response packets,
       #  with type equal to +Expanded Types+ (254).
       #  @return [Integer] 32-bit vendor type
-      define_field :vendor_type, Types::Int32,
-                   optional: ->(eap) { eap.type? && (eap.type == 254) }
+      define_attr :vendor_type, BinStruct::Int32,
+                  optional: ->(eap) { eap.type? && (eap.type == 254) }
 
       # @!attribute body
-      #  @return [Types::String, Header::Base]
-      define_field :body, Types::String
+      #  @return [BinStruct::String, Header::Base]
+      define_attr :body, BinStruct::String
 
       # @return [EAP]
       def initialize(options={})
@@ -132,7 +132,7 @@ module PacketGen
       # @return [Dot11] may return a subclass object if a more specific class
       #   may be determined
       def read(str)
-        super(str)
+        super
         return self unless self.instance_of?(EAP)
         return self unless type?
 
@@ -201,7 +201,7 @@ module PacketGen
       # Calculate length field from content
       # @return [Integer]
       def calc_length
-        Base.calculate_and_set_length self
+        Base.calculate_and_set_length(self)
       end
 
       # Say is this EAP header has {#type} field
@@ -217,7 +217,7 @@ module PacketGen
       # @param [Packet] packet
       # @return [void]
       def added_to_packet(packet)
-        return if packet.respond_to? :eap
+        return if packet.respond_to?(:eap)
 
         packet.instance_eval("def eap(arg=nil); header(#{self.class}, arg); end") # def eap(arg=nil); header(EAP, arg); end
       end

data/lib/packetgen/header/eth.rb

@@ -11,8 +11,8 @@ module PacketGen
     # An Ethernet header consists of:
     # * a destination MAC address ({MacAddr}),
     # * a source MAC address (MacAddr),
-    # * a {#ethertype} ({Types::Int16}),
-    # * and a body (a {Types::String} or another Header class).
+    # * a {#ethertype} ({BinStruct::Int16}),
+    # * and a body (a {BinStruct::String} or another Header class).
     #
     # == Create a Ethernet header
     #  # standalone
@@ -33,27 +33,27 @@ module PacketGen
     class Eth < Base
       # Ethernet MAC address, as a group of 6 bytes
       # @author Sylvain Daubert
-      class MacAddr < Types::Fields
-        include Types::Fieldable
+      class MacAddr < BinStruct::Struct
+        include BinStruct::Structable
 
         # @!attribute a0
         #  @return [Integer] first byte from MacAddr
-        define_field :a0, Types::Int8
+        define_attr :a0, BinStruct::Int8
         # @!attribute a1
         #  @return [Integer] second byte from MacAddr
-        define_field :a1, Types::Int8
+        define_attr :a1, BinStruct::Int8
         # @!attribute a2
         #  @return [Integer] third byte from MacAddr
-        define_field :a2, Types::Int8
+        define_attr :a2, BinStruct::Int8
         # @!attribute a3
         #  @return [Integer] fourth byte from MacAddr
-        define_field :a3, Types::Int8
+        define_attr :a3, BinStruct::Int8
         # @!attribute a4
         #  @return [Integer] fifth byte from MacAddr
-        define_field :a4, Types::Int8
+        define_attr :a4, BinStruct::Int8
         # @!attribute a5
         #  @return [Integer] sixth byte from MacAddr
-        define_field :a5, Types::Int8
+        define_attr :a5, BinStruct::Int8
 
         # Read a human-readable string to populate +MacAddr+
         # @param [String] str
@@ -65,7 +65,7 @@ module PacketGen
           raise ArgumentError, 'not a MAC address' unless bytes.size == 6
 
           6.times do |i|
-            self[:"a#{i}"].read(bytes[i].to_i(16))
+            self[:"a#{i}"].from_human(bytes[i].to_i(16))
           end
           self
         end
@@ -73,27 +73,27 @@ module PacketGen
         # +MacAddr+ in human readable form (colon format)
         # @return [String]
         def to_human
-          fields.map { |m| '%02x' % self[m] }.join(':')
+          attributes.map { |m| '%02x' % self[m] }.join(':')
         end
 
         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
 
       # @!attribute dst
       #  @return [MacAddr] Destination MAC address
-      define_field :dst, MacAddr, default: '00:00:00:00:00:00'
+      define_attr :dst, MacAddr, default: '00:00:00:00:00:00'
       # @!attribute src
       #  @return [MacAddr] Source MAC address
-      define_field :src, MacAddr, default: '00:00:00:00:00:00'
+      define_attr :src, MacAddr, default: '00:00:00:00:00:00'
       # @!attribute ethertype
       #  @return [Integer] 16-bit integer to determine payload type
-      define_field :ethertype, Types::Int16, default: 0
+      define_attr :ethertype, BinStruct::Int16, default: 0
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  @return [BinStruct::String,Header::Base]
+      define_attr :body, BinStruct::String
 
       # send Eth packet on wire.
       # @param [String] iface interface name

data/lib/packetgen/header/gre.rb

@@ -26,8 +26,6 @@ module PacketGen
       # IP protocol number for GRE
       IP_PROTOCOL = 47
 
-      define_field :u16, Types::Int16
-
       # @!attribute c
       #   @return [Boolean]
       # @!attribute k
@@ -38,26 +36,26 @@ module PacketGen
       #   @return [Integer]
       # @!attribute ver
       #   @return [Integer]
-      define_bit_fields_on :u16, :c, :r, :k, :s, :reserved0, 9, :ver, 3
+      define_bit_attr :u16, c: 1, r: 1, k: 1, s: 1, reserved0: 9, ver: 3
 
       # @!attribute protocol_type
       #   @return [Integer]
-      define_field :protocol_type, Types::Int16
+      define_attr :protocol_type, BinStruct::Int16
       # @!attribute checksum
       #   @return [Integer]
-      define_field :checksum, Types::Int16, default: 0, optional: ->(gre) { gre.c? }
+      define_attr :checksum, BinStruct::Int16, default: 0, optional: lambda(&:c?)
       # @!attribute reserved1
       #   @return [Integer]
-      define_field :reserved1, Types::Int16, default: 0, optional: ->(gre) { gre.c? }
+      define_attr :reserved1, BinStruct::Int16, default: 0, optional: lambda(&:c?)
       # @!attribute key
       #   @return [Integer]
-      define_field :key, Types::Int32, optional: ->(gre) { gre.k? }
+      define_attr :key, BinStruct::Int32, optional: lambda(&:k?)
       # @!attribute sequence_number
       #   @return [Integer]
-      define_field :sequence_number, Types::Int32, optional: ->(gre) { gre.s? }
+      define_attr :sequence_number, BinStruct::Int32, optional: lambda(&:s?)
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  @return [BinStruct::String,Header::Base]
+      define_attr :body, BinStruct::String
 
       alias seqnum sequence_number
       alias seqnum= sequence_number=

data/lib/packetgen/header/http/headers.rb

@@ -13,7 +13,7 @@ module PacketGen
       # @abstract Base class for HTTP headers.
       # @author Kent 'picat' Gruber
       class Headers
-        include Types::Fieldable
+        include BinStruct::Structable
 
         # Underlying Headers data (or nil).
         # @return [Hash, nil]
@@ -76,7 +76,7 @@ module PacketGen
         end
 
         # Read human-readable data to populate header data.
-        # @param [String, Hash] data
+        # @param [Hash] data
         # @return [self]
         def from_human(data)
           read(data)

data/lib/packetgen/header/http/request.rb

@@ -10,9 +10,9 @@ module PacketGen
   module Header
     module HTTP
       # An HTTP/1.1 Request packet consists of:
-      # * the http verb ({Types::String}).
-      # * the path ({Types::String}).
-      # * the version ({Types::String}).
+      # * the http verb ({BinStruct::String}).
+      # * the path ({BinStruct::String}).
+      # * the version ({BinStruct::String}).
       # * associated http headers ({HTTP::Headers}).
       #
       # == Create a HTTP Request header
@@ -35,25 +35,26 @@ module PacketGen
       #
       # @author Kent 'picat' Gruber
       # @author Sylvain Daubert
+      # @author LemonTree55
       # @since 3.1.0 Rename +#method+ into {#verb} to not mask +Object#method+.
       class Request < Base
         # @!attribute verb
-        #   @return [Types::String]
+        #   @return [BinStruct::String]
         #   @since 3.1.0
-        define_field :verb, Types::String
+        define_attr :verb, BinStruct::String
         # @!attribute path
-        #   @return [Types::String]
-        define_field :path,    Types::String
+        #   @return [BinStruct::String]
+        define_attr :path,    BinStruct::String
         # @!attribute version
-        #   @return [Types::String]
-        define_field :version, Types::String, default: 'HTTP/1.1'
+        #   @return [BinStruct::String]
+        define_attr :version, BinStruct::String, default: 'HTTP/1.1'
         # @!attribute headers
         #   associated http/1.1 headers
         #   @return [HTTP::Headers]
-        define_field :headers, HTTP::Headers
+        define_attr :headers, HTTP::Headers
         # @!attribute body
-        #   @return [Types::String]
-        define_field :body, Types::String
+        #   @return [BinStruct::String]
+        define_attr :body, BinStruct::String
 
         # @param [Hash] options
         # @option options [String] :verb
@@ -61,7 +62,7 @@ module PacketGen
         # @option options [String] :version
         # @option options [Hash]   :headers
         def initialize(options={})
-          super(options)
+          super
           self.headers ||= options[:headers]
         end
 
@@ -70,9 +71,9 @@ module PacketGen
         def read(str)
           lines = lines(str)
           first_line_words = lines.shift.split
-          self[:verb].read first_line_words[0]
-          self[:path].read first_line_words[1]
-          self[:version].read first_line_words[2]
+          self[:verb].read(first_line_words[0])
+          self[:path].read(first_line_words[1])
+          self[:version].read(first_line_words[2])
 
           # requests can sometimes have a payload
           headers, data = headers_and_payload_from_lines(lines)

data/lib/packetgen/header/http/response.rb

@@ -10,11 +10,11 @@ module PacketGen
   module Header
     module HTTP
       # An HTTP/1.1 Response packet consists of:
-      # * the version ({Types::String}).
-      # * the status code ({Types::String}).
-      # * the status message ({Types::String}).
+      # * the version ({BinStruct::String}).
+      # * the status code ({BinStruct::String}).
+      # * the status message ({BinStruct::String}).
       # * associated http headers ({HTTP::Headers}).
-      # * the actual http payload body ({Types::String}).
+      # * the actual http payload body ({BinStruct::String}).
       #
       # == Create a HTTP Response header
       #   # standalone
@@ -36,23 +36,24 @@ module PacketGen
       #   http_resp.headers     = { "Host": "tcpdump.org" } # even a hash
       #
       # @author Kent 'picat' Gruber
+      # @author LemonTree55
       class Response < Base
         # @!attribute version
-        #   @return [Types::String]
-        define_field :version,     Types::String, default: 'HTTP/1.1'
+        #   @return [BinStruct::String]
+        define_attr :version,     BinStruct::String, default: 'HTTP/1.1'
         # @!attribute status_code
-        #   @return [Types::String]
-        define_field :status_code, Types::String
+        #   @return [BinStruct::String]
+        define_attr :status_code, BinStruct::String
         # @!attribute status_mesg
-        #   @return [Types::String]
-        define_field :status_mesg, Types::String
+        #   @return [BinStruct::String]
+        define_attr :status_mesg, BinStruct::String
         # @!attribute headers
         #   associated http/1.1 headers
-        #   @return [Types::String]
-        define_field :headers, HTTP::Headers
+        #   @return [BinStruct::String]
+        define_attr :headers, HTTP::Headers
         # @!attribute body
         #   @return [HTTP::PHeaders]
-        define_field :body, Types::String
+        define_attr :body, BinStruct::String
 
         # @param [Hash] options
         # @option options [String] :version
@@ -61,7 +62,7 @@ module PacketGen
         # @option options [String] :body
         # @option options [Hash]   :headers
         def initialize(options={})
-          super(options)
+          super
           self.headers ||= options[:headers]
         end
 
@@ -125,9 +126,9 @@ module PacketGen
           first_line = headers.shift.split
           return if first_line.size < 3
 
-          self[:version].read first_line[0]
-          self[:status_code].read first_line[1]
-          self[:status_mesg].read first_line[2..].join(' ')
+          self[:version].read(first_line[0])
+          self[:status_code].read(first_line[1])
+          self[:status_mesg].read(first_line[2..].join(' '))
         end
 
         def raise_on_bad_version_status

data/lib/packetgen/header/http/verbs.rb

@@ -9,10 +9,8 @@
 module PacketGen
   module Header
     # @since 2.2.0
+    # @author Kent 'picat' Gruber
     module HTTP
-      # @abstract Collection of useful HTTP verbs.
-      # @author Kent 'picat' Gruber
-
       # Valid HTTP Verbs
       VERBS = %w[GET HEAD POST PUT DELETE CONNECT OPTIONS TRACE PATCH].freeze
 

data/lib/packetgen/header/icmp.rb

@@ -15,9 +15,9 @@ module PacketGen
     #   |     Type      |     Code      |          Checksum             |
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     # A ICMP header consists of:
-    # * a {#type} field ({Types::Int8} type),
-    # * a {#code} field ({Types::Int8} type),
-    # * a {#checksum} field ({Types::Int16} type),
+    # * a {#type} field ({BinStruct::Int8} type),
+    # * a {#code} field ({BinStruct::Int8} type),
+    # * a {#checksum} field ({BinStruct::Int16} type),
     # * and a {#body}.
     #
     # == Create a ICMP header
@@ -41,18 +41,18 @@ module PacketGen
       # @!attribute type
       #  8-bit ICMP type
       #  @return [Integer]
-      define_field :type, Types::Int8
+      define_attr :type, BinStruct::Int8
       # @!attribute code
       #  8-bit ICMP code
       #  @return [Integer]
-      define_field :code, Types::Int8
+      define_attr :code, BinStruct::Int8
       # @!attribute checksum
       #  16-bit ICMP checksum
       #  @return [Integer]
-      define_field :checksum, Types::Int16
+      define_attr :checksum, BinStruct::Int16
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  @return [BinStruct::String,Header::Base]
+      define_attr :body, BinStruct::String
 
       # Compute checksum and set +checksum+ field
       # @return [Integer]

data/lib/packetgen/header/icmpv6.rb

@@ -15,9 +15,9 @@ module PacketGen
     #   |     Type      |     Code      |          Checksum             |
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     # A ICMPv6 header consists of:
-    # * a +type+ field ({Types::Int8} type),
-    # * a +code+ field ({Types::Int8} type),
-    # * a +checksum+ field ({Types::Int16} type),
+    # * a +type+ field ({BinStruct::Int8} type),
+    # * a +code+ field ({BinStruct::Int8} type),
+    # * a +checksum+ field ({BinStruct::Int16} type),
     # * and a +body+.
     #
     # == Create a ICMPv6 header

data/lib/packetgen/header/igmp.rb

@@ -20,9 +20,9 @@ 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),
     # * a {#group_addr} field ({Header::IP::Addr} type),
     # * and a {#body} (unused for IGMPv2).
     #
@@ -56,22 +56,22 @@ module PacketGen
       # @!attribute type
       #  8-bit IGMP Type
       #  @return [Integer]
-      define_field :type, Types::Int8Enum, enum: TYPES
+      define_attr :type, BinStruct::Int8Enum, enum: TYPES
       # @!attribute max_resp_time
       #  8-bit IGMP Max Response Time
       #  @return [Integer]
-      define_field :max_resp_time, Types::Int8
+      define_attr :max_resp_time, BinStruct::Int8
       # @!attribute checksum
       #  16-bit IGMP Checksum
       #  @return [Integer]
-      define_field :checksum, Types::Int16
+      define_attr :checksum, BinStruct::Int16
       # @!attribute group_addr
       #  IP Group address
       #  @return [IP::Addr]
-      define_field :group_addr, IP::Addr, default: '0.0.0.0'
+      define_attr :group_addr, IP::Addr, default: '0.0.0.0'
       # @!attribute body
       #  @return [String,Base]
-      define_field :body, Types::String
+      define_attr :body, BinStruct::String
 
       # @api private
       # @note This method is used internally by PacketGen and should not be

data/lib/packetgen/header/igmpv3/group_record.rb

@@ -11,7 +11,7 @@ module PacketGen
     class IGMPv3
       # Class to handle IGMPv3 Group Records.
       #
-      # A Group Record is a block of fields containing information
+      # A Group Record is a block of attributes.containing information
       # pertaining to the sender's membership in a single multicast group on
       # the interface from which the Report is sent.
       #
@@ -40,8 +40,8 @@ module PacketGen
       #   |                                                               |
       #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       # @author Sylvain Daubert
-      class GroupRecord < Types::Fields
-        include Types::Fieldable
+      class GroupRecord < BinStruct::Struct
+        include BinStruct::Structable
 
         # Known record types
         RECORD_TYPES = {
@@ -56,29 +56,29 @@ 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 Group Record pertains
         #  @return [IP::Addr]
-        define_field :multicast_addr, IP::Addr, default: '0.0.0.0'
+        define_attr :multicast_addr, IP::Addr, default: '0.0.0.0'
         # @!attribute source_addr
         #  Array of source addresses
         #  @return [IP::ArrayOfAddr]
-        define_field :source_addr, IP::ArrayOfAddr,
-                     builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
+        define_attr :source_addr, IP::ArrayOfAddr,
+                    builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
         # @!attribute aux_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 }) }
 
         def human_type
           self[:type].to_human
@@ -91,7 +91,7 @@ module PacketGen
 
       # Class to handle series of {GroupRecord}.
       # @author Sylvain Daubert
-      class GroupRecords < Types::Array
+      class GroupRecords < BinStruct::Array
         set_of GroupRecord
 
         # Separator used in {#to_human}.

data/lib/packetgen/header/igmpv3/mq.rb

@@ -31,7 +31,7 @@ module PacketGen
       #   |                       Source Address [N]                      |
       #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       #
-      # Fields are:
+      # Struct are:
       # * 32-bit {#group_addr} field ({Header::IP::Addr} type),
       # * 4-bit {#resv}, a reserved field,
       # * 1-bit {#flag_s} (Suppress Router-Side Processing),
@@ -44,36 +44,34 @@ module PacketGen
         # @!attribute group_addr
         #  IP Group address
         #  @return [IP::Addr]
-        define_field :group_addr, IP::Addr, default: '0.0.0.0'
+        define_attr :group_addr, IP::Addr, default: '0.0.0.0'
         # @!attribute u8
         #  First 8-bit field, composed of {#resv}, {#flag_s} and {#qrv}
         #  @return [Integer]
-        define_field :u8, Types::Int8
+        # @!attribute resv
+        #  4-bit reserved field in
+        #  @return [Integer]
+        # @!attribute flag_s
+        #  1-bit S flag (Suppress Router-Side Processing)
+        #  @return [Integer]
+        # @!attribute qrv
+        #  3-bit Querier's Robustness Variable
+        #  @return [Integer]
+        define_bit_attr :u8, resv: 4, flag_s: 1, qrv: 3
         # @!attribute qqic
         #  8-bit QQIC
         #  @return [Integer,Float]
-        define_field :qqic, Types::Int8
+        define_attr :qqic, BinStruct::Int8
         # @!attribute number_of_sources
         #  16-bit Number of Sources in {#source_addr}
         #  @return [Integer]
-        define_field :number_of_sources, Types::Int16
+        define_attr :number_of_sources, BinStruct::Int16
 
         # @!attribute source_addr
         #  Array of IP source addresses
         #  @return [IP::ArrayOfAddr]
-        define_field :source_addr, IP::ArrayOfAddr,
-                     builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
-
-        # @!attribute resv
-        #  4-bit reserved field in
-        #  @return [Integer]
-        # @!attribute flag_s
-        #  1-bit S flag (Suppress Router-Side Processing)
-        #  @return [Boolean]
-        # @!attribute qrv
-        #  3-bit Querier's Robustness Variable
-        #  @return [Integer]
-        define_bit_fields_on :u8, :resv, 4, :flag_s, :qrv, 3
+        define_attr :source_addr, IP::ArrayOfAddr,
+                    builder: ->(h, t) { t.new(counter: h[:number_of_sources]) }
 
         undef qqic, qqic=
 

data/lib/packetgen/header/igmpv3/mr.rb

@@ -49,17 +49,17 @@ module PacketGen
         # @!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_gr
         #  16-bit Number of group records in {#group_records}
         #  @return [Integer]
-        define_field :number_of_gr, Types::Int16, default: 0
+        define_attr :number_of_gr, BinStruct::Int16, default: 0
 
         # @!attribute group_records
         #  Array of group records
         #  @return [GroupRecords]
-        define_field :group_records, GroupRecords,
-                     builder: ->(h, t) { t.new(counter: h[:number_of_gr]) }
+        define_attr :group_records, GroupRecords,
+                    builder: ->(h, t) { t.new(counter: h[:number_of_gr]) }
       end
     end