packetgen 2.8.6 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee37bbcc3ffa4d0ba19838f04c4c57ee5de15244a7bf6e2c78101148cff0026
-  data.tar.gz: 02afc1072186723ec5d16424e3fcb0a832e2e2ab114fd6232ace7dedba873fde
+  metadata.gz: a9619d169e7a064e415e479dd208f15339f59700baf805bbc7a79437967c1cd5
+  data.tar.gz: 4d1ceeeee51b56dab91331e43672b7fe15ddeb87971bb36bc5670399f2e55080
 SHA512:
-  metadata.gz: 5198cc85801daf880d3ac32313ac2f611ceebfa8c8023aedfe2d95021563d620234f363be048c279e3b8d2f121e465854525c2707d6fba6e82479c3beb88ff3f
-  data.tar.gz: 98c6e9b198b1e8294b9dc38a13d3efb7cd81c0b9dafe9d6bc0998dbff07da02deca5bb7efd2bdc7f83507dc46d20d3b658620dc6f5444739485f3a9704bf9c5b
+  metadata.gz: a0a27dd879ec6c9362bade001b6f6701686f80a589d2dd75478f5894dbaf8bd5b766f00f692437dca4ecbf96ceb830d4fcfeaef2e2354bccec7addd76f4b7ab8
+  data.tar.gz: bfb2b7de3b541c85cd1d367b4d8976d78d47c9872cabafd46cba12751926128f6a664c687520b28b7224af8439829219f9f6ad5a950de5878c9ee6f1d9b14243

data/lib/packetgen/header/bootp.rb

@@ -132,18 +132,11 @@ module PacketGen
 
       # @return [String]
       def inspect
-        str = Inspect.dashed_line(self.class, 1)
-        fields.each do |attr|
-          next if attr == :body
-          next unless is_present?(attr)
-
-          str << if (attr == :chaddr) && (self.hlen == 6)
-                   Inspect.inspect_attribute(attr, Eth::MacAddr.new.read(self[:chaddr][0, 6]), 1)
-                 else
-                   Inspect.inspect_attribute(attr, self[attr], 1)
-                 end
+        super do |attr|
+          next unless (attr == :chaddr) && (self.hlen == 6)
+
+          Inspect.inspect_attribute(attr, Eth::MacAddr.new.read(self[:chaddr][0, 6]))
         end
-        str
       end
 
       # Invert opcode, if known

data/lib/packetgen/header/dns.rb

@@ -250,24 +250,20 @@ module PacketGen
 
       # @return [String]
       def inspect
-        str = Inspect.dashed_line(self.class, 1)
-        fields.each do |attr|
-          if attr == :u16
-            flags = %i[qr aa tc rd ra].select! { |flag| send "#{flag}?" }
-                                      .map(&:to_s).join(',')
-            str << Inspect.shift_level(1)
-            str << Inspect::FMT_ATTR % ['Flags', 'flags', flags]
-            opcode = '%-16s (%u)' % [OPCODES.key(self.opcode), self.opcode]
-            str << Inspect.shift_level(1)
-            str << Inspect::FMT_ATTR % ['Integer', 'opcode', opcode]
-            rcode = '%-16s (%u)' % [RCODES.key(self.rcode), self.rcode]
-            str << Inspect.shift_level(1)
-            str << Inspect::FMT_ATTR % ['Integer', 'rcode', rcode]
-          else
-            str << Inspect.inspect_attribute(attr, self[attr], 1)
-          end
+        super do |attr|
+          next unless attr == :u16
+
+          flags = %i[qr aa tc rd ra].select! { |flag| send "#{flag}?" }
+                                    .map(&:to_s).join(',')
+          str = Inspect.shift_level
+          str << Inspect::FMT_ATTR % ['Flags', 'flags', flags]
+          opcode = '%-16s (%u)' % [OPCODES.key(self.opcode), self.opcode]
+          str << Inspect.shift_level
+          str << Inspect::FMT_ATTR % ['Integer', 'opcode', opcode]
+          rcode = '%-16s (%u)' % [RCODES.key(self.rcode), self.rcode]
+          str << Inspect.shift_level
+          str << Inspect::FMT_ATTR % ['Integer', 'rcode', rcode]
         end
-        str
       end
     end
 

data/lib/packetgen/header/eap/tls.rb

@@ -47,23 +47,15 @@ module PacketGen
 
         # @return [String]
         def inspect
-          str = Inspect.dashed_line(self.class, 1)
-          fields.each do |attr|
-            next if attr == :body
-            next unless present?(attr)
+          super do |attr|
+            next unless attr == :flags
 
