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 "network/networkprotocol.h"
-#include "json/json.h"
+#include <json/json.h>
#include "convert_json.h"
#include "httpfetch.h"
#include "util/string.h"
{
std::string path = ServerList::getFilePath();
std::string liststring;
- if (fs::PathExists(path)) {
- std::ifstream istream(path.c_str());
- if (istream.is_open()) {
- std::ostringstream ostream;
- ostream << istream.rdbuf();
- liststring = ostream.str();
- istream.close();
- }
- }
+ fs::ReadFile(path, liststring);
return deSerialize(liststring);
}
std::vector<ServerListSpec> getOnline()
{
std::ostringstream geturl;
+
+ u16 proto_version_min = CLIENT_PROTOCOL_VERSION_MIN;
+
geturl << g_settings->get("serverlist_url") <<
- "/list?proto_version_min=" << CLIENT_PROTOCOL_VERSION_MIN <<
+ "/list?proto_version_min=" << proto_version_min <<
"&proto_version_max=" << CLIENT_PROTOCOL_VERSION_MAX;
Json::Value root = fetchJsonValue(geturl.str(), NULL);
return server_list;
}
- for (unsigned int i = 0; i < root.size(); i++) {
- if (root[i].isObject()) {
- server_list.push_back(root[i]);
+ for (const Json::Value &i : root) {
+ if (i.isObject()) {
+ server_list.push_back(i);
}
}
server["address"] = tmp;
std::getline(stream, 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);
server["description"] = tmp;
serverlist.push_back(server);
const std::string serialize(const std::vector<ServerListSpec> &serverlist)
{
std::string liststring;
- for (std::vector<ServerListSpec>::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;
{
Json::Value root;
Json::Value list(Json::arrayValue);
- for (std::vector<ServerListSpec>::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;
- return writer.write(root);
+
+ return fastWriteJson(root);
}
#if USE_CURL
-void sendAnnounce(const std::string &action,
+void sendAnnounce(AnnounceAction action,
const u16 port,
const std::vector<std::string> &clients_names,
const double uptime,
const float lag,
const std::string &gameid,
const std::string &mg_name,
- const std::vector<ModSpec> &mods)
+ const std::vector<ModSpec> &mods,
+ bool dedicated)
{
+ static const char *aa_names[] = {"start", "update", "delete"};
Json::Value server;
- server["action"] = action;
+ 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["clients"] = (int) clients_names.size();
server["clients_max"] = g_settings->getU16("max_users");
server["clients_list"] = Json::Value(Json::arrayValue);
- for (std::vector<std::string>::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"] = 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 (std::vector<ModSpec>::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;
+ if (action == AA_START) {
+ actionstream << "Announcing " << aa_names[action] << " to " <<
+ g_settings->get("serverlist_url") << std::endl;
+ } else {
+ infostream << "Announcing " << aa_names[action] << " to " <<
+ g_settings->get("serverlist_url") << std::endl;
+ }
+
HTTPFetchRequest fetch_request;
fetch_request.url = g_settings->get("serverlist_url") + std::string("/announce");
- fetch_request.post_fields["json"] = writer.write(server);
+ fetch_request.method = HTTP_POST;
+ fetch_request.fields["json"] = fastWriteJson(server);
fetch_request.multipart = true;
httpfetch_async(fetch_request);
}
#endif
-} //namespace ServerList
+} // namespace ServerList
projects / minetest.git / blobdiff