hrr_rb_ssh 0.1.4 → 0.1.5

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/pty_req/context.rb

@@ -33,12 +33,12 @@ module HrrRbSsh
                   @variables  = variables
                   @vars       = variables
 
-                  @term_environment_variable_value = message['TERM environment variable value']
-                  @terminal_width_characters       = message['terminal width, characters']
-                  @terminal_height_rows            = message['terminal height, rows']
-                  @terminal_width_pixels           = message['terminal width, pixels']
-                  @terminal_height_pixels          = message['terminal height, pixels']
-                  @encoded_terminal_modes          = message['encoded terminal modes']
+                  @term_environment_variable_value = message[:'TERM environment variable value']
+                  @terminal_width_characters       = message[:'terminal width, characters']
+                  @terminal_height_rows            = message[:'terminal height, rows']
+                  @terminal_width_pixels           = message[:'terminal width, pixels']
+                  @terminal_height_pixels          = message[:'terminal height, pixels']
+                  @encoded_terminal_modes          = message[:'encoded terminal modes']
                 end
 
                 def chain_proc &block

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/subsystem/context.rb

@@ -28,7 +28,7 @@ module HrrRbSsh
                   @variables  = variables
                   @vars       = variables
 
-                  @subsystem_name = message['subsystem name']
+                  @subsystem_name = message[:'subsystem name']
                 end
 
                 def chain_proc &block

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/window_change/context.rb

@@ -31,10 +31,10 @@ module HrrRbSsh
                   @variables  = variables
                   @vars       = variables
 
-                  @terminal_width_columns = message['terminal width, columns']
-                  @terminal_height_rows   = message['terminal height, rows']
-                  @terminal_width_pixels  = message['terminal width, pixels']
-                  @terminal_height_pixels = message['terminal height, pixels']
+                  @terminal_width_columns = message[:'terminal width, columns']
+                  @terminal_height_rows   = message[:'terminal height, rows']
+                  @terminal_width_pixels  = message[:'terminal width, pixels']
+                  @terminal_height_pixels = message[:'terminal height, pixels']
                 end
 
                 def chain_proc &block

data/lib/hrr_rb_ssh/connection/channel/channel_type/session.rb

@@ -1,16 +1,58 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/logger'
+
 module HrrRbSsh
   class Connection
     class Channel
       class ChannelType
         class Session < ChannelType
           NAME = 'session'
