diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 2 | ||||
| -rw-r--r-- | src/convert_json.cpp | 2 | ||||
| -rw-r--r-- | src/guiEngine.cpp | 2 | ||||
| -rw-r--r-- | src/server.cpp | 2 | ||||
| -rw-r--r-- | src/serverlist.cpp | 24 | ||||
| -rw-r--r-- | src/serverlist.h | 3 |
6 files changed, 21 insertions, 14 deletions
diff --git a/src/client.cpp b/src/client.cpp index 19105b504..c458684f6 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -250,7 +250,7 @@ void * MediaFetchThread::Thread() m_file_data.push_back(make_pair(i->name, data)); } else { m_failed.push_back(*i); - infostream << "cURL request failed for " << i->name << std::endl; + infostream << "cURL request failed for " << i->name << " (" << curl_easy_strerror(res) << ")"<< std::endl; } curl_easy_cleanup(curl); } diff --git a/src/convert_json.cpp b/src/convert_json.cpp index 7a69071ef..9b704aca6 100644 --- a/src/convert_json.cpp +++ b/src/convert_json.cpp @@ -59,7 +59,7 @@ Json::Value fetchJsonValue(const std::string url, res = curl_easy_perform(curl); if (res != CURLE_OK) - errorstream<<"Jsonreader: "<< url <<" not found (internet connection?)"<<std::endl; + errorstream<<"Jsonreader: "<< url <<" not found (" << curl_easy_strerror(res) << ")" <<std::endl; curl_easy_cleanup(curl); } diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index f3b3a6845..2324dba16 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -533,7 +533,7 @@ bool GUIEngine::downloadFile(std::string url,std::string target) { res = curl_easy_perform(curl); if (res != CURLE_OK) { errorstream << "File at url \"" << url - <<"\" not found (internet connection?)" <<std::endl; + <<"\" not found (" << curl_easy_strerror(res) << ")" <<std::endl; retval = false; } fclose(targetfile); diff --git a/src/server.cpp b/src/server.cpp index 60bf422f7..955858c70 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1237,7 +1237,7 @@ void Server::AsyncRunStep() float &counter = m_masterserver_timer; if((!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true) { - ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id); + ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id, m_mods); counter = 0.01; } counter += dtime; diff --git a/src/serverlist.cpp b/src/serverlist.cpp index 6a68e0eac..7a374eb47 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -194,34 +194,40 @@ std::string serializeJson(std::vector<ServerListSpec> serverlist) #if USE_CURL static size_t ServerAnnounceCallback(void *contents, size_t size, size_t nmemb, void *userp) { - return 0; //((std::string*)userp)->append((char*)contents, size * nmemb); - //return size * nmemb; + return size * nmemb; } -void sendAnnounce(std::string action, u16 clients, double uptime, std::string gameid) { +void sendAnnounce(std::string action, u16 clients, double uptime, std::string gameid, std::vector<ModSpec> m_mods) { Json::Value server; if (action.size()) server["action"] = action; server["port"] = g_settings->get("port"); - if (action != "del") { + 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["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["rollback"] = g_settings->getBool("enable_rollback_recording"); 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"); if (uptime >=1) server["uptime"] = (int)uptime; if (gameid!="") server["gameid"] = gameid; - } - if(server["action"] == "start") + + if(server["action"] == "start") { + server["mods"] = Json::Value(Json::arrayValue); + for(std::vector<ModSpec>::iterator m = m_mods.begin(); m != m_mods.end(); m++) { + server["mods"].append(m->name); + } actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl; + } + Json::StyledWriter writer; CURL *curl; curl = curl_easy_init(); @@ -236,8 +242,8 @@ void sendAnnounce(std::string action, u16 clients, double uptime, std::string ga 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; + if (res != CURLE_OK) + errorstream<<"Serverlist at url "<<g_settings->get("serverlist_url")<<" error ("<<curl_easy_strerror(res)<<")"<<std::endl; curl_easy_cleanup(curl); } diff --git a/src/serverlist.h b/src/serverlist.h index d01415c50..365e86beb 100644 --- a/src/serverlist.h +++ b/src/serverlist.h @@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <iostream> #include "config.h" +#include "mods.h" #include "json/json.h" #ifndef SERVERLIST_HEADER @@ -39,7 +40,7 @@ namespace ServerList std::vector<ServerListSpec> deSerializeJson(std::string liststring); std::string serializeJson(std::vector<ServerListSpec>); #if USE_CURL - void sendAnnounce(std::string action = "", u16 clients = 0, double uptime = 0, std::string gameid = ""); + void sendAnnounce(std::string action = "", u16 clients = 0, double uptime = 0, std::string gameid = "", std::vector<ModSpec> m_mods = std::vector<ModSpec>()); #endif } //ServerList namespace |