summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/httpfetch.cpp15
-rw-r--r--src/porting.cpp53
-rw-r--r--src/porting.h6
3 files changed, 52 insertions, 22 deletions
diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp
index 599507562..2eca363d7 100644
--- a/src/httpfetch.cpp
+++ b/src/httpfetch.cpp
@@ -18,16 +18,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "socket.h" // for select()
-#include "porting.h" // for sleep_ms()
+#include "porting.h" // for sleep_ms(), get_sysinfo()
#include "httpfetch.h"
#include <iostream>
#include <sstream>
#include <list>
#include <map>
#include <errno.h>
-#ifndef _WIN32
-#include <sys/utsname.h>
-#endif
#include "jthread/jevent.h"
#include "config.h"
#include "exceptions.h"
@@ -50,15 +47,7 @@ HTTPFetchRequest::HTTPFetchRequest()
timeout = g_settings->getS32("curl_timeout");
connect_timeout = timeout * 5;
- useragent = std::string("Minetest/") + minetest_version_hash + " ";
-#ifdef _WIN32
- useragent += "(Windows)";
-#else
- struct utsname osinfo;
- uname(&osinfo);
- useragent += std::string("(") + osinfo.sysname + "/"
- + osinfo.release + " " + osinfo.machine + ")";
-#endif
+ useragent = std::string("Minetest/") + minetest_version_hash + " (" + porting::get_sysinfo() + ")";
}
diff --git a/src/porting.cpp b/src/porting.cpp
index a080a44e5..b0a1843eb 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -23,15 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
See comments in porting.h
*/
-#if defined(linux)
- #include <unistd.h>
-#elif defined(__APPLE__)
- #include <unistd.h>
+#if defined(__APPLE__)
#include <mach-o/dyld.h>
+ #include "CoreFoundation/CoreFoundation.h"
#elif defined(__FreeBSD__)
- #include <unistd.h>
#include <sys/types.h>
#include <sys/sysctl.h>
+#elif defined(_WIN32)
+ #include <algorithm>
+#endif
+#if !defined(_WIN32)
+ #include <unistd.h>
+ #include <sys/utsname.h>
#endif
#include "porting.h"
@@ -42,10 +45,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/string.h"
#include <list>
-#ifdef __APPLE__
- #include "CoreFoundation/CoreFoundation.h"
-#endif
-
namespace porting
{
@@ -284,6 +283,42 @@ bool detectMSVCBuildDir(char *c_path)
return (removeStringEnd(path, ends) != "");
}
+std::string get_sysinfo()
+{
+#ifdef _WIN32
+ OSVERSIONINFO osvi;
+ std::ostringstream oss;
+ std::string tmp;
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&osvi);
+ tmp = osvi.szCSDVersion;
+ std::replace(tmp.begin(), tmp.end(), ' ', '_');
+
+ oss << "Windows/" << osvi.dwMajorVersion << "."
+ << osvi.dwMinorVersion;
+ if(osvi.szCSDVersion[0])
+ oss << "-" << tmp;
+ oss << " ";
+ #ifdef _WIN64
+ oss << "x86_64";
+ #else
+ BOOL is64 = FALSE;
+ if(IsWow64Process(GetCurrentProcess(), &is64) && is64)
+ oss << "x86_64"; // 32-bit app on 64-bit OS
+ else
+ oss << "x86";
+ #endif
+
+ return oss.str();
+#else
+ struct utsname osinfo;
+ uname(&osinfo);
+ return std::string(osinfo.sysname) + "/"
+ + osinfo.release + " " + osinfo.machine;
+#endif
+}
+
void initializePaths()
{
#if RUN_IN_PLACE
diff --git a/src/porting.h b/src/porting.h
index ea7f31b13..7cd4cf031 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -149,6 +149,12 @@ bool threadBindToProcessor(threadid_t tid, int pnumber);
bool threadSetPriority(threadid_t tid, int prio);
/*
+ Return system information
+ e.g. "Linux/3.12.7 x86_64"
+*/
+std::string get_sysinfo();
+
+/*
Resolution is 10-20ms.
Remember to check for overflows.
Overflow can occur at any value higher than 10000000.