packetgen-plugin-smb 0.6.3 → 0.7.0

data/lib/packetgen/plugin/ntlm.rb

@@ -8,7 +8,7 @@
 module PacketGen::Plugin
   # Base class for NTLM authentication protocol.
   # @author Sylvain Daubert
-  class NTLM < PacketGen::Types::Fields
+  class NTLM < BinStruct::Struct
     # NTLM message types
     TYPES = {
       'negotiate' => 1,
@@ -26,16 +26,16 @@ module PacketGen::Plugin
     # @!attribute signature
     #  8-byte NTLM signature
     #  @return [String]
-    define_field :signature, PacketGen::Types::String, static_length: 8, default: SIGNATURE
+    define_attr :signature, BinStruct::String, static_length: 8, default: SIGNATURE
     # @!attribute type
     #  4-byte message type
     #  @return [Integer]
-    define_field :type, PacketGen::Types::Int32leEnum, enum: TYPES
+    define_attr :type, BinStruct::Int32leEnum, enum: TYPES
     # @!attribute payload
     #  @return [String]
-    define_field :payload, PacketGen::Types::String
+    define_attr :payload, BinStruct::String
 
-    class <<self
+    class << self
       # @api private
       # Return fields defined in payload one.
       # @return [Hash]
@@ -55,16 +55,15 @@ module PacketGen::Plugin
 
       # Define a flags field.
       # @return [void]
-      def define_negotiate_flags
-        define_field_before :payload, :flags, PacketGen::Types::Int32le
-        define_bit_fields_on :flags, :flags_w, :flags_v, :flags_u, :flags_r13, 3,
-                             :flags_t, :flags_r4, :flags_s, :flags_r,
-                             :flags_r5, :flags_q, :flags_p, :flags_r6,
-                             :flags_o, :flags_n, :flags_m, :flags_r7,
-                             :flags_l, :flags_k, :flags_j, :flags_r8,
-                             :flags_h, :flags_r9, :flags_g, :flags_f,
-                             :flags_e, :flags_d, :flags_r10, :flags_c,
-                             :flags_b, :flags_a
+      def define_negotiate_flags # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        define_bit_attr_before :payload, :flags, endian: :little, flags_w: 1, flags_v: 1, flags_u: 1, flags_r13: 3,
+                                                 flags_t: 1, flags_r4: 1, flags_s: 1, flags_r: 1,
+                                                 flags_r5: 1, flags_q: 1, flags_p: 1, flags_r6: 1,
+                                                 flags_o: 1, flags_n: 1, flags_m: 1, flags_r7: 1,
+                                                 flags_l: 1, flags_k: 1, flags_j: 1, flags_r8: 1,
+                                                 flags_h: 1, flags_r9: 1, flags_g: 1, flags_f: 1,
+                                                 flags_e: 1, flags_d: 1, flags_r10: 1, flags_c: 1,
+                                                 flags_b: 1, flags_a: 1
         alias_method :nego56?, :flags_w?
         alias_method :key_exch?, :flags_v?
         alias_method :nego128?, :flags_u?
@@ -93,7 +92,7 @@ module PacketGen::Plugin
         class_eval do
           def flags_a=(value)
             self.old_flags_a = value
-            self.class.payload_fields.each do |name, _|
+            self.class.payload_fields.each_key do |name|
               attr = send(name)
               attr.unicode = value if attr.respond_to?(:unicode=)
             end
@@ -118,9 +117,9 @@ module PacketGen::Plugin
         @payload_fields ||= {}
         @payload_fields[name] = [type, options]
 
-        define_field_before :payload, :"#{name}_len", PacketGen::Types::Int16le
-        define_field_before :payload, :"#{name}_maxlen", PacketGen::Types::Int16le
-        define_field_before :payload, :"#{name}_offset", PacketGen::Types::Int32le
+        define_attr_before :payload, :"#{name}_len", BinStruct::Int16le
+        define_attr_before :payload, :"#{name}_maxlen", BinStruct::Int16le
+        define_attr_before :payload, :"#{name}_offset", BinStruct::Int32le
 
         attr_accessor name
       end
@@ -146,7 +145,7 @@ module PacketGen::Plugin
     # Populate object from a binary string
     # @param [String] str
     # @return [self]
-    def read(str)
+    def read(str) # rubocop:disable Metrics/AbcSize
       super
       return self if self.class.payload_fields.nil?
 
@@ -174,7 +173,7 @@ module PacketGen::Plugin
       return self if self.class.payload_fields.nil?
 
       previous_len = 0
-      self.class.payload_fields.each do |name, _type_and_opt|
+      self.class.payload_fields.each_key do |name|
         send(:"#{name}_len=", 0)
         send(:"#{name}_offset=", offset_of(:payload) + previous_len)
 
@@ -194,7 +193,7 @@ module PacketGen::Plugin
       s = super
       return s if self.class.payload_fields.nil?
 
-      self.class.payload_fields.each do |name, _type_and_opt|
+      self.class.payload_fields.each_key do |name|
         attr = send(name)
         attr.unicode = unicode? if attr.respond_to?(:unicode=)
         s << attr.to_s unless attr.nil? || send("#{name}_len").zero?

data/lib/packetgen/plugin/smb/blocks.rb

@@ -12,28 +12,28 @@ module PacketGen::Plugin
     # {Blocks} handles parameter block and data block. Parameter block is
     # composed of:
     # * a 8-bit {#word_count} field,
-    # * a {#words} field, an array of +PacketGen::Types::Int16le+.
+    # * a {#words} field, an array of +BinStruct::Int16le+.
     # Data block is composed of:
     # * a little endian 16-bit {#byte_count} field,
-    # * a {#bytes} field, an array of +PacketGen::Types::Int8+.
+    # * a {#bytes} field, an array of +BinStruct::Int8+.
     # @author Sylvain Daubert
     class Blocks < PacketGen::Header::Base
       # @!attribute word_count
       #  The size, in 2-byte words, of the {#words} field.
       #  @return [Integer]
-      define_field :word_count, PacketGen::Types::Int8
+      define_attr :word_count, BinStruct::Int8
       # @!attribute words
       #  The message-specific parameters structure.
-      #  @return [PacketGen::Types::ArrayOfInt16le]
-      define_field :words, PacketGen::Types::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:word_count]) }
+      #  @return [BinStruct::ArrayOfInt16le]
+      define_attr :words, BinStruct::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:word_count]) }
       # @!attribute byte_count
       #  The size, in bytes, of the {#bytes} field.
       #  @return [Integer]
