packetgen 3.3.3 → 4.1.0

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

@@ -31,24 +31,26 @@ 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
+      # @example Create a DbDescription payload
       #   # standalone
       #   dbd = PacketGen::Header::OSPFv2::DbDescription.new
       #   # in a packet
-      #   pkt = PacketGen.gen('IP', src: source_ip).add('OSPFv2').add('OSPFv2::DbDescription')
+      #   pkt = PacketGen.gen('IP').add('OSPFv2').add('OSPFv2::DbDescription')
+      #   pkt.ospfize
       #   # access to DbDescription payload
-      #   pkt.ospfv2_dbdescription    # => PacketGen::Header::OSPFv2::DbDescription
+      #   pkt.ospfv2_dbdescription.class    # => PacketGen::Header::OSPFv2::DbDescription
       #
-      # == DbDescription attributes
+      # @example DbDescription attributes
+      #   dbd = PacketGen::Header::OSPFv2::DbDescription.new
       #   dbd.mtu = 1500
       #   # set options. Options may also be set one by one with {#mt_opt},
       #   # {#e_opt}, {#mc_opt}, {#n_opt}, {#l_opt}, {#dc_opt}, {#o_opt} and {#dn_opt}
@@ -57,14 +59,12 @@ module PacketGen
       #   dbd.seqnum = 0x800001
       #   # add a LSA Router header
       #   dbd.lsas << { type: 'Router', age: 40, link_state_id: '0.0.0.1', advertising_router: '1.1.1.1', sequence_number: 42, checksum: 0x1234, length: 56 }
-      #   # a header may also be set from an existing lsa
-      #   dbd.lsas << existing_lsa.to_lsa_header
       # @author Sylvain Daubert
       class DbDescription < Base
         # @!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,25 +29,26 @@ 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}.
       #
-      # == Create a HELLO payload
+      # @example Create a HELLO payload
       #   # standalone
       #   hello = PacketGen::Header::OSPFv2::Hello.new
       #   # in a packet
-      #   pkt = PacketGen.gen('IP', src: source_ip).add('OSPFv2').add('OSPFv2::Hello')
+      #   pkt = PacketGen.gen('IP').add('OSPFv2').add('OSPFv2::Hello')
       #   # make IP header correct for OSPF
       #   pkt.ospfize
       #   # access to Hello payload
-      #   pkt.ospfv2_hello    # => PacketGen::Header::OSPFv2::Hello
+      #   pkt.ospfv2_hello.class    # => PacketGen::Header::OSPFv2::Hello
       #
-      # == HELLO attributes
+      # @example HELLO attributes
+      #   hello = PacketGen::Header::OSPFv2::Hello.new
       #   hello.network_mask = '255.255.255.0'
       #   hello.hello_interval = 10
       #   hello.options = 0
@@ -63,11 +64,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 +77,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
+        #  The identity (as an IP address) 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,
+        #  The identity (as an IP address) 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

@@ -28,24 +28,23 @@ module PacketGen
       # This paylod is implemented as a unique field: {#lsas}, which is an
       # {ArrayOfLSA} object.
       #
-      # == Create a LSAck payload
+      # @example Create a LSAck payload
       #   # standalone
       #   lsack = PacketGen::Header::OSPFv2::LSAck.new
       #   # in a packet
-      #   pkt = PacketGen.gen('IP', src: source_ip).add('OSPFv2').add('OSPFv2::LSAck')
+      #   pkt = PacketGen.gen('IP').add('OSPFv2').add('OSPFv2::LSAck')
       #   # access to LSAck payload
-      #   lasck = pkt.ospfv2_lsack    # => PacketGen::Header::OSPFv2::LSAck
+      #   lasck = pkt.ospfv2_lsack.class   # => PacketGen::Header::OSPFv2::LSAck
       #
-      # == Adding LSA headers to a LSAck payload
+      # @example Adding LSA headers to a LSAck payload
+      #   lsack = PacketGen::Header::OSPFv2::LSAck.new
       #   lsack.lsas << { type: 'Router', age: 40, link_state_id: '0.0.0.1', advertising_router: '1.1.1.1', sequence_number: 42, checksum: 0x1234, length: 56 }
-      #   # a header may also be set from an existing lsa
-      #   lasck.lsas << existing_lsa.to_lsa_header
       # @author Sylvain Daubert
       class LSAck < Base
         # @!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+ to handle series
       # of {LSR LSRs}.
       # @author Sylvain Daubert
-      class ArrayOfLSR < Types::Array
+      class ArrayOfLSR < BinStruct::Array
         set_of LSR
       end
 