+
+          def initialize connection, channel, message
+            @logger = HrrRbSsh::Logger.new self.class.name
+            @connection = connection
+            @channel = channel
+            @variables = {}
+            @proc_chain = ProcChain.new
+          end
+
+          def start
+            @proc_chain_thread = proc_chain_thread
+          end
+
+          def close
+            if @proc_chain_thread
+              @proc_chain_thread.exit
+            end
+          end
+
+          def request message
+            request_type = message[:'request type']
+            RequestType[request_type].run @proc_chain, @connection.username, @channel.request_handler_io, @variables, message, @connection.options
+          end
+
+          def proc_chain_thread
+            Thread.start {
+              @logger.info("start proc chain thread")
+              begin
+                exitstatus = @proc_chain.call_next
+              rescue => e
+                @logger.error([e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join)
+                exitstatus = 1
+              ensure
+                @logger.info("closing proc chain thread")
+                @channel.close from=:channel_type_instance, exitstatus=exitstatus
+                @logger.info("proc chain thread closed")
+              end
+            }
+          end
         end
       end
     end
   end
 end
 
+require 'hrr_rb_ssh/connection/channel/channel_type/session/proc_chain'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type'

data/lib/hrr_rb_ssh/connection/channel/channel_type.rb

@@ -28,3 +28,4 @@ module HrrRbSsh
 end
 
 require 'hrr_rb_ssh/connection/channel/channel_type/session'
+require 'hrr_rb_ssh/connection/channel/channel_type/direct_tcpip'

data/lib/hrr_rb_ssh/connection/channel.rb

@@ -3,7 +3,6 @@
 
 require 'socket'
 require 'hrr_rb_ssh/logger'
-require 'hrr_rb_ssh/connection/channel/proc_chain'
 require 'hrr_rb_ssh/connection/channel/channel_type'
 
 module HrrRbSsh
@@ -13,24 +12,34 @@ module HrrRbSsh
       MAXIMUM_PACKET_SIZE = 100000
 
       attr_reader \
-        :receive_payload_queue
+        :channel_type,
+        :local_channel,
+        :remote_channel,
+        :local_window_size,
+        :local_maximum_packet_size,
+        :remote_window_size,
+        :remote_maximum_packet_size,
+        :receive_message_queue,
+        :request_handler_io
 
-      def initialize connection, channel_type, local_channel, remote_channel, initial_window_size, maximum_packet_size
+      def initialize connection, message
         @logger = HrrRbSsh::Logger.new self.class.name
 
         @connection = connection
-        @channel_type = channel_type
-        @local_channel  = local_channel
-        @remote_channel = remote_channel
+
+        @channel_type = message[:'channel type']
+        @local_channel  = message[:'sender channel']
+        @remote_channel = message[:'sender channel']
         @local_window_size          = INITIAL_WINDOW_SIZE
         @local_maximum_packet_size  = MAXIMUM_PACKET_SIZE
-        @remote_window_size         = initial_window_size
-        @remote_maximum_packet_size = maximum_packet_size
+        @remote_window_size         = message[:'initial window size']
+        @remote_maximum_packet_size = message[:'maximum packet size']
+
+        @channel_type_instance = ChannelType[@channel_type].new connection, self, message
 
-        @receive_payload_queue = Queue.new
+        @receive_message_queue = Queue.new
         @receive_data_queue = Queue.new
 
-        @proc_chain = ProcChain.new
         @channel_io, @request_handler_io = UNIXSocket.pair
 
         @closed = nil
@@ -40,7 +49,7 @@ module HrrRbSsh
         @channel_loop_thread = channel_loop_thread
         @sender_thread       = sender_thread
         @receiver_thread     = receiver_thread
-        @proc_chain_thread   = proc_chain_thread
+        @channel_type_instance.start
         @closed = false
       end
 
@@ -48,10 +57,10 @@ module HrrRbSsh
         return if @closed
         @logger.info("close channel")
         @closed = true
-        unless from == :proc_chain_thread
-          @proc_chain_thread.exit
+        unless from == :channel_type_instance
+          @channel_type_instance.close
         end
-        @receive_payload_queue.close
+        @receive_message_queue.close
         @receive_data_queue.close
         begin
           @request_handler_io.close
@@ -64,7 +73,7 @@ module HrrRbSsh
           Thread.pass
         end
         begin
-          if from == :proc_chain_thread
+          if from == :channel_type_instance
             send_channel_eof
             case exitstatus
             when Integer
@@ -89,29 +98,28 @@ module HrrRbSsh
       def channel_loop_thread
         Thread.start do
           @logger.info("start channel loop thread")
-          variables = {}
           loop do
             begin
-              message = @receive_payload_queue.deq
-              if message.nil? && @receive_payload_queue.closed?
+              message = @receive_message_queue.deq
+              if message.nil? && @receive_message_queue.closed?
                 @receive_data_queue.close
                 @logger.info("closing channel loop thread")
                 break
               end
-              case message['message number']
+              case message[:'message number']
               when HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST::VALUE
-                @logger.info("received channel request: #{message['request type']}")
-                request message, variables
-                if message['want reply']
+                @logger.info("received channel request: #{message[:'request type']}")
+                @channel_type_instance.request message
+                if message[:'want reply']
                   send_channel_success
                 end
               when HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA::VALUE
                 @logger.info("received channel data")
-                local_channel = message['recipient channel']
-                @receive_data_queue.enq message['data']
+                local_channel = message[:'recipient channel']
+                @receive_data_queue.enq message[:'data']
               when HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE
                 @logger.debug("received channel window adjust")
-                @remote_window_size = [@remote_window_size + message['bytes to add'], 0xffff_ffff].min
+                @remote_window_size = [@remote_window_size + message[:'bytes to add'], 0xffff_ffff].min
               else
                 @logger.warn("received unsupported message: #{message.inspect}")
               end
@@ -191,31 +199,10 @@ module HrrRbSsh
         }
       end
 