-            if attr == :flags
-              shift = Inspect.shift_level(1)
-              value = %i[l m s].map { |f| send("#{f}?") ? f.to_s : '.' }.join
-              value = '%-16s (0x%02x)' % [value, self.flags]
-              str << shift
-              str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
-                                          attr, value]
-            else
-              str << Inspect.inspect_attribute(attr, self[attr], 1)
-            end
+            str = Inspect.shift_level
+            value = %i[l m s].map { |f| send("#{f}?") ? f.to_s : '.' }.join
+            value = '%-16s (0x%02x)' % [value, self.flags]
+            str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
+                                        attr, value]
           end
-          str
         end
       end
     end

data/lib/packetgen/header/eap/ttls.rb

@@ -51,24 +51,18 @@ module PacketGen
 
         # @return [String]
         def inspect
-          str = Inspect.dashed_line(self.class, 1)
-          fields.each do |attr|
-            next if attr == :body
-            next unless is_present?(attr)
+          super do |attr|
+            next unless attr == :flags
 
-            if attr == :flags
-              shift = Inspect.shift_level(1)
-              value = %i[l m s].map { |f| send("#{f}?") ? f.to_s : '.' }.join
-              value = '%-16s (0x%02x)' % [value, self.flags]
-              str << shift
-              str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
-                                          attr, value]
-              str << Inspect::FMT_ATTR % ['', 'version', self.version]
-            else
-              str << Inspect.inspect_attribute(attr, self[attr], 1)
-            end
+            shift = Inspect.shift_level
+            str = shift.dup
+            value = %i[l m s].map { |f| send("#{f}?") ? f.to_s : '.' }.join
+            value = '%-16s (0x%02x)' % [value, self.flags]
+            str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
+                                        attr, value]
+            str << shift
+            str << Inspect::FMT_ATTR % ['', 'version', self.version]
           end
-          str
         end
       end
     end

data/lib/packetgen/header/ike.rb

@@ -189,28 +189,18 @@ module PacketGen
 
       # @return [String]
       def inspect
-        str = Inspect.dashed_line(self.class, )
-        fields.each do |attr|
-          next if attr == :body
-
+        super do |attr|
           case attr
           when :flags
             str_flags = ''.dup
             %w[r v i].each do |flag|
               str_flags << (send("flag_#{flag}?") ? flag.upcase : '.')
             end
-            str << Inspect.shift_level(2)
+            str = Inspect.shift_level
             str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''), attr,
                                         str_flags]
-          when :exchange_type
-            str << Inspect.shift_level(2)
-            str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''), attr,
-                                        human_exchange_type]
-          else
-            str << Inspect.inspect_attribute(attr, self[attr], 2)
           end
         end
-        str
       end
 
       # Toggle +I+ and +R+ flags.

data/lib/packetgen/header/ike/cert.rb

@@ -68,24 +68,6 @@ module PacketGen
         def human_encoding
           self[:encoding].to_human
         end
-
-        # @return [String]
-        def inspect
-          str = Inspect.dashed_line(self.class, 1)
-          fields.each do |attr|
-            case attr
-            when :body
-              next
-            when :encoding
-              str << Inspect.shift_level(1)
-              str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''), attr,
-                                          human_encoding]
-            else
-              str << Inspect.inspect_attribute(attr, self[attr], 1)
-            end
-          end
-          str
-        end
       end
     end
 

data/lib/packetgen/header/ike/certreq.rb

@@ -52,19 +52,11 @@ module PacketGen
 
         # @return [String]
         def inspect
-          str = Inspect.dashed_line(self.class, 1)
-          fields.each do |attr|
-            case attr
-            when :body
-              next
-            when :content
-              str << Inspect.shift_level(1)
-              str << Inspect::FMT_ATTR % ['hashes', :content, human_content]
-            else
-              str << Inspect.inspect_attribute(attr, self[attr], 1)
-            end
+          super do |attr|
+            next unless attr == :content
+            str = Inspect.shift_level
+            str << Inspect::FMT_ATTR % ['hashes', :content, human_content]
           end
-          str
         end
       end
     end

data/lib/packetgen/header/ike/notify.rb

@@ -160,19 +160,13 @@ module PacketGen
 
         # @return [String]
         def inspect
-          str = Inspect.dashed_line(self.class, 1)
-          fields.each do |attr|
-            next if attr == :body
+          super do |attr|
+            next unless attr == :protocol
 
-            if %i[protocol message_type].include? attr
-              str << Inspect.shift_level(1)
-              str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''), attr,
-                                          send("human_#{attr}")]
-            else
-              str << Inspect.inspect_attribute(attr, self[attr], 1)
-            end
+            str = Inspect.shift_level
+            str << Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''), attr,
+                                        human_protocol]
           end
-          str
         end
       end
     end

