提交: 39630f65538f113a9e2562e710525b6a84a4e4e0 - main (git)

Commit MetaInfo

• 修订版: 39630f65538f113a9e2562e710525b6a84a4e4e0 (tree)
• 时间: 2012-10-06 01:23:54
• 作者: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

ClientReceiveFullServerInfo, ServerRequestedFullServerInfo コマンドを追加
サーバーのconfig.jsonのリポジトリ上の位置を変更

更改概述

• modified: .gitignore
• modified: client/Client.cpp
• modified: client/CommandManager.cpp
• modified: client/bin/system/plugins/textchat/main.js
• modified: common/network/Command.cpp
• modified: common/network/Command.hpp
• modified: common/network/CommandHeader.hpp
• modified: package.py
• modified: server/Config.cpp
• modified: server/Config.hpp
• modified: server/Server.cpp
• modified: server/Server.hpp
• modified: server/main.cpp
• delete: {mmo-0.3.9_123 => client/bin}/system/languages/en.json
• delete: {mmo-0.3.9_123 => client/bin}/system/languages/jp.json
• delete: {server => client/bin/server}/config.json

差异

--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ log_*.txt
 /Client/bin/account.xml
 /Client/bin/config.json
 /Client/bin/Log.txt
-/Client/bin/server
 /Server/server_key.pub
 /Server/server_key
 /Server/Debug
@@ -30,7 +29,6 @@ log_*.txt
 /server/buildversion.hpp
 /server/Release
 /ServerLauncher
-/client/bin/server
 /client/bin/tool
 /client/bin/widgets
 /client/bin/models

--- a/client/Client.cpp
+++ b/client/Client.cpp
@@ -108,6 +108,8 @@ Client::Client(const std::string& host,
                                             (uint16_t)MMO_PROTOCOL_VERSION,
                                             session->udp_port()
                                     ));
+							
+							session->Send(network::ServerRequestedFullServerInfo());
                         }
                     }
                     break;

--- a/client/CommandManager.cpp
+++ b/client/CommandManager.cpp
@@ -85,6 +85,14 @@ void CommandManager::FetchCommand(const network::Command& command)
 	}
 	break;
 