-      def proc_chain_thread
-        Thread.start {
-          @logger.info("start proc chain thread")
-          begin
-            exitstatus = @proc_chain.call_next
-          rescue => e
-            @logger.error([e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join)
-            exitstatus = 1
-          ensure
-            @logger.info("closing proc chain thread")
-            close from=:proc_chain_thread, exitstatus=exitstatus
-            @logger.info("proc chain thread closed")
-          end
-        }
-      end
-
-      def request message, variables
-        request_type = message['request type']
-        ChannelType[@channel_type]::RequestType[request_type].run @proc_chain, @connection.username, @request_handler_io, variables, message, @connection.options
-      end
-
       def send_channel_success
         message = {
-          'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_SUCCESS::VALUE,
-          'recipient channel' => @remote_channel,
+          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_SUCCESS::VALUE,
+          :'recipient channel' => @remote_channel,
         }
         payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_SUCCESS.encode message
         @connection.send payload
@@ -223,9 +210,9 @@ module HrrRbSsh
 
       def send_channel_window_adjust
         message = {
-          'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE,
-          'recipient channel' => @remote_channel,
-          'bytes to add'      => INITIAL_WINDOW_SIZE,
+          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE,
+          :'recipient channel' => @remote_channel,
+          :'bytes to add'      => INITIAL_WINDOW_SIZE,
         }
         payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST.encode message
         @connection.send payload
@@ -233,9 +220,9 @@ module HrrRbSsh
 
       def send_channel_data data
         message = {
-          'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA::VALUE,
-          'recipient channel' => @remote_channel,
-          'data'              => data,
+          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA::VALUE,
+          :'recipient channel' => @remote_channel,
+          :'data'              => data,
         }
         payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA.encode message
         @connection.send payload
@@ -243,11 +230,11 @@ module HrrRbSsh
 
       def send_channel_request_exit_status exitstatus
         message = {
-          'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST::VALUE,
-          'recipient channel' => @remote_channel,
-          'request type'      => 'exit-status',
-          'want reply'        => false,
-          'exit status'       => exitstatus,
+          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST::VALUE,
+          :'recipient channel' => @remote_channel,
+          :'request type'      => "exit-status",
+          :'want reply'        => false,
+          :'exit status'       => exitstatus,
         }
         payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST.encode message
         @connection.send payload
@@ -255,8 +242,8 @@ module HrrRbSsh
 
       def send_channel_eof
         message = {
-          'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_EOF::VALUE,
-          'recipient channel' => @remote_channel,
+          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_EOF::VALUE,
+          :'recipient channel' => @remote_channel,
         }
         payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_EOF.encode message
         @connection.send payload
@@ -264,8 +251,8 @@ module HrrRbSsh
 
       def send_channel_close
         message = {
-          'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_CLOSE::VALUE,
-          'recipient channel' => @remote_channel,
+          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_CLOSE::VALUE,
+          :'recipient channel' => @remote_channel,
         }
         payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_CLOSE.encode message
         @connection.send payload

data/lib/hrr_rb_ssh/connection/request_handler/reference_shell_request_handler.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'timeout'
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
@@ -23,7 +24,7 @@ module HrrRbSsh
                 STDERR.reopen pts, 'w'
                 pts.close
                 context.vars[:env] ||= Hash.new
-                exec context.vars[:env], 'login', '-f', context.username
+                exec context.vars[:env], 'login', '-pf', context.username
               end
 
               pts.close
@@ -62,16 +63,35 @@ module HrrRbSsh
                 end
               }
 
-              pid, status = Process.waitpid2 pid
-              threads.each do |t|
-                begin
-                  t.exit
-                  t.join
-                rescue => e
-                  context.logger.error(e.full_message)
+              begin
+                pid, status = Process.waitpid2 pid
+                context.logger.info "shell exited with status #{status.inspect}"
+                status.exitstatus
+              ensure
+                unless status
+                  context.logger.info "exiting shell"
+                  Process.kill :TERM, pid
+                  begin
+                    Timeout.timeout(1) do
+                      pid, status = Process.waitpid2 pid
+                    end
+                  rescue Timeout::Error
+                    context.logger.warn "force exiting shell"
+                    Process.kill :KILL, pid
+                    pid, status = Process.waitpid2 pid
+                  end
+                  context.logger.info "shell exited with status #{status.inspect}"
+                end
+                threads.each do |t|
+                  begin
+                    t.exit
+                    t.join
+                  rescue => e
+                    context.logger.error(e.full_message)
+                  end
                 end
+                context.logger.info "proc chain finished"
               end
-              status.exitstatus
             }
           }
         end

data/lib/hrr_rb_ssh/connection.rb

@@ -90,7 +90,7 @@ module HrrRbSsh
     def global_request payload
       @logger.info('received ' + HrrRbSsh::Message::SSH_MSG_GLOBAL_REQUEST::ID)
       message = HrrRbSsh::Message::SSH_MSG_GLOBAL_REQUEST.decode payload
