From 5917e862977518b80cb7a2a4b9dfbeda59c3656b Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Sun, 3 Mar 2013 00:02:00 +0400 Subject: Add one more curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); --- src/serverlist.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/serverlist.cpp') diff --git a/src/serverlist.cpp b/src/serverlist.cpp index d37b5d637..3dfc79f50 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -259,6 +259,7 @@ void sendAnnounce(std::string action, u16 clients) { if (curl) { CURLcode res; + curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl, CURLOPT_URL, (g_settings->get("serverlist_url")+std::string("/announce?json=")+curl_easy_escape(curl, writer.write( server ).c_str(), 0)).c_str()); //curl_easy_setopt(curl, CURLOPT_USERAGENT, "minetest"); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::ServerAnnounceCallback); -- cgit v1.2.3 From 16c11eb4a3bb46a388c645b7db738762e444cde8 Mon Sep 17 00:00:00 2001 From: proller Date: Sat, 30 Mar 2013 02:03:24 +0400 Subject: Masterserver: report gameid, uptime, cosmetic fixes on server web page --- src/serverlist.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/serverlist.cpp') diff --git a/src/serverlist.cpp b/src/serverlist.cpp index 3dfc79f50..93f9d2435 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -232,7 +232,7 @@ static size_t ServerAnnounceCallback(void *contents, size_t size, size_t nmemb, //((std::string*)userp)->append((char*)contents, size * nmemb); //return size * nmemb; } -void sendAnnounce(std::string action, u16 clients) { +void sendAnnounce(std::string action, u16 clients, double uptime, std::string gameid) { Json::Value server; if (action.size()) server["action"] = action; @@ -250,6 +250,9 @@ void sendAnnounce(std::string action, u16 clients) { 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") actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl; -- cgit v1.2.3