対局中に空行などを定期的に送信するクライアントの指し手放置時間切れを検知できない

• Reporter: mizar
• Owner: (None)
• Type: Bugs
• Status: Closed
• Component: (None)
• MileStone: (None)
• Priority: 5 - Medium
• Severity: 5 - Medium
• Resolution: None
• File: None

Details Reply

将棋所テスト版４ のような、定期的に無意味な文字列を対局中に送信するクライアントの場合、指し手放置の時間切れを検知出来ず、対局が何時までも閉じられなくなる可能性があります。

shogi-serverにて、クライアントからの入力が一定時間無かった時(:timeout)にしか指し手放置時間切れの検知処理を行っていなかったのが原因と見られます。

 # Return
 #   - a received string
 #   - :timeout
 #   - :exception
 #   - nil when a socket is closed
 #
 def gets_safe(socket, timeout=nil)
   if r = select([socket], nil, nil, timeout)
     return r[0].first.gets
   else
     return :timeout
   end
 rescue Exception => ex
   log_error("gets_safe: #{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}")
   return :exception
 end

* 解決案1: 検知間隔を充分に短くする

 ------------------------------- shogi_server.rb -------------------------------
 @@ -46,7 +46,7 @@ require 'shogi_server/buoy'
  module ShogiServer # for a namespace
  
  Max_Identifier_Length = 32
 -Default_Timeout = 60            # for single socket operation
 +Default_Timeout = 28            # for single socket operation
  Default_Game_Name = "default-1500-0"
  Default_Max_Moves = 256
  Default_Least_Time_Per_Move = 0

* 解決案2: KeepAliveCommand / SpaceCommand の実行時にも時間切れの検知を行う

https://osdn.net/users/mizar/pf/shogi-server/scm/commits/a128e96f671e3a2dcf38eb80b4a00b628069e1c5

 --------------------------- shogi_server/command.rb ---------------------------
 @@ -157,6 +157,10 @@ module ShogiServer
  
      def call
        @player.write_safe("\n")
 +      if (@player.status == "game")
 +        s = @player.game.handle_one_move(:keepalive, @player, @time)
 +        return :return if (s && @player.protocol == LoginCSA::PROTOCOL)
 +      end
        return :continue
      end
    end
 @@ -685,6 +689,10 @@ module ShogiServer
  
      def call
        ## ignore null string
 +      if (@player.status == "game")
 +        s = @player.game.handle_one_move(:space, @player, @time)
 +        return :return if (s && @player.protocol == LoginCSA::PROTOCOL)
 +      end
        return :continue
      end
    end
 
 ----------------------------- shogi_server/game.rb -----------------------------
 @@ -248,7 +248,7 @@ class Game
    # class Game
    def handle_one_move(str, player, end_time)
      unless turn?(player)
 -      return false if str == :timeout
 +      return false if (str == :timeout || str == :keepalive || str == :space)
  
        @fh.puts("'Deferred %s" % [str])
        log_warning("Deferred a move [%s] scince it is not %s 's turn." %
 @@ -263,7 +263,7 @@ class Game
  
      if (@time_clock.timeout?(@current_player, @start_time, @end_time))
        status = :timeout
 -    elsif (str == :timeout)
 +    elsif (str == :timeout || str == :keepalive || str == :space)
        return false            # time isn't expired. players aren't swapped. continue game
      else
        t = @time_clock.process_time(@current_player, @start_time, @end_time)

Ticket History (3/6 Histories)

2020-10-01 21:25 Updated by: mizar

• New Ticket "対局中に空行などを定期的に送信するクライアントの指し手放置時間切れを検知できない" created

2020-10-01 21:42 Updated by: mizar

Comment

(This comment has been deleted)

2020-10-02 01:06 Updated by: mizar

• Details Updated

2020-10-02 01:44 Updated by: mizar

• Details Updated

2020-10-04 23:31 Updated by: mizar

Comment Reply

将棋所4.7.1テスト版4 ではアプリケーションレベルでのkeepaliveが半角空白(SP)+改行(LF)文字の送信にて1分おきに行われているため、単に改行(LF)文字が送信されていることを想定した shogi-server 20201004 での修正 https://osdn.net/projects/shogi-server/scm/git/shogi-server/commits/8d5884aa82cc5b0b31ca115cfea891ba37ad6fe3 では不十分です。

追加的に、以下のような修正が必要になると思われます。

https://osdn.net/users/mizar/pf/shogi-server/scm/commits/7cd512b50be019cee0d9c000716be2277d50743f

 --------------------------- shogi_server/command.rb ---------------------------
 @@ -28,7 +28,7 @@ module ShogiServer
      def Command.factory(str, player, time=Time.now)
        cmd = nil
        case str
 -      when "", /^%[^%]/, :timeout
 +      when "", /^\s*$/, /^%[^%]/, :timeout
          cmd = SpecialCommand.new(str, player)
        when /^[\+\-][^%]/
          cmd = MoveCommand.new(str, player)
 @@ -108,8 +108,6 @@ module ShogiServer
          new_buoy_game = nil
          nth_move      = nil
          cmd = ForkCommand.new(str, player, source_game, new_buoy_game, nth_move)
 -      when /^\s*$/
 -        cmd = SpaceCommand.new(str, player)
        when /^%%%[^%]/
          # TODO: just ignore commands specific to 81Dojo.
          # Need to discuss with 81Dojo people.
 @@ -172,7 +170,7 @@ module ShogiServer
      end
    end
  
 -  # Command like "%TORYO", :timeout, or keep alive
 +  # Command like "%TORYO", :timeout, space, or keep alive
    #
    # Keep Alive is an application-level protocol. Whenever the server receives
    # an LF, it sends back an LF.  Note that the 30 sec rule (client may not send
 @@ -191,6 +189,9 @@ module ShogiServer
          @player.write_safe("\n")
          # Fall back to :timeout to check the game gets timed up
          @str = :timeout
 +      elsif /^\s+$/ =~ @str
 +        # Fall back to :timeout to check the game gets timed up
 +        @str = :timeout
        end
  
        if (@player.status == "game")
 @@ -673,19 +674,6 @@ module ShogiServer
      end
    end
  
 -  # Command for a space
 -  #
 -  class SpaceCommand < Command
 -    def initialize(str, player)
 -      super
 -    end
 -
 -    def call
 -      ## ignore null string
 -      return :continue
 -    end
 -  end
 -
    # Command for an error
    #
    class ErrorCommand < Command

(Edited, 2020-10-05 00:29 Updated by: mizar)

2020-12-06 18:52 Updated by: beatles

• Status Update from Open to Closed