X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=shogi-server;h=b5e1ecfe4a36d440ab127e801d34329b3263d713;hp=89e611886973bb8076175792dc2df4523b9acbbd;hb=20160409;hpb=f6791aead10681f976fa81147042707f4ff5f673;ds=sidebyside diff --git a/shogi-server b/shogi-server index 89e6118..b5e1ecf 100755 --- a/shogi-server +++ b/shogi-server @@ -1,4 +1,4 @@ -#! /usr/bin/ruby1.9.1 +#! /usr/bin/ruby # $Id$ # # Author:: NABEYA Kenichi, Daigo Moriwaki @@ -6,7 +6,7 @@ # #-- # Copyright (C) 2004 NABEYA Kenichi (aka nanami@2ch) -# Copyright (C) 2007-2008 Daigo Moriwaki (daigo at debian dot org) +# Copyright (C) 2007-2012 Daigo Moriwaki (daigo at debian dot org) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ $topdir = nil $league = nil $logger = nil $config = nil -$:.unshift File.dirname(__FILE__) +$:.unshift(File.dirname(File.expand_path(__FILE__))) require 'shogi_server' require 'shogi_server/config' require 'shogi_server/util' @@ -40,6 +40,8 @@ require 'tempfile' # MAIN # +ONE_DAY = 3600 * 24 # in seconds + ShogiServer.reload # Return @@ -76,6 +78,13 @@ OPTIONS port_number a port number for the server to listen. 4081 is often used. + --least-time-per-move n + Least time in second per move: 0, 1 (default 1). + - 0: The new rule that CSA introduced in November 2014. + - 1: The old rule before it. + --max-moves n + when a game with the n-th move played does not end, make the game a draw. + Default 256. 0 disables this feature. --pid-file file a file path in which a process ID will be written. Use with --daemon option. @@ -93,14 +102,17 @@ EXAMPLES Run the shogi-server. Then clients can connect to port#4081. The server output logs to the stdout. - 2. % ./shogi-server --daemon . --pid-file ./shogi-server.pid \ + 2. % ./shogi-server --max-moves 0 --least-time-per-move 1 test 4081 + Run the shogi-server in compliance with CSA Protocol V1.1.2 or before. + + 3. % ./shogi-server --daemon . --pid-file ./shogi-server.pid \ --player-log-dir ./player-logs \ test 4081 Run the shogi-server as a daemon. The server outputs regular logs to shogi-server.log located in the current directory and network messages in ./player-logs directory. - 3. % ./shogi-server --daemon . --pid-file ./shogi-server.pid \ + 4. % ./shogi-server --daemon . --pid-file ./shogi-server.pid \ --player-log-dir ./player-logs \ --floodgate-games floodgate-900-0,floodgate-3600-0 \ test 4081 @@ -138,14 +150,25 @@ FLOODGATE SCHEDULE CONFIGURATIONS Sat 22:00 Sun 13:00 + PAREMETER SETTING + + In addition, this configuration file allows to set parameters + for the specific Floodaget group. A list of parameters is the + following: + + * pairing_factory: + Specifies a factory function name generating a pairing + method which will be used in a specific Floodgate game. + ex. set pairing_factory floodgate_zyunisen + * sacrifice: + Specifies a sacrificed player. + ex. set sacrifice gps500+e293220e3f8a3e59f79f6b0efffaa931 + LICENSE GPL versoin 2 or later SEE ALSO -RELEASE - #{ShogiServer::Release} - REVISION #{ShogiServer::Revision} @@ -180,10 +203,12 @@ end def parse_command_line options = Hash::new parser = GetoptLong.new( - ["--daemon", GetoptLong::REQUIRED_ARGUMENT], - ["--floodgate-games", GetoptLong::REQUIRED_ARGUMENT], - ["--pid-file", GetoptLong::REQUIRED_ARGUMENT], - ["--player-log-dir", GetoptLong::REQUIRED_ARGUMENT]) + ["--daemon", GetoptLong::REQUIRED_ARGUMENT], + ["--floodgate-games", GetoptLong::REQUIRED_ARGUMENT], + ["--least-time-per-move", GetoptLong::REQUIRED_ARGUMENT], + ["--max-moves", GetoptLong::REQUIRED_ARGUMENT], + ["--pid-file", GetoptLong::REQUIRED_ARGUMENT], + ["--player-log-dir", GetoptLong::REQUIRED_ARGUMENT]) parser.quiet = true begin parser.each_option do |name, arg| @@ -252,6 +277,12 @@ def check_command_line $stderr.puts "WARNING: --floodgate-history has been deprecated." $options["floodgate-history"] = nil end + + $options["max-moves"] ||= ShogiServer::Default_Max_Moves + $options["max-moves"] = $options["max-moves"].to_i + + $options["least-time-per-move"] ||= ShogiServer::Default_Least_Time_Per_Move + $options["least-time-per-move"] = $options["least-time-per-move"].to_i end # See if a file can be created in the directory. @@ -319,9 +350,15 @@ def login_loop(client) player = ShogiServer::Player::new(str, client, eol) login = ShogiServer::Login::factory(str, player) if (current_player = $league.find(player.name)) + # Even if a player is in the 'game' state, when the status of the + # player has not been updated for more than a day, it is very + # likely that the player is stalling. In such a case, a new player + # can override the current player. if (current_player.password == player.password && - current_player.status != "game") - log_message(sprintf("user %s login forcely", player.name)) + (current_player.status != "game" || + Time.now - current_player.last_command_at > ONE_DAY)) + log_message("player %s login forcibly, nudging the former player" % [player.name]) + log_message(" the former player was in %s and received the last command at %s" % [current_player.status, current_player.last_command_at]) current_player.kill else login.incorrect_duplicated_player(str) @@ -375,6 +412,7 @@ def main $league.dir = $topdir config = {} + config[:BindAddress] = "0.0.0.0" config[:Port] = port config[:ServerType] = WEBrick::Daemon if $options["daemon"] config[:Logger] = $logger @@ -420,7 +458,10 @@ def main client.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) # Keepalive time can be set by /proc/sys/net/ipv4/tcp_keepalive_time player, login = login_loop(client) # loop - next unless player + unless player + log_error("Detected a timed out login attempt") + next + end log_message(sprintf("user %s login", player.name)) login.process