Ores: Make 'absheight' flag non-functional

[minetest.git] / src / serverlist.cpp

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 472a6b85c285cbc4acb2df56f2aebf249171071b..cc38ec8ce5889dd440689536eec5bb5be14f2b02 100644 (file)
--- 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 <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"
@@ -67,8 +68,15 @@ std::vector<ServerListSpec> getLocal()
 
 std::vector<ServerListSpec> getOnline()
 {
-       Json::Value root = fetchJsonValue(
-                       (g_settings->get("serverlist_url") + "/list").c_str(), NULL);
+       std::ostringstream geturl;
+
+       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<ServerListSpec> server_list;
 
@@ -161,7 +169,7 @@ 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++) {
+                       ++it) {
                liststring += "[server]\n";
                liststring += (*it)["name"].asString() + '\n';
                liststring += (*it)["address"].asString() + '\n';
@@ -178,7 +186,7 @@ const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)
        Json::Value list(Json::arrayValue);
        for (std::vector<ServerListSpec>::const_iterator it = serverlist.begin();
                        it != serverlist.end();
-                       it++) {
+                       ++it) {
                list.append(*it);
        }
        root["list"] = list;
@@ -188,7 +196,7 @@ const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)
 
 
 #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,
@@ -196,18 +204,23 @@ void sendAnnounce(const std::string &action,
                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["creative"]     = g_settings->getBool("creative_mode");
                server["damage"]       = g_settings->getBool("enable_damage");
@@ -226,20 +239,19 @@ void sendAnnounce(const std::string &action,
                if (gameid != "") 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) {
+                               it != mods.end(); ++it) {
                        server["mods"].append(it->name);
                }
                actionstream << "Announcing to " << g_settings->get("serverlist_url") << std::endl;
-       } else {
+       } else if (action == AA_UPDATE) {
                if (lag)
                        server["lag"] = lag;
        }
@@ -253,4 +265,5 @@ void sendAnnounce(const std::string &action,
 }
 #endif
 
-} //namespace ServerList
+} // namespace ServerList
+