packetgen 2.3.0 → 2.4.0

data/lib/packetgen/packet.rb

@@ -148,6 +148,24 @@ module PacketGen
       self
     end
 
+    # Insert a header in packet
+    # @param [Header] prev header after which insert new one
+    # @param [String] protocol protocol to insert
+    # @param [Hash] options protocol specific options
+    # @return [self]
+    # @raise [ArgumentError] unknown protocol
+    def insert(prev, protocol, options={})
+      klass = check_protocol(protocol)
+
+      nxt = prev.body
+      header = klass.new(options)
+      add_header header, previous_header: prev
+      idx = @headers.index(prev) + 1
+      @headers[idx, 0] = header
+      header[:body] = nxt
+      self
+    end
+
     # Check if a protocol header is embedded in packet
     # @return [Boolean]
     # @raise [ArgumentError] unknown protocol

data/lib/packetgen/types/array.rb

@@ -46,6 +46,7 @@ module PacketGen
           obj = klass.new.read(str)
           self.push obj
           str.slice!(0, obj.sz)
+          break if @counter and self.size == @counter.to_i
         end
         self
       end

data/lib/packetgen/types/string.rb

@@ -26,19 +26,20 @@ module PacketGen
       # @return [String] self
       def read(str)
         s = str.to_s
-        s = case @length_from
-            when Types::Int
-              s[0, @length_from.to_i]
-            when Proc
-              s[0, @length_from.call]
-            else
-              if @static_length.is_a? Integer
-                s[0, @static_length]
-              else
-                s
-              end
-            end
-        self.replace s
+        str_end = case @length_from
+                  when Types::Int
+                    str_end = @length_from.to_i
+                  when Proc
+                    str_end = @length_from.call
+                  else
+                    if @static_length.is_a? Integer
+                      str_end = @static_length
+                    else
+                      str_end = s.size
+                    end
+                  end
+        str_end = 0 if str_end < 0
+        self.replace(s[0, str_end])
         self
       end
 

data/lib/packetgen/version.rb

@@ -8,5 +8,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
@@ -185,6 +185,11 @@ files:
 - lib/packetgen/header/http/response.rb
 - lib/packetgen/header/icmp.rb
 - lib/packetgen/header/icmpv6.rb
+- lib/packetgen/header/igmp.rb
+- lib/packetgen/header/igmpv3.rb
+- lib/packetgen/header/igmpv3/group_record.rb
+- lib/packetgen/header/igmpv3/mq.rb
+- lib/packetgen/header/igmpv3/mr.rb
 - lib/packetgen/header/ike.rb
 - lib/packetgen/header/ike/auth.rb
 - lib/packetgen/header/ike/cert.rb
@@ -199,8 +204,19 @@ files:
 - lib/packetgen/header/ike/ts.rb
 - lib/packetgen/header/ike/vendor_id.rb
 - lib/packetgen/header/ip.rb
+- lib/packetgen/header/ip/addr.rb
+- lib/packetgen/header/ip/option.rb
+- lib/packetgen/header/ip/options.rb
 - lib/packetgen/header/ipv6.rb
+- lib/packetgen/header/ipv6/addr.rb
+- lib/packetgen/header/ipv6/extension.rb
+- lib/packetgen/header/ipv6/hop_by_hop.rb
 - lib/packetgen/header/llc.rb
+- lib/packetgen/header/mld.rb
+- lib/packetgen/header/mldv2.rb
+- lib/packetgen/header/mldv2/mcast_address_record.rb
+- lib/packetgen/header/mldv2/mlq.rb
+- lib/packetgen/header/mldv2/mlr.rb
 - lib/packetgen/header/snmp.rb
 - lib/packetgen/header/tcp.rb
 - lib/packetgen/header/tcp/option.rb