+	// サーバーデータ受信
+	case ClientReceiveFullServerInfo:
+	{
+		std::string xml;
+		network::Utils::Deserialize(command.body(), &xml);
+	}
+	break;
+
 	case ClientReceiveJSON:
 	// case ClientReceiveChatLog:
 	{

--- a/mmo-0.3.9_123/system/languages/en.json
+++ b/client/bin/system/languages/en.json
@@ -9,6 +9,7 @@
 			"status":
 				{
 					"name":					"Status",
+					"trip":					"Tripcode",
 					"nickname":				"Nickname",
 					"modelname":			"Model",
 					"user_id":				"UserID",

--- a/mmo-0.3.9_123/system/languages/jp.json
+++ b/client/bin/system/languages/jp.json
@@ -9,6 +9,7 @@
 			"status":
 				{
 					"name":					"ステータス",
+					"trip":					"トリップ",
 					"nickname":				"ニックネーム",
 					"modelname":			"モデル名",
 					"user_id":				"ユーザーID",

--- a/client/bin/system/plugins/textchat/main.js
+++ b/client/bin/system/plugins/textchat/main.js
@@ -17,6 +17,11 @@ var list;
 // チャットメッセージ受信
 var even_line = false;
 Network.onReceive = function (info, msg) {
+
+	if (msg.type && msg.type != "chat") {
+		return;
+	}
+
 	var trip = ""
 	if (info.player.trip()) {
 		trip = "《" + info.player.trip() + "》"
@@ -151,13 +156,14 @@ InputBox.onEnter = function (text) {
 
             // システム      
             case "system":
-                var msgObject = { system: args.trim() };
+                var msgObject = { type: "system", system: args.trim() };
                 Network.sendAll(msgObject);
                 break;
 
             // プライベート      
             case "private":
                 var msgObject = {
+                	type: "chat", 
                     private: [
                     			Player.myself().id(),
                     			Player.getFromName([args.trim()]).id()
@@ -177,7 +183,7 @@ InputBox.onEnter = function (text) {
 
     } else {
         // コマンドでない場合はそのままチャットメッセージとして送信
-        var msgObject = { body: text };
+        var msgObject = { type: "chat", body: text };
         Network.sendAll(msgObject);
     }
 

--- a/common/network/Command.cpp
+++ b/common/network/Command.cpp
@@ -40,22 +40,9 @@ FatalConnectionError::FatalConnectionError(uint32_t user_id) :
     body_ = Utils::Serialize(user_id);
 }
 
-ServerStartEncryptedSession::ServerStartEncryptedSession() :
-        Command(header::ServerStartEncryptedSession, "")
-{
-
-}
-
-ClientStartEncryptedSession::ClientStartEncryptedSession() :
-        Command(header::ClientStartEncryptedSession, "")
-{
-
-}
-
 ServerReceivePublicKey::ServerReceivePublicKey(const std::string& key) :
         Command(header::ServerReceivePublicKey, key)
 {
-
 }
 
 ClientReceiveCommonKey::ClientReceiveCommonKey(const std::string& key,
@@ -83,18 +70,6 @@ ServerReceiveClientInfo::ServerReceiveClientInfo(const std::string& key, uint16_
 
 }
 
-ClientRequestedPublicKey::ClientRequestedPublicKey() :
-        Command(header::ClientRequestedPublicKey, "")
-{
-
-}
-
-ClientRequestedClientInfo::ClientRequestedClientInfo() :
-        Command(header::ClientRequestedClientInfo, "")
-{
-
-}
-
 ServerRequestedAccountRevisionPatch::ServerRequestedAccountRevisionPatch(uint32_t user_id, int revision) :
                                            Command(header::ServerRequestedAccountRevisionPatch,
                                                    Utils::Serialize(user_id, revision))
@@ -118,12 +93,6 @@ ClientReceiveWriteAverageLimitUpdate::ClientReceiveWriteAverageLimitUpdate(uint1
 {
 }
 
-ClientReceiveServerCrowdedError::ClientReceiveServerCrowdedError() :
-        Command(header::ClientReceiveServerCrowdedError, "")
-{
-
-}
-
 ClientReceiveUnsupportVersionError::ClientReceiveUnsupportVersionError(uint32_t require_version) :
         Command(header::ClientReceiveUnsupportVersionError, Utils::Serialize(require_version))
 {
@@ -157,4 +126,10 @@ ClientReceiveServerInfo::ClientReceiveServerInfo(const std::string& stage) :
 
 }
 
+ClientReceiveFullServerInfo::ClientReceiveFullServerInfo(const std::string& xml) :
+	Command(header::ClientReceiveFullServerInfo, Utils::Serialize(xml))
+{
+
+}
+
 }

--- a/common/network/Command.hpp
+++ b/common/network/Command.hpp
@@ -43,6 +43,20 @@ typedef boost::weak_ptr<Session> SessionWeakPtr;
 			boost::asio::ip::udp::endpoint udp_endpoint_;
     };
 
+	template<header::CommandHeader Header>
+	class CommandTemplate : public Command {
+		public:
+			CommandTemplate() :
+			  Command(Header, "") {}
+	};
+
+	typedef CommandTemplate<header::ServerStartEncryptedSession>		ServerStartEncryptedSession;
+	typedef CommandTemplate<header::ClientStartEncryptedSession>		ClientStartEncryptedSession;
+	typedef CommandTemplate<header::ClientRequestedPublicKey>			ClientRequestedPublicKey;
+	typedef CommandTemplate<header::ClientRequestedClientInfo>			ClientRequestedClientInfo;
+	typedef CommandTemplate<header::ClientReceiveServerCrowdedError>	ClientReceiveServerCrowdedError;
+	typedef CommandTemplate<header::ServerRequestedFullServerInfo>		ServerRequestedFullServerInfo;
+
     // コネクションの切断
     class FatalConnectionError : public Command {
     public:
@@ -50,18 +64,6 @@ typedef boost::weak_ptr<Session> SessionWeakPtr;
         FatalConnectionError(uint32_t user_id);
     };
 
-    // 暗号化通信を開始
-    class ServerStartEncryptedSession : public Command {
-    public:
-        ServerStartEncryptedSession();
-    };
-
-    // 暗号化通信を開始
-    class ClientStartEncryptedSession : public Command {
-    public:
-        ClientStartEncryptedSession();
-    };
-
     // クライアントからの公開鍵を受信
     class ServerReceivePublicKey : public Command {
     public:
@@ -94,18 +96,6 @@ typedef boost::weak_ptr<Session> SessionWeakPtr;
         ServerReceiveClientInfo(const std::string& key, uint16_t version, uint16_t udp_port);
     };
 
-    // 公開鍵を要求された
-    class ClientRequestedPublicKey : public Command {
-    public:
-        ClientRequestedPublicKey();
-    };
-
-    // クライアントの情報を要求された
-    class ClientRequestedClientInfo : public Command {
-    public:
-        ClientRequestedClientInfo();
-    };
-
     class ServerRequestedAccountRevisionPatch : public Command {
     public:
         ServerRequestedAccountRevisionPatch(uint32_t user_id, int revision);
@@ -128,11 +118,6 @@ typedef boost::weak_ptr<Session> SessionWeakPtr;
         ClientReceiveWriteAverageLimitUpdate(uint16_t byte);
     };
 
-    class ClientReceiveServerCrowdedError : public Command {
-    public:
-        ClientReceiveServerCrowdedError();
-    };
-
     class ClientReceiveUnsupportVersionError : public Command {
     public:
         ClientReceiveUnsupportVersionError(uint32_t require_version);
@@ -163,4 +148,9 @@ typedef boost::weak_ptr<Session> SessionWeakPtr;
         ClientReceiveServerInfo(const std::string& stage);
 	};
 
+	class ClientReceiveFullServerInfo : public Command {
+    public:
+        ClientReceiveFullServerInfo(const std::string& xml);
+	};
+
 }

--- a/common/network/CommandHeader.hpp
+++ b/common/network/CommandHeader.hpp
@@ -28,6 +28,8 @@ namespace header {
         ServerUpdateAccountProperty =               0x13,
         ServerReceiveJSON =                         0x14,
         ClientReceiveJSON =                         0x15,
+        ServerRequestedFullServerInfo =             0x16,
+        ClientReceiveFullServerInfo =               0x17,
 		
 		ServerReceiveWriteLimit =					0x20,
 		ServerRequstedStatus =						0xE0,

--- a/package.py
+++ b/package.py
@@ -35,7 +35,7 @@ def make_full_package(model = True):
 	zip.write(os.path.join(base_dir, 'license.txt'), 'license.txt')
 	zip.write(os.path.join(base_dir, 'mmd.txt'), 'mmd.txt')
 
-	zip.write(os.path.join(base_dir, 'server/config.json'), 'server/config.json')
+	zip.write(os.path.join(bin_path, 'server/config.json'), 'server/config.json')
 
 	zip.write(os.path.join(bin_path, 'config.json'), 'config.json')
 	zip.write(os.path.join(bin_path, 'server/server.exe'), 'server/server.exe')
@@ -91,11 +91,11 @@ def make_server_package():
 	zip = zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
 
 	zip.write(os.path.join(base_dir, 'license.txt'), 'license.txt')
-	zip.write(os.path.join(base_dir, 'server/config.json'), 'config.json')
 	zip.write(os.path.join(base_dir, 'server/readme.txt'), 'readme.txt')
 
 	bin_path = os.path.join(base_dir, 'client/bin/')
 	zip.write(os.path.join(bin_path, 'server/server.exe'), 'server.exe')
+	zip.write(os.path.join(bin_path, 'server/config.json'), 'config.json')
 	        
 	zip.close()
 	

--- a/server/Config.cpp
+++ b/server/Config.cpp
@@ -40,36 +40,36 @@ Config::Config()
 
 void Config::Load()
 {
-    using boost::property_tree::ptree;
-    ptree pt;
-
-    try {
-        read_json(std::ifstream(CONFIG_JSON), pt);
-    } catch(std::exception& e) {
+	try {
+		read_json(std::ifstream(CONFIG_JSON), pt_);
+	} catch(std::exception& e) {
 		Logger::Error(unicode::ToTString(e.what()));
-    }
+	}
 	
-    port_ =             pt.get<uint16_t>("port", 39390);
-    server_name_ =		pt.get<std::string>("server_name", "MMO Server");
-    stage_ =			pt.get<std::string>("stage", "stage:ケロリン町");
-    capacity_ =			pt.get<int>("capacity", 20);
+    port_ =             pt_.get<uint16_t>("port", 39390);
+    server_name_ =		pt_.get<std::string>("server_name", "MMO Server");
+	stage_ =			pt_.get<std::string>("stage", unicode::sjis2utf8("stage:ケロリン町"));
+    capacity_ =			pt_.get<int>("capacity", 20);
 
-	public_ =			pt.get<bool>("public", false);
+	public_ =			pt_.get<bool>("public", false);
 
-	receive_limit_1_ =	pt.get<int>("receive_limit_1", 60);
-	receive_limit_2_ =	pt.get<int>("receive_limit_2", 100);
+	receive_limit_1_ =	pt_.get<int>("receive_limit_1", 60);
+	receive_limit_2_ =	pt_.get<int>("receive_limit_2", 100);
 
-	auto patterns =		pt.get_child("blocking_address_patterns", ptree());
+	auto patterns =		pt_.get_child("blocking_address_patterns", ptree());
 	BOOST_FOREACH(const auto& item, patterns) {
 		blocking_address_patterns_.push_back(item.second.get_value<std::string>());
 	}
 	
-	timestamp_ = last_write_time(CONFIG_JSON);
+	if (exists(CONFIG_JSON)) {
+		timestamp_ = last_write_time(CONFIG_JSON);
+	}
 }
 
 void Config::Reload()
 {
-	if (timestamp_ < last_write_time(CONFIG_JSON)) {
+	if (exists(CONFIG_JSON) &&
+		timestamp_ < last_write_time(CONFIG_JSON)) {
 		Config::Load();
 		Logger::Info(_T("Configuration reloaded."));
 	}
@@ -112,4 +112,9 @@ int Config::receive_limit_2() const
 const std::list<std::string>& Config::blocking_address_patterns() const
 {
 	return blocking_address_patterns_;
+}
+
+const boost::property_tree::ptree& Config::pt() const
+{
+	return pt_;
 }
\ No newline at end of file

--- a/server/Config.hpp
+++ b/server/Config.hpp
@@ -31,6 +31,8 @@ class Config
 		
 		std::list<std::string> blocking_address_patterns_;
 
+		boost::property_tree::ptree pt_;
+
     public:
         uint16_t port() const;
         const std::string& server_name() const;
@@ -42,6 +44,8 @@ class Config
 
 		const std::list<std::string>& blocking_address_patterns() const;
 
+		const boost::property_tree::ptree& pt() const;
+
 	private:
 		static const char* CONFIG_JSON;
 		time_t timestamp_;

--- a/server/Server.cpp
+++ b/server/Server.cpp
@@ -99,6 +99,18 @@ namespace network {
 		return msg;
 	}
 
+	std::string Server::GetFullStatus() const
+	{
+		using namespace boost::property_tree;
+		ptree xml_ptree;
+
+		xml_ptree.put_child("config", config_.pt());
+
+		std::stringstream stream;
+		write_xml(stream, xml_ptree);
+		return stream.str();
+	}
+
     bool Server::Empty() const
     {
         return GetUserCount() == 0;
@@ -120,16 +132,13 @@ namespace network {
 		config_.Reload();
 
 		const auto address = session->tcp_socket().remote_endpoint().address();
+
+		// 拒否IPでないか判定
 		if(IsBlockedAddress(address)) {
 			Logger::Info("Blocked IP Address: %s", address);
             session->Close();
 
-		} else if (GetUserCount() >= config_.capacity()) {
-			Logger::Info("Refused Session");
-            session->SyncSend(ClientReceiveServerCrowdedError());
-            session->Close();
-
-        } else {
+		} else {
             session->set_on_receive(callback_);
             session->Start();
             sessions_.push_back(SessionWeakPtr(session));

--- a/server/Server.hpp
+++ b/server/Server.hpp
@@ -37,6 +37,7 @@ class Server {
 
         bool Empty() const;
 		std::string GetStatusJSON() const;
+		std::string GetFullStatus() const;
 
         int GetSessionReadAverageLimit();
 		int GetUserCount() const;

--- a/server/main.cpp
+++ b/server/main.cpp
@@ -18,6 +18,7 @@
 #include "Config.hpp"
 #include "Account.hpp"
 #include "version.hpp"
+
 #ifdef __linux__
 #include "ServerSigHandler.hpp"
 #include <csignal>
@@ -82,6 +83,15 @@ void server()
 
         switch (c.header()) {
 
+		// フルステータス要求
+		case network::header::ServerRequestedFullServerInfo:
+		{
+			if (auto session = c.session().lock()) {
+				session->Send(network::ClientReceiveFullServerInfo(server.GetFullStatus()));
+			}
+		}
+		break;
+
 		// ステータス要求
 		case network::header::ServerRequstedStatus:
 		{
@@ -156,6 +166,14 @@ void server()
         {
             if (auto session = c.session().lock()) {
 
+				// 最大接続数を超えていないか判定
+				if (server.GetUserCount() >= config.capacity()) {
+					Logger::Info("Refused Session");
+					session->SyncSend(network::ClientReceiveServerCrowdedError());
+					session->Close();
+
+				}
+
 				session->ResetReadByteAverage();
 
                 std::string finger_print;