packetgen-plugin-smb 0.6.2 → 0.7.0

data/lib/packetgen/plugin/smb2/negotiate/context.rb

@@ -21,7 +21,7 @@ module PacketGen::Plugin
       #   |                              ...                              |
       #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       # @author Sylvain Daubert
-      class Context < PacketGen::Types::Fields
+      class Context < BinStruct::Struct
         # Known types
         TYPES = {
           'PREAUTH_INTEGRITY_CAP' => 1,
@@ -31,23 +31,23 @@ module PacketGen::Plugin
         # @!attribute type
         #  16-bit context type
         #  @return [Integer]
-        define_field :type, PacketGen::Types::Int16leEnum, enum: TYPES
+        define_attr :type, BinStruct::Int16leEnum, enum: TYPES
         # @!attribute data_length
         #  16-bit data length
         #  @return [Integer]
-        define_field :data_length, PacketGen::Types::Int16le
+        define_attr :data_length, BinStruct::Int16le
         # @!attribute reserved
         #  32-bit reserved field
         #  @return [Integer]
-        define_field :reserved, PacketGen::Types::Int32le
+        define_attr :reserved, BinStruct::Int32le
         # @!attribute data
         #  context data
         #  @return [String]
-        define_field :data, PacketGen::Types::String, builder: ->(h, t) { t.new(length_from: h[:data_length]) }
+        define_attr :data, BinStruct::String, builder: ->(h, t) { t.new(length_from: h[:data_length]) }
         # @!attribute pad
         #  Padding to align next context on a 8-byte offset
         #  @return [String]
-        define_field :pad, PacketGen::Types::String, builder: ->(h, t) { t.new(length_from: -> { 8 - (h.offset_of(:data) + h.data_length) % 8 }) }
+        define_attr :pad, BinStruct::String, builder: ->(h, t) { t.new(length_from: -> { 8 - ((h.offset_of(:data) + h.data_length) % 8) }) }
 
         # @private
         alias old_read read
@@ -74,45 +74,45 @@ module PacketGen::Plugin
 
       # Specialized {Context} for PREAUTH_INTEGRITY_CAP type.
       class PreauthIntegrityCap < Context
-        remove_field :data
+        remove_attr :data
         # @!attribute hash_alg_count
         #  16-bit number of hash algorithm in {#hash_alg}
         #  @return [Integer]
-        define_field_before :pad, :hash_alg_count, PacketGen::Types::Int16le
+        define_attr_before :pad, :hash_alg_count, BinStruct::Int16le
         # @!attribute salt_length
         #  16-bit length of {#salt} field, in bytes.
         #  @return [Integer]
-        define_field_before :pad, :salt_length, PacketGen::Types::Int16le
+        define_attr_before :pad, :salt_length, BinStruct::Int16le
         # @!attribute hash_alg
         #  Array of 16-bit integer IDs specifying the supported preauthentication
         #  hash algorithms
-        #  @return [PacketGen::Types::ArrayOfInt16le]
-        define_field_before :pad, :hash_alg, PacketGen::Types::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:hash_alg_count]) }
+        #  @return [BinStruct::ArrayOfInt16le]
+        define_attr_before :pad, :hash_alg, BinStruct::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:hash_alg_count]) }
         # @!attribute salt
         #  Salt value for hash
         #  @return [String]
-        define_field_before :pad, :salt, PacketGen::Types::String, builder: ->(h, t) { t.new(length_from: h[:salt_length]) }
-        update_field :pad, builder: ->(h, t) { t.new(length_from: -> { (8 - (h.offset_of(:salt) + h.salt_length) % 8) % 8 }) }
+        define_attr_before :pad, :salt, BinStruct::String, builder: ->(h, t) { t.new(length_from: h[:salt_length]) }
+        update_attr :pad, builder: ->(h, t) { t.new(length_from: -> { (8 - ((h.offset_of(:salt) + h.salt_length) % 8)) }) }
       end
 
       # Specialized {Context} for ENCRYPTION_CAP type.
       class EncryptionCap < Context