data/lib/packetgen/header/ip.rb

@@ -235,26 +235,25 @@ module PacketGen
 
       # @return [String]
       def inspect
-        str = Inspect.dashed_line(self.class, 1)
-        shift = Inspect.shift_level(1)
-        fields.each do |attr|
-          next if attr == :body
-
-          str << Inspect.inspect_attribute(attr, self[attr], 1)
-          if attr == :u8
-            str << shift + Inspect::FMT_ATTR % ['', 'version', version]
-            str << shift + Inspect::FMT_ATTR % ['', 'ihl', ihl]
-          elsif attr == :frag
+        super do |attr|
+          case attr
+          when :u8
+            shift = Inspect.shift_level
+            str = Inspect.inspect_attribute(attr, self[attr])
+            str << shift << Inspect::FMT_ATTR % ['', 'version', version]
+            str << shift << Inspect::FMT_ATTR % ['', 'ihl', ihl]
+          when :frag
+            shift = Inspect.shift_level
+            str = Inspect.inspect_attribute(attr, self[attr])
             flags = flag_rsv? ? %w[RSV] : []
             flags << 'DF' if flag_df?
             flags << 'MF' if flag_mf?
             flags_str = flags.empty? ? 'none' : flags.join(',')
-            str << shift + Inspect::FMT_ATTR % ['', 'flags', flags_str]
+            str << shift << Inspect::FMT_ATTR % ['', 'flags', flags_str]
             foff = Inspect.int_dec_hex(fragment_offset, 4)
-            str << shift + Inspect::FMT_ATTR % ['', 'frag_offset', foff]
+            str << shift << Inspect::FMT_ATTR % ['', 'frag_offset', foff]
           end
         end
-        str
       end
 
       # Check version field

data/lib/packetgen/header/ipv6.rb

@@ -137,21 +137,17 @@ module PacketGen
 
       # @return [String]
       def inspect
-        str = Inspect.dashed_line(self.class, 1)
-        fields.each do |attr|
-          next if attr == :body
-
-          str << Inspect.inspect_attribute(attr, self[attr], 1)
-          if attr == :u32
-            shift = Inspect.shift_level(2)
-            str << shift + Inspect::FMT_ATTR % ['', 'version', version]
-            tclass = Inspect.int_dec_hex(traffic_class, 2)
-            str << shift + Inspect::FMT_ATTR % ['', 'tclass', tclass]
-            fl_value = Inspect.int_dec_hex(flow_label, 5)
-            str << shift + Inspect::FMT_ATTR % ['', 'flow_label', fl_value]
-          end
+        super do |attr|
+          next unless attr == :u32
+
+          str = Inspect.inspect_attribute(attr, self[attr])
+          shift = Inspect.shift_level
+          str << shift + Inspect::FMT_ATTR % ['', 'version', version]
+          tclass = Inspect.int_dec_hex(traffic_class, 2)
+          str << shift + Inspect::FMT_ATTR % ['', 'tclass', tclass]
+          fl_value = Inspect.int_dec_hex(flow_label, 5)
+          str << shift + Inspect::FMT_ATTR % ['', 'flow_label', fl_value]
         end
-        str
       end
 
       # Check version field

data/lib/packetgen/header/snmp.rb

@@ -113,7 +113,7 @@ module PacketGen
         sequence :pdu,
                  implicit: SNMP::PDU_GET, constructed: true,
                  content: [integer(:id, value: 0),
-                           enumerated(:error, value: 0, enum: ERRORS),
+                           integer(:error, value: 0, enum: ERRORS),
                            integer(:error_index, value: 0),
                            model(:varbindlist, VariableBindings)]
       end
@@ -162,13 +162,13 @@ module PacketGen
                  implicit: SNMP::PDU_TRAPv1, constructed: true,
                  content: [objectid(:enterprise),
                            octet_string(:agent_addr),
-                           enumerated(:generic_trap, enum: { 'cold_start'        => 0,
-                                                             'warm_start'        => 1,
-                                                             'link_down'         => 2,
-                                                             'link_up'           => 3,
-                                                             'auth_failure'      => 4,
-                                                             'egp_neighbor_loss' => 5,
-                                                             'specific'          => 6 }),
+                           integer(:generic_trap, enum: { 'cold_start'        => 0,
+                                                          'warm_start'        => 1,
+                                                          'link_down'         => 2,
+                                                          'link_up'           => 3,
+                                                          'auth_failure'      => 4,
+                                                          'egp_neighbor_loss' => 5,
+                                                          'specific'          => 6 }),
                            integer(:specific_trap),
                            integer(:timestamp),
                            model(:varbindlist, VariableBindings)]
@@ -243,8 +243,8 @@ module PacketGen
       end
 
       sequence :message,
