X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverlist.cpp;h=ae3bd98a40081e169732551e881cff473037a419;hb=f6a33a1a7a298cb7d3fb18818bae97bd1b89d633;hp=cc41216ff5a7f8c512588130c665f6853abf15b8;hpb=9afeb97fc693a769f2d9dad4aad6ddbdef285a71;p=dragonfireclient.git diff --git a/src/serverlist.cpp b/src/serverlist.cpp index cc41216ff..ae3bd98a4 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -17,18 +17,19 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include #include #include "version.h" -#include "main.h" // for g_settings #include "settings.h" #include "serverlist.h" #include "filesys.h" #include "porting.h" #include "log.h" -#include "json/json.h" +#include "network/networkprotocol.h" +#include #include "convert_json.h" #include "httpfetch.h" #include "util/string.h" @@ -67,20 +68,34 @@ std::vector getLocal() std::vector getOnline() { - Json::Value root = fetchJsonValue( - (g_settings->get("serverlist_url") + "/list").c_str(), NULL); + std::ostringstream geturl; - std::vector serverlist; + u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ? + CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN; + + geturl << g_settings->get("serverlist_url") << + "/list?proto_version_min=" << proto_version_min << + "&proto_version_max=" << CLIENT_PROTOCOL_VERSION_MAX; + Json::Value root = fetchJsonValue(geturl.str(), NULL); + + std::vector server_list; + + if (!root.isObject()) { + return server_list; + } - if (root.isArray()) { - for (unsigned int i = 0; i < root.size(); i++) { - if (root[i].isObject()) { - serverlist.push_back(root[i]); - } + root = root["list"]; + if (!root.isArray()) { + return server_list; + } + + for (const Json::Value &i : root) { + if (i.isObject()) { + server_list.push_back(i); } } - return serverlist; + return server_list; } @@ -152,14 +167,12 @@ std::vector deSerialize(const std::string &liststring) const std::string serialize(const std::vector &serverlist) { std::string liststring; - for (std::vector::const_iterator it = serverlist.begin(); - it != serverlist.end(); - it++) { + for (const ServerListSpec &it : serverlist) { liststring += "[server]\n"; - liststring += (*it)["name"].asString() + '\n'; - liststring += (*it)["address"].asString() + '\n'; - liststring += (*it)["port"].asString() + '\n'; - liststring += (*it)["description"].asString() + '\n'; + liststring += it["name"].asString() + '\n'; + liststring += it["address"].asString() + '\n'; + liststring += it["port"].asString() + '\n'; + liststring += it["description"].asString() + '\n'; liststring += '\n'; } return liststring; @@ -169,10 +182,8 @@ const std::string serializeJson(const std::vector &serverlist) { Json::Value root; Json::Value list(Json::arrayValue); - for (std::vector::const_iterator it = serverlist.begin(); - it != serverlist.end(); - it++) { - list.append(*it); + for (const ServerListSpec &it : serverlist) { + list.append(it); } root["list"] = list; Json::FastWriter writer; @@ -181,24 +192,31 @@ const std::string serializeJson(const std::vector &serverlist) #if USE_CURL -void sendAnnounce(const std::string &action, +void sendAnnounce(AnnounceAction action, + const u16 port, const std::vector &clients_names, const double uptime, const u32 game_time, const float lag, const std::string &gameid, - const std::vector &mods) + const std::string &mg_name, + const std::vector &mods, + bool dedicated) { + static const char *aa_names[] = {"start", "update", "delete"}; Json::Value server; - server["action"] = action; - server["port"] = g_settings->getU16("port"); + server["action"] = aa_names[action]; + server["port"] = port; if (g_settings->exists("server_address")) { server["address"] = g_settings->get("server_address"); } - if (action != "delete") { + if (action != AA_DELETE) { + bool strict_checking = g_settings->getBool("strict_protocol_version_checking"); server["name"] = g_settings->get("server_name"); server["description"] = g_settings->get("server_description"); - server["version"] = minetest_version_simple; + server["version"] = g_version_string; + server["proto_min"] = strict_checking ? LATEST_PROTOCOL_VERSION : SERVER_PROTOCOL_VERSION_MIN; + server["proto_max"] = strict_checking ? LATEST_PROTOCOL_VERSION : SERVER_PROTOCOL_VERSION_MAX; server["url"] = g_settings->get("server_url"); server["creative"] = g_settings->getBool("creative_mode"); server["damage"] = g_settings->getBool("enable_damage"); @@ -209,39 +227,37 @@ void sendAnnounce(const std::string &action, server["clients"] = (int) clients_names.size(); server["clients_max"] = g_settings->getU16("max_users"); server["clients_list"] = Json::Value(Json::arrayValue); - for (std::vector::const_iterator it = clients_names.begin(); - it != clients_names.end(); - ++it) { - server["clients_list"].append(*it); + for (const std::string &clients_name : clients_names) { + server["clients_list"].append(clients_name); } - if (gameid != "") server["gameid"] = gameid; + if (!gameid.empty()) + server["gameid"] = gameid; } - if (action == "start") { - server["dedicated"] = g_settings->getBool("server_dedicated"); + if (action == AA_START) { + server["dedicated"] = dedicated; server["rollback"] = g_settings->getBool("enable_rollback_recording"); - server["mapgen"] = g_settings->get("mg_name"); + server["mapgen"] = mg_name; server["privs"] = g_settings->get("default_privs"); - server["can_see_far_names"] = g_settings->getBool("unlimited_player_transfer_distance"); + server["can_see_far_names"] = g_settings->getS16("player_transfer_distance") <= 0; server["mods"] = Json::Value(Json::arrayValue); - for (std::vector::const_iterator it = mods.begin(); - it != mods.end(); - ++it) { - server["mods"].append(it->name); + for (const ModSpec &mod : mods) { + server["mods"].append(mod.name); } actionstream << "Announcing to " << g_settings->get("serverlist_url") << std::endl; - } else { + } else if (action == AA_UPDATE) { if (lag) server["lag"] = lag; } Json::FastWriter writer; - HTTPFetchRequest fetchrequest; - fetchrequest.url = g_settings->get("serverlist_url") + std::string("/announce"); - fetchrequest.post_fields["json"] = writer.write(server); - fetchrequest.multipart = true; - httpfetch_async(fetchrequest); + HTTPFetchRequest fetch_request; + fetch_request.url = g_settings->get("serverlist_url") + std::string("/announce"); + fetch_request.post_fields["json"] = writer.write(server); + fetch_request.multipart = true; + httpfetch_async(fetch_request); } #endif -} //namespace ServerList +} // namespace ServerList +