Remove blank default values for emergequeue_limit_* settings

[dragonfireclient.git] / src / serverlist.cpp

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 204427f8870a46496d0fae2b94d81eee129f10f7..64511b5b0d9fadf75a806ffd305c39c5e609481a 100644 (file)
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -188,7 +188,7 @@ std::string serializeJson(std::vector<ServerListSpec> serverlist)
 
 
 #if USE_CURL
-void sendAnnounce(std::string action, const std::vector<std::string> & clients_names, double uptime, u32 game_time, std::string gameid, std::vector<ModSpec> mods) {
+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) {
        Json::Value server;
        if (action.size())
                server["action"]        = action;
@@ -226,16 +226,19 @@ void sendAnnounce(std::string action, const std::vector<std::string> & clients_n
                        server["mods"].append(m->name);
                }
                actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl;
+       } else {
+               if (lag)
+                       server["lag"]   = lag;
        }
 
-       Json::StyledWriter writer;
+       Json::FastWriter writer;
        HTTPFetchRequest fetchrequest;
-       fetchrequest.url = g_settings->get("serverlist_url")
-               + std::string("/announce?json=")
-               + urlencode(writer.write(server));
-       fetchrequest.useragent = std::string("Minetest ")+minetest_version_hash;
-       fetchrequest.caller = HTTPFETCH_DISCARD;
-       fetchrequest.timeout = g_settings->getS32("curl_timeout");
+       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);
 }
 #endif