-      define_field :byte_count, PacketGen::Types::Int16le
+      define_attr :byte_count, BinStruct::Int16le
       # @!attribute bytes
       #  The message-specific data structure.
-      #  @return [PacketGen::Types::ArrayOfInt8]
-      define_field :bytes, PacketGen::Types::ArrayOfInt8, builder: ->(h, t) { t.new(counter: h[:byte_count]) }
+      #  @return [BinStruct::ArrayOfInt8]
+      define_attr :bytes, BinStruct::ArrayOfInt8, builder: ->(h, t) { t.new(counter: h[:byte_count]) }
 
       # Give protocol name for this class
       # @return [String]

data/lib/packetgen/plugin/smb/browser/domain_announcement.rb

@@ -14,7 +14,7 @@ module PacketGen::Plugin
       # announce the machine group it serves.
       # @author Sylvain Daubert
       class DomainAnnouncement < HostAnnouncement
-        update_field :opcode, default: 12
+        update_attr :opcode, default: 12
 
         alias browser_conf_ver_maj os_ver_maj
         alias browser_conf_ver_min os_ver_min

data/lib/packetgen/plugin/smb/browser/host_announcement.rb

@@ -22,50 +22,50 @@ module PacketGen::Plugin
           @protocol_name = "SMB::Browser::#{basename}"
         end
 
