packetgen 3.3.3 → 4.0.0

data/lib/packetgen/header/ipv6.rb

@@ -37,16 +37,16 @@ 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 payload length field ({#length}, {BinStruct::Int16} type}),
+    # * a next header field ({#next}, {BinStruct::Int8} type),
     # * a hop-limit field ({#hop}, +Int8+ type),
     # * a source address field ({#src}, {IPv6::Addr} type),
     # * a destination address field ({#dst}, +IPv6::Addr+ type),
-    # * and a {#body} ({Types::String} type).
+    # * and a {#body} ({BinStruct::String} type).
     #
     # == Create a IPv6 header
     #  # standalone
@@ -95,38 +95,36 @@ module PacketGen
       # @!attribute u32
       #  First 32-bit word of IPv6 header
       #  @return [Integer]
-      define_field :u32, Types::Int32, default: 0x6000_0000
+      # @!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_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
+      #  @return [BinStruct::String,Header::Base]
+      define_attr :body, BinStruct::String
 
       # Compute length and set +len+ field
       # @return [Integer]
@@ -143,14 +141,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
 

data/lib/packetgen/header/llc.rb

@@ -12,25 +12,25 @@ 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 {Base} class).
     # @author Sylvain Daubert
     # @since 1.4.0
     class LLC < Base
       # @!attribute dsap
       #  @return [Integer] 8-bit dsap value
-      define_field :dsap, Types::Int8
+      define_attr :dsap, BinStruct::Int8
       # @!attribute ssap
       #  @return [Integer] 8-bit ssap value
-      define_field :ssap, Types::Int8
+      define_attr :ssap, BinStruct::Int8
       # @!attribute control
       #  @return [Integer] 8-bit control value
-      define_field :control, Types::Int8
+      define_attr :control, BinStruct::Int8
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  @return [BinStruct::String,Header::Base]
+      define_attr :body, BinStruct::String
     end
     self.add_class LLC
     Dot11::Data.bind LLC, type: 2, wep?: false
@@ -38,21 +38,21 @@ 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 {Base} class).
     # @author Sylvain Daubert
     # @since 1.4.0
     class SNAP < Base
       # @!attribute oui
-      #  @return [Types::OUI]
-      define_field :oui, Types::OUI
+      #  @return [BinStruct::OUI]
+      define_attr :oui, BinStruct::OUI
       # @!attribute proto_id
       #  @return [Integer] 16-bit protocol id
-      define_field :proto_id, Types::Int16
+      define_attr :proto_id, BinStruct::Int16
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  @return [BinStruct::String,Header::Base]
+      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

@@ -47,7 +47,7 @@ module PacketGen
       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

@@ -26,8 +26,8 @@ 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).
     #
@@ -49,20 +49,20 @@ module PacketGen
       # @!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
+      define_attr :body, BinStruct::String
 
       # @api private
       # @note This method is used internally by PacketGen and should not be

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,29 +61,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 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
         #  @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
@@ -96,7 +96,7 @@ 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}.

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

@@ -57,18 +57,18 @@ 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
@@ -80,31 +80,29 @@ module PacketGen
         # @!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/ospfv2/db_description.rb

@@ -31,13 +31,13 @@ module PacketGen
       #   |                              ...                              |
       #
       # A DB description payload is composed of:
-      # * a 16-bit {#mtu} field ({Types::Int16}),
-      # * a 8-bit {#options} field ({Types::Int8}),
-      # * a 8-bit {#flags} field ({Types::Int8}). Supported flags are:
+      # * a 16-bit {#mtu} field ({BinStruct::Int16}),
+      # * a 8-bit {#options} field ({BinStruct::Int8}),
+      # * a 8-bit {#flags} field ({BinStruct::Int8}). Supported flags are:
       #   * {i_flag},
       #   * {m_flag},
       #   * {ms_flag},
-      # * a 32-bit {#sequence_number} field ({Types::Int32}),
+      # * a 32-bit {#sequence_number} field ({BinStruct::Int32}),
       # * and an array of {LSAHeader LSAHeaders} ({#lsas}, {ArrayOfLSA}).
       #
       # == Create a DbDescription payload