@@ -65,24 +65,25 @@ module PacketGen
       # This paylod is implemented as a unique field: {#lsrs}, which is an
       # {ArrayOfLSR} object.
       #
-      # == Create a LSRequest payload
+      # @example Create a LSRequest payload
       #   # standalone
       #   lsr = PacketGen::Header::OSPFv2::LSRequest.new
       #   # in a packet
-      #   pkt = PacketGen.gen('IP', src: source_ip).add('OSPFv2').add('OSPFv2::LSRequest')
+      #   pkt = PacketGen.gen('IP').add('OSPFv2').add('OSPFv2::LSRequest')
       #   # make IP header correct for OSPF
       #   pkt.ospfize
       #   # access to LSRequest payload
-      #   pkt.ospfv2_lsrequest    # => PacketGen::Header::OSPFv2::LSRequest
+      #   pkt.ospfv2_lsrequest.class    # => PacketGen::Header::OSPFv2::LSRequest
       #
-      # == Add LSA requests to a LSRequest
+      # @example Add LSA requests to a LSRequest
+      #   lsr = PacketGen::Header::OSPFv2::LSRequest.new
       #   lsr.lsrs << { type: 'Router', link_state_id: '0.0.0.1', advertising_router: '1.1.1.1'}
       # @author Sylvain Daubert
       class LSRequest < Base
         # @!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,22 +22,22 @@ 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
+      # @example Create a LSUpdate payload
       #   # standalone
       #   lsu = PacketGen::Header::OSPFv2::LSUpdate.new
       #   # in a packet
-      #   pkt = PacketGen.gen('IP', src: source_ip).add('OSPFv2').add('OSPFv2::LSUpdate')
+      #   pkt = PacketGen.gen('IP').add('OSPFv2').add('OSPFv2::LSUpdate')
       #   # make IP header correct for OSPF
       #   pkt.ospfize
       #   # access to LSUpdate payload
-      #   lsu = pkt.ospfv2_lsupdate    # => PacketGen::Header::OSPFv2::LSUpdate
+      #   lsu = pkt.ospfv2_lsupdate.class    # => PacketGen::Header::OSPFv2::LSUpdate
       #
-      # == Add LSAs to a LSUpdate payload
-      # Adding LSAs with {ArrayOfLSA#<< ArrayOfLSA#<<} automagically update
-      # {#lsas_count}. To not update it, use {ArrayOfLSA#push ArrayOfLSA#push}.
+      # @example Add LSAs to a LSUpdate payload
+      #   lsu = PacketGen::Header::OSPFv2::LSUpdate.new
+      #   # Adding LSAs with #<< automagically update #lsas_count. To not update it, use #push.
       #   lsu.lsas << { type: 'Router', age: 40, link_state_id: '0.0.0.1', advertising_router: '1.1.1.1', sequence_number: 42 }
       #   lsu.lsas_count     #=> 1
       #   # add a link to Router LSA
@@ -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]

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

@@ -16,28 +16,28 @@ module PacketGen
         # @!attribute body
         #  LSA body
         #  @return [String]
-        define_field :body, Types::String,
-                     builder: ->(h, t) { t.new(length_from: -> { h.length - 20 }) }
+        define_attr :body, BinStruct::String,
+                    builder: ->(h, t) { t.new(length_from: -> { h.length - 20 }) }
       end
 
       # This class handles TOS metrics for {Link links} in a {LSARouter
       # LSA router payload}.
       # @author Sylvain Daubert
-      class TosMetric < Types::Fields
-        include Types::Fieldable
+      class TosMetric < BinStruct::Struct
+        include BinStruct::Structable
 
         # @!attribute tos
         #  8-bit IP Type of Service that this metric refers to.
         #  @return [Integer]
-        define_field :tos, Types::Int8
+        define_attr :tos, BinStruct::Int8
         # @!attribute reserved
         #  8-bit reserved field.
         #  @return [Integer]
-        define_field :reserved, Types::Int8, default: 0
+        define_attr :reserved, BinStruct::Int8, default: 0
         # @!attribute tos_metric
         #  16-bit TOS-specific metric information..
         #  @return [Integer]
-        define_field :tos_metric, Types::Int16
+        define_attr :tos_metric, BinStruct::Int16
 
         # @return [String]
         def to_human
@@ -45,48 +45,58 @@ module PacketGen
         end
       end
 
-      # This class defines a specialized {Types::Array array} to handle series
+      # This class defines a specialized +BinStruct::Array+ to handle series
       # of {TosMetric TOS metrics}.
       # @author Sylvain Daubert
