flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T249, using FSC server as obfuscated server

Browse Source 
Only show in local builds
This commit is contained in:
Klaus Basan
2018-02-11 07:17:51 +01:00
parent 3307560db9
commit 9009045dd0
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/data/globalsetup.cpp
View File

@@ -234,7 +234,7 @@ namespace BlackCore
CServerList CGlobalSetup::getFsdTestServersPlusHardcodedServers() const CServerList CGlobalSetup::getFsdTestServersPlusHardcodedServers() const
{ {
static const CServerList hardcoded({ CServer::swiftFsdTestServer() }); static const CServerList hardcoded({ CServer::swiftFsdTestServer(), CServer::fscServer() });
CServerList testServers(m_fsdTestServers); CServerList testServers(m_fsdTestServers);
testServers.addIfAddressNotExists(hardcoded); testServers.addIfAddressNotExists(hardcoded);
return testServers; return testServers;

2
src/blackgui/components/logincomponent.cpp
View File

@@ -147,7 +147,7 @@ namespace BlackGui
CServerList otherServers(m_otherTrafficNetworkServers.getThreadLocal()); CServerList otherServers(m_otherTrafficNetworkServers.getThreadLocal());
// add a testserver when no servers can be loaded // 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()); otherServers.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers());
CLogMessage(this).info("Added servers for testing"); CLogMessage(this).info("Added servers for testing");

2
src/blackgui/components/settingsnetworkserverscomponent.cpp
View File

@@ -60,7 +60,7 @@ namespace BlackGui
// add swift test servers in case we have no servers: // add swift test servers in case we have no servers:
// this is debug/bootstrap feature we can continue to test when something goes wrong // 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()); serverList.push_back(sGui->getGlobalSetup().getFsdTestServersPlusHardcodedServers());
} }

8
src/blackmisc/network/server.cpp
View File

@@ -75,6 +75,14 @@ namespace BlackMisc
return withPw ? dvp : dvnp; 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 bool CServer::matchesName(const QString &name) const
{ {
return m_name.length() == name.length() && return m_name.length() == name.length() &&

3
src/blackmisc/network/server.h
View File

@@ -205,6 +205,9 @@ namespace BlackMisc
//! swift FSD test server //! swift FSD test server
static const CServer &swiftFsdTestServer(bool withPw = false); static const CServer &swiftFsdTestServer(bool withPw = false);
//! FSC server
static const CServer &fscServer();
private: private:
QString m_name; QString m_name;
QString m_description; QString m_description;