@@ -64,7 +64,7 @@ module PacketGen
         # @!attribute mtu
         #  16-bit interface MTU
         #  @return [Integer]
-        define_field :mtu, Types::Int16
+        define_attr :mtu, BinStruct::Int16
 
         # @!macro define_options
         OSPFv2.define_options(self)
@@ -72,30 +72,29 @@ module PacketGen
         # @!attribute flags
         #  8-bit interface flags ({#i_flag}, {#m_flag} and {#ms_flag})
         #  @return [Integer]
-        define_field :flags, Types::Int8
         # @!attribute i_flag
         #  Init bit
-        #  @return [Boolean]
+        #  @return [Integer]
         # @!attribute m_flag
         #  More bit
-        #  @return [Boolean]
+        #  @return [Integer]
         # @!attribute ms_flag
         #  Master/Slave bit
-        #  @return [Boolean]
-        define_bit_fields_on :flags, :zero, 5, :i_flag, :m_flag, :ms_flag
+        #  @return [Integer]
+        define_bit_attr :flags, zero: 5, i_flag: 1, m_flag: 1, ms_flag: 1
 
         # @!attribute sequence_number
         #  32-bit DD sequence number, used to sequence the collection of Database
         #  Description Packets.
         #  @return [Integer]
-        define_field :sequence_number, Types::Int32
+        define_attr :sequence_number, BinStruct::Int32
         alias seqnum sequence_number
         alias seqnum= sequence_number=
 
         # @!attribute lsas
         #  Array of LSA headers
         #  @return [ArrayOfLSAHeader]
-        define_field :lsas, ArrayOfLSA, builder: ->(_h, t) { t.new(only_headers: true) }
+        define_attr :lsas, ArrayOfLSA, builder: ->(_h, t) { t.new(only_headers: true) }
       end
     end
 

data/lib/packetgen/header/ospfv2/hello.rb

@@ -29,10 +29,10 @@ module PacketGen
       #   |                              ...                              |
       # A HELLO payload consists of:
       # * a {#network_mask} field ({IP::Addr}),
-      # * a {#hello_interval} field ({Types::Int16}),
-      # * an {#options} field ({Types::Int8}),
-      # * a {#priority} field ({Types::Int8}),
-      # * a {#dead_interval} field ({Types::Int32}),
+      # * a {#hello_interval} field ({BinStruct::Int16}),
+      # * an {#options} field ({BinStruct::Int8}),
+      # * a {#priority} field ({BinStruct::Int8}),
+      # * a {#dead_interval} field ({BinStruct::Int32}),
       # * a {#designated_router} field ({IP::Addr}),
       # * a {#backup_designated_router} field ({IP::Addr}),
       # * a {#neighbors} array containing neighbors as {IP::Addr}.
@@ -63,11 +63,11 @@ module PacketGen
         # @!attribute network_mask
         #  The network mask associated with this interface.
         #  @return [String]
-        define_field :network_mask, IP::Addr
+        define_attr :network_mask, IP::Addr
         # @!attribute hello_interval
         #  The number of seconds between this router's Hello packets.
         #  @return [Integer]
-        define_field :hello_interval, Types::Int16
+        define_attr :hello_interval, BinStruct::Int16
 
         # @!macro define_options
         OSPFv2.define_options(self)
@@ -76,25 +76,25 @@ module PacketGen
         #  This router's Router Priority.  Used in (Backup) Designated
         #  Router election.
         #  @return [Integer]
-        define_field :priority, Types::Int8
+        define_attr :priority, BinStruct::Int8
         # @!attribute dead_interval
         #  The number of seconds before declaring a silent router down.
         #  @return [Integer]
-        define_field :dead_interval, Types::Int32
+        define_attr :dead_interval, BinStruct::Int32
         # @!attribute designated_router
         #  The identity of the Designated Router for this network, in the
         #  view of the sending router.
         #  @return [String]
-        define_field :designated_router, IP::Addr
+        define_attr :designated_router, IP::Addr
         # @!attribute backup_designated_router
         #  The identity of the Backup Designated Router for this network,
         #  in the view of the sending router.
         #  @return [String]
