From 9009045dd0034f0489615b1df0f0c7dc9a39675c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 11 Feb 2018 07:17:51 +0100 Subject: [PATCH] Ref T249, using FSC server as obfuscated server Only show in local builds --- src/blackcore/data/globalsetup.cpp | 2 +- src/blackgui/components/logincomponent.cpp | 2 +- .../components/settingsnetworkserverscomponent.cpp | 2 +- src/blackmisc/network/server.cpp | 8 ++++++++ src/blackmisc/network/server.h | 3 +++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index 1b1b655d3..48498e6aa 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -234,7 +234,7 @@ namespace BlackCore CServerList CGlobalSetup::getFsdTestServersPlusHardcodedServers() const { - static const CServerList hardcoded({ CServer::swiftFsdTestServer() }); + static const CServerList hardcoded({ CServer::swiftFsdTestServer(), CServer::fscServer() }); CServerList testServers(m_fsdTestServers); testServers.addIfAddressNotExists(hardcoded); return testServers; diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 65e812d8d..910f7cca2 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -147,7 +147,7 @@ namespace BlackGui CServerList otherServers(m_otherTrafficNetworkServers.getThreadLocal()); // add a testserver when no servers can be loaded - if (otherServers.isEmpty() && (sGui->isDeveloperFlagSet() || CBuildConfig::isLocalDeveloperDebugBuild())) + if (otherServers.isEmpty() && CBuildConfig::isLocalDeveloperDebugBuild()) { otherServers.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers()); CLogMessage(this).info("Added servers for testing"); diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/blackgui/components/settingsnetworkserverscomponent.cpp index 3857076a2..127fb5952 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.cpp +++ b/src/blackgui/components/settingsnetworkserverscomponent.cpp @@ -60,7 +60,7 @@ namespace BlackGui // add swift test servers in case we have no servers: // this is debug/bootstrap feature we can continue to test when something goes wrong - if (serverList.isEmpty() && (sGui->isDeveloperFlagSet())) + if (serverList.isEmpty() && CBuildConfig::isLocalDeveloperDebugBuild()) { serverList.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers()); } diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp index bc73fed4a..ae352c776 100644 --- a/src/blackmisc/network/server.cpp +++ b/src/blackmisc/network/server.cpp @@ -75,6 +75,14 @@ namespace BlackMisc return withPw ? dvp : dvnp; } + const CServer &CServer::fscServer() + { + static const CServer fsc("FSC", "FSC e.V.", "OBF:AwJIKfgkQDJEIRnno29DJlB+UK0=", 6809, + CUser(), + CFsdSetup(), CEcosystem(CEcosystem::privateFsd()), CServer::FSDServer); + return fsc; + } + bool CServer::matchesName(const QString &name) const { return m_name.length() == name.length() && diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index 01f2e92a9..1f94ee2ae 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -205,6 +205,9 @@ namespace BlackMisc //! swift FSD test server static const CServer &swiftFsdTestServer(bool withPw = false); + //! FSC server + static const CServer &fscServer(); + private: QString m_name; QString m_description;