-        remove_field :body
-        update_field :opcode, default: 1
+        remove_attr :body
+        update_attr :opcode, default: 1
         # @!attribute update_count
         #  8-bit integer. Not used. Should be 0
         #  @return [Integer]
-        define_field :update_count, PacketGen::Types::Int8, default: 0
+        define_attr :update_count, BinStruct::Int8, default: 0
         # @!attribute periodicity
         #  32-bit integer that must be the announcement frequency of the
         #  server in milliseconds.
         # @return [Integer]
-        define_field :periodicity, PacketGen::Types::Int32le
+        define_attr :periodicity, BinStruct::Int32le
         # @!attribute server_name
         #  Null-terminated ASCII string of 16-byte length. Used to identify
         #  server.
         #  @return [String]
-        define_field :server_name, PacketGen::Types::CString, static_length: 16
+        define_attr :server_name, BinStruct::CString, static_length: 16
         # @!attribute os_ver_maj
         #  8-bit integer indicating the OS major version number
         #  @return [Integer]
-        define_field :os_ver_maj, PacketGen::Types::Int8
+        define_attr :os_ver_maj, BinStruct::Int8
         # @!attribute os_ver_min
         #  8-bit integer indicating the OS minor version number
         #  @return [Integer]
-        define_field :os_ver_min, PacketGen::Types::Int8
+        define_attr :os_ver_min, BinStruct::Int8
         # @!attribute server_type
         #  32-bit integer indicating the type of the server
         #  @return [Integer]
-        define_field :server_type, PacketGen::Types::Int32le
+        define_attr :server_type, BinStruct::Int32le
         # @!attribute browser_ver_maj
         #  8-bit Browser protocol major version number. Should be 15.
         #  @return [Integer]
-        define_field :browser_ver_maj, PacketGen::Types::Int8, default: 15
+        define_attr :browser_ver_maj, BinStruct::Int8, default: 15
         # @!attribute browser_ver_min
         #  8-bit Browser protocol minor version number. Should be 1.
         #  @return [Integer]
-        define_field :browser_ver_min, PacketGen::Types::Int8, default: 1
+        define_attr :browser_ver_min, BinStruct::Int8, default: 1
         # @!attribute signature
         #  16-bit sinature integer. Should be 0xAA55.
         #  @return [Integer]
-        define_field :signature, PacketGen::Types::Int16le, default: 0xaa55
+        define_attr :signature, BinStruct::Int16le, default: 0xaa55
         # @!attribute comment
         #  Null-terminated ASCII string.
         #  @return [String]
-        define_field :comment, PacketGen::Types::CString
+        define_attr :comment, BinStruct::CString
       end
       PacketGen::Header.add_class HostAnnouncement
       SMB::Trans::Request.bind HostAnnouncement, name: '\\MAILSLOT\\BROWSE', body: ->(v) { v[0] == OPCODES['HostAnnouncement'] }

data/lib/packetgen/plugin/smb/browser/local_master_announcement.rb

@@ -14,7 +14,7 @@ module PacketGen::Plugin
       # advertise its presence.
       # @author Sylvain Daubert
       class LocalMasterAnnouncement < HostAnnouncement
-        update_field :opcode, default: 15
+        update_attr :opcode, default: 15
       end
       PacketGen::Header.add_class LocalMasterAnnouncement
       SMB::Trans::Request.bind LocalMasterAnnouncement, name: '\\MAILSLOT\\BROWSE', body: ->(v) { v[0] == OPCODES['LocalMasterAnnouncement'] }

data/lib/packetgen/plugin/smb/browser.rb

@@ -33,10 +33,10 @@ module PacketGen::Plugin
       # @!attribute opcode
       #  8-bit opcode
       #  @return [Integer]