-        remove_field :data
+        remove_attr :data
         # @!attribute cipher_count
         #  16-bit number of cipher algorithm in {#ciphers}
         #  @return [Integer]
-        define_field_before :pad, :cipher_count, PacketGen::Types::Int16le
+        define_attr_before :pad, :cipher_count, BinStruct::Int16le
         # @!attribute ciphers
         #  Array of 16-bit integer IDs specifying the supported encryption
         #  algorithms
-        #  @return [PacketGen::Types::ArrayOfInt16le]
-        define_field_before :pad, :ciphers, PacketGen::Types::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:cipher_count]) }
-        update_field :pad, builder: ->(h, t) { t.new(length_from: -> { (8 - (h.offset_of(:cipher_count) + h[:cipher_count].sz) % 8) % 8 }) }
+        #  @return [BinStruct::ArrayOfInt16le]
+        define_attr_before :pad, :ciphers, BinStruct::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:cipher_count]) }
+        update_attr :pad, builder: ->(h, t) { t.new(length_from: -> { (8 - ((h.offset_of(:cipher_count) + h[:cipher_count].sz) % 8)) % 8 }) }
       end
 
       # Array of {Context}
       # @author Sylvain Daubert
-      class ArrayOfContext < PacketGen::Types::Array
+      class ArrayOfContext < BinStruct::Array
         set_of Context
 
         private

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

@@ -53,23 +53,22 @@ module PacketGen::Plugin
         # @!attribute structure_size
         #  16-bit negotiate request structure size. Should be 36.
         #  @return [Integer]
-        define_field :structure_size, PacketGen::Types::Int16le, default: 36
+        define_attr :structure_size, BinStruct::Int16le, default: 36
         # @!attribute dialect_count
         #  16-bit number of dialects that are contained in {#dialects}.
         #  @return [Integer]
-        define_field :dialect_count, PacketGen::Types::Int16le
+        define_attr :dialect_count, BinStruct::Int16le
         # @!attribute security_mode
         #  16-bit security mode field.
         #  @return [Integer]
-        define_field :security_mode, PacketGen::Types::Int16leEnum, enum: SECURITY_MODES
+        define_attr :security_mode, BinStruct::Int16leEnum, enum: SECURITY_MODES
         # @!attribute reserved
         #  16-bit reserved field.
         #  @return [Integer]
-        define_field :reserved, PacketGen::Types::Int16le
+        define_attr :reserved, BinStruct::Int16le
         # @!attribute capabilities
         #  32-bit capabilities field.
         #  @return [Integer]
-        define_field :capabilities, PacketGen::Types::Int32le
         # @!attribute cap_encryption
         #  Indicates if encryption is supported
         #  @return [Boolean]
@@ -91,28 +90,29 @@ module PacketGen::Plugin
         # @!attribute cap_dfs
         #  Indicates if Distributed File system (DFS) is supported
         #  @return [Boolean]
-        define_bit_fields_on :capabilities, :cap_rsv, 25, :cap_encryption, :cap_dir_leasing,
-                                            :cap_persistent_handles, :cap_multi_channel,
-                                            :cap_large_mtu, :cap_leasing, :cap_dfs
+        define_bit_attr :capabilities, endian: :little,
+                                       cap_rsv: 25, cap_encryption: 1, cap_dir_leasing: 1,
+                                       cap_persistent_handles: 1, cap_multi_channel: 1,
+                                       cap_large_mtu: 1, cap_leasing: 1, cap_dfs: 1
         # @!attribute client_guid
         #  @return []
-        define_field :client_guid, GUID
+        define_attr :client_guid, GUID
         # @!attribute context_offset
         #  Only for SMB3 dialect.
         #  @return [Integer]
-        define_field :context_offset, PacketGen::Types::Int32le
+        define_attr :context_offset, BinStruct::Int32le
         # @!attribute context_count
         #  Only for SMB3 dialect.
         #  @return [Integer]
-        define_field :context_count, PacketGen::Types::Int16le
+        define_attr :context_count, BinStruct::Int16le
         # @!attribute reserved2
         #  Only for SMB3 dialect.
         #  @return [Integer]
