51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <fstream>
#include <iostream>
#include <sstream>
#include <algorithm>
#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 <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 dir_path = std::string("client") + DIR_DELIM
- + "serverlist" + DIR_DELIM;
- fs::CreateDir(porting::path_user + DIR_DELIM + "client");
+ 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);
- std::string rel_path = dir_path + serverlist_file;
- std::string path = porting::path_user + DIR_DELIM + rel_path;
- return 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))
- {
+ if (fs::PathExists(path)) {
std::ifstream istream(path.c_str());
- if(istream.is_open())
- {
+ if (istream.is_open()) {
std::ostringstream ostream;
ostream << istream.rdbuf();
liststring = ostream.str();
}
}
- return ServerList::deSerialize(liststring);
+ return deSerialize(liststring);
}
std::vector<ServerListSpec> getOnline()
{
- Json::Value root = fetchJsonValue((g_settings->get("serverlist_url")+"/list").c_str(), NULL);
+ std::ostringstream geturl;
- std::vector<ServerListSpec> serverlist;
+ u16 proto_version_min = CLIENT_PROTOCOL_VERSION_MIN;
- if (root.isArray()) {
- for (unsigned int i = 0; i < root.size(); i++)
- {
- if (root[i].isObject()) {
- serverlist.push_back(root[i]);
- }
+ 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<ServerListSpec> server_list;
+
+ if (!root.isObject()) {
+ return server_list;
+ }
+
+ 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;
}
-/*
- 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;
}
}
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);
std::string path = ServerList::getFilePath();
std::ostringstream ss(std::ios_base::binary);
ss << ServerList::serialize(serverlist);
- fs::safeWriteToFile(path, ss.str());
+ 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;
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::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
-void sendAnnounce(std::string action, const std::vector<std::string> & clients_names, double uptime, u32 game_time, float lag, std::string gameid, std::vector<ModSpec> mods) {
+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)
+{
+ static const char *aa_names[] = {"start", "update", "delete"};
Json::Value server;
- if (action.size())
- server["action"] = action;
- server["port"] = g_settings->get("port");
- server["address"] = g_settings->get("server_address");
- if (action != "delete") {
- server["name"] = g_settings->get("server_name");
- server["description"] = g_settings->get("server_description");
- server["version"] = minetest_version_simple;
- server["url"] = g_settings->get("server_url");
- server["creative"] = g_settings->get("creative_mode");
- server["damage"] = g_settings->get("enable_damage");
- server["password"] = g_settings->getBool("disallow_empty_password");
- server["pvp"] = g_settings->getBool("enable_pvp");
- server["clients"] = (int)clients_names.size();
- server["clients_max"] = g_settings->get("max_users");
- server["clients_list"] = Json::Value(Json::arrayValue);
- for(u32 i = 0; i < clients_names.size(); ++i) {
- server["clients_list"].append(clients_names[i]);
+ server["action"] = aa_names[action];
+ server["port"] = port;
+ if (g_settings->exists("server_address")) {
+ server["address"] = g_settings->get("server_address");
+ }
+ 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 (uptime >= 1) server["uptime"] = (int)uptime;
- if (gameid != "") server["gameid"] = gameid;
- if (game_time >= 1) server["game_time"] = game_time;
+ if (!gameid.empty())
+ server["gameid"] = gameid;
}
- if(server["action"] == "start") {
- server["dedicated"] = g_settings->get("server_dedicated");
- server["privs"] = g_settings->get("default_privs");
- server["rollback"] = g_settings->getBool("enable_rollback_recording");
- server["mapgen"] = g_settings->get("mg_name");
- server["can_see_far_names"] = g_settings->getBool("unlimited_player_transfer_distance");
- server["mods"] = Json::Value(Json::arrayValue);
- for(std::vector<ModSpec>::iterator m = mods.begin(); m != mods.end(); m++) {
- server["mods"].append(m->name);
+ 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 {
+ actionstream << "Announcing to " << g_settings->get("serverlist_url") << std::endl;
+ } else if (action == AA_UPDATE) {
if (lag)
- server["lag"] = lag;
+ server["lag"] = lag;
}
- Json::FastWriter writer;
- HTTPFetchRequest fetchrequest;
- fetchrequest.url = g_settings->get("serverlist_url") + std::string("/announce");
- std::string query = std::string("json=") + urlencode(writer.write(server));
- if (query.size() < 1000)
- fetchrequest.url += "?" + query;
- else
- fetchrequest.post_fields = query;
- httpfetch_async(fetchrequest);
+ 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
+
projects / dragonfireclient.git / blobdiff