-      define_field :opcode, PacketGen::Types::Int8Enum, enum: OPCODES
+      define_attr :opcode, BinStruct::Int8Enum, enum: OPCODES
       # @!attribute body
       #  @return [String]
-      define_field :body, PacketGen::Types::String
+      define_attr :body, BinStruct::String
 
       alias old_read read
       private :old_read
@@ -46,10 +46,10 @@ module PacketGen::Plugin
       # @return [Browser] may return a subclass object if a more specific class
       #   may be determined
       def read(str)
-        if self.class == Browser
+        if self.instance_of?(Browser)
           return self if str.nil?
 
-          PacketGen.force_binary str
+          str = str.b
           self[:opcode].read str[0]
 
           opcode_klass = Browser.const_get(self[:opcode].to_human) if Browser.const_defined?(self[:opcode].to_human)
@@ -71,7 +71,7 @@ module PacketGen::Plugin
       def added_to_packet(packet)
         return if packet.respond_to? :smb_browser
 
-        packet.instance_eval("def smb_browser(arg=nil); header(#{self.class}, arg); end")
+        packet.instance_eval("def smb_browser(arg=nil); header(#{self.class}, arg); end") # def smb_browser(arg=nil); header(Browser, arg); end
       end
 
       private

data/lib/packetgen/plugin/smb/close/request.rb

@@ -16,11 +16,11 @@ module PacketGen::Plugin
         #  The size, in 2-byte words, of the SMB command parameters. It should
         #  be +3+.
         #  @return [Integer]
-        define_field :word_count, PacketGen::Types::Int8, default: 3
+        define_attr :word_count, BinStruct::Int8, default: 3
         # @!attribute fid
         #  16-bit FID of the object to close
         #  @return [Integer]
-        define_field :fid, PacketGen::Types::Int16le, default: 3
+        define_attr :fid, BinStruct::Int16le, default: 3
         # @!attribute last_modified
         #  32-bit time value encoded as the number of seconds since January
         #  1, 1970 00:00:00.0. The client can request that the last modification
@@ -28,11 +28,11 @@ module PacketGen::Plugin
         #  or +0xFFFFFFFF+ results in the server not updating the last modification
         #  time.
         #  @return [Integer]
-        define_field :last_modified, PacketGen::Types::Int32le
+        define_attr :last_modified, BinStruct::Int32le
         # @!attribute byte_count
         #  Should be 0.
         #  @return [Integer]
-        define_field :byte_count, PacketGen::Types::Int16le, default: 0
+        define_attr :byte_count, BinStruct::Int16le, default: 0
 
         # Give protocol name for this class
         # @return [String]

data/lib/packetgen/plugin/smb/close/response.rb

@@ -18,12 +18,12 @@ module PacketGen::Plugin
         #  The size, in 2-byte words, of the SMB command parameters. It should
         #  be +0+.
         #  @return [Integer]
-        define_field :word_count, PacketGen::Types::Int8, default: 3
-        define_field :last_modified, PacketGen::Types::Int32le
+        define_attr :word_count, BinStruct::Int8, default: 3
+        define_attr :last_modified, BinStruct::Int32le
         # @!attribute byte_count
         #  Should be 0.
         #  @return [Integer]
-        define_field :byte_count, PacketGen::Types::Int16le, default: 0
+        define_attr :byte_count, BinStruct::Int16le, default: 0
 
         # Give protocol name for this class
         # @return [String]

data/lib/packetgen/plugin/smb/filetime.rb

@@ -10,7 +10,7 @@ module PacketGen::Plugin
     # SMB FILETIME.
     # @author Sylvain Daubert
     class Filetime
-      include PacketGen::Types::Fieldable
+      include BinStruct::Structable
 
       # Base time for SMB FILETIME.
       # This value also indicate no time.
@@ -35,11 +35,9 @@ module PacketGen::Plugin
       # @option options [Time] :time
       # @raise [ArgumentError] if +:time+ and +:filetime+ are both given.
       def initialize(options={})
