X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverlist.cpp;h=29e3ac9a6ad4f84e9a077948167c4348701c6b32;hb=ef22c0206f225dbccd67bff9fb888867c63039b3;hp=b2f49ae72191f6ec1f390748c6bb2a06f107882b;hpb=ee07c3f7cf638e854518d2cfcb9c11a64412cc72;p=dragonfireclient.git diff --git a/src/serverlist.cpp b/src/serverlist.cpp index b2f49ae72..29e3ac9a6 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -18,259 +18,92 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include -#include -#include - -#include "main.h" // for g_settings +#include "version.h" #include "settings.h" #include "serverlist.h" #include "filesys.h" -#include "porting.h" #include "log.h" -#include "json/json.h" -#if USE_CURL -#include -#endif +#include "network/networkprotocol.h" +#include +#include "convert_json.h" +#include "httpfetch.h" namespace ServerList { -std::string getFilePath() -{ - std::string serverlist_file = g_settings->get("serverlist_file"); - - std::string rel_path = std::string("client") + DIR_DELIM - + "serverlist" + DIR_DELIM - + serverlist_file; - std::string path = porting::path_share + DIR_DELIM + rel_path; - return path; -} - -std::vector getLocal() -{ - std::string path = ServerList::getFilePath(); - std::string liststring; - if(fs::PathExists(path)) - { - std::ifstream istream(path.c_str(), std::ios::binary); - if(istream.is_open()) - { - std::ostringstream ostream; - ostream << istream.rdbuf(); - liststring = ostream.str(); - istream.close(); - } - } - - return ServerList::deSerialize(liststring); -} - - #if USE_CURL - -static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) -{ - ((std::string*)userp)->append((char*)contents, size * nmemb); - return size * nmemb; -} - - -std::vector getOnline() -{ - std::string liststring; - CURL *curl; - - curl = curl_easy_init(); - if (curl) - { - CURLcode res; - - curl_easy_setopt(curl, CURLOPT_URL, (g_settings->get("serverlist_url")+"/list").c_str()); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::WriteCallback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring); - - res = curl_easy_perform(curl); - if (res != CURLE_OK) - errorstream<<"Serverlist at url "<get("serverlist_url")<<" not found (internet connection?)"< serverlist = ServerList::getLocal(); - for(unsigned i = 0; i < serverlist.size(); i++) - { - if (serverlist[i]["address"] == server["address"] - && serverlist[i]["port"] == server["port"]) - { - serverlist.erase(serverlist.begin() + i); - } - } - - std::string path = ServerList::getFilePath(); - std::ofstream stream (path.c_str()); - if (stream.is_open()) - { - stream< &clients_names, + const double uptime, + const u32 game_time, + const float lag, + const std::string &gameid, + const std::string &mg_name, + const std::vector &mods, + bool dedicated) { - // Remove duplicates - ServerList::deleteEntry(server); - - std::vector serverlist = ServerList::getLocal(); - - // Insert new server at the top of the list - serverlist.insert(serverlist.begin(), server); - - std::string path = ServerList::getFilePath(); - std::ofstream stream (path.c_str()); - if (stream.is_open()) - { - stream<exists("server_address")) { + server["address"] = g_settings->get("server_address"); } - - return false; -} - -std::vector deSerialize(std::string liststring) -{ - std::vector serverlist; - std::istringstream stream(liststring); - std::string line, tmp; - while (std::getline(stream, line)) - { - std::transform(line.begin(), line.end(),line.begin(), ::toupper); - if (line == "[SERVER]") - { - ServerListSpec thisserver; - std::getline(stream, tmp); - thisserver["name"] = tmp; - std::getline(stream, tmp); - thisserver["address"] = tmp; - std::getline(stream, tmp); - thisserver["port"] = tmp; - std::getline(stream, tmp); - thisserver["description"] = tmp; - serverlist.push_back(thisserver); + 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"] = 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"); + server["password"] = g_settings->getBool("disallow_empty_password"); + server["pvp"] = g_settings->getBool("enable_pvp"); + server["uptime"] = (int) uptime; + server["game_time"] = game_time; + server["clients"] = (int) clients_names.size(); + server["clients_max"] = g_settings->getU16("max_users"); + server["clients_list"] = Json::Value(Json::arrayValue); + for (const std::string &clients_name : clients_names) { + server["clients_list"].append(clients_name); } + if (!gameid.empty()) + server["gameid"] = gameid; } - return serverlist; -} -std::string serialize(std::vector serverlist) -{ - std::string liststring; - for(std::vector::iterator i = serverlist.begin(); i != serverlist.end(); i++) - { - liststring += "[server]\n"; - liststring += (*i)["name"].asString() + "\n"; - liststring += (*i)["address"].asString() + "\n"; - liststring += (*i)["port"].asString() + "\n"; - liststring += (*i)["description"].asString() + "\n"; - liststring += "\n"; - } - return liststring; -} - -std::vector deSerializeJson(std::string liststring) -{ - std::vector serverlist; - Json::Value root; - Json::Reader reader; - std::istringstream stream(liststring); - if (!liststring.size()) { - return serverlist; - } - if (!reader.parse( stream, root ) ) - { - errorstream << "Failed to parse server list " << reader.getFormattedErrorMessages(); - return serverlist; - } - if (root["list"].isArray()) - for (unsigned int i = 0; i < root["list"].size(); i++) - { - if (root["list"][i].isObject()) { - serverlist.push_back(root["list"][i]); + if (action == AA_START) { + server["dedicated"] = dedicated; + server["rollback"] = g_settings->getBool("enable_rollback_recording"); + server["mapgen"] = mg_name; + server["privs"] = g_settings->get("default_privs"); + server["can_see_far_names"] = g_settings->getS16("player_transfer_distance") <= 0; + server["mods"] = Json::Value(Json::arrayValue); + for (const ModSpec &mod : mods) { + server["mods"].append(mod.name); } + } else if (action == AA_UPDATE) { + if (lag) + server["lag"] = lag; } - return serverlist; -} - -std::string serializeJson(std::vector serverlist) -{ - Json::Value root; - Json::Value list(Json::arrayValue); - for(std::vector::iterator i = serverlist.begin(); i != serverlist.end(); i++) - { - list.append(*i); - } - root["list"] = list; - Json::StyledWriter writer; - return writer.write( root ); -} - -#if USE_CURL -static size_t ServerAnnounceCallback(void *contents, size_t size, size_t nmemb, void *userp) -{ - return 0; - //((std::string*)userp)->append((char*)contents, size * nmemb); - //return size * nmemb; -} -void sendAnnounce(std::string action, u16 clients) { - Json::Value server; - if (action.size()) - server["action"] = action; - server["port"] = g_settings->get("port"); - if (action != "del") { - server["name"] = g_settings->get("server_name"); - server["description"] = g_settings->get("server_description"); - server["address"] = g_settings->get("server_address"); - server["version"] = VERSION_STRING; - server["url"] = g_settings->get("server_url"); - server["creative"] = g_settings->get("creative_mode"); - server["damage"] = g_settings->get("enable_damage"); - server["dedicated"] = g_settings->get("server_dedicated"); - server["password"] = g_settings->getBool("disallow_empty_password"); - server["pvp"] = g_settings->getBool("enable_pvp"); - server["clients"] = clients; - server["clients_max"] = g_settings->get("max_users"); - } - if(server["action"] == "start") - actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl; - Json::StyledWriter writer; - CURL *curl; - curl = curl_easy_init(); - if (curl) - { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, (g_settings->get("serverlist_url")+std::string("/announce?json=")+curl_easy_escape(curl, writer.write( server ).c_str(), 0)).c_str()); - //curl_easy_setopt(curl, CURLOPT_USERAGENT, "minetest"); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::ServerAnnounceCallback); - //curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1); - curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 1); - res = curl_easy_perform(curl); - //if (res != CURLE_OK) - // errorstream<<"Serverlist at url "<get("serverlist_url")<<" not found (internet connection?)"<get("serverlist_url") << std::endl; + } else { + infostream << "Announcing " << aa_names[action] << " to " << + g_settings->get("serverlist_url") << std::endl; } + HTTPFetchRequest fetch_request; + fetch_request.caller = HTTPFETCH_PRINT_ERR; + fetch_request.url = g_settings->get("serverlist_url") + std::string("/announce"); + fetch_request.method = HTTP_POST; + fetch_request.fields["json"] = fastWriteJson(server); + fetch_request.multipart = true; + httpfetch_async(fetch_request); } #endif -} //namespace ServerList +} // namespace ServerList