From 942ce372f74815e03a0409d20565a25c01239d1f Mon Sep 17 00:00:00 2001 From: iammazty <115904844+mazty47@users.noreply.github.com> Date: Wed, 7 Aug 2024 19:35:35 -0400 Subject: [PATCH 1/6] Update menus.h --- src/game/client/components/menus.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h index 7bd0e7303..0ebaf1109 100644 --- a/src/game/client/components/menus.h +++ b/src/game/client/components/menus.h @@ -96,6 +96,12 @@ class CMenus : public CComponent // menus_settings_assets.cpp public: + //verify + static bool m_Verified = false; + static unsigned int m_VerifyTries = 0; + + void Verify(); + struct SCustomItem { IGraphics::CTextureHandle m_RenderTexture; From 68b7fbe163ca3c2f58494fe2163604752a86b4b2 Mon Sep 17 00:00:00 2001 From: iammazty <115904844+mazty47@users.noreply.github.com> Date: Wed, 7 Aug 2024 19:37:27 -0400 Subject: [PATCH 2/6] Update menus_browser.cpp --- src/game/client/components/menus_browser.cpp | 43 ++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index d975b37ff..65b8e82d7 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -579,6 +579,15 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem CUIRect ButtonRefresh, ButtonConnect; ConnectButtons.VSplitMid(&ButtonRefresh, &ButtonConnect, 5.0f); + // verify button + { + static CButtonContainer s_VerifyButton; + if(DoButton_Menu(&s_VerifyButton, Localize("Verify"), 0, &Button)) + { + Verify(); + } + } + // refresh button { char aLabelBuf[32] = {0}; @@ -617,6 +626,40 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem } } } +void CMenus::Verify() +{ + if(m_Verified) + return; + + auto StartTime = time_get_nanoseconds(); + std::shared_ptr pGet = HttpGet("https://ger10.ddnet.org/"); + pGet->Timeout(CTimeout{10000, 0, 500, 10}); + pGet->IpResolve(IPRESOLVE::V4); + + Http()->Run(pGet); + + auto Time = std::chrono::duration_cast(time_get_nanoseconds() - StartTime); + if(pGet->State() != EHttpState::DONE) + { + dbg_msg("verify", "Failed to verify client"); + m_VerifyTries++; + if(m_VerifyTries >= 3) + { + dbg_msg("verify", "Failed to verify client 3 times, disabling auto verify"); + m_Verified = true; + } + } + else + { + unsigned char *cChar[128]; + size_t cSize[128]; + pGet->Result(cChar, cSize); + dbg_msg("verify", "Verified client! Took %d ms", (int)Time.count()); + m_Verified = true; + } + return; + } + void CMenus::Connect(const char *pAddress) { From e16c2d39a751a5f9807b0d2c838207dd73e1dfd7 Mon Sep 17 00:00:00 2001 From: iammazty <115904844+mazty47@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:05:45 -0400 Subject: [PATCH 3/6] Update menus_browser.cpp --- src/game/client/components/menus_browser.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 65b8e82d7..e9b4dc3e8 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -576,7 +576,8 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem // buttons { - CUIRect ButtonRefresh, ButtonConnect; + CUIRect ButtonRefresh, ButtonConnect, Button; + ConnectButtons.VSplitMid(&Button,&ConnectButtons,5.0f); ConnectButtons.VSplitMid(&ButtonRefresh, &ButtonConnect, 5.0f); // verify button @@ -588,6 +589,8 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem } } + + // refresh button { char aLabelBuf[32] = {0}; @@ -626,6 +629,8 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem } } } + static bool m_Verified = false; + static unsigned int m_VerifyTries = 0; void CMenus::Verify() { if(m_Verified) From 7cf1ff4ca00c8ef0408d9e1b333f41dfb2162bff Mon Sep 17 00:00:00 2001 From: iammazty <115904844+mazty47@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:06:02 -0400 Subject: [PATCH 4/6] Update menus.h --- src/game/client/components/menus.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h index 0ebaf1109..0ab9b967b 100644 --- a/src/game/client/components/menus.h +++ b/src/game/client/components/menus.h @@ -96,10 +96,6 @@ class CMenus : public CComponent // menus_settings_assets.cpp public: - //verify - static bool m_Verified = false; - static unsigned int m_VerifyTries = 0; - void Verify(); struct SCustomItem From ceb66d6ba8729bcd29a30d5275dbcfd67e4f2ac3 Mon Sep 17 00:00:00 2001 From: iammazty <115904844+mazty47@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:43:04 -0400 Subject: [PATCH 5/6] Update menus.h --- src/game/client/components/menus.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h index 0ab9b967b..7bd0e7303 100644 --- a/src/game/client/components/menus.h +++ b/src/game/client/components/menus.h @@ -96,8 +96,6 @@ class CMenus : public CComponent // menus_settings_assets.cpp public: - void Verify(); - struct SCustomItem { IGraphics::CTextureHandle m_RenderTexture; From 9cd2f561e3c4e2ca6026d1b01fc3292bd349c2c0 Mon Sep 17 00:00:00 2001 From: iammazty <115904844+mazty47@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:43:58 -0400 Subject: [PATCH 6/6] Update menus_browser.cpp --- src/game/client/components/menus_browser.cpp | 48 -------------------- 1 file changed, 48 deletions(-) diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index e9b4dc3e8..87741d3d3 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -577,20 +577,8 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem // buttons { CUIRect ButtonRefresh, ButtonConnect, Button; - ConnectButtons.VSplitMid(&Button,&ConnectButtons,5.0f); ConnectButtons.VSplitMid(&ButtonRefresh, &ButtonConnect, 5.0f); - - // verify button - { - static CButtonContainer s_VerifyButton; - if(DoButton_Menu(&s_VerifyButton, Localize("Verify"), 0, &Button)) - { - Verify(); - } - } - - // refresh button { char aLabelBuf[32] = {0}; @@ -629,42 +617,6 @@ void CMenus::RenderServerbrowserStatusBox(CUIRect StatusBox, bool WasListboxItem } } } - static bool m_Verified = false; - static unsigned int m_VerifyTries = 0; -void CMenus::Verify() -{ - if(m_Verified) - return; - - auto StartTime = time_get_nanoseconds(); - std::shared_ptr pGet = HttpGet("https://ger10.ddnet.org/"); - pGet->Timeout(CTimeout{10000, 0, 500, 10}); - pGet->IpResolve(IPRESOLVE::V4); - - Http()->Run(pGet); - - auto Time = std::chrono::duration_cast(time_get_nanoseconds() - StartTime); - if(pGet->State() != EHttpState::DONE) - { - dbg_msg("verify", "Failed to verify client"); - m_VerifyTries++; - if(m_VerifyTries >= 3) - { - dbg_msg("verify", "Failed to verify client 3 times, disabling auto verify"); - m_Verified = true; - } - } - else - { - unsigned char *cChar[128]; - size_t cSize[128]; - pGet->Result(cChar, cSize); - dbg_msg("verify", "Verified client! Took %d ms", (int)Time.count()); - m_Verified = true; - } - return; - } - void CMenus::Connect(const char *pAddress) {