-        if (options.keys & %i[time filetime]).size == 2
-          raise ArgumentError, ':time and :filetime options are both given'
-        end
+        raise ArgumentError, ':time and :filetime options are both given' if options.key?(:time) && options.key?(:filetime)
 
-        @int = PacketGen::Types::SInt64le.new(options[:filetime])
+        @int = BinStruct::SInt64le.new(value: options[:filetime])
         if options[:time]
           @time = options[:time].getgm
           @int.value = time2filetime
@@ -123,7 +121,7 @@ module PacketGen::Plugin
       def time2filetime
         # Time#to_f then #to_r is more precise than Time#to_r
         # (ie Time#to_r sometimes does a rounding error).
-        (@time.to_i - NO_TIME.to_i) * ONE_SEC + ((@time.to_f.to_r * ONE_SEC) % ONE_SEC).to_i
+        ((@time.to_i - NO_TIME.to_i) * ONE_SEC) + ((@time.to_f.to_r * ONE_SEC) % ONE_SEC).to_i
       end
     end
   end

data/lib/packetgen/plugin/smb/negotiate/dialect.rb

@@ -12,16 +12,16 @@ module PacketGen::Plugin
       # * a 8-bit {#format} field, which should be set to 0x02,
       # * a null-terminated string identifying a SMB dialect.
       # @author Sylvain Daubert
-      class Dialect < PacketGen::Types::Fields
+      class Dialect < BinStruct::Struct
         # @!attribute format
         #  8-bit format. Should be +2+ to indicate a null-terminated string for
         #  {#dialect} field.
         #  @return [Integer]
-        define_field :format, PacketGen::Types::Int8, default: 2
+        define_attr :format, BinStruct::Int8, default: 2
         # @!attribute dialect
         #  Null-terminated string identifying a SMB dialect.
         #  @return [String]
-        define_field :dialect,PacketGen::Types::CString
+        define_attr :dialect, BinStruct::CString
 
         # @return [String]
         def to_human
@@ -29,9 +29,9 @@ module PacketGen::Plugin
         end
       end
 
-      # Specialized {PacketGen::Types::Array} to embed {Dialect Dialects}.
+      # Specialized {BinStruct::Array} to embed {Dialect Dialects}.
       # @author Sylvain Daubert
-      class ArrayOfDialect < PacketGen::Types::Array
+      class ArrayOfDialect < BinStruct::Array
         set_of Dialect
       end
     end

data/lib/packetgen/plugin/smb/negotiate/request.rb

@@ -18,13 +18,13 @@ module PacketGen::Plugin
         #  The size, in 2-byte words, of the SMB command parameters. It should
         #  be +0+ setup_count+.
         #  @return [Integer]
-        define_field :word_count, PacketGen::Types::Int8, default: 0
+        define_attr :word_count, BinStruct::Int8, default: 0
         # @!attribute byte_count
         #  @return [Integer]
-        define_field :byte_count, PacketGen::Types::Int16le
+        define_attr :byte_count, BinStruct::Int16le
         # @!attribute dialects
         #  @return [ArrayOfDialect]
-        define_field :dialects, ArrayOfDialect
+        define_attr :dialects, ArrayOfDialect
 
         def self.protocol_name
           'SMB::Negotiate::Request'
@@ -32,4 +32,4 @@ module PacketGen::Plugin
       end
     end
   end
-end
+end

data/lib/packetgen/plugin/smb/ntcreateandx/request.rb

@@ -24,7 +24,7 @@ module PacketGen::Plugin
       #   * {#root_dir_fid} (+Int32le+),
       #   * {#access_mask} (+Int32le+),
       #   * {#alloc_size} (+Int64le+),
-      #   * {#attributes} (+Int32le+),
+      #   * {#fattributes} (+Int32le+),
       #   * {#share_access} (+Int32le+),
       #   * {#disposition} (+Int32le+),
       #   * {#options} (+Int32le+),
@@ -51,93 +51,93 @@ module PacketGen::Plugin
         # @!attribute word_count
         #  The size, in 2-byte words, of the SMB parameters.
         #  @return [Integer]
-        define_field :word_count, PacketGen::Types::Int8, default: 24
+        define_attr :word_count, BinStruct::Int8, default: 24
         # @!attribute and_xcommand
         #  8-bit command code for the next SMB command in the
         #  packet.
         #  @return [Integer]
-        define_field :and_xcommand, PacketGen::Types::Int8Enum, enum: COMMANDS
+        define_attr :and_xcommand, BinStruct::Int8Enum, enum: COMMANDS
         # @!attribute rsv1
         #  8-bit reserved field.
         #  @return [Integer]
-        define_field :rsv1, PacketGen::Types::Int8, default: 0
+        define_attr :rsv1, BinStruct::Int8, default: 0
         # @!attribute and_xoffset
         #  16-bit offset from the start of SMB header to the start of
         #  the  {#word_count} field in the next SMB command in this
         #  packet.
         #  @return [Integer]
-        define_field :and_xoffset, PacketGen::Types::Int16le, default: 0
+        define_attr :and_xoffset, BinStruct::Int16le, default: 0
         # @!attribute rsv2
         #  8-bit reserved field.
         #  @return [Integer]
-        define_field :rsv2, PacketGen::Types::Int8, default: 0
+        define_attr :rsv2, BinStruct::Int8, default: 0
         # @!attribute filename_len
         #  16-bit length of the {#filename} field.
         #  @return [Integer]
-        define_field :filename_len, PacketGen::Types::Int16le
+        define_attr :filename_len, BinStruct::Int16le
         alias filename_length filename_len
         alias filename_length= filename_len=
         # @!attribute flags
         #  32-bit flags word
         #  @return [Integer]
-        define_field :flags, PacketGen::Types::Int32le
+        define_attr :flags, BinStruct::Int32le
         # @!attribute root_dir_fid
         #  32-bit file ID of an opened root directory.
         #  @return [Integer]
-        define_field :root_dir_fid, PacketGen::Types::Int32le
+        define_attr :root_dir_fid, BinStruct::Int32le
         # @!attribute access_mask
         #  32-bit flags that indicate access rights.
         #  @return [Integer]
-        define_field :access_mask, PacketGen::Types::Int32le
+        define_attr :access_mask, BinStruct::Int32le
         # @!attribute alloc_size
         #  64-bit initial allocation size.
         #  @return [Integer]
-        define_field :alloc_size, PacketGen::Types::Int64le
-        # @!attribute attributes
+        define_attr :alloc_size, BinStruct::Int64le
+        # @!attribute fattributes
         #  32-bit extended file attributes.
         #  @return [Integer]
-        define_field :attributes, PacketGen::Types::Int32le
+        define_attr :fattributes, BinStruct::Int32le
         # @!attribute share_access
         #  32-bit field that specifies how the file should be shared.
         #  @return [Integer]
-        define_field :share_access, PacketGen::Types::Int32le
+        define_attr :share_access, BinStruct::Int32le
         # @!attribute disposition
         #  32-bit value that represents the action to take if the file
         #  already exists or if the file is a new file and does not already
         #  exist.
         #  @return [Integer]
-        define_field :disposition, PacketGen::Types::Int32le
+        define_attr :disposition, BinStruct::Int32le
         # @!attribute options
         #  32-bit field containing flag options to use if creating the file
         #  or the directory.
         #  @return [Integer]
-        define_field :options, PacketGen::Types::Int32le
+        define_attr :options, BinStruct::Int32le
         # @!attribute impersonation
         #  32-bit field specifying the impersonation level requested by
         #  the application.
         #  @return [Integer]