-        define_field :reserved2, PacketGen::Types::Int16le
+        define_attr :reserved2, BinStruct::Int16le
         # @!attribute dialects
         #  Array of 16-bit integers specifying the supported dialtec revisions.
-        #  @return [Array<PacketGen::Types::Int16le>]
-        define_field :dialects, PacketGen::Types::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:dialect_count]) }
+        #  @return [Array<BinStruct::Int16le>]
+        define_attr :dialects, BinStruct::ArrayOfInt16le, builder: ->(h, t) { t.new(counter: h[:dialect_count]) }
         # @!attribute pad
         #  Optional padding between the end of the {#dialects} array and the first negotiate
         #  context in {#context_list} so that the first negotiate context is 8-byte aligned.
@@ -122,7 +122,7 @@ module PacketGen::Plugin
         #  If {#dialects} contains the value 0x0311, then this field must contain an array
         #  of {Context}
         #  @return [ArrayOfContext]
-        define_field :context_list, ArrayOfContext, builder: ->(h, t) { t.new(counter: h[:context_count]) }
+        define_attr :context_list, ArrayOfContext, builder: ->(h, t) { t.new(counter: h[:context_count]) }
 
         # Protocol name
         # @return [String]
@@ -131,25 +131,18 @@ module PacketGen::Plugin
         end
 
         # @return [String]
-        def inspect
+        def inspect # rubocop:disable Metrics/AbcSize
           super do |attr|
             case attr
             when :capabilities
-              value = bits_on(attr).reject { |_, v| v > 1 }
-                                   .keys
-                                   .select { |b| send("#{b}?") }
-                                   .map(&:to_s)
+              value = bits_on(attr).select { |b| respond_to?("#{b}?") && send("#{b}?") }
+                                   .map { |v| v.to_s.delete_prefix('cap_') }
                                    .join(',')
-                                   .gsub!(/cap_/, '')
               value = '%-16s (0x%08x)' % [value, self[attr].to_i]
-              str = PacketGen::Inspect.shift_level
-              str << PacketGen::Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
-                                                     attr, value]
+              inspect_attr(attr, value)
             when :dialects
               list = self.dialects.map { |v| '%#x' % v.to_i }.join(',')
-              str = PacketGen::Inspect.shift_level
-              str << PacketGen::Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
-                                                     attr, list]
+              inspect_attr(attr, list)
             end
           end
         end
@@ -164,6 +157,13 @@ module PacketGen::Plugin
           self.context_offset = SMB2::HEADER_SIZE + offset_of(:context_list) unless context_list.empty?
           context_list.each { |ctx| ctx.calc_length if ctx.respond_to? :calc_length }
         end
+
+        private
+
+        def inspect_attr(attr, value)
+          str = PacketGen::Inspect.shift_level
+          str << (PacketGen::Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''), attr, value])
+        end
       end
     end
   end

data/lib/packetgen/plugin/smb2/negotiate/response.rb

@@ -61,26 +61,25 @@ module PacketGen::Plugin
         # @!attribute structure_size
         #  16-bit negotiate request structure size. Should be 65.
         #  @return [Integer]
-        define_field :structure_size, PacketGen::Types::Int16le, default: 65
+        define_attr :structure_size, BinStruct::Int16le, default: 65
         # @!attribute security_mode
         #  16-bit security mode field.
         #  @return [Integer]
-        define_field :security_mode, PacketGen::Types::Int16leEnum, enum: Negotiate::Request::SECURITY_MODES
+        define_attr :security_mode, BinStruct::Int16leEnum, enum: Negotiate::Request::SECURITY_MODES
         # @!attribute dialect
         #  16-bit prefered SMB2 protocol dialect number.
         #  @return [Integer]
-        define_field :dialect, PacketGen::Types::Int16le
+        define_attr :dialect, BinStruct::Int16le
         # @!attribute context_count
         #  Only for SMB3 dialect.
         #  @return [Integer]