-               content: [enumerated(:version, value: 'v2c',
-                                    enum: { 'v1' => 0, 'v2c' => 1, 'v2' => 2, 'v3' => 3 }),
+               content: [integer(:version, value: 'v2c',
+                                 enum: { 'v1' => 0, 'v2c' => 1, 'v2' => 2, 'v3' => 3 }),
                          octet_string(:community, value: 'public'),
                          model(:data, PDUs)]
 
@@ -280,13 +280,13 @@ module PacketGen
 
       def inspect
         str = super
-        str << Inspect.shift_level(1)
+        str << Inspect.shift_level
         if self[:data].chosen.nil?
           str << Inspect::FMT_ATTR % [self[:data].type, :data, '']
         else
           data = self[:data]
           str << Inspect::FMT_ATTR % [data.type, :data, data.chosen_value.type]
-          str << Inspect.dashed_line('ASN.1 content', 1)
+          str << Inspect.dashed_line('ASN.1 content')
           str << data.chosen_value.inspect(1)
           begin
             str << Inspect.inspect_body(self[:message].to_der, 'ASN.1 DER')

data/lib/packetgen/header/tcp.rb

@@ -206,24 +206,20 @@ module PacketGen
 
       # @return [String]
       def inspect
-        str = Inspect.dashed_line(self.class, 1)
-        shift = Inspect.shift_level(1)
-        fields.each do |attr|
-          next if attr == :body
-
-          str << Inspect.inspect_attribute(attr, self[attr], 1)
-          if attr == :u16
-            doff = Inspect.int_dec_hex(data_offset, 1)
-            str << shift + Inspect::FMT_ATTR % ['', 'data_offset', doff]
-            str << shift + Inspect::FMT_ATTR % ['', 'reserved', reserved]
-            flags = ''.dup
-            %w[ns cwr ece urg ack psh rst syn fin].each do |fl|
-              flags << (send("flag_#{fl}?") ? fl[0].upcase : '.')
-            end
-            str << shift + Inspect::FMT_ATTR % ['', 'flags', flags]
+        super do |attr|
+          next unless attr == :u16
+
+          shift = Inspect.shift_level
+          str = Inspect.inspect_attribute(attr, self[attr])
+          doff = Inspect.int_dec_hex(data_offset, 1)
+          str<< shift << Inspect::FMT_ATTR % ['', 'data_offset', doff]
+          str << shift << Inspect::FMT_ATTR % ['', 'reserved', reserved]
+          flags = ''.dup
+          %w[ns cwr ece urg ack psh rst syn fin].each do |fl|
+            flags << (send("flag_#{fl}?") ? fl[0].upcase : '.')
           end
+          str << shift << Inspect::FMT_ATTR % ['', 'flags', flags]
         end
-        str
       end
 
       # Invert source and destination port numbers

data/lib/packetgen/types/fields.rb

@@ -356,7 +356,9 @@ module PacketGen
         @fields = {}
         @optional_fields = {}
 
-        self.class.class_eval { @field_defs }.each do |field, ary|
+        field_defs = self.class.class_eval { @field_defs }
+        self.class.fields.each do |field|
+          ary = field_defs[field]
           type, default, builder, optional, enum, field_options = ary
           default = default.to_proc.call(self) if default.is_a?(Proc)
           @fields[field] = if builder
@@ -480,7 +482,13 @@ module PacketGen
         self
       end
 
-      # Common inspect method for headers
+      # Common inspect method for headers.
+      #
+      # A block may be given to differently format some attributes. This
+      # may be used by subclasses to handle specific fields.
+      # @yieldparam attr [Symbol] attribute to inspect
+      # @yieldreturn [String,nil] the string to print for +attr+, or +nil+
+      #  to let +inspect+ generate it
       # @return [String]
       def inspect
         str = Inspect.dashed_line(self.class, 1)
@@ -488,7 +496,8 @@ module PacketGen
           next if attr == :body
           next unless present?(attr)
 
-          str << Inspect.inspect_attribute(attr, self[attr], 1)
+          result = yield(attr)if block_given?
+          str << (result || Inspect.inspect_attribute(attr, self[attr], 1))
         end
         str
       end

data/lib/packetgen/version.rb

@@ -10,5 +10,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = '2.8.6'
+  VERSION = '2.8.7'
 end

data/packetgen.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'interfacez', '~>1.0'
   spec.add_dependency 'pcaprub', '~>0.12.4'
-  spec.add_dependency 'rasn1', '~>0.5', '>= 0.6.3'
+  spec.add_dependency 'rasn1', '~>0.5', '>= 0.6.6'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 12.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interfacez
@@ -47,7 +47,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement