X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverlist.cpp;h=18264e933cce2f8f5e0032b1f00d10b9668f7c58;hb=0c08f948d7014e66d5a79d7584c03164af2edd93;hp=b5e6aad4e979f5f6063854564f56beb180d54959;hpb=979ca23f1eae1adeb8b0083dffe7203c54d87395;p=dragonfireclient.git

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index b5e6aad4e..18264e933 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -17,43 +17,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <fstream>
 #include <iostream>
 #include <sstream>
 #include <algorithm>
 
-#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 <curl/curl.h>
-#endif
+#include "network/networkprotocol.h"
+#include <json/json.h>
+#include "convert_json.h"
+#include "httpfetch.h"
+#include "util/string.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::string dir_path = "client" DIR_DELIM "serverlist" DIR_DELIM;
+	fs::CreateDir(porting::path_user + DIR_DELIM  "client");
+	fs::CreateDir(porting::path_user + DIR_DELIM + dir_path);
+	return porting::path_user + DIR_DELIM + dir_path + serverlist_file;
 }
 
+
 std::vector<ServerListSpec> 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())
-		{
+	if (fs::PathExists(path)) {
+		std::ifstream istream(path.c_str());
+		if (istream.is_open()) {
 			std::ostringstream ostream;
 			ostream << istream.rdbuf();
 			liststring = ostream.str();
@@ -61,72 +62,66 @@ std::vector<ServerListSpec> getLocal()
 		}
 	}
 
-	return ServerList::deSerialize(liststring);
+	return deSerialize(liststring);
 }
 
 
-#if USE_CURL
-
-static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
+std::vector<ServerListSpec> getOnline()
 {
-    ((std::string*)userp)->append((char*)contents, size * nmemb);
-    return size * nmemb;
-}
+	std::ostringstream geturl;
 
+	u16 proto_version_min = CLIENT_PROTOCOL_VERSION_MIN;
 
-std::vector<ServerListSpec> getOnline()
-{
-	std::string liststring;
-	CURL *curl;
+	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);
 
-	curl = curl_easy_init();
-	if (curl)
-	{
-		CURLcode res;
+	std::vector<ServerListSpec> server_list;
 
-		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);
+	if (!root.isObject()) {
+		return server_list;
+	}
 
-		res = curl_easy_perform(curl);
-		if (res != CURLE_OK)
-			errorstream<<"Serverlist at url "<<g_settings->get("serverlist_url")<<" not found (internet connection?)"<<std::endl;
-		curl_easy_cleanup(curl);
+	root = root["list"];
+	if (!root.isArray()) {
+		return server_list;
 	}
-	return ServerList::deSerializeJson(liststring);
+
+	for (const Json::Value &i : root) {
+		if (i.isObject()) {
+			server_list.push_back(i);
+		}
+	}
+
+	return server_list;
 }
 
-#endif
 
-/*
-	Delete a server fromt he local favorites list
-*/
-bool deleteEntry (ServerListSpec server)
+// Delete a server from the local favorites list
+bool deleteEntry(const ServerListSpec &server)
 {
 	std::vector<ServerListSpec> 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);
+	for (std::vector<ServerListSpec>::iterator it = serverlist.begin();
+			it != serverlist.end();) {
+		if ((*it)["address"] == server["address"] &&
+				(*it)["port"] == server["port"]) {
+			it = serverlist.erase(it);
+		} else {
+			++it;
 		}
 	}
 
 	std::string path = ServerList::getFilePath();
-	std::ofstream stream (path.c_str());
-	if (stream.is_open())
-	{
-		stream<<ServerList::serialize(serverlist);
-		return true;
-	}
-	return false;
+	std::ostringstream ss(std::ios_base::binary);
+	ss << ServerList::serialize(serverlist);
+	if (!fs::safeWriteToFile(path, ss.str()))
+		return false;
+	return true;
 }
 
-/*
-	Insert a server to the local favorites list
-*/
-bool insert (ServerListSpec server)
+// Insert a server to the local favorites list
+bool insert(const ServerListSpec &server)
 {
 	// Remove duplicates
 	ServerList::deleteEntry(server);
@@ -137,140 +132,140 @@ bool insert (ServerListSpec server)
 	serverlist.insert(serverlist.begin(), server);
 
 	std::string path = ServerList::getFilePath();
-	std::ofstream stream (path.c_str());
-	if (stream.is_open())
-	{
-		stream<<ServerList::serialize(serverlist);
-	}
+	std::ostringstream ss(std::ios_base::binary);
+	ss << ServerList::serialize(serverlist);
+	if (!fs::safeWriteToFile(path, ss.str()))
+		return false;
 
-	return false;
+	return true;
 }
 