-        define_field :context_count, PacketGen::Types::Int16le
+        define_attr :context_count, BinStruct::Int16le
         # @!attribute server_guid
         #  @return []
-        define_field :server_guid, GUID
+        define_attr :server_guid, GUID
         # @!attribute capabilities
         #  32-bit capabilities field.
         #  @return [Integer]
-        define_field :capabilities, PacketGen::Types::Int32le
         # @!attribute cap_encryption
         #  Indicates if encryption is supported
         #  @return [Boolean]
@@ -102,45 +101,46 @@ module PacketGen::Plugin
         # @!attribute cap_dfs
         #  Indicates if Distributed File system (DFS) is supported
         #  @return [Boolean]
-        define_bit_fields_on :capabilities, :cap_rsv, 25, :cap_encryption, :cap_dir_leasing,
-                                            :cap_persistent_handles, :cap_multi_channel,
-                                            :cap_large_mtu, :cap_leasing, :cap_dfs
+        define_bit_attr :capabilities, endian: :little,
+                                       cap_rsv: 25, cap_encryption: 1, cap_dir_leasing: 1,
+                                       cap_persistent_handles: 1, cap_multi_channel: 1,
+                                       cap_large_mtu: 1, cap_leasing: 1, cap_dfs: 1
         # @!attribute max_trans_size
         #  32-bit value indicating the maximum size of the buffer used for
         #  QUERY_INFO, QUERY_DIRECTORY, SET_INFO and CHANGE_NOTIFY operations.
         #  @return [Integer]
-        define_field :max_trans_size, PacketGen::Types::Int32le
+        define_attr :max_trans_size, BinStruct::Int32le
         # @!attribute max_read_size
         #  32-bit value indicating the maximum size of a READ request
         #  @return [Integer]
-        define_field :max_read_size, PacketGen::Types::Int32le
+        define_attr :max_read_size, BinStruct::Int32le
         # @!attribute max_write_size
         #  32-bit value indicating the maximum size of a WRITE request
         #  @return [Integer]
-        define_field :max_write_size, PacketGen::Types::Int32le
+        define_attr :max_write_size, BinStruct::Int32le
         # @!attribute system_time
         #  System time of the SMB2 server
         #  @return [SMB::Filetime]
-        define_field :system_time, SMB::Filetime
+        define_attr :system_time, SMB::Filetime
         # @!attribute start_time
         #  Start time of the SMB2 server
         #  @return [SMB::Filetime]
-        define_field :start_time, SMB::Filetime
+        define_attr :start_time, SMB::Filetime
         # @!attribute buffer_offset
         #  The offset, from the beginning of the SMB2 header of the {#buffer}.
         #  @return [Integer]
-        define_field :buffer_offset, PacketGen::Types::Int16le
+        define_attr :buffer_offset, BinStruct::Int16le
         # @!attribute buffer_length
         #  The length of the {#buffer} field.
         #  @return [Integer]
-        define_field :buffer_length, PacketGen::Types::Int16le
+        define_attr :buffer_length, BinStruct::Int16le
         # @!attribute context_offset
         #  Only for SMB3 dialect.
         #  @return [Integer]
-        define_field :context_offset, PacketGen::Types::Int32le
+        define_attr :context_offset, BinStruct::Int32le
         # @!attribute buffer
         #  @return [GSSAPI]
-        define_field :buffer, GSSAPI, token: :init, optional: ->(h) { h.buffer_offset.positive? }
+        define_attr :buffer, GSSAPI, token: :init, optional: ->(h) { h.buffer_offset.positive? }
         # @!attribute pad
         #  Optional padding between the end of the {#buffer} field and the first negotiate
         #  context in {#context_list} so that the first negotiate context is 8-byte aligned
@@ -151,7 +151,7 @@ module PacketGen::Plugin
         #  If {#dialect} has the value 0x0311, then this field must contain an array
         #  of {Context}
         #  @return [ArrayOfContext]
