packetgen 3.3.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8316e4a27cffbad65cbfabe1eb42746afda43b137eeca97352201f72b1a785cf
-  data.tar.gz: 621a076c2b6159d9a60e0842d318298cbcb5c983b358983bc9e21b2e1ec50b96
+  metadata.gz: 984125cdf335b4573a862ed481c155740f07588e10263da4a35455a9d2d4f803
+  data.tar.gz: 01df13a9c405ba0887a540b952eb8ddea6c1dd8f58adfc1689b8ec0c628b14f4
 SHA512:
-  metadata.gz: 447552efc82789c71b1f2de48059a387318471366866794b70e9318f04d53ca78e16b63ec2f8984f162b02bca2c3cbe6c0f96ccd083f86d99a5dfaddbe1daa2d
-  data.tar.gz: 01426b4136c2084607621087fd856677c27842de93b6b266cb15056a59ba6e2f126b87a268c5369a012819a0d37e5c79866b57c8821fa80f4b7dfcbcde10f785
+  metadata.gz: bec2e6720c1a658f777826dc2b7ad81b3cc1addeee5dd99b147357b005151b69d4df3b9c02fd529644a9dd9634106da3fb2b5d73d892769d85d7ef480347e7d7
+  data.tar.gz: 897ebe8f59b88ad3b72eb8edc5a9a23f46228fda646453e2878a3b6a534d53620d58c5ec1396f5632727577a41cbab565d42f50714d9138e907a63de7e3d804d

data/README.md

