プロトコルバージョンを3に変更

[mmo/main.git] / server / Server.cpp

diff --git a/server/Server.cpp b/server/Server.cpp
index 5c3f279..59e6912 100644 (file)
--- a/server/Server.cpp
+++ b/server/Server.cpp
@@ -1,4 +1,4 @@
-//\r
+//\r
 // Server.cpp\r
 //\r
 \r
@@ -7,18 +7,20 @@
 #include <algorithm>\r
 #include <boost/make_shared.hpp>\r
 #include <boost/foreach.hpp>\r
+#include <boost/archive/text_oarchive.hpp>\r
+#include <boost/property_tree/ptree_serialization.hpp>\r
 #include "../common/Logger.hpp"\r
 #include "../common/network/Command.hpp"\r
 #include "../common/network/Utils.hpp"\r
 \r
 namespace network {\r
 \r
-    Server::Server(Config& config) :\r
-                       config_(config),\r
-            endpoint_(tcp::v4(), config.port()),\r
+    Server::Server() :\r
+            endpoint_(tcp::v4(), config_.port()),\r
             acceptor_(io_service_, endpoint_),\r
-            socket_udp_(io_service_, udp::endpoint(udp::v4(), config.port())),\r
-            udp_packet_count_(0)\r
+            socket_udp_(io_service_, udp::endpoint(udp::v4(), config_.port())),\r
+            udp_packet_count_(0),\r
+                       recent_chat_log_(10)\r
     {\r
     }\r
 \r
@@ -28,7 +30,8 @@ namespace network {
                 [&](network::Command c){\r
 \r
             // ログアウト\r
-            if (c.header() == network::header::FatalConnectionError) {\r
+            if (c.header() == network::header::FatalConnectionError || \r
+                               c.header() == network::header::UserFatalConnectionError) {\r
                 if (callback) {\r
                                        (*callback)(c);\r
                                }\r
@@ -48,6 +51,12 @@ namespace network {
 \r
         });\r
 \r
+               BOOST_FOREACH(const auto& host, config().lobby_servers()) {\r
+                       udp::resolver resolver(io_service_);\r
+                       udp::resolver::query query(udp::v4(), host.c_str(), "39380");\r
+                       lobby_hosts_.push_back(resolver.resolve(query));\r
+               }\r
+\r
         {\r
         auto new_session = boost::make_shared<ServerSession>(io_service_);\r
         acceptor_.async_accept(new_session->tcp_socket(),\r
@@ -80,7 +89,9 @@ namespace network {
        int Server::GetUserCount() const\r
        {\r
                auto count = std::count_if(sessions_.begin(), sessions_.end(),\r
-                       [](const SessionWeakPtr& s){ return !s.expired() && s.lock()->online(); });\r
+                       [](const SessionWeakPtr& s){ \r
+                               return !s.expired() && s.lock()->online() && s.lock()->id() > 0; \r
+                       });\r
 \r
                return count;\r
        }\r
@@ -105,12 +116,56 @@ namespace network {
                ptree xml_ptree;\r
 \r
                xml_ptree.put_child("config", config_.pt());\r
+               xml_ptree.put("version", (boost::format("%d.%d.%d") \r
+                       % MMO_VERSION_MAJOR % MMO_VERSION_MINOR % MMO_VERSION_REVISION).str());\r
+               xml_ptree.put("protocol_version", MMO_PROTOCOL_VERSION);\r
+\r
+               {\r
+                       ptree player_array;\r
+                       auto id_list = account_.GetIDList();\r
+                       BOOST_FOREACH(const auto& s, sessions_) {\r
+                               if (!s.expired() && s.lock()->online() && s.lock()->id() > 0) {\r
+                                       auto id = s.lock()->id();\r
+                                       ptree player;\r
+                                       player.put("name", account_.GetUserName(id));\r
+                                       player.put("model_name", account_.GetUserModelName(id));\r
+                                       player_array.push_back(std::make_pair("", player));\r
+                               }\r
+                       }\r
+                       xml_ptree.put_child("players", player_array);\r
+               }\r
 \r
+               //{\r
+               //      ptree log_array;\r
+               //      BOOST_FOREACH(const std::string& msg, recent_chat_log_) {\r
+               //              log_array.push_back(std::make_pair("", msg));\r
+               //      }\r
+               //      xml_ptree.put_child("recent_chat_log", log_array);\r
+               //}\r
+\r
+               xml_ptree.put_child("channels", channel_.pt());\r
                std::stringstream stream;\r
-               write_xml(stream, xml_ptree);\r
+               boost::archive::text_oarchive oa(stream);\r
+               oa << xml_ptree;\r
+\r
                return stream.str();\r
        }\r
 \r
+       const Config& Server::config() const\r
+       {\r
+               return config_;\r
+       }\r
+\r
+       Account& Server::account()\r
+       {\r
+               return account_;\r
+       }\r
+       \r
+       void Server::AddChatLog(const std::string& msg)\r
+       {\r
+               recent_chat_log_.push_back(msg);\r
+       }\r
+\r
     bool Server::Empty() const\r
     {\r
         return GetUserCount() == 0;\r
@@ -148,8 +203,8 @@ namespace network {
         }\r
 \r
         auto new_session = boost::make_shared<ServerSession>(io_service_);\r
-         acceptor_.async_accept(new_session->tcp_socket(),\r
-                 boost::bind(&Server::ReceiveSession, this, new_session, boost::asio::placeholders::error));\r
+        acceptor_.async_accept(new_session->tcp_socket(),\r
+                boost::bind(&Server::ReceiveSession, this, new_session, boost::asio::placeholders::error));\r
 \r
                RefreshSession();\r
     }\r
@@ -171,7 +226,9 @@ namespace network {
             if (auto session = ptr.lock()) {\r
                                if (channel < 0 || (channel >= 0 && session->channel() == channel)) {\r
                                        if (!limited || session->write_average_limit() > session->GetWriteByteAverage()) {\r
-                                               session->Send(command);\r
+                                               if (session->id() > 0) {\r
+                                                       session->Send(command);\r
+                                               }\r
                                        }\r
                                }\r
             }\r
@@ -184,7 +241,7 @@ namespace network {
             if (auto session = ptr.lock()) {\r
                                if (channel < 0 || (channel >= 0 && session->channel() == channel)) {\r
                                        if (!limited || session->write_average_limit() > session->GetWriteByteAverage()) {\r
-                                               if (session->id() != self_id) {\r
+                                               if (session->id() > 0 && session->id() != self_id) {\r
                                                        session->Send(command);\r
                                                }\r
                                        }\r
@@ -223,6 +280,14 @@ namespace network {
         }\r
     }\r
 \r
+       void Server::SendPublicPing()\r
+       {\r
+               static char request[] = "P";\r
+               BOOST_FOREACH(const auto& iterator, lobby_hosts_) {\r
+                       io_service_.post(boost::bind(&Server::DoWriteUDP, this, request, *iterator));\r
+               }\r
+       }\r
+\r
     void Server::SendUDP(const std::string& message, const boost::asio::ip::udp::endpoint endpoint)\r
     {\r
                io_service_.post(boost::bind(&Server::DoWriteUDP, this, message, endpoint));\r