packetgen 3.1.1 → 3.1.6

data/lib/packetgen/header/bootp.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     # Bootstrap Protocol, {https://tools.ietf.org/html/rfc951
@@ -45,7 +45,7 @@ module PacketGen
       # DHCP opcodes
       OPCODES = {
         'BOOTREQUEST' => 1,
-        'BOOTREPLY'   => 2
+        'BOOTREPLY' => 2
       }.freeze
 
       # @!attribute op

data/lib/packetgen/header/dhcp.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     # Dynamic Host Configuration Protocol, {https://tools.ietf.org/html/rfc2131

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DHCP

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DHCP

data/lib/packetgen/header/dhcpv6.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     # Dynamic Host Configuration Protocol for IPv6, {https://tools.ietf.org/html/rfc3315
@@ -55,16 +55,16 @@ module PacketGen
 
       # DHCPv6 message types
       MESSAGE_TYPES = {
-        'SOLLICIT'            => 1,
-        'ADVERTISE'           => 2,
-        'REQUEST'             => 3,
-        'CONFIRM'             => 4,
-        'RENEW'               => 5,
-        'REBIND'              => 6,
-        'REPLY'               => 7,
-        'RELEASE'             => 8,
-        'DECLINE'             => 9,
-        'RECONFIGURE'         => 10,
+        'SOLLICIT' => 1,
+        'ADVERTISE' => 2,
+        'REQUEST' => 3,
+        'CONFIRM' => 4,
+        'RENEW' => 5,
+        'REBIND' => 6,
+        'REPLY' => 7,
+        'RELEASE' => 8,
+        'DECLINE' => 9,
+        'RECONFIGURE' => 10,
         'INFORMATION-REQUEST' => 11
       }.freeze
 

data/lib/packetgen/header/dhcpv6/duid.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DHCPv6
       # @abstract Base class for DUID (DHCP Unique ID)
       # @author Sylvain Daubert
       class DUID < Types::Fields
+        include Types::Fieldable
+
         TYPES = {
           'DUID-LLT' => 1,
-          'DUID-EN'  => 2,
-          'DUID-LL'  => 3
+          'DUID-EN' => 2,
+          'DUID-LL' => 3
         }.freeze
 
         # @!attribute type
@@ -34,7 +36,7 @@ module PacketGen
         # @param [String] str
         # @return [DUID]
         def read(str)
-          if self.class == DUID
+          if self.instance_of?(DUID)
             super
             case type
             when 1
@@ -58,6 +60,8 @@ module PacketGen
         end
       end
 
+      # rubocop:disable Naming/ClassAndModuleCamelCase
+
       # DUID Based on Link-layer Address Plus Time
       # @author Sylvain Daubert
       class DUID_LLT < DUID
@@ -140,3 +144,5 @@ module PacketGen
     end
   end
 end
+
+# rubocop:enable Naming/ClassAndModuleCamelCase

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DHCPv6
@@ -17,6 +17,8 @@ module PacketGen
       # field to replace it by specific option field(s).
       # @author Sylvain Daubert
       class Option < Types::Fields
+        include Types::Fieldable
+
         # @!attribute type
         #  16-bit option type
         #  @return [Integer]
@@ -55,7 +57,7 @@ module PacketGen
               case options[:type]
               when Integer
                 klass = Option.subclasses[options[:type]]
-                klass.new(options) if klass
+                klass&.new(options)
               when String
                 if DHCPv6.const_defined?(options[:type])
                   klass = DHCPv6.const_get(options[:type])
@@ -85,7 +87,7 @@ module PacketGen
         # Get human-readable {#type}
         # @return [String]
         def human_type
-          if self.class == Option
+          if self.instance_of?(Option)
             "option#{type}"
           else
             self.class.to_s.sub(/.*::/, '')
@@ -95,7 +97,7 @@ module PacketGen
         # Get a human-readable string for this option
         # @return [String]
         def to_human
-          str = "#{human_type}:".dup
+          str = +"#{human_type}:"
           if respond_to?(:human_data) && !human_data.empty?
             str << human_data
           elsif !self[:data].nil?
@@ -230,17 +232,7 @@ module PacketGen
 
         # @!attribute options
         #   @return [RequestedOptions]
-        define_field :options, RequestedOptions
-
-        # Populate object from +str+
-        # @param [String] str
-        # @return [self]
-        def read(str)
-          self[:type].read str[0, 2]
-          self[:length].read str[2, 2]
-          self[:options].read str[4, self.length]
-          self
-        end
+        define_field :options, RequestedOptions, builder: ->(h, t) { t.new(length_from: h[:length]) }
 
         # Get human-readable data
         # @return [String]

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DHCPv6

data/lib/packetgen/header/dhcpv6/relay.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DHCPv6

data/lib/packetgen/header/dns.rb