-        define_field :context_list, ArrayOfContext, builder: ->(h, t) { t.new(counter: h[:context_count]) }
+        define_attr :context_list, ArrayOfContext, builder: ->(h, t) { t.new(counter: h[:context_count]) }
 
         # Protocol name
         # @return [String]
@@ -164,16 +164,13 @@ module PacketGen::Plugin
           super do |attr|
             next unless attr == :capabilities
 
-            value = bits_on(attr).reject { |_, v| v > 1 }
-                                 .keys
-                                 .select { |b| send("#{b}?") }
+            value = bits_on(attr).select { |b| respond_to?("#{b}?") && send("#{b}?") }
                                  .map(&:to_s)
                                  .join(',')
-                                 .gsub!(/cap_/, '')
+                                 .gsub!('cap_', '')
             value = '%-16s (0x%08x)' % [value, self[attr].to_i]
             str = PacketGen::Inspect.shift_level
-            str << PacketGen::Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
-                                                   attr, value]
+            str << (PacketGen::Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''), attr, value])
           end
         end
 
@@ -182,15 +179,23 @@ module PacketGen::Plugin
         # Also calculate lengths in {Context contexts}.
         # @return [void]
         def calc_length
-          self[:pad].read SMB2::MAX_PADDING
+          self[:pad].read(SMB2::MAX_PADDING)
+          calc_buffer_fields
+          calc_context_fields
+        end
+
+        private
 
+        def calc_buffer_fields
           self.buffer_length = self[:buffer].sz
           self.buffer_offset = if self.buffer_length.zero?
                                  0
                                else
                                  SMB2::HEADER_SIZE + offset_of(:buffer)
                                end
+        end
 
+        def calc_context_fields
           self.context_offset = 0
           self.context_offset = SMB2::HEADER_SIZE + offset_of(:context_list) unless context_list.empty?
           context_list.each { |ctx| ctx.calc_length if ctx.respond_to? :calc_length }

data/lib/packetgen/plugin/smb2/session_setup/request.rb

@@ -36,50 +36,48 @@ module PacketGen::Plugin
         # @!attribute structure_size
         #  16-bit session setup request structure size. Should be 25.
         #  @return [Integer]
-        define_field :structure_size, PacketGen::Types::Int16le, default: 25
+        define_attr :structure_size, BinStruct::Int16le, default: 25
         # @!attribute flags
         #  8-bit flags for SMB 3 dialect.
         #  @return [Integer]
-        define_field :flags, PacketGen::Types::Int8
         # @!attribute flags_rsv
         #  @return [Integer]
         # @!attribute flags_binding?
         #  @return [Boolean]
-        define_bit_fields_on :flags, :flags_rsv, 7, :flags_binding
+        define_bit_attr :flags, flags_rsv: 7, flags_binding: 1
         # @!attribute security_mode
         #  16-bit security mode field.
         #  @return [Integer]
-        define_field :security_mode, PacketGen::Types::Int8Enum, enum: SECURITY_MODES
+        define_attr :security_mode, BinStruct::Int8Enum, enum: SECURITY_MODES
         # @!attribute capabilities
         #  32-bit capabilities field.
         #  @return [Integer]
-        define_field :capabilities, PacketGen::Types::Int32le
         # @!attribute cap_rsv
         #  31-bit reserved field
         #  @return [Boolean]
         # @!attribute cap_dfs
         #  Indicates if Distributed File system (DFS) is supported
         #  @return [Boolean]
-        define_bit_fields_on :capabilities, :cap_rsv, 31, :cap_dfs
+        define_bit_attr :capabilities, endian: :little, cap_rsv: 31, cap_dfs: 1
         # @!attribute channel
         #  32-bit reserved field
         #  @return [Integer]
-        define_field :channel, PacketGen::Types::Int32le
+        define_attr :channel, BinStruct::Int32le
         # @!attribute buffer_offset
         #  The offset, from the beginning of the SMB2 header of the {#buffer}.
         #  @return [Integer]
-        define_field :buffer_offset, PacketGen::Types::Int16le, default: SMB2::HEADER_SIZE + 6 * 4
+        define_attr :buffer_offset, BinStruct::Int16le, default: SMB2::HEADER_SIZE + (6 * 4)
         # @!attribute buffer_length
         #  The length of the {#buffer} field.
         #  @return [Integer]