-      class ArrayOfTosMetric < Types::Array
+      class ArrayOfTosMetric < BinStruct::Array
         set_of TosMetric
       end
 
       # This class handles links in a {LSARouter LSA router payload}.
       # @author Sylvain Daubert
-      class Link < Types::Fields
-        include Types::Fieldable
+      class Link < BinStruct::Struct
+        include BinStruct::Structable
 
         # @!attribute id
+        #  Identify the link
         #  @return [IP::Addr]
-        define_field :id, IP::Addr
+        define_attr :id, IP::Addr
         # @!attribute data
+        #  Link data
         #  @return [IP::Addr]
-        define_field :data, IP::Addr
+        define_attr :data, IP::Addr
         # @!attribute type
+        #  Link type.
+        #  * 1: Point-to-point connection to another router
+        #  * 2: Connection to a transit network
+        #  * 3: Connection to a stub network
+        #  * 4: Virtual link
         #  @return [Integer]
-        define_field :type, Types::Int8
+        define_attr :type, BinStruct::Int8
         # @!attribute tos_count
+        #  Count of #{#tos TOS metrics}
         #  @return [Integer]
-        define_field :tos_count, Types::Int8
+        define_attr :tos_count, BinStruct::Int8
         # @!attribute metric
+        #  The cost of using this router link
         #  @return [Integer]
-        define_field :metric, Types::Int16
+        define_attr :metric, BinStruct::Int16
         # @!attribute tos
         #  Additionnal TOS metrics
         #  @return [ArrayOfTosMetric]
-        define_field :tos, ArrayOfTosMetric, builder: ->(h, t) { t.new(counter: h[:tos_count]) }
+        define_attr :tos, ArrayOfTosMetric, builder: ->(h, t) { t.new(counter: h[:tos_count]) }
 
+        # Get human-readable description
         # @return [String]
         def to_human
           "<type:#{type},metric:#{metric},id:#{id},data:#{data}>"
         end
       end
 
-      # This class defines a specialized {Types::Array array} to handle series
+      # This class defines a specialized +BinStruct::Array+ to handle series
       # of {Link Links}.
       # @author Sylvain Daubert
-      class ArrayOfLink < Types::Array
+      class ArrayOfLink < BinStruct::Array
         set_of Link
       end
 
@@ -94,30 +104,32 @@ module PacketGen
       #
       # A LSA router payload is composed of:
       # * a header (see methods inherited from {LSAHeader}),
-      # * a 16-bit flag word {#u16} ({Types::Int16}),
-      # * a 16-bit {#link_count} field ({Types::Int16}),
+      # * a 16-bit flag word {#u16} (+BinStruct::Int16+),
+      # * a 16-bit {#link_count} field (+BinStruct::Int16+),
       # * an array of {#links} ({ArrayOfLink}).
       # @author Sylvain Daubert
       class LSARouter < LSAHeader
         # @attribute u16
         #  16-bit flag word
         #  @return [Integer]
-        define_field :u16, Types::Int16
+        # @attribute v_flag
+        #  Virtual link point flag
+        #  @return [Integer]
+        # @attribute e_flag*
+        #  AS boundary flag
+        #  @return [Integer]
+        # @attribute b_flag
+        #  Area border router flag
+        #  @return [Integer]
+        define_bit_attr :u16, z: 5, v_flag: 1, e_flag: 1, b_flag: 1, zz: 8
         # @attribute link_count
         #  Number of links
         #  @return [Integer]
-        define_field :link_count, Types::Int16
+        define_attr :link_count, BinStruct::Int16
         # @attribute links
+        #  Router links
         #  @return [ArrayOfLink]
-        define_field :links, ArrayOfLink, builder: ->(h, t) { t.new(counter: h[:link_count]) }
-
-        # @attribute v_flag
-        #  @return [Boolean]
-        # @attribute e_flag
-        #  @return [Boolean]
-        # @attribute b_flag
-        #  @return [Boolean]
-        define_bit_fields_on :u16, :z, 5, :v_flag, :e_flag, :b_flag, :zz, 8
+        define_attr :links, ArrayOfLink, builder: ->(h, t) { t.new(counter: h[:link_count]) }
       end
 
       # This class handles LSA Network payloads.
@@ -130,48 +142,55 @@ module PacketGen
       class LSANetwork < LSAHeader
         # @!attribute netmask
         #  @return [IP::Addr]
-        define_field :netmask, IP::Addr
+        define_attr :netmask, IP::Addr
         # @!attribute routers
         #  List of routers in network
         #  @return [IP::ArrayOfAddr]