-        define_field :impersonation, PacketGen::Types::Int32le
+        define_attr :impersonation, BinStruct::Int32le
         # @!attribute sec_flags
         #  8-bit security flags.
-        define_field :sec_flags, PacketGen::Types::Int8
+        define_attr :sec_flags, BinStruct::Int8
         # @!attribute byte_count
         #  The size, in bytes, of the SMB data.
         #  @return [Integer]
-        define_field :byte_count, PacketGen::Types::Int16le
+        define_attr :byte_count, BinStruct::Int16le
         # @!attribute pad1
         #  Padding before {#filename} to align it on 16-bit boundary. Only present
         #  if {SMB#flags2_unicode?} is +true+.
         #  @return [Integer]
-        define_field :pad1, PacketGen::Types::Int8, optional: ->(h) { h&.packet&.smb&.flags2_unicode? }
+        define_attr :pad1, BinStruct::Int8, optional: ->(h) { h&.packet&.smb&.flags2_unicode? } # rubocop:disable Style/SafeNavigationChainLength
         # @!attribute filename
         #  A string that represents the fully qualified name of the file
         #  relative to the supplied TID
         # @return [String]
-        define_field :filename, SMB::String, builder: ->(h, t) { t.new(unicode: !h.packet || h.packet.smb.flags2_unicode?) }
+        define_attr :filename, SMB::String, builder: ->(h, t) { t.new(unicode: !h.packet || h.packet.smb.flags2_unicode?) }
         # @!attribute extra_bytes
         #  @return [Integer]
-        define_field :extra_bytes, PacketGen::Types::String,
-                     builder: ->(h, t) { t.new(length_from: -> { h.byte_count - (h.present?(:pad1) ? 1 : 0) - h[:filename].sz }) }
+        define_attr :extra_bytes, BinStruct::String,
+                    builder: ->(h, t) { t.new(length_from: -> { h.byte_count - (h.present?(:pad1) ? 1 : 0) - h[:filename].sz }) }
 
         # Give protocol name for this class
         # @return [String]

data/lib/packetgen/plugin/smb/ntcreateandx/response.rb

@@ -23,81 +23,81 @@ module PacketGen::Plugin
         # @!attribute word_count
         #  The size, in 2-byte words, of the SMB parameters.
         #  @return [Integer]
-        define_field :word_count, PacketGen::Types::Int8, default: 34
+        define_attr :word_count, BinStruct::Int8, default: 34
         # @!attribute and_xcommand
         #  8-bit command code for the next SMB command in the
         #  packet.
         #  @return [Integer]
-        define_field :and_xcommand, PacketGen::Types::Int8Enum, enum: Request::COMMANDS
+        define_attr :and_xcommand, BinStruct::Int8Enum, enum: Request::COMMANDS
         # @!attribute rsv1
         #  8-bit reserved field.
         #  @return [Integer]
-        define_field :rsv1, PacketGen::Types::Int8, default: 0
+        define_attr :rsv1, BinStruct::Int8, default: 0
         # @!attribute and_xoffset
         #  16-bit offset from the start of SMB header to the start of
         #  the  {#word_count} field in the next SMB command in this
         #  packet.
         #  @return [Integer]
-        define_field :and_xoffset, PacketGen::Types::Int16le, default: 0
+        define_attr :and_xoffset, BinStruct::Int16le, default: 0
         # @!attribute oplock_level
         #  8-bit OpLock level.
         #  @return [Integer]
-        define_field :oplock_level, PacketGen::Types::Int8Enum, enum: OP_LOCK_LEVELS
+        define_attr :oplock_level, BinStruct::Int8Enum, enum: OP_LOCK_LEVELS
         # @!attribute fid
         #  16-bit FID.
         #  @return [Integer]
-        define_field :fid, PacketGen::Types::Int16le
+        define_attr :fid, BinStruct::Int16le
         # @!attribute disposition
         #  32-bit value that represents the action to take if the file
         #  already exists or if the file is a new file and does not already
         #  exist.
         #  @return [Integer]