-      if message['want reply']
+      if message[:'want reply']
         # returns always failure because global request is not supported so far
         send_request_failure
       end
@@ -99,50 +99,45 @@ module HrrRbSsh
     def channel_open payload
       @logger.info('received ' + HrrRbSsh::Message::SSH_MSG_CHANNEL_OPEN::ID)
       message = HrrRbSsh::Message::SSH_MSG_CHANNEL_OPEN.decode payload
-      channel_type = message['channel type']
-      local_channel  = message['sender channel']
-      remote_channel = message['sender channel']
-      initial_window_size = message['initial window size']
-      maximum_packet_size = message['maximum packet size']
-      channel = Channel.new self, channel_type, local_channel, remote_channel, initial_window_size, maximum_packet_size
-      @channels[local_channel] = channel
+      channel = Channel.new self, message
+      @channels[channel.local_channel] = channel
       channel.start
-      send_channel_open_confirmation channel_type, local_channel, remote_channel, initial_window_size, maximum_packet_size
+      send_channel_open_confirmation channel
     end
 
     def channel_request payload
       @logger.info('received ' + HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST::ID)
       message = HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST.decode payload
-      local_channel = message['recipient channel']
-      @channels[local_channel].receive_payload_queue.enq message
+      local_channel = message[:'recipient channel']
+      @channels[local_channel].receive_message_queue.enq message
     end
 
     def channel_window_adjust payload
       @logger.info('received ' + HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::ID)
       message = HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST.decode payload
-      local_channel = message['recipient channel']
-      @channels[local_channel].receive_payload_queue.enq message
+      local_channel = message[:'recipient channel']
+      @channels[local_channel].receive_message_queue.enq message
     end
 
     def channel_data payload
       @logger.info('received ' + HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA::ID)
       message = HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA.decode payload
-      local_channel = message['recipient channel']
-      @channels[local_channel].receive_payload_queue.enq message
+      local_channel = message[:'recipient channel']
+      @channels[local_channel].receive_message_queue.enq message
     end
 
     def channel_eof payload
       @logger.info('received ' + HrrRbSsh::Message::SSH_MSG_CHANNEL_EOF::ID)
       message = HrrRbSsh::Message::SSH_MSG_CHANNEL_EOF.decode payload
-      local_channel = message['recipient channel']
+      local_channel = message[:'recipient channel']
       channel = @channels[local_channel]
-      channel.receive_payload_queue.close
+      channel.receive_message_queue.close
     end
 
     def channel_close payload
       @logger.info('received ' + HrrRbSsh::Message::SSH_MSG_CHANNEL_CLOSE::ID)
       message = HrrRbSsh::Message::SSH_MSG_CHANNEL_CLOSE.decode payload
-      local_channel = message['recipient channel']
+      local_channel = message[:'recipient channel']
       channel = @channels[local_channel]
       channel.close
       @logger.info("deleting channel")
@@ -152,7 +147,7 @@ module HrrRbSsh
 
     def send_request_success
       message = {
-        'message number' => HrrRbSsh::Message::SSH_MSG_REQUEST_SUCCESS::VALUE,
+        :'message number' => HrrRbSsh::Message::SSH_MSG_REQUEST_SUCCESS::VALUE,
       }
       payload = HrrRbSsh::Message::SSH_MSG_REQUEST_SUCCESS.encode message
       @authentication.send payload
@@ -160,20 +155,20 @@ module HrrRbSsh
 
     def send_request_failure
       message = {
-        'message number' => HrrRbSsh::Message::SSH_MSG_REQUEST_FAILURE::VALUE,
+        :'message number' => HrrRbSsh::Message::SSH_MSG_REQUEST_FAILURE::VALUE,
       }
       payload = HrrRbSsh::Message::SSH_MSG_REQUEST_FAILURE.encode message
       @authentication.send payload
     end
 
-    def send_channel_open_confirmation channel_type, local_channel, remote_channel, initial_window_size, maximum_packet_size
+    def send_channel_open_confirmation channel
       message = {
-        'message number'      => HrrRbSsh::Message::SSH_MSG_CHANNEL_OPEN_CONFIRMATION::VALUE,
-        'channel type'        => channel_type,
-        'recipient channel'   => remote_channel,
-        'sender channel'      => local_channel,
-        'initial window size' => initial_window_size,
-        'maximum packet size' => maximum_packet_size,
+        :'message number'      => HrrRbSsh::Message::SSH_MSG_CHANNEL_OPEN_CONFIRMATION::VALUE,
+        :'channel type'        => channel.channel_type,
+        :'recipient channel'   => channel.remote_channel,
+        :'sender channel'      => channel.local_channel,
+        :'initial window size' => channel.local_window_size,
+        :'maximum packet size' => channel.local_maximum_packet_size,
       }
       payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_OPEN_CONFIRMATION.encode message
       @authentication.send payload