-        define_field :routers, IP::ArrayOfAddr,
-                     builder: ->(h, t) { t.new(length_from: -> { h.length - 24 }) }
+        define_attr :routers, IP::ArrayOfAddr,
+                    builder: ->(h, t) { t.new(length_from: -> { h.length - 24 }) }
       end
 
       # This class handles external links in {LSAASExternal LSA AS-External payloads}.
       # @author Sylvain Daubert
-      class External < Types::Fields
-        include Types::Fieldable
+      # @author LemonTree55
+      class External < BinStruct::Struct
+        include BinStruct::Structable
 
         # @!attribute u8
+        #  1st byte containing {#e_flag} and #{tos}
         #  @return [Integer]
-        define_field :u8, Types::Int8
+        # @!attribute e_flag
+        #  1-bit type of external metric.
+        #  If set, {#metric} is Type 2 external metric, else it is Type1.
+        #  @return [Integer]
+        # @!attribute tos
+        #  7-bit TOS
+        #  @return [Integer]
+        define_bit_attr :u8, e_flag: 1, tos: 7
         # @!attribute metric
+        #  Cost of this route
         #  @return [Integer]
-        define_field :metric, Types::Int24
+        define_attr :metric, BinStruct::Int24
         # @!attribute forwarding_addr
+        #  Forwarding address
         #  @return [IP::Addr]
-        define_field :forwarding_addr, IP::Addr
+        define_attr :forwarding_addr, IP::Addr
         # @!attribute ext_route_tag
+        #  32-bit external route tag. Not used by OSPF protocol.
         #  @return [Integer]
-        define_field :ext_route_tag, Types::Int32
-
-        # @!attribute e_flag
-        #  @return [Boolean]
-        # @!attribute tos
-        #  @return [Integer]
-        define_bit_fields_on :u8, :e_flag, :tos, 7
+        define_attr :ext_route_tag, BinStruct::Int32
 
+        # Get human-readable string
         # @return [String]
         def to_human
           "<type:#{e_flag? ? 2 : 1},tos:#{tos},metric:#{metric},fwaddr:#{forwarding_addr},tag:#{ext_route_tag}>"
         end
       end
 
-      # This class defines a specialized {Types::Array array} to handle series
+      # This class defines a specialized +BinStruct::Array+ to handle series
       # of {External Externals}.
       # @author Sylvain Daubert
-      class ArrayOfExternal < Types::Array
+      class ArrayOfExternal < BinStruct::Array
         set_of External
       end
 
@@ -185,33 +204,33 @@ module PacketGen
       class LSAASExternal < LSAHeader
         # @!attribute netmask
         #  @return [IP::Addr]
-        define_field :netmask, IP::Addr
+        define_attr :netmask, IP::Addr
         # @!attribute externals
         #  List of external destinations
         #  @return [ArrayOfExternal]
-        define_field :externals, ArrayOfExternal,
-                     builder: ->(h, t) { t.new(length_from: -> { h.length - 24 }) }
+        define_attr :externals, ArrayOfExternal,
+                    builder: ->(h, t) { t.new(length_from: -> { h.length - 24 }) }
       end
 
-      # This class defines a specialized {Types::Array array} to handle series
+      # This class defines a specialized +BinStruct::Array+ to handle series
       # of {LSA LSAs}. It recognizes known LSA types and infers correct type.
       # @author Sylvain Daubert
-      class ArrayOfLSA < Types::Array
+      class ArrayOfLSA < BinStruct::Array
         set_of LSAHeader
 
         # @param [Hash] options
-        # @option options [Types::Int] counter Int object used as a counter for this set
-        # @option options [Boolean] only_headers if +true+, only {LSAHeader LSAHeaders}
+        # @option options [BinStruct::Int] :counter +BinStruct::Int+ object used as a counter for this set
+        # @option options [Boolean] :only_headers if +true+, only {LSAHeader LSAHeaders}
         #  will be added to this array.
         def initialize(options={})
-          super()
+          super
           @only_headers = options[:only_headers] || false
         end
 
         private
 
         def record_from_hash(hsh)
-          raise ArgumentError, 'hash should have :type key' unless hsh.key? :type
+          raise ArgumentError, 'hash should have :type key' unless hsh.key?(:type)
 
           klass = if @only_headers
                     LSAHeader
@@ -231,8 +250,8 @@ module PacketGen
         def get_lsa_class_by_human_type(htype)
           klassname = "LSA#{htype.to_s.delete('-')}"
           begin
-            if OSPFv2.const_defined? klassname
-              OSPFv2.const_get klassname
+            if OSPFv2.const_defined?(klassname)
+              OSPFv2.const_get(klassname)
             else
               LSA
             end