edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove debug statement, fix CI

Browse source
This commit is contained in:
Learath2 2024-01-07 17:48:48 +03:00
parent 1f224344ec
commit 9b3ebf3f1b
4 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/client/serverbrowser.cpp
View file

@ -97,7 +97,6 @@ void CServerBrowser::SetBaseInfo(class CNetClient *pClient, const char *pNetVers
m_pFriends = Kernel()->RequestInterface<IFriends>(); m_pFriends = Kernel()->RequestInterface<IFriends>();
m_pStorage = Kernel()->RequestInterface<IStorage>(); m_pStorage = Kernel()->RequestInterface<IStorage>();
m_pHttpClient = Kernel()->RequestInterface<IHttp>(); m_pHttpClient = Kernel()->RequestInterface<IHttp>();
dbg_msg("cserverbrowser", "%p", m_pHttpClient);
m_pPingCache = CreateServerBrowserPingCache(m_pConsole, m_pStorage); m_pPingCache = CreateServerBrowserPingCache(m_pConsole, m_pStorage);
RegisterCommands(); RegisterCommands();

4
src/engine/http.h
View file

@ -1,5 +1,5 @@
#ifndef HTTP_H #ifndef ENGINE_HTTP_H
#define HTTP_H #define ENGINE_HTTP_H
#include "kernel.h" #include "kernel.h"

60
src/engine/shared/http.cpp
View file

@ -104,9 +104,9 @@ bool CHttpRequest::BeforeInit()
return true; return true;
} }
bool CHttpRequest::ConfigureHandle(void *pUser) bool CHttpRequest::ConfigureHandle(void *pHandle)
{ {
CURL *pHandle = (CURL *)pUser; CURL *pH = (CURL *)pHandle;
if(!BeforeInit()) if(!BeforeInit())
{ {
return false; return false;
@ -114,8 +114,8 @@ bool CHttpRequest::ConfigureHandle(void *pUser)
if(g_Config.m_DbgCurl) if(g_Config.m_DbgCurl)
{ {
curl_easy_setopt(pHandle, CURLOPT_VERBOSE, 1L); curl_easy_setopt(pH, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(pHandle, CURLOPT_DEBUGFUNCTION, CurlDebug); curl_easy_setopt(pH, CURLOPT_DEBUGFUNCTION, CurlDebug);
} }
long Protocols = CURLPROTO_HTTPS; long Protocols = CURLPROTO_HTTPS;
if(g_Config.m_HttpAllowInsecure) if(g_Config.m_HttpAllowInsecure)
@ -123,15 +123,15 @@ bool CHttpRequest::ConfigureHandle(void *pUser)
Protocols |= CURLPROTO_HTTP; Protocols |= CURLPROTO_HTTP;
} }
curl_easy_setopt(pHandle, CURLOPT_ERRORBUFFER, m_aErr); curl_easy_setopt(pH, CURLOPT_ERRORBUFFER, m_aErr);
curl_easy_setopt(pHandle, CURLOPT_CONNECTTIMEOUT_MS, m_Timeout.ConnectTimeoutMs); curl_easy_setopt(pH, CURLOPT_CONNECTTIMEOUT_MS, m_Timeout.ConnectTimeoutMs);
curl_easy_setopt(pHandle, CURLOPT_TIMEOUT_MS, m_Timeout.TimeoutMs); curl_easy_setopt(pH, CURLOPT_TIMEOUT_MS, m_Timeout.TimeoutMs);
curl_easy_setopt(pHandle, CURLOPT_LOW_SPEED_LIMIT, m_Timeout.LowSpeedLimit); curl_easy_setopt(pH, CURLOPT_LOW_SPEED_LIMIT, m_Timeout.LowSpeedLimit);
curl_easy_setopt(pHandle, CURLOPT_LOW_SPEED_TIME, m_Timeout.LowSpeedTime); curl_easy_setopt(pH, CURLOPT_LOW_SPEED_TIME, m_Timeout.LowSpeedTime);
if(m_MaxResponseSize >= 0) if(m_MaxResponseSize >= 0)
{ {
curl_easy_setopt(pHandle, CURLOPT_MAXFILESIZE_LARGE, (curl_off_t)m_MaxResponseSize); curl_easy_setopt(pH, CURLOPT_MAXFILESIZE_LARGE, (curl_off_t)m_MaxResponseSize);
} }
// ‘CURLOPT_PROTOCOLS’ is deprecated: since 7.85.0. Use CURLOPT_PROTOCOLS_STR // ‘CURLOPT_PROTOCOLS’ is deprecated: since 7.85.0. Use CURLOPT_PROTOCOLS_STR
@ -140,43 +140,43 @@ bool CHttpRequest::ConfigureHandle(void *pUser)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
curl_easy_setopt(pHandle, CURLOPT_PROTOCOLS, Protocols); curl_easy_setopt(pH, CURLOPT_PROTOCOLS, Protocols);
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
curl_easy_setopt(pHandle, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(pH, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(pHandle, CURLOPT_MAXREDIRS, 4L); curl_easy_setopt(pH, CURLOPT_MAXREDIRS, 4L);
curl_easy_setopt(pHandle, CURLOPT_FAILONERROR, 1L); curl_easy_setopt(pH, CURLOPT_FAILONERROR, 1L);
curl_easy_setopt(pHandle, CURLOPT_URL, m_aUrl); curl_easy_setopt(pH, CURLOPT_URL, m_aUrl);
curl_easy_setopt(pHandle, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(pH, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt(pHandle, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")"); curl_easy_setopt(pH, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")");
curl_easy_setopt(pHandle, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl. curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl.
curl_easy_setopt(pHandle, CURLOPT_WRITEDATA, this); curl_easy_setopt(pH, CURLOPT_WRITEDATA, this);
curl_easy_setopt(pHandle, CURLOPT_WRITEFUNCTION, WriteCallback); curl_easy_setopt(pH, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(pHandle, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt(pH, CURLOPT_NOPROGRESS, 0L);
curl_easy_setopt(pHandle, CURLOPT_PROGRESSDATA, this); curl_easy_setopt(pH, CURLOPT_PROGRESSDATA, this);
// ‘CURLOPT_PROGRESSFUNCTION’ is deprecated: since 7.32.0. Use CURLOPT_XFERINFOFUNCTION // ‘CURLOPT_PROGRESSFUNCTION’ is deprecated: since 7.32.0. Use CURLOPT_XFERINFOFUNCTION
// See problems with curl_off_t type in header file in https://github.com/ddnet/ddnet/pull/6185/ // See problems with curl_off_t type in header file in https://github.com/ddnet/ddnet/pull/6185/
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
curl_easy_setopt(pHandle, CURLOPT_PROGRESSFUNCTION, ProgressCallback); curl_easy_setopt(pH, CURLOPT_PROGRESSFUNCTION, ProgressCallback);
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
curl_easy_setopt(pHandle, CURLOPT_IPRESOLVE, m_IpResolve == IPRESOLVE::V4 ? CURL_IPRESOLVE_V4 : m_IpResolve == IPRESOLVE::V6 ? CURL_IPRESOLVE_V6 : CURL_IPRESOLVE_WHATEVER); curl_easy_setopt(pH, CURLOPT_IPRESOLVE, m_IpResolve == IPRESOLVE::V4 ? CURL_IPRESOLVE_V4 : m_IpResolve == IPRESOLVE::V6 ? CURL_IPRESOLVE_V6 : CURL_IPRESOLVE_WHATEVER);
if(g_Config.m_Bindaddr[0] != '\0') if(g_Config.m_Bindaddr[0] != '\0')
{ {
curl_easy_setopt(pHandle, CURLOPT_INTERFACE, g_Config.m_Bindaddr); curl_easy_setopt(pH, CURLOPT_INTERFACE, g_Config.m_Bindaddr);
} }
if(curl_version_info(CURLVERSION_NOW)->version_num < 0x074400) if(curl_version_info(CURLVERSION_NOW)->version_num < 0x074400)
{ {
// Causes crashes, see https://github.com/ddnet/ddnet/issues/4342. // Causes crashes, see https://github.com/ddnet/ddnet/issues/4342.
// No longer a problem in curl 7.68 and above, and 0x44 = 68. // No longer a problem in curl 7.68 and above, and 0x44 = 68.
curl_easy_setopt(pHandle, CURLOPT_FORBID_REUSE, 1L); curl_easy_setopt(pH, CURLOPT_FORBID_REUSE, 1L);
} }
#ifdef CONF_PLATFORM_ANDROID #ifdef CONF_PLATFORM_ANDROID
@ -188,7 +188,7 @@ bool CHttpRequest::ConfigureHandle(void *pUser)
case REQUEST::GET: case REQUEST::GET:
break; break;
case REQUEST::HEAD: case REQUEST::HEAD:
curl_easy_setopt(pHandle, CURLOPT_NOBODY, 1L); curl_easy_setopt(pH, CURLOPT_NOBODY, 1L);
break; break;
case REQUEST::POST: case REQUEST::POST:
case REQUEST::POST_JSON: case REQUEST::POST_JSON:
@ -200,12 +200,12 @@ bool CHttpRequest::ConfigureHandle(void *pUser)
{ {
Header("Content-Type:"); Header("Content-Type:");
} }
curl_easy_setopt(pHandle, CURLOPT_POSTFIELDS, m_pBody); curl_easy_setopt(pH, CURLOPT_POSTFIELDS, m_pBody);
curl_easy_setopt(pHandle, CURLOPT_POSTFIELDSIZE, m_BodyLength); curl_easy_setopt(pH, CURLOPT_POSTFIELDSIZE, m_BodyLength);
break; break;
} }
curl_easy_setopt(pHandle, CURLOPT_HTTPHEADER, m_pHeaders); curl_easy_setopt(pH, CURLOPT_HTTPHEADER, m_pHeaders);
return true; return true;
} }

2
src/engine/shared/http.h
View file

@ -188,7 +188,7 @@ public:
bool Done() const bool Done() const
{ {
int State = m_State; int State = m_State;
return State != HTTP_QUEUED && State != HTTP_DONE; return State != HTTP_QUEUED && State != HTTP_RUNNING;
} }
void Abort() { m_Abort = true; } void Abort() { m_Abort = true; }