data/lib/hrr_rb_ssh/message/001_ssh_msg_disconnect.rb

@@ -34,10 +34,10 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
-        [DataType::Uint32,    'reason code'],
-        [DataType::String,    'description'],
-        [DataType::String,    'language tag'],
+        [DataType::Byte,      :'message number'],
+        [DataType::Uint32,    :'reason code'],
+        [DataType::String,    :'description'],
+        [DataType::String,    :'language tag'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/002_ssh_msg_ignore.rb

@@ -16,8 +16,8 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
-        [DataType::String,    'data'],
+        [DataType::Byte,      :'message number'],
+        [DataType::String,    :'data'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/003_ssh_msg_unimplemented.rb

@@ -16,8 +16,8 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
-        [DataType::Uint32,    'packet sequence number of rejected message'],
+        [DataType::Byte,      :'message number'],
+        [DataType::Uint32,    :'packet sequence number of rejected message'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/004_ssh_msg_debug.rb

@@ -16,10 +16,10 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
-        [DataType::Boolean,   'always_display'],
-        [DataType::String,    'message'],
-        [DataType::String,    'language tag'],
+        [DataType::Byte,      :'message number'],
+        [DataType::Boolean,   :'always_display'],
+        [DataType::String,    :'message'],
+        [DataType::String,    :'language tag'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/005_ssh_msg_service_request.rb

@@ -16,8 +16,8 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
-        [DataType::String,    'service name'],
+        [DataType::Byte,      :'message number'],
+        [DataType::String,    :'service name'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/006_ssh_msg_service_accept.rb

@@ -16,8 +16,8 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
-        [DataType::String,    'service name'],
+        [DataType::Byte,      :'message number'],
+        [DataType::String,    :'service name'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/020_ssh_msg_kexinit.rb

@@ -16,35 +16,35 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::Byte,      'cookie (random byte)'],
-        [DataType::NameList, 'kex_algorithms'],
-        [DataType::NameList, 'server_host_key_algorithms'],
-        [DataType::NameList, 'encryption_algorithms_client_to_server'],
-        [DataType::NameList, 'encryption_algorithms_server_to_client'],
-        [DataType::NameList, 'mac_algorithms_client_to_server'],
-        [DataType::NameList, 'mac_algorithms_server_to_client'],
-        [DataType::NameList, 'compression_algorithms_client_to_server'],
-        [DataType::NameList, 'compression_algorithms_server_to_client'],
-        [DataType::NameList, 'languages_client_to_server'],
-        [DataType::NameList, 'languages_server_to_client'],
-        [DataType::Boolean,   'first_kex_packet_follows'],
-        [DataType::Uint32,    '0 (reserved for future extension)'],
+        [DataType::Byte,      :'message number'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::Byte,      :'cookie (random byte)'],
+        [DataType::NameList,  :'kex_algorithms'],
+        [DataType::NameList,  :'server_host_key_algorithms'],
+        [DataType::NameList,  :'encryption_algorithms_client_to_server'],
+        [DataType::NameList,  :'encryption_algorithms_server_to_client'],
+        [DataType::NameList,  :'mac_algorithms_client_to_server'],
+        [DataType::NameList,  :'mac_algorithms_server_to_client'],
+        [DataType::NameList,  :'compression_algorithms_client_to_server'],
+        [DataType::NameList,  :'compression_algorithms_server_to_client'],
+        [DataType::NameList,  :'languages_client_to_server'],
+        [DataType::NameList,  :'languages_server_to_client'],
+        [DataType::Boolean,   :'first_kex_packet_follows'],
+        [DataType::Uint32,    :'0 (reserved for future extension)'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/021_ssh_msg_newkeys.rb

@@ -16,7 +16,7 @@ module HrrRbSsh
 
       DEFINITION = [
         #[DataType, Field Name]
-        [DataType::Byte,      'message number'],
+        [DataType::Byte,      :'message number'],
       ]
     end
   end