@@ -1,20 +1,27 @@
 
 [![Gem Version](https://badge.fury.io/rb/packetgen.svg)](https://badge.fury.io/rb/packetgen)
 [![Action status](https://github.com/lemontree55/packetgen/workflows/ci/badge.svg?branch=master)](https://github.com/lemontree55/packetgen/actions?query=workflow%3Aci)
+
 # PacketGen
 
 PacketGen provides simple ways to generate, send and capture network packets.
 
 ## Installation
+
 PacketGen depends on PcapRub, which needs pcap development files to install. On Debian, you have to do:
 
-    $ sudo apt install libpcap-dev
+```bash
+sudo apt install libpcap-dev
+```
 
 Installation using RubyGems is then easy:
 
-    $ gem install packetgen
+```bash
+gem install packetgen
+```
 
 Or add it to a Gemfile:
+
 ```ruby
 gem 'packetgen'
 ```
@@ -22,6 +29,7 @@ gem 'packetgen'
 ## Usage
 
 ### Easily create packets
+
 ```ruby
 PacketGen.gen('IP')             # generate a IP packet object
 PacketGen.gen('TCP')            # generate a TCP over IP packet object
@@ -37,6 +45,7 @@ PacketGen.gen('IP').to_s
 ```
 
 ### Send packets on wire
+
 ```ruby
 # send Ethernet packet
 PacketGen.gen('Eth', src: '00:00:00:00:00:01', dst: '00:00:00:00:00:02').to_w
@@ -52,11 +61,13 @@ PacketGen.gen('RadioTap').
 ```
 
 ### Parse packets from binary data
+
 ```ruby
 packet = PacketGen.parse(binary_data)
 ```
 
 ### Capture packets from wire
+
 ```ruby
 # Capture packets from first network interface, action from a block
 PacketGen.capture do |packet|
@@ -71,6 +82,7 @@ packets = PacketGen.capture(iface: 'eth0', filter: 'ip src 1.1.1.2', max: 1)
 ```
 
 ### Easily manipulate packets
+
 ```ruby
 # access header fields
 pkt = PacketGen.gen('IP').add('TCP')
@@ -96,6 +108,7 @@ pkt2.decapsulate(pkt2.ip)              # pkt2 is now inner IP/TCP packet
 ```
 
 ### Read/write PcapNG files
+
 ```ruby
 # read a PcapNG file, containing multiple packets
 packets = PacketGen.read('file.pcapng')
@@ -107,14 +120,16 @@ PacketGen.write('more_packets.pcapng', packets)
 ```
 
 ### Add custom header/protocol
-Since v1.1.0, PacketGen permits adding your own header classes.
+
+PacketGen permits adding your own header classes.
+
 First, define the new header class. For example:
 
 ```ruby
 module MyModule
  class MyHeader < PacketGen::Header::Base
-   define_field :field1, PacketGen::Types::Int32
-   define_field :field2, PacketGen::Types::Int32
+   define_attr :field1, BinStruct::Int32
+   define_attr :field2, BinStruct::Int32
  end
 end
 ```
@@ -135,24 +150,27 @@ PacketGen::Header::IP.bind_header MyModule::MyHeader, protocol: 254
 And use it:
 
 ```ruby
-pkt = Packet.gen('IP').add('MyHeader', field1: 0x12345678)
-pkt.myheader.field2.read 0x01
+pkt = Packet.gen('IP').add('MyHeader', field1: 0x12345678, field2: 0x87654321)
+pkt.to_w # Send it on wire
 ```
 
 ## Interactive console
+
 PacketGen provides an interactive console: `pgconsole`.
 
 In this console, context includes PacketGen module to give direct access to PacketGen
 classes. A special `config` object gives local network configuration:
 
-    $ pgconsole
-    pg(main)> config
-    => #<PacketGen::Config:0x00559f27d2afe8
-     @hwaddr="75:74:73:72:71:70",
-     @iface="eth0",
-     @ipaddr="192.168.0.2">
-    pg(main)> packets = capture(max: 5)
-    pg(main)> exit
+```text
+$ pgconsole
+pg(main)> config
+=> #<PacketGen::Config:0x00559f27d2afe8
+ @hwaddr="75:74:73:72:71:70",
+ @iface="eth0",
+ @ipaddr="192.168.0.2">
+pg(main)> packets = capture(max: 5)
+pg(main)> exit
+```
 
 If `pry` gem is installed, it is used as backend for `pgconsole`, else IRB is used.
 
@@ -167,20 +185,18 @@ Available plugins (available as gem) are:
 
 ## See also
 
-Wiki: https://github.com/lemontree55/packetgen/wiki
+Wiki: <https://github.com/lemontree55/packetgen/wiki>
 
-API documentation: http://www.rubydoc.info/gems/packetgen
+API documentation: <http://www.rubydoc.info/gems/packetgen>
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/lemontree55/packetgen.
+Bug reports and pull requests are welcome on GitHub at <https://github.com/lemontree55/packetgen>.
 
 ## License
 
 MIT License (see [LICENSE](https://github.com/lemontree55/packetgen/blob/master/LICENSE))
 
 ### Other sources
-All original code maintains its copyright from its original authors and licensing.
 
-This is mainly for PcapNG (originally copied from [PacketFu](https://github.com/packetfu/packetfu),
-but i am the original author.
+All original code maintains its copyright from its original authors and licensing.

data/lib/packetgen/capture.rb

@@ -61,7 +61,7 @@ module PacketGen
       @packets     = []
       @raw_packets = []
       @timestamps = []
-      set_options iface, max, timeout, filter, promisc, parse, snaplen, monitor
+      set_options(iface, max, timeout, filter, promisc, parse, snaplen, monitor)
     end
 
     # Start capture
@@ -75,7 +75,7 @@ module PacketGen
     # @author Sylvain Daubert
     # @author optix2000 - add monitor argument
     def start(iface: nil, max: nil, timeout: nil, filter: nil, promisc: false, parse: true, snaplen: nil, monitor: nil, &block)
-      set_options iface, max, timeout, filter, promisc, parse, snaplen, monitor
+      set_options(iface, max, timeout, filter, promisc, parse, snaplen, monitor)
 
       @cap_thread = Thread.new do
         PCAPRUBWrapper.capture(**capture_args) do |packet|

data/lib/packetgen/config.rb

@@ -12,7 +12,6 @@ require 'singleton'
 module PacketGen
   # Config class to provide +config+ object to pgconsole
   # @author Sylvain Daubert
-  # @author Kent 'picat' Gruber
   # @since 1.4.1
   # @since 2.1.3 Config is singleton
   class Config

data/lib/packetgen/deprecation.rb

@@ -8,7 +8,7 @@ module PacketGen
   module Deprecation
     # Default remove version for deprecated classes/methods
     # @since 3.1.0
-    REMOVE_VERSION = '4.0.0'
+    REMOVE_VERSION = '5.0.0'
 
     # @private
     # @param [String] remove_version
@@ -32,10 +32,10 @@ module PacketGen
       complete_new_method_name = "#{base_name}#{new_method}" unless new_method.nil?
 
       file, line = caller(2..2).first.split(':')[0, 2]
-      message = +"#{file}:#{line}: #{complete_deprecated_method_name} is deprecated"
+      message = "#{file}:#{line}: #{complete_deprecated_method_name} is deprecated"
       message << " in favor of #{complete_new_method_name}" unless new_method.nil?
       message << '. ' << self.removed(remove_version)
-      warn message
+      warn(message)
     end
 
     # Warn when using a deprecated method
@@ -46,10 +46,10 @@ module PacketGen
     # @since 3.1.0
     def self.deprecated_class(klass, new_klass=nil, remove_version: REMOVE_VERSION)
       file, line = caller(2..2).first.split(':')[0, 2]
-      message = +"#{file}:#{line}: #{klass} is deprecated"
+      message = "#{file}:#{line}: #{klass} is deprecated"
       message << " in favor of #{new_klass}" unless new_klass.nil?
       message << '. ' << self.removed(remove_version)
-      warn message
+      warn(message)
     end
 
     # Warn when using a deprecated method's option
@@ -64,9 +64,9 @@ module PacketGen
     def self.deprecated_option(klass, method, option, klass_method: false, remove_version: REMOVE_VERSION)
       base_name = "#{klass}#{klass_method ? '.' : '#'}"
       method_name = "#{base_name}#{method}"
-      message = +"option #{option} is deprecated for method #{method_name}. "
+      message = "option #{option} is deprecated for method #{method_name}. "
       message << self.removed(remove_version)
-      warn message
+      warn(message)
     end
   end
 end

data/lib/packetgen/header/arp.rb

@@ -9,9 +9,9 @@
 module PacketGen
   module Header
     # An ARP header consists of:
-    # * a hardware type ({#hrd} or {#htype}) field ({Types::Int16}),
+    # * a hardware type ({#hrd} or {#htype}) field ({BinStruct::Int16}),
     # * a protocol type ({#pro} or {#ptype}) field (+Int16+),
-    # * a hardware address length ({#hln} or {#hlen}) field ({Types::Int8}),
+    # * a hardware address length ({#hln} or {#hlen}) field ({BinStruct::Int8}),
     # * a protocol address length ({#pln} or {#plen}) field (+Int8+),
     # * a {#opcode} (or {#op}) field (+Int16+),
     # * a source hardware address ({#sha} or {#src_mac}) field ({Eth::MacAddr}),
@@ -33,42 +33,42 @@ module PacketGen
       # @!attribute hrd
       #  16-bit hardware protocol type
       #  # @return [Integer]
-      define_field :hrd, Types::Int16, default: 1
+      define_attr :hrd, BinStruct::Int16, default: 1
       # @!attribute pro
       #  16-bit internet protocol type
       #  # @return [Integer]
-      define_field :pro, Types::Int16, default: 0x800
+      define_attr :pro, BinStruct::Int16, default: 0x800
       # @!attribute hln
       #  8-bit hardware address length
       #  # @return [Integer]
-      define_field :hln, Types::Int8, default: 6
+      define_attr :hln, BinStruct::Int8, default: 6
       # @!attribute pln
       #  8-bit internet address length
       #  # @return [Integer]
-      define_field :pln, Types::Int8, default: 4
+      define_attr :pln, BinStruct::Int8, default: 4
       # @!attribute op
       #  16-bit operation code
       #  # @return [Integer]
-      define_field :op, Types::Int16Enum, enum: { 'request' => 1, 'reply' => 2 }
+      define_attr :op, BinStruct::Int16Enum, enum: { 'request' => 1, 'reply' => 2 }
       # @!attribute sha
       #  source hardware address
       #  @return [Eth::MacAddr]
-      define_field :sha, Eth::MacAddr
+      define_attr :sha, Eth::MacAddr
       # @!attribute spa
       #  source protocol address
       #  @return [IP::Addr]
-      define_field :spa, IP::Addr
+      define_attr :spa, IP::Addr
       # @!attribute tha
       #  target hardware address
       #  @return [Eth::MacAddr]
-      define_field :tha, Eth::MacAddr
+      define_attr :tha, Eth::MacAddr
       # @!attribute tpa
       #  target protocol address
       #  @return [IP::Addr]
-      define_field :tpa, IP::Addr
+      define_attr :tpa, IP::Addr
       # @!attribute body
-      #  @return [Types::String,Header::Base]
-      define_field :body, Types::String
+      #  @return [BinStruct::String,Header::Base]
+      define_attr :body, BinStruct::String
 
       # @param [Hash] options
       # @option options [Integer] :hrd network protocol type (default: 1)

data/lib/packetgen/header/asn1_base.rb

@@ -21,7 +21,7 @@ module PacketGen
       include Headerable
 
       class << self
-        # Define some methods from given ASN.1 fields to mimic {Base} attributes
+        # Define some methods from given ASN.1 attributes.to mimic {Base} attributes
         # @param [Array<Symbol>] attributes
         # @return [void]
         def define_attributes(*attributes)

data/lib/packetgen/header/base.rb

@@ -13,28 +13,28 @@ module PacketGen
     #    * +#calc_checksum+, which computes header checksum,
     #    * +#calc_length+, which computes header length,
     #    * {#parse?},
-    #    * +#reply!+, which inverts needed fields to forge a response.
+    #    * +#reply!+, which inverts needed attributes.to forge a response.
     # @author Sylvain Daubert
-    class Base < Types::Fields
+    class Base < BinStruct::Struct
       include Headerable
 
       # @api private
       # Simple class to handle a header association
-      class Binding < Struct.new(:key, :value)
+      class Binding < ::Struct.new(:key, :value)
         # Check +fields+ responds to binding
-        # @param [Types::Fields] fields
+        # @param [BinStruct::Struct] fields
         # @return [Boolean]
         def check?(fields)
           case self[:value]
           when Proc
-            self[:value].call fields.send(self[:key])
+            self[:value].call(fields.send(self[:key]))
           else
             fields.send(self[:key]) == self[:value]
           end
         end
 
         # Set +fields+ field to binding value
-        # @param [Types::Fields] fields
+        # @param [BinStruct::Struct] fields
         # @return [void]
         def set(fields)
           case self[:value]
@@ -62,14 +62,14 @@ module PacketGen
         end
 
         # Check +fields+ responds to binding
-        # @param [Types::Fields] fields
+        # @param [BinStruct::Struct] fields
         # @return [Boolean]
         def check?(fields)
           @check.call(fields)
         end
 
         # Set +fields+ field to binding value
-        # @param [Types::Fields] fields
+        # @param [BinStruct::Struct] fields
         # @return [void]
         def set(fields)
           @set.call(fields)
@@ -120,22 +120,22 @@ module PacketGen
         end
 
         # Check +fields+ responds to set of bindings
-        # @param [Types::Fields] fields
+        # @param [BinStruct::Struct] fields
         # @return [Boolean]
         def check?(fields)
           @bindings.any? { |group| group.all? { |binding| binding.check?(fields) } }
         end
 
         # Set +fields+ to bindings value
-        # @param [Types::Fields] fields
+        # @param [BinStruct::Struct] fields
         # @return [void]
         def set(fields)
-          @bindings.first.each { |b| b.set fields }
+          @bindings.first.each { |b| b.set(fields) }
         end
       end
 
       # @private
-      # On inheritage, create +@known_header+ class variable
+      # On inheritance, create +@known_header+ class variable
       # @param [Class] klass
       # @return [void]
       def self.inherited(klass)
@@ -151,7 +151,7 @@ module PacketGen
 
         # Bind a upper header to current one.
         # @param [Class] header_klass header class to bind to current class
-        # @param [Hash] args current class fields and their value when +header_klass+
+        # @param [Hash] args current class attributes.and their value when +header_klass+
         #   is embedded in current class.
         #
         #   Given value may be a lambda, whose alone argument is the value extracted
@@ -182,11 +182,10 @@ module PacketGen
         #                                 ->(hdr) { hdr.field1 == 41 && hdr.body[0..1] == "\x00\x00" }]
         # @since 2.7.0
         def bind(header_klass, args={})
-          if @known_headers[header_klass].nil?
+          bindings = @known_headers[header_klass]
+          if bindings.nil?
             bindings = Bindings.new
             @known_headers[header_klass] = bindings
-          else
-            bindings = @known_headers[header_klass]
           end
           bindings.new_set
           args.each do |key, value|
@@ -213,7 +212,7 @@ module PacketGen
         end
       end
 
-      # @see Types::Fields#initialize
+      # @see BinStruct::Struct#initialize
       def initialize(options={})
         @packet = options.delete(:packet) if options.key?(:packet)
         super
@@ -242,7 +241,7 @@ module PacketGen
       def ip_header(header)
         hid = header_id(header)
         iph = packet.headers[0...hid].reverse.find { |h| h.is_a?(IP) || h.is_a?(IPv6) }
-        raise FormatError, 'no IP or IPv6 header in packet' if iph.nil?
+        raise FormatError, 'no IP nor IPv6 header in packet' if iph.nil?
 
         iph
       end

data/lib/packetgen/header/bootp.rb

@@ -12,23 +12,23 @@ module PacketGen
     # RFC 951}
     #
     # A BOOTP header consists of:
-    # * an operation code field ({#op} of type {Types::Int8Enum}),
-    # * a hardware address type ({#htype} of type {Types::Int8}),
-    # * a hardware address length ({#hlen} of type {Types::Int8}),
-    # * a {#hops} field ({Types::Int8}),
-    # * a transaction ID ({#xid} of type {Types::Int32}),
-    # * a {#secs} field (){Types::Int16}),
-    # * a {#flags} field (){Types::Int16}):
+    # * an operation code field ({#op} of type {BinStruct::Int8Enum}),
+    # * a hardware address type ({#htype} of type {BinStruct::Int8}),
+    # * a hardware address length ({#hlen} of type {BinStruct::Int8}),
+    # * a {#hops} field ({BinStruct::Int8}),
+    # * a transaction ID ({#xid} of type {BinStruct::Int32}),
+    # * a {#secs} field (){BinStruct::Int16}),
+    # * a {#flags} field (){BinStruct::Int16}):
     #   * a 1-bit broadcast flag ({#b}),
     #   * a 15-bit Must Be Zero field ({#mbz}),
     # * a {#ciaddr} field ({IP::Addr}),
     # * a {#yiaddr} field ({IP::Addr}),
     # * a {#siaddr} field ({IP::Addr}),
     # * a {#giaddr} field ({IP::Addr}),
-    # * a {#chaddr} field (16-byte {Types::String}),
-    # * a {#sname} field (64-byte {Types::CString}),
-    # * a {#file} field (128-byte {Types::CString}),
-    # * and a body ({Types::String}).
+    # * a {#chaddr} field (16-byte {BinStruct::String}),
+    # * a {#sname} field (64-byte {BinStruct::CString}),
+    # * a {#file} field (128-byte {BinStruct::CString}),
+    # * and a body ({BinStruct::String}).
     #
     # == Create a BOOTP header
     #   # standalone
@@ -52,84 +52,82 @@ module PacketGen
       # @!attribute op
       #   8-bit opcode
       #   @return [Integer]
-      define_field :op, Types::Int8Enum, enum: OPCODES
+      define_attr :op, BinStruct::Int8Enum, enum: OPCODES
 
       # @!attribute htype
       #  8-bit hardware address type
       #  @return [Integer]
-      define_field :htype, Types::Int8, default: 1
+      define_attr :htype, BinStruct::Int8, default: 1
 
       # @!attribute hlen
       #  8-bit hardware address length
       #  @return [Integer]
-      define_field :hlen, Types::Int8, default: 6
+      define_attr :hlen, BinStruct::Int8, default: 6
 
       # @!attribute hops
       #  @return [Integer]
-      define_field :hops, Types::Int8
+      define_attr :hops, BinStruct::Int8
 
       # @!attribute xid
       #  32-bit Transaction ID
       #  @return [Integer]
-      define_field :xid, Types::Int32
+      define_attr :xid, BinStruct::Int32
 
       # @!attribute secs
       #  16-bit integer: number of seconds elapsed since client began address
       #  acquisition or renewal process
       #  @return [Integer]
-      define_field :secs, Types::Int16
+      define_attr :secs, BinStruct::Int16
 
       # @!attribute flags
       #  16-bit flag field
       #  @return [Integer]
-      define_field :flags, Types::Int16
+      # @!attribute b
+      #  Broadcast flag, from {#flags}
+      # @return [Boolean]
+      # @!attribute mbz
+      #  15-bit Must Be Zero bits, from {#flags}
+      # @return [Boolean]
+      define_bit_attr :flags, b: 1, mbz: 15
 
       # @!attribute ciaddr
       #  client IP address
       #  @return [String]
-      define_field :ciaddr, IP::Addr
+      define_attr :ciaddr, IP::Addr
 
       # @!attribute yiaddr
       #  'your' (client) IP address
       #  @return [String]
-      define_field :yiaddr, IP::Addr
+      define_attr :yiaddr, IP::Addr
 
       # @!attribute siaddr
       #  IP address of next server to use in bootstrap
       #  @return [String]
-      define_field :siaddr, IP::Addr
+      define_attr :siaddr, IP::Addr
 
       # @!attribute giaddr
       #  Relay agent IP address, used in booting via a relay agent
       #  @return [String]
-      define_field :giaddr, IP::Addr
+      define_attr :giaddr, IP::Addr
 
       # @!attribute chaddr
       #   client hardware address
       #   @return [String]
-      define_field :chaddr, Types::String, static_length: 16
+      define_attr :chaddr, BinStruct::String, static_length: 16
 
       # @!attribute sname
       #   optional server hostname, null-terminated string
       #   @return [String]
-      define_field :sname, Types::CString, static_length: 64
+      define_attr :sname, BinStruct::CString, static_length: 64
 
       # @!attribute file
       #   Boot file name, null terminated string
       #   @return [String]
-      define_field :file, Types::CString, static_length: 128
+      define_attr :file, BinStruct::CString, static_length: 128
 
       # @!attribute body
       #   @return [String]
-      define_field :body, Types::String
-
-      # @!attribute b
-      #  Broadcast flag, from {#flags}
-      # @return [Boolean]
-      # @!attribute mbz
-      #  15-bit Must Be Zero bits, from {#flags}
-      # @return [Boolean]
-      define_bit_fields_on :flags, :b, :mbz, 15
+      define_attr :body, BinStruct::String
 
       # @return [String]
       def inspect

data/lib/packetgen/header/dhcp/option.rb

@@ -59,51 +59,51 @@ module PacketGen
 
       # @!parse
       #  # Option class with string value. {#type #type} and {#length #length} are
-      #  # {Types::Int8}.
+      #  # {BinStruct::Int8}.
       #  #
       #  # See also {IPAddrOption}, {Int8Option}, {Int16Option} and {Int32Option}.
       #  # @since 2.2.0
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
-      #  class Option < Types::AbstractTLV; end
+      #  # @since 3.1.0 subclass of {BinStruct::AbstractTLV}
+      #  class Option < BinStruct::AbstractTLV; end
       # @private
-      Option = Types::AbstractTLV.create
+      Option = BinStruct::AbstractTLV.create
       Option.define_type_enum DHCP_OPTIONS
       # @!parse
       #  # {Option} class with IP address value
       #  # @since 2.2.0
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
-      #  class IPAddrOption < Types::AbstractTLV; end
+      #  # @since 3.1.0 subclass of {BinStruct::AbstractTLV}
+      #  class IPAddrOption < BinStruct::AbstractTLV; end
       # @private
-      IPAddrOption = Types::AbstractTLV.create(value_class: IP::Addr)
+      IPAddrOption = BinStruct::AbstractTLV.create(value_class: IP::Addr)
       IPAddrOption.define_type_enum DHCP_OPTIONS
       # @!parse
       #  # {Option} class with int8 value
       #  # @since 2.2.0
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
-      #  class Int8Option < Types::AbstractTLV; end
+      #  # @since 3.1.0 subclass of {BinStruct::AbstractTLV}
+      #  class Int8Option < BinStruct::AbstractTLV; end
       # @private
-      Int8Option = Types::AbstractTLV.create(value_class: Types::Int8)
+      Int8Option = BinStruct::AbstractTLV.create(value_class: BinStruct::Int8)
       Int8Option.define_type_enum DHCP_OPTIONS
       # @!parse
       #  # {Option} class with int16 value
       #  # @since 2.2.0
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
-      #  class Int16Option < Types::AbstractTLV; end
+      #  # @since 3.1.0 subclass of {BinStruct::AbstractTLV}
+      #  class Int16Option < BinStruct::AbstractTLV; end
       # @private
-      Int16Option = Types::AbstractTLV.create(value_class: Types::Int16)
+      Int16Option = BinStruct::AbstractTLV.create(value_class: BinStruct::Int16)
       Int16Option.define_type_enum DHCP_OPTIONS
       # @!parse
       #  # {Option} class with int32 value
       #  # @since 2.2.0
-      #  # @since 3.1.0 subclass of {Types::AbstractTLV}
-      #  class Int32Option < Types::AbstractTLV; end
+      #  # @since 3.1.0 subclass of {BinStruct::AbstractTLV}
+      #  class Int32Option < BinStruct::AbstractTLV; end
       # @private
-      Int32Option = Types::AbstractTLV.create(value_class: Types::Int32)
+      Int32Option = BinStruct::AbstractTLV.create(value_class: BinStruct::Int32)
       Int32Option.define_type_enum DHCP_OPTIONS
 
       # Class to indicate DHCP options end
-      class End < Types::Int8
-        def initialize(value=255)
+      class End < BinStruct::Int8
+        def initialize(options={ value: 255 })
           super
         end
 
@@ -115,7 +115,7 @@ module PacketGen
 
       # Class to indicate padding after DHCP options
       class Pad < End
-        def initialize(value=0)
+        def initialize(options={ value: 0 })
           super
         end
       end

data/lib/packetgen/header/dhcp/options.rb

@@ -22,7 +22,7 @@ module PacketGen
       #   # And finish with padding
       #   options << { type: 'pad' }
       # @author Sylvain Daubert
-      class Options < Types::Array
+      class Options < BinStruct::Array
         set_of Option
 
         private