-        define_field :buffer_length, PacketGen::Types::Int16le
+        define_attr :buffer_length, BinStruct::Int16le
         # @!attribute prev_session_id
         #  64-bit previously established session id
         #  @return [Integer]
-        define_field :prev_session_id, PacketGen::Types::Int64le
+        define_attr :prev_session_id, BinStruct::Int64le
         # @!attribute buffer
         #  @return [GSSAPI]
-        define_field :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset.positive? }
+        define_attr :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset.positive? }
 
         # Calculate and set {#buffer_length} and {#buffer_offset} fields.
         # @return [void]

data/lib/packetgen/plugin/smb2/session_setup/response.rb

@@ -25,11 +25,10 @@ module PacketGen::Plugin
         # @!attribute structure_size
         #  16-bit session setup request structure size. Should be 9.
         #  @return [Integer]
-        define_field :structure_size, PacketGen::Types::Int16le, default: 9
+        define_attr :structure_size, BinStruct::Int16le, default: 9
         # @!attribute flags
         #  16-bit session flags
         #  @return [Integer]
-        define_field :flags, PacketGen::Types::Int16le
         # @!attribute flags_rsv
         #  13-bit reserved field
         #  @return [Integer]
@@ -39,18 +38,18 @@ module PacketGen::Plugin
         #  @return [Boolean]
         # @!attribute flags_is_guest?
         #  @return [Boolean]
-        define_bit_fields_on :flags, :flags_rsv, 13, :flags_encrypt_data, :flags_is_null, :flags_is_guest
+        define_bit_attr :flags, endian: :little, flags_rsv: 13, flags_encrypt_data: 1, lags_is_null: 1, flags_is_guest: 1
         # @!attribute buffer_offset
         #  The offset, from the beginning of the SMB2 header of the {#buffer}.
         #  @return [Integer]
-        define_field :buffer_offset, PacketGen::Types::Int16le, default: SMB2::HEADER_SIZE + 8
+        define_attr :buffer_offset, BinStruct::Int16le, default: SMB2::HEADER_SIZE + 8
         # @!attribute buffer_length
         #  The length of the {#buffer} field.
         #  @return [Integer]
-        define_field :buffer_length, PacketGen::Types::Int16le
+        define_attr :buffer_length, BinStruct::Int16le
         # @!attribute buffer
         #  @return [GSSAPI]
-        define_field :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset.positive? }
+        define_attr :buffer, GSSAPI, token: :response, optional: ->(h) { h.buffer_offset.positive? }
 
         # Calculate and set {#buffer_length} and {#buffer_offset} fields.
         # @return [void]

data/lib/packetgen/plugin/smb2.rb

@@ -33,7 +33,7 @@ module PacketGen::Plugin
     }.freeze
 
     # SMB marker, on start of header
-    MARKER = PacketGen.force_binary("\xfeSMB").freeze
+    MARKER = "\xfeSMB".b.freeze
 
     # SMB2 header size
     HEADER_SIZE = 64
@@ -44,99 +44,96 @@ module PacketGen::Plugin
     # @!attribute protocol
     #  This field must contain {MARKER SMB2 marker}
     #  @return [String]
-    define_field :protocol, PacketGen::Types::String, static_length: 4, default: MARKER
+    define_attr :protocol, BinStruct::String, static_length: 4, default: MARKER
     # @!attribute structure_size
     #  16-bit SMB2 header size. Should be 64.
     #  @return [Integer]
-    define_field :structure_size, PacketGen::Types::Int16le, default: HEADER_SIZE
+    define_attr :structure_size, BinStruct::Int16le, default: HEADER_SIZE
     # @!attribute credit charge
     #  16-bit credit charge field. Must not be used and must be set to 0.
     #  @return [Integer]