-        define_field :disposition, PacketGen::Types::Int32le
+        define_attr :disposition, BinStruct::Int32le
         # @!attribute create_time
         #  64-bit integer representing the time that the file was created.
         #  @return [Integer]
-        define_field :create_time, SMB::Filetime
+        define_attr :create_time, SMB::Filetime
         # @!attribute access_time
         #  64-bit integer representing the time that the file was last accessed.
         #  @return [Integer]
-        define_field :access_time, SMB::Filetime
+        define_attr :access_time, SMB::Filetime
         # @!attribute write_time
         #  64-bit integer representing the time that the file was last writen.
         #  @return [Integer]
-        define_field :write_time, SMB::Filetime
+        define_attr :write_time, SMB::Filetime
         # @!attribute change_time
         #  64-bit integer representing the time that the file was last changed.
         #  @return [Integer]
-        define_field :change_time, SMB::Filetime
-        # @!attribute attributes
+        define_attr :change_time, SMB::Filetime
+        # @!attribute fattributes
         #  32-bit extended file attributes.
         #  @return [Integer]
-        define_field :attributes, PacketGen::Types::Int32le
+        define_attr :fattributes, BinStruct::Int32le
         # @!attribute alloc_size
         #  64-bit integer representing the number of bytes allocated to the file.
         #  @return [Integer]
-        define_field :alloc_size, PacketGen::Types::Int64le
+        define_attr :alloc_size, BinStruct::Int64le
         # @!attribute end_of_file
         #  64-bit integer representing the end of file offset.
         #  @return [Integer]
-        define_field :end_of_file, PacketGen::Types::Int64le
+        define_attr :end_of_file, BinStruct::Int64le
         # @!attribute res_type
         #  16-bit file type.
         #  @return [Integer]
-        define_field :res_type, PacketGen::Types::Int16le
+        define_attr :res_type, BinStruct::Int16le
         # @!attribute pipe_status
         #  16-bit field that shows the status of the named pipe (if opened resource
         #  is a named pipe).
         #  @return [Integer]
-        define_field :pipe_status, PacketGen::Types::Int16le
+        define_attr :pipe_status, BinStruct::Int16le
         # @!attribute directory
         #  8-bit field indicating is the FID represents a directory.
         #  @return [Integer]
-        define_field :directory, PacketGen::Types::Int8
+        define_attr :directory, BinStruct::Int8
         # @!attribute byte_count
         #  The size, in bytes, of the SMB data. Should be zero.
         #  @return [Integer]
-        define_field :byte_count, PacketGen::Types::Int16le, default: 0
+        define_attr :byte_count, BinStruct::Int16le, default: 0
 
         # Give protocol name for this class
         # @return [String]
@@ -108,7 +108,7 @@ module PacketGen::Plugin
         # Say if FID is a directory
         # @return [Boolean]
         def directory?
-          self.directory > 0
+          self.directory.positive?
         end
 
         # @!method human_create_time
@@ -120,7 +120,7 @@ module PacketGen::Plugin
         # @!method human_change_time
         #  @return [String]
         %i[create access write change].each do |type|
-          class_eval "def human_#{type}_time; self[:#{type}_time].to_human; end"
+          class_eval "def human_#{type}_time; self[:#{type}_time].to_human; end" # def human_create_time; self[:create_time].to_human; end
         end
       end
     end

data/lib/packetgen/plugin/smb/string.rb

@@ -13,7 +13,7 @@ module PacketGen::Plugin
     # @author Sylvain Daubert
     class String
       extend Forwardable
-      include PacketGen::Types::Fieldable
+      include BinStruct::Structable
 
       def_delegators :@string, :[], :length, :size, :inspect, :==, :<<,
                      :unpack, :force_encoding, :encoding, :index, :empty?,