-std::vector<ServerListSpec> deSerialize(std::string liststring)
+std::vector<ServerListSpec> deSerialize(const std::string &liststring)
 {
 	std::vector<ServerListSpec> 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;
+	while (std::getline(stream, line)) {
+		std::transform(line.begin(), line.end(), line.begin(), ::toupper);
+		if (line == "[SERVER]") {
+			ServerListSpec server;
 			std::getline(stream, tmp);
-			thisserver["name"] = tmp;
+			server["name"] = tmp;
 			std::getline(stream, tmp);
-			thisserver["address"] = tmp;
+			server["address"] = tmp;
 			std::getline(stream, tmp);
-			thisserver["port"] = tmp;
+			server["port"] = tmp;
+			bool unique = true;
+			for (const ServerListSpec &added : serverlist) {
+				if (server["name"] == added["name"]
+						&& server["port"] == added["port"]) {
+					unique = false;
+					break;
+				}
+			}
+			if (!unique)
+				continue;
 			std::getline(stream, tmp);
-			thisserver["description"] = tmp;
-			serverlist.push_back(thisserver);
+			server["description"] = tmp;
+			serverlist.push_back(server);
 		}
 	}
 	return serverlist;
 }
 
-std::string serialize(std::vector<ServerListSpec> serverlist)
+const std::string serialize(const std::vector<ServerListSpec> &serverlist)
 {
 	std::string liststring;
-	for(std::vector<ServerListSpec>::iterator i = serverlist.begin(); i != serverlist.end(); i++)
-	{
+	for (const ServerListSpec &it : serverlist) {
 		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";
+		liststring += it["name"].asString() + '\n';
+		liststring += it["address"].asString() + '\n';
+		liststring += it["port"].asString() + '\n';
+		liststring += it["description"].asString() + '\n';
+		liststring += '\n';
 	}
 	return liststring;
 }
 
-std::vector<ServerListSpec> deSerializeJson(std::string liststring)
-{
-	std::vector<ServerListSpec> 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]);
-		}
-	}
-	return serverlist;
-}
-
-std::string serializeJson(std::vector<ServerListSpec> serverlist)
+const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)
 {
 	Json::Value root;
 	Json::Value list(Json::arrayValue);
-	for(std::vector<ServerListSpec>::iterator i = serverlist.begin(); i != serverlist.end(); i++)
-	{
-		list.append(*i);
+	for (const ServerListSpec &it : serverlist) {
+		list.append(it);
 	}
 	root["list"] = list;
-	Json::StyledWriter writer;
-	return writer.write( root );
+
+	return fastWriteJson(root);
 }
 
 
 #if USE_CURL
-static size_t ServerAnnounceCallback(void *contents, size_t size, size_t nmemb, void *userp)
+void sendAnnounce(AnnounceAction action,
+		const u16 port,
+		const std::vector<std::string> &clients_names,
+		const double uptime,
+		const u32 game_time,
+		const float lag,
+		const std::string &gameid,
+		const std::string &mg_name,
+		const std::vector<ModSpec> &mods,
+		bool dedicated)
 {
-    return 0;
-    //((std::string*)userp)->append((char*)contents, size * nmemb);
-    //return size * nmemb;
-}
-void sendAnnounce(std::string action, u16 clients) {
+	static const char *aa_names[] = {"start", "update", "delete"};
 	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");
+	server["action"] = aa_names[action];
+	server["port"] = port;
+	if (g_settings->exists("server_address")) {
+		server["address"] = g_settings->get("server_address");
 	}
-	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 "<<g_settings->get("serverlist_url")<<" not found (internet connection?)"<<std::endl;
-		curl_easy_cleanup(curl);
+	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;
 	}
 
+	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);
+		}
+		actionstream << "Announcing to " << g_settings->get("serverlist_url") << std::endl;
+	} else if (action == AA_UPDATE) {
+		if (lag)
+			server["lag"] = lag;
+	}
+
+	HTTPFetchRequest fetch_request;
+	fetch_request.url = g_settings->get("serverlist_url") + std::string("/announce");
+	fetch_request.post_fields["json"] = fastWriteJson(server);
+	fetch_request.multipart = true;
+	httpfetch_async(fetch_request);
 }
 #endif
 
-} //namespace ServerList
+} // namespace ServerList
+