packetgen 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8959dbe60df80490d1ac31eaf40b05a206860bf6bed306997a66ca9c77dfb0b
-  data.tar.gz: 4615a1084f86e4b0ab216b3766dbde7d1b0b2b1e3c2e6b0d2e1a63aba1ff7bd6
+  metadata.gz: 6297501a0b2bbf2242e1481e52183c961d694306611cc7b61db46aaac59cb399
+  data.tar.gz: b9af651662460d50c7ea93030f171469d5efbc85759df27e6fa25d6870f6f5b8
 SHA512:
-  metadata.gz: 636f0dcea926b57cb7ec7a824744dfbcab9c6ddbb7f6749d8fda8f63fec410d20dcf199f362ae63878104725e94c7075d17f94b3f0dc8458b3d975e9521343da
-  data.tar.gz: 50e679400b1f882fbe2d3bc9e3ba5e01bb24dbe4a83b3372b999cbe0d1565703a7fc6afc08c437900e23b92c549c46ad422e3e76140254034c8840ba3a8ecb2e
+  metadata.gz: b1dea6fa78201583d40f94439943a217deeea8fd6b7485a6fd0a748c802fd6f0d3f25b82e7dcf24e525dd93634a111ae49c4437fde73b6e51ab4d37070346dcb
+  data.tar.gz: ca4b7bd3596d9e50ab6cc9d3bbcaeb9127544509badb2371eab71466cbe85efdfe4060ccb072c1724bf1240c427fc27ab4ace581250fdb79d1c0c5bf5d7f32ed

data/README.md

@@ -1,6 +1,5 @@
 
 [![Gem Version](https://badge.fury.io/rb/packetgen.svg)](https://badge.fury.io/rb/packetgen)
-[![Build Status](https://travis-ci.org/sdaubert/packetgen.svg?branch=master)](https://travis-ci.org/sdaubert/packetgen)
 
 # PacketGen
 

data/lib/packetgen/types/cstring.rb

@@ -17,8 +17,9 @@ module PacketGen
       extend Forwardable
       include Fieldable
 
-      def_delegators :@string, :[], :length, :size, :inspect, :==, :<<,
-                     :unpack, :force_encoding, :encoding, :index, :empty?
+      def_delegators :@string, :[], :length, :size, :inspect, :==,
+                     :unpack, :force_encoding, :encoding, :index, :empty?,
+                     :encode, :slice, :slice!
 
       # @return [::String]
       attr_reader :string
@@ -28,7 +29,7 @@ module PacketGen
       # @param [Hash] options
       # @option options [Integer] :static_length set a static length for this string
       def initialize(options={})
-        register_internal_string ''
+        register_internal_string(+'')
         @static_length = options[:static_length]
       end
 
@@ -37,9 +38,8 @@ module PacketGen
       def read(str)
         s = str.to_s
         s = s[0, static_length] if static_length?
-        idx = s.index(0.chr)
-        s = s[0, idx] unless idx.nil?
         register_internal_string s
+        remove_null_character
         self
       end
 
@@ -55,6 +55,15 @@ module PacketGen
         PacketGen.force_binary(s)
       end
 
+      # Append the given string to CString
+      # @param [#to_s] str
+      # @return [self]
+      def <<(str)
+        @string << str.to_s
+        remove_null_character
+        self
+      end
+
       # @return [Integer]
       def sz
         if static_length?
@@ -80,8 +89,7 @@ module PacketGen
 
       # @return [String]
       def to_human
-        idx = self.index(+"\x00".encode(self.encoding)) || self.sz
-        self[0, idx]
+        string
       end
 
       private
@@ -90,6 +98,11 @@ module PacketGen
         @string = str
         PacketGen.force_binary(@string)
       end
+
+      def remove_null_character
+        idx = string.index(0.chr)
+        register_internal_string(string[0, idx]) unless idx.nil?
+      end
     end
   end
 end

data/lib/packetgen/types/string.rb

@@ -18,8 +18,9 @@ module PacketGen
       include Fieldable
       include LengthFrom
 
-      def_delegators :@string, :[], :to_s, :length, :size, :inspect, :==, :<<,
-                     :unpack, :force_encoding, :encoding, :index, :empty?
+      def_delegators :@string, :[], :to_s, :length, :size, :inspect, :==,
+                     :unpack, :force_encoding, :encoding, :index, :empty?,
+                     :encode, :slice, :slice!, :[]=
 
       # @return [::String]
       attr_reader :string
@@ -31,11 +32,15 @@ module PacketGen
       #   takes length when reading
       # @option options [Integer] :static_length set a static length for this string
       def initialize(options={})
-        register_internal_string ''
+        register_internal_string(+'')
         initialize_length_from(options)
         @static_length = options[:static_length]
       end
 
+      def initialize_copy(_orig)
+        @string = @string.dup
+      end
+
       # @param [::String] str
       # @return [String] self
       def read(str)
@@ -68,6 +73,14 @@ module PacketGen
         inspect
       end
 
+      # Append the given string to String
+      # @param [#to_s] str
+      # @return [self]
+      def <<(str)
+        @string << str.to_s
+        self
+      end
+
       alias sz length
       alias to_human to_s
       alias from_human read

data/lib/packetgen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interfacez