-    define_field :credit_charge, PacketGen::Types::Int16le
+    define_attr :credit_charge, BinStruct::Int16le
     # @!attribute status
     #  32-bit status field (SMB 2 dialect only).
     #  @return [Integer]
-    define_field :status, PacketGen::Types::Int32le
+    define_attr :status, BinStruct::Int32le
     # @!attribute command
     #  16-bit command field
     #  @return [Integer]
-    define_field :command, PacketGen::Types::Int16leEnum, enum: COMMANDS
+    define_attr :command, BinStruct::Int16leEnum, enum: COMMANDS
     # @!attribute credit
     #  16-bit credit field. This is the number of credits a client is requesting in
     #  a request, and the number of credits granted in a response.
     #  @return [Integer]
-    define_field :credit, PacketGen::Types::Int16le
-    # @!attribute flags
-    #  32-bit flags field
+    define_attr :credit, BinStruct::Int16le
+    # @!attribute flags_rsv1
+    #  2-bit reserved field
+    #  @return [Integer]
+    # @!attribute flags_smb3_replay_op?
+    #  When set, the command is a replay operation (only SMB 3 dialect).
+    #  @return [Boolean]
+    # @!attribute flags_dsf_op?
+    #  When set, the command is a Distributed File System (DFS) operation..
+    #  @return [Boolean]
+    # @!attribute flags_rsv2
+    #  21-bit reserved field
+    #  @return [Integer]
+    # @!attribute flags_smb3_priority
+    #  3-bit value of I/O priority (only SMB 3 dialect).
     #  @return [Integer]
-    define_field :flags, PacketGen::Types::Int32le
+    # @!attribute flags_signed?
+    #  When set, the message is signed.
+    #  @return [Boolean]
+    # @!attribute flags_related_op?
+    #  When set, the message is a related operation in a compounded chain.
+    #  @return [Boolean]
+    # @!attribute flags_async?
+    #  When set, the message is a asynchronous.
+    #  @return [Boolean]
+    # @!attribute flags_response?
+    #  When set, the message is a response from server to client.
+    #  @return [Boolean]
+    define_bit_attr :flags, endian: :little,
+                            flags_rsv1: 2, flags_smb3_replay_op: 1, flags_dfs_op: 1,
+                            flags_rsv2: 21, flags_smb3_priority: 3,
+                            flags_signed: 1, flags_related_op: 1, flags_async: 1,
+                            flags_response: 1
     # @!attribute next_command
     #  32-bit offset from the beginning of this SMB2 header to the start of the subsequent
     #  8-byte aligned SMB2 header (only for compounded requests).
     #  @return [Integer]
-    define_field :next_command, PacketGen::Types::Int32le
+    define_attr :next_command, BinStruct::Int32le
     # @!attribute message_id
     #  64-bit alue that identifies a message request and response uniquely across all
     #  messages that are sent on the same SMB 2 Protocol transport connection.
     #  @return [Integer]
-    define_field :message_id, PacketGen::Types::Int64le
+    define_attr :message_id, BinStruct::Int64le
     # @!attribute async_id
     #  64-bit unique ID that is created by the server to handle operations
     #  asynchronously. Only present for asynchronous messages.
     #  @return [Integer]
-    define_field :async_id, PacketGen::Types::Int64le, optional: ->(h) { h.flags & 2 == 2 }
+    define_attr :async_id, BinStruct::Int64le, optional: ->(h) { h.flags & 2 == 2 }
     # @!attribute reserved
     #  32-bit reserved field.
     #  Only present for synchronous messages.
     #  @return [Integer]
-    define_field :reserved, PacketGen::Types::Int32le, optional: ->(h) { (h.flags & 2).zero? }
+    define_attr :reserved, BinStruct::Int32le, optional: ->(h) { h.flags.nobits?(2) }
     # @!attribute tree_id
     #  32-bit integer that uniquely identifies the tree connect for the command.
     #  Only present for synchronous messages.
     #  @return [Integer]
-    define_field :tree_id, PacketGen::Types::Int32le, optional: ->(h) { (h.flags & 2).zero? }
+    define_attr :tree_id, BinStruct::Int32le, optional: ->(h) { h.flags.nobits?(2) }
     # @!attribute session_id
     #  64-bit integer that uniquely identifies the established session for the command.
     #  @return [Integer]
