packetgen 1.4.3 → 2.0.0

data/lib/packetgen/packet.rb

@@ -44,6 +44,12 @@ module PacketGen
   # == Save packets to a file
   #  Packet.write 'file.pcapng', packets
   #
+  # @since 2.0.0
+  #   
+  #   Packet accessor has changed. When header class is in a namespace
+  #   (for example Dot11::* header classes), to avoid clashes in names, such
+  #   accessors are named +namespace_class+. For example {Header::Dot11::Data}
+  #   header is now accessed through +Packet#dot11_data+ and nor more +Packet#data+).
   # @author Sylvain Daubert
   class Packet
     # @return [Array<Header::Base]
@@ -216,10 +222,15 @@ module PacketGen
 
     # Encapulate another packet in +self+
     # @param [Packet] other
+    # @param [Boolean] parsing set to +true+ to not update last current header field
+    #    from binding with first other's one. Use only when current heade field as
+    #    its value set accordingly.
     # @return [self] +self+ with new headers from +other+
     # @since 1.1.0
-    def encapsulate(other)
-      other.headers.each { |h| add_header h }
+    def encapsulate(other, parsing: false)
+      other.headers.each_with_index do |h, i|
+        add_header h, parsing: (i > 0) || parsing
+      end
     end
 
     # Remove headers from +self+
@@ -327,19 +338,19 @@ module PacketGen
     # Add a header to packet
     # @param [Header::Base] header
     # @param [Header::Base] previous_header
+    # @param [Boolean] parsing
     # @return [void]
     def add_header(header, previous_header: nil, parsing: false)
-      protocol = header.protocol_name
       prev_header = previous_header || @headers.last
       if prev_header
         bindings = prev_header.class.known_headers[header.class]
         if bindings.nil?
           bindings = prev_header.class.known_headers[header.class.superclass]
           if bindings.nil?
-            msg = "#{prev_header.class} knowns no layer association with #{protocol}. "
-            msg << "Try #{prev_header.class}.bind_layer(PacketGen::Header::#{protocol}, "
-            msg << "#{prev_header.protocol_name.downcase}_proto_field: "
-            msg << "value_for_#{protocol.downcase})"
+            msg = "#{prev_header.class} knowns no layer association with #{header.protocol_name}. "
+            msg << "Try #{prev_header.class}.bind_layer(#{header.class}, "
+            msg << "#{prev_header.method_name}_proto_field: "
+            msg << "value_for_#{header.method_name})"
             raise ArgumentError, msg
           end
         end
@@ -348,8 +359,8 @@ module PacketGen
       end
       header.packet = self
       @headers << header unless previous_header
-      unless respond_to? protocol.downcase
-        self.class.class_eval "def #{protocol.downcase}(arg=nil);" \
+      unless respond_to? header.method_name
+        self.class.class_eval "def #{header.method_name}(arg=nil);" \
                               "header(#{header.class}, arg); end"
       end
     end
@@ -375,11 +386,14 @@ module PacketGen
       decode_packet_bottom_up = true
       while decode_packet_bottom_up do
         last_known_hdr = @headers.last
+        break unless last_known_hdr.respond_to? :body
+        break if last_known_hdr.body.empty?
         search_header(last_known_hdr) do |nh|
           str = last_known_hdr.body
           nheader = nh.new
           nheader = nheader.read(str)
           add_header nheader, parsing: true
+          nheader.dissect if nheader.respond_to? :dissect
         end
         decode_packet_bottom_up = (@headers.last != last_known_hdr)
       end

data/lib/packetgen/types/fields.rb

@@ -187,13 +187,21 @@ module PacketGen
         end
       end
 
+      # Delete a previously defined field
+      # @param [Symbol] name
+      # @return [void]
+      def self.delete_field(name)
+        @ordered_fields.delete name
+        @field_defs.delete name
+      end
+
       # Define a bitfield on given attribute
       #   class MyHeader < PacketGen::Types::Fields
       #     define_field :flags, Types::Int16
       #     # define a bit field on :flag attribute:
       #     # flag1, flag2 and flag3 are 1-bit fields
       #     # type and stype are 3-bit fields. reserved is a 6-bit field
-      #     define_bit_fields_on :flags, :flag1, :flag2, :flag3, :type, 3, :stype, 3, :reserved: 7
+      #     define_bit_fields_on :flags, :flag1, :flag2, :flag3, :type, 3, :stype, 3, :reserved, 7
       #   end
       # A bitfield of size 1 bit defines 2 methods:
       # * +#field?+ which returns a Boolean,
@@ -340,9 +348,9 @@ module PacketGen
       # @return [String]
       def inspect
         str = Inspect.dashed_line(self.class, 2)
-        @fields.each do |attr, value|
+        fields.each do |attr|
           next if attr == :body
-          str << Inspect.inspect_attribute(attr, value, 2)
+          str << Inspect.inspect_attribute(attr, self[attr], 2)
         end
         str
       end

data/lib/packetgen/version.rb

@@ -8,5 +8,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = "1.4.3"
+  VERSION = "2.0.0"
 end

data/packetgen.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pcaprub', '~>0.12.4'
   spec.add_dependency 'pry', '~>0.10'
   spec.add_dependency 'network_interface'
+  spec.add_dependency 'net-proto', '~>1.2'
+  spec.add_dependency 'rasn1', '~>0.3', '>= 0.3.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
@@ -52,6 +52,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-proto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rasn1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +176,9 @@ files:
 - lib/packetgen/config.rb
 - lib/packetgen/header.rb
 - lib/packetgen/header/arp.rb
+- lib/packetgen/header/asn1_base.rb
 - lib/packetgen/header/base.rb
+- lib/packetgen/header/crypto.rb
 - lib/packetgen/header/dns.rb
 - lib/packetgen/header/dns/name.rb
 - lib/packetgen/header/dns/opt.rb
@@ -163,9 +199,23 @@ files:
 - lib/packetgen/header/eth.rb
 - lib/packetgen/header/icmp.rb
 - lib/packetgen/header/icmpv6.rb
+- lib/packetgen/header/ike.rb
+- lib/packetgen/header/ike/auth.rb
+- lib/packetgen/header/ike/cert.rb
+- lib/packetgen/header/ike/certreq.rb
+- lib/packetgen/header/ike/id.rb
+- lib/packetgen/header/ike/ke.rb
+- lib/packetgen/header/ike/nonce.rb
+- lib/packetgen/header/ike/notify.rb
+- lib/packetgen/header/ike/payload.rb
+- lib/packetgen/header/ike/sa.rb
+- lib/packetgen/header/ike/sk.rb
+- lib/packetgen/header/ike/ts.rb
+- lib/packetgen/header/ike/vendor_id.rb
 - lib/packetgen/header/ip.rb
 - lib/packetgen/header/ipv6.rb
 - lib/packetgen/header/llc.rb
+- lib/packetgen/header/snmp.rb
 - lib/packetgen/header/tcp.rb
 - lib/packetgen/header/tcp/option.rb
 - lib/packetgen/header/tcp/options.rb