@@ -1,11 +1,11 @@
 # coding: utf-8
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     # DNS: Domain Name Service
@@ -120,7 +120,7 @@ module PacketGen
 
       # DNS opcodes
       OPCODES = {
-        'query'  => 0,
+        'query' => 0,
         'iquery' => 1,
         'status' => 2,
         'notify' => 4,
@@ -129,13 +129,13 @@ module PacketGen
 
       # DNS Response codes
       RCODES = {
-        'ok'              => 0,
-        'no-error'        => 0,
-        'format-error'    => 1,
-        'server-failure'  => 2,
-        'name-error'      => 3,
+        'ok' => 0,
+        'no-error' => 0,
+        'format-error' => 1,
+        'server-failure' => 2,
+        'name-error' => 3,
         'not-implemented' => 4,
-        'refused'         => 5
+        'refused' => 5
       }.freeze
 
       # @!attribute id

data/lib/packetgen/header/dns/name.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DNS
@@ -43,28 +43,32 @@ module PacketGen
           self << Types::IntString.new
         end
 
+        # Clear name
+        #   @return [void]
+        def clear
+          super
+          @pointer = nil
+          @pointer_name = nil
+        end
+
         # Read a sequence of label from a string
         # @param [String] str binary string
         # @return [Name] self
         def read(str)
-          @pointer = nil
-          @pointer_name = nil
           clear
           return self if str.nil?
 
           PacketGen.force_binary str
           start = 0
           loop do
-            index = str[start, 2].unpack('n').first
+            index = str[start, 2].unpack1('n')
             if pointer? index
               # Pointer on another label
               @pointer = str[start, 2]
               break
             else
-              label = Types::IntString.new
-              label.read(str[start..-1])
+              label = add_label_from(str[start..-1])
               start += label.sz
-              self << label
               break if label.length.zero? || str[start..-1].length.zero?
             end
           end
@@ -101,7 +105,7 @@ module PacketGen
           return nil unless @pointer
           return @pointer_name if @pointer_name
 
-          index = @pointer.unpack('n').first
+          index = @pointer.unpack1('n')
           mask = ~POINTER_MASK & 0xffff
           ptr = index & mask
           name = Name.new
@@ -112,6 +116,13 @@ module PacketGen
         def record_from_hash(_hsh)
           raise NotImplementedError, "not supported by #{self.class}"
         end
+
+        def add_label_from(str)
+          label = Types::IntString.new
+          label.read(str)
+          self << label
+          label
+        end
       end
     end
   end

data/lib/packetgen/header/dns/opt.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 require_relative 'option'
 
 module PacketGen

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DNS

data/lib/packetgen/header/dns/qdsection.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DNS
@@ -35,7 +35,7 @@ module PacketGen
           while !str.empty? && (self.size < @counter.to_i)
             question = Question.new(@dns).read(str)
             str.slice!(0, question.sz)
-            self.push question
+            push question
           end
           self
         end

data/lib/packetgen/header/dns/question.rb

@@ -1,56 +1,58 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen
   module Header
     class DNS
       # DNS Question
       # @author Sylvain Daubert
       class Question < Types::Fields
+        include Types::Fieldable
+
         # Ressource Record types
         TYPES = {
-          'A'        => 1,
-          'NS'       => 2,
-          'MD'       => 3,
-          'MF'       => 4,
-          'CNAME'    => 5,
-          'SOA'      => 6,
-          'MB'       => 7,
-          'MG'       => 8,
-          'MR'       => 9,
-          'NULL'     => 10,
-          'WKS'      => 11,
-          'PTR'      => 12,
-          'HINFO'    => 13,
-          'MINFO'    => 14,
-          'MX'       => 15,
-          'TXT'      => 16,
-          'AAAA'     => 28,
-          'SRV'      => 33,
-          'NAPTR'    => 35,
-          'KX'       => 36,
-          'CERT'     => 37,
-          'OPT'      => 41,
-          'DS'       => 43,
-          'RRSIG'    => 46,
-          'NSEC'     => 47,
-          'DNSKEY'   => 48,
-          'TKEY'     => 249,
-          'TSIG'     => 250,
-          '*'        => 255
+          'A' => 1,
+          'NS' => 2,
+          'MD' => 3,
+          'MF' => 4,
+          'CNAME' => 5,
+          'SOA' => 6,
+          'MB' => 7,
+          'MG' => 8,
+          'MR' => 9,
+          'NULL' => 10,
+          'WKS' => 11,
+          'PTR' => 12,
+          'HINFO' => 13,
+          'MINFO' => 14,
+          'MX' => 15,
+          'TXT' => 16,
+          'AAAA' => 28,
+          'SRV' => 33,
+          'NAPTR' => 35,
+          'KX' => 36,
+          'CERT' => 37,
+          'OPT' => 41,
+          'DS' => 43,
+          'RRSIG' => 46,
+          'NSEC' => 47,
+          'DNSKEY' => 48,
+          'TKEY' => 249,
+          'TSIG' => 250,
+          '*' => 255
         }.freeze
 
         # Ressource Record classes
         CLASSES = {
-          'IN'   => 1,
-          'CH'   => 3,
-          'HS'   => 4,
+          'IN' => 1,
+          'CH' => 3,
+          'HS' => 4,
           'NONE' => 254,
-          '*'    => 255
+          '*' => 255
         }.freeze
 
         # @!attribute name