-        define_field :backup_designated_router, IP::Addr
+        define_attr :backup_designated_router, IP::Addr
         # @!attribute neighbors
         #  Array of neighbors
         #  @return [IP::ArrayOfAddr]
-        define_field :neighbors, IP::ArrayOfAddr
+        define_attr :neighbors, IP::ArrayOfAddr
       end
     end
 

data/lib/packetgen/header/ospfv2/ls_ack.rb

@@ -45,7 +45,7 @@ module PacketGen
         # @!attribute lsas
         #  Array of LSA headers
         #  @return [ArrayOfLSA]
-        define_field :lsas, ArrayOfLSA, builder: ->(_h, t) { t.new(only_headers: true) }
+        define_attr :lsas, ArrayOfLSA, builder: ->(_h, t) { t.new(only_headers: true) }
       end
     end
 

data/lib/packetgen/header/ospfv2/ls_request.rb

@@ -9,27 +9,27 @@
 module PacketGen
   module Header
     class OSPFv2
-      # This class handle a LS request, which is composed 3 {Types::Int32} fields:
+      # This class handle a LS request, which is composed 3 {BinStruct::Int32} fields:
       # * {#type},
       # * {#link_state_id},
       # * and {#advertising_router}.
       # @author Sylvain Daubert
-      class LSR < Types::Fields
-        include Types::Fieldable
+      class LSR < BinStruct::Struct
+        include BinStruct::Structable
 
         # @!attribute type
         #  The type of the LSA to request.
         #  @return [Integer]
-        define_field :type, Types::Int32Enum, enum: LSAHeader::TYPES
+        define_attr :type, BinStruct::Int32Enum, enum: LSAHeader::TYPES
         # @!attribute link_state_id
         #  This field identifies the portion of the internet environment
         #  that is being described by the LSA to request.
         #  @return [String]
-        define_field :link_state_id, IP::Addr
+        define_attr :link_state_id, IP::Addr
         # @!attribute advertising_router
         #  The Router ID of the requested LSA.
         #  @return [String]
-        define_field :advertising_router, IP::Addr
+        define_attr :advertising_router, IP::Addr
 
         # Get human-readable type
         # @return [String]
@@ -43,10 +43,10 @@ module PacketGen
         end
       end
 
-      # This class defines a specialized {Types::Array array} to handle series
+      # This class defines a specialized {BinStruct::Array array} to handle series
       # of {LSR LSRs}.
       # @author Sylvain Daubert
-      class ArrayOfLSR < Types::Array
+      class ArrayOfLSR < BinStruct::Array
         set_of LSR
       end
 
@@ -82,7 +82,7 @@ module PacketGen
         # @!attribute lsrs
         #  Array of {LSR}
         #  @return [ArrayOfLSR]
-        define_field :lsrs, ArrayOfLSR
+        define_attr :lsrs, ArrayOfLSR
       end
     end
 

data/lib/packetgen/header/ospfv2/ls_update.rb

@@ -22,7 +22,7 @@ module PacketGen
       #   +-                                                            +-+
       #   |                              ...                              |
       # This paylod is implemented with two fields:
-      # * {#lsas_count}, a {Types::Int32} field,
+      # * {#lsas_count}, a {BinStruct::Int32} field,
       # * and {#lsas}, an {ArrayOfLSA} object.
       #
       # == Create a LSUpdate payload
@@ -47,11 +47,11 @@ module PacketGen
         # @!attribute lsas_count
         #  Count of LSAs included in this update
         #  @return [Integer]
-        define_field :lsas_count, Types::Int32
+        define_attr :lsas_count, BinStruct::Int32
         # @!attribute lsas
         #  Array of {LSA LSAs}
         #  @return [ArrayOfLSA]
-        define_field :lsas, ArrayOfLSA, builder: ->(h, t) { t.new(counter: h[:lsas_count]) }
+        define_attr :lsas, ArrayOfLSA, builder: ->(h, t) { t.new(counter: h[:lsas_count]) }
 
         # Calculate checksums of all LSAs
         # @return [void]