-    define_field :session_id, PacketGen::Types::Int64le
+    define_attr :session_id, BinStruct::Int64le
     # @!attribute signature
     #  16-byte message signature
     #  @return [String]
-    define_field :signature, PacketGen::Types::String, static_length: 16, default: [0, 0].pack('qq')
+    define_attr :signature, BinStruct::String, static_length: 16, default: [0, 0].pack('qq')
     # @!attribute body
     #  @return [String]
-    define_field :body, PacketGen::Types::String
-    # @!attribute flags_rsv1
-    #  2-bit reserved field
-    #  @return [Integer]
-    # @!attribute flags_smb3_replay_op?
-    #  When set, the command is a replay operation (only SMB 3 dialect).
-    #  @return [Boolean]
-    # @!attribute flags_dsf_op?
-    #  When set, the command is a Distributed File System (DFS) operation..
-    #  @return [Boolean]
-    # @!attribute flags_rsv2
-    #  21-bit reserved field
-    #  @return [Integer]
-    # @!attribute flags_smb3_priority
-    #  3-bit value of I/O priority (only SMB 3 dialect).
-    #  @return [Integer]
-    # @!attribute flags_signed?
-    #  When set, the message is signed.
-    #  @return [Boolean]
-    # @!attribute flags_related_op?
-    #  When set, the message is a related operation in a compounded chain.
-    #  @return [Boolean]
-    # @!attribute flags_async?
-    #  When set, the message is a asynchronous.
-    #  @return [Boolean]
-    # @!attribute flags_response?
-    #  When set, the message is a response from server to client.
-    #  @return [Boolean]
-    define_bit_fields_on :flags, :flags_rsv1, 2, :flags_smb3_replay_op, :flags_dfs_op,
-                                 :flags_rsv2, 21, :flags_smb3_priority, 3,
-                                 :flags_signed, :flags_related_op, :flags_async,
-                                 :flags_response
+    define_attr :body, BinStruct::String
 
     # Helper to bind a SMB2 command to {SMB2} header.
     # @param [String] command name
@@ -146,7 +143,7 @@ module PacketGen::Plugin
       krequest = self.const_get("#{contantized}::Request")
       kresponse = self.const_get("#{contantized}::Response")
       PacketGen::Header.add_class krequest
-      self.bind krequest, command: SMB2::COMMANDS[command], flags: ->(v) { v.nil? ? 0 : (v & 1).zero? }
+      self.bind krequest, command: SMB2::COMMANDS[command], flags: ->(v) { v.nil? ? 0 : v.nobits?(1) }
       PacketGen::Header.add_class kresponse
       self.bind kresponse, command: SMB2::COMMANDS[command], flags: ->(v) { v.nil? ? 1 : (v & 1 == 1) }
     end
@@ -168,16 +165,13 @@ module PacketGen::Plugin
       super do |attr|
         next unless attr == :flags
 
-        value = bits_on(attr).reject { |_, v| v > 1 }
-                             .keys
-                             .select { |b| send("#{b}?") }
+        value = bits_on(attr).select { |b| respond_to?("#{b}?") && send("#{b}?") }
                              .map(&:to_s)
                              .join(',')
                              .gsub!(/#{attr}_/, '')
         value = '%-16s (0x%02x)' % [value, self[attr].to_i]
         str = PacketGen::Inspect.shift_level
-        str << PacketGen::Inspect::FMT_ATTR % [self[attr].class.to_s.sub(/.*::/, ''),
-                                               attr, value]
+        str << (PacketGen::Inspect::FMT_ATTR % [self[attr].type_name, attr, value])
       end
     end
   end

data/lib/packetgen/plugin/smb_version.rb

@@ -2,6 +2,6 @@
 
 module PacketGen
   module Plugin
-    SMB_VERSION = '0.6.2'
+    SMB_VERSION = '0.7.0'
   end
 end