zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 06:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- change anonstats cvars in order to allow easier updates to them in the future

Browse source
This commit is contained in:
Rachael Alexanderson 2023-09-17 04:44:10 -04:00
parent 2666f22ed7
commit 25e9561279
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/d_anonstats.cpp
View file

@ -38,9 +38,9 @@ extern int sys_ostype;
#include "gl_interface.h" #include "gl_interface.h"
#include "printf.h" #include "printf.h"
CVAR(Int, sys_statsenabled49, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOSET) CVAR(Int, anonstats_enabled411, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOSET)
CVAR(String, sys_statshost, "gzstats.drdteam.org", CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOSET) CVAR(String, anonstats_host, "gzstats.drdteam.org", CVAR_NOSET)
CVAR(Int, sys_statsport, 80, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOSET) CVAR(Int, anonstats_port, 80, CVAR_NOSET)
#define CHECKVERSION 490 #define CHECKVERSION 490
#define CHECKVERSIONSTR "490" #define CHECKVERSIONSTR "490"
@ -73,9 +73,6 @@ FString URLencode(const char *s)
bool I_HTTPRequest(const char* request) bool I_HTTPRequest(const char* request)
{ {
if ((*sys_statshost)[0] == 0)
return false; // no host, disable
WSADATA wsaData; WSADATA wsaData;
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
{ {
@ -84,20 +81,20 @@ bool I_HTTPRequest(const char* request)
} }
SOCKET Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); SOCKET Socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
struct hostent *host; struct hostent *host;
host = gethostbyname(sys_statshost); host = gethostbyname(anonstats_host);
if (host == nullptr) if (host == nullptr)
{ {
DPrintf(DMSG_ERROR, "Error looking up hostname.\n"); DPrintf(DMSG_ERROR, "Error looking up hostname.\n");
return false; return false;
} }
SOCKADDR_IN SockAddr; SOCKADDR_IN SockAddr;
SockAddr.sin_port = htons(sys_statsport); SockAddr.sin_port = htons(anonstats_port);
SockAddr.sin_family = AF_INET; SockAddr.sin_family = AF_INET;
SockAddr.sin_addr.s_addr = *((uint32_t*)host->h_addr); SockAddr.sin_addr.s_addr = *((uint32_t*)host->h_addr);
DPrintf(DMSG_NOTIFY, "Connecting to host %s\n", *sys_statshost); DPrintf(DMSG_NOTIFY, "Connecting to host %s\n", *anonstats_host);
if (connect(Socket, (SOCKADDR*)(&SockAddr), sizeof(SockAddr)) != 0) if (connect(Socket, (SOCKADDR*)(&SockAddr), sizeof(SockAddr)) != 0)
{ {
DPrintf(DMSG_ERROR, "Connection to host %s failed!\n", *sys_statshost); DPrintf(DMSG_ERROR, "Connection to host %s failed!\n", *anonstats_host);
return false; return false;
} }
send(Socket, request, (int)strlen(request), 0); send(Socket, request, (int)strlen(request), 0);
@ -119,14 +116,14 @@ bool I_HTTPRequest(const char* request)
#else #else
bool I_HTTPRequest(const char* request) bool I_HTTPRequest(const char* request)
{ {
if ((*sys_statshost)[0] == 0) if ((*anonstats_host)[0] == 0)
return false; // no host, disable return false; // no host, disable
int sockfd, portno, n; int sockfd, portno, n;
struct sockaddr_in serv_addr; struct sockaddr_in serv_addr;
struct hostent *server; struct hostent *server;
portno = sys_statsport; portno = anonstats_port;
sockfd = socket(AF_INET, SOCK_STREAM, 0); sockfd = socket(AF_INET, SOCK_STREAM, 0);
if (sockfd < 0) if (sockfd < 0)
@ -135,7 +132,7 @@ bool I_HTTPRequest(const char* request)
return false; return false;
} }
server = gethostbyname(sys_statshost); server = gethostbyname(anonstats_host);
if (server == NULL) if (server == NULL)
{ {
DPrintf(DMSG_ERROR, "Error looking up hostname.\n"); DPrintf(DMSG_ERROR, "Error looking up hostname.\n");
@ -148,10 +145,10 @@ bool I_HTTPRequest(const char* request)
server->h_length); server->h_length);
serv_addr.sin_port = htons(portno); serv_addr.sin_port = htons(portno);
DPrintf(DMSG_NOTIFY, "Connecting to host %s\n", *sys_statshost); DPrintf(DMSG_NOTIFY, "Connecting to host %s\n", *anonstats_host);
if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0)
{ {
DPrintf(DMSG_ERROR, "Connection to host %s failed!\n", *sys_statshost); DPrintf(DMSG_ERROR, "Connection to host %s failed!\n", *anonstats_host);
return false; return false;
} }
@ -294,7 +291,7 @@ void D_DoAnonStats()
{ {
#ifndef _DEBUG #ifndef _DEBUG
// Do not repeat if already sent. // Do not repeat if already sent.
if (sys_statsenabled49 != 1 || sentstats_hwr_done >= CHECKVERSION) if (anonstats_enabled411 != 1 || sentstats_hwr_done >= CHECKVERSION)
{ {
return; return;
} }
@ -307,7 +304,7 @@ void D_DoAnonStats()
static char requeststring[1024]; static char requeststring[1024];
mysnprintf(requeststring, sizeof requeststring, "GET /stats_202109.py?render=%i&cores=%i&os=%i&glversion=%i&vendor=%s&model=%s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\nUser-Agent: %s %s\r\n\r\n", mysnprintf(requeststring, sizeof requeststring, "GET /stats_202109.py?render=%i&cores=%i&os=%i&glversion=%i&vendor=%s&model=%s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\nUser-Agent: %s %s\r\n\r\n",
GetRenderInfo(), GetCoreInfo(), GetOSVersion(), GetGLVersion(), URLencode(screen->vendorstring).GetChars(), URLencode(screen->DeviceName()).GetChars(), *sys_statshost, GAMENAME, VERSIONSTR); GetRenderInfo(), GetCoreInfo(), GetOSVersion(), GetGLVersion(), URLencode(screen->vendorstring).GetChars(), URLencode(screen->DeviceName()).GetChars(), *anonstats_host, GAMENAME, VERSIONSTR);
DPrintf(DMSG_NOTIFY, "Sending %s", requeststring); DPrintf(DMSG_NOTIFY, "Sending %s", requeststring);
#if 1//ndef _DEBUG #if 1//ndef _DEBUG
// Don't send info in debug builds // Don't send info in debug builds
@ -320,7 +317,7 @@ void D_DoAnonStats()
void D_ConfirmSendStats() void D_ConfirmSendStats()
{ {
if (sys_statsenabled49 >= 0) if (anonstats_enabled411 >= 0)
{ {
return; return;
} }
@ -376,7 +373,7 @@ void D_ConfirmSendStats()
enabled.Int = SDL_ShowMessageBox(&messageboxdata, &buttonid) == 0 && buttonid == 0; enabled.Int = SDL_ShowMessageBox(&messageboxdata, &buttonid) == 0 && buttonid == 0;
#endif // _WIN32 #endif // _WIN32
sys_statsenabled49->ForceSet(enabled, CVAR_Int); anonstats_enabled411->ForceSet(enabled, CVAR_Int);
} }
#endif // NO_SEND_STATS #endif // NO_SEND_STATS

3
src/d_defcvars.cpp
View file

@ -124,9 +124,12 @@ void D_GrabCVarDefaults()
SHOULD_BLACKLIST(vid_adapter) SHOULD_BLACKLIST(vid_adapter)
SHOULD_BLACKLIST(sys_statsenabled47) SHOULD_BLACKLIST(sys_statsenabled47)
SHOULD_BLACKLIST(sys_statsenabled49) SHOULD_BLACKLIST(sys_statsenabled49)
SHOULD_BLACKLIST(anonstats_statsenabled411)
SHOULD_BLACKLIST(save_dir) SHOULD_BLACKLIST(save_dir)
SHOULD_BLACKLIST(sys_statsport) SHOULD_BLACKLIST(sys_statsport)
SHOULD_BLACKLIST(sys_statshost) SHOULD_BLACKLIST(sys_statshost)
SHOULD_BLACKLIST(anonstats_port)
SHOULD_BLACKLIST(anonstats_host)
SHOULD_BLACKLIST(sentstats_hwr_done) SHOULD_BLACKLIST(sentstats_hwr_done)
var = FindCVar(CurrentFindCVar, NULL); var = FindCVar(CurrentFindCVar, NULL);