From c62bab010fcf2b4b93af1cf0b71d4d0dbf78fed8 Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 7 Jan 2014 02:50:45 +0400 Subject: Send long announce as POST, show OS in useragent Add lag reporting to masterserver (average dtime) StyledWriter -> FastWriter in masterserver announce --- src/httpfetch.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/httpfetch.cpp') diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp index 60e4591a9..9eed045fe 100644 --- a/src/httpfetch.cpp +++ b/src/httpfetch.cpp @@ -25,6 +25,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#ifndef _MSC_VER +#include +#endif #include "jthread/jevent.h" #include "config.h" #include "exceptions.h" @@ -32,10 +35,32 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "util/container.h" #include "util/thread.h" +#include "version.h" +#include "main.h" +#include "settings.h" JMutex g_httpfetch_mutex; std::map > g_httpfetch_results; + HTTPFetchRequest::HTTPFetchRequest() + { + url = ""; + caller = HTTPFETCH_DISCARD; + request_id = 0; + timeout = g_settings->getS32("curl_timeout"); + connect_timeout = timeout * 5; + + useragent = std::string("Minetest ") + minetest_version_hash; +#ifdef _MSC_VER + useragent += "Windows"; +#else + struct utsname osinfo; + uname(&osinfo); + useragent += std::string(" (") + osinfo.sysname + "; " + osinfo.release + "; " + osinfo.machine + ")"; +#endif + } + + static void httpfetch_deliver_result(const HTTPFetchResult &fetchresult) { unsigned long caller = fetchresult.caller; -- cgit v1.2.3