From 5c56715c288f6417241adaeb2855fec34e50a401 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 30 Sep 2019 22:23:37 +0200
Subject: [PATCH] Ref T730, add AFV test server in "test server list"

---
 src/blackcore/data/globalsetup.cpp |  8 +++++++-
 src/blackmisc/network/server.cpp   | 15 ++++++++++++---
 src/blackmisc/network/server.h     |  5 ++++-
 src/blackmisc/network/serverlist.h |  2 +-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index ab1927c8a..61169a4ee 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -278,7 +278,13 @@ namespace BlackCore
 
         CServerList CGlobalSetup::getPredefinedServersPlusHardcodedServers() const
         {
-            static const CServerList hardcoded({ CServer::swiftFsdTestServer(), CServer::fscServer(), CServer::esTowerView() });
+            static const CServerList hardcoded(
+            {
+                CServer::swiftFsdTestServer(),
+                CServer::fscFsdServer(),
+                CServer::afvFsdTestServer(),
+                CServer::esTowerView()
+            });
             CServerList testServers(m_predefinedServers);
             testServers.addIfAddressNotExists(hardcoded);
             return testServers;
diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp
index 3354377a2..e9ea229d0 100644
--- a/src/blackmisc/network/server.cpp
+++ b/src/blackmisc/network/server.cpp
@@ -7,12 +7,13 @@
  */
 
 #include "blackmisc/network/server.h"
-#include "blackmisc/stringutils.h"
-#include "blackmisc/logcategory.h"
 #include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategory.h"
+#include "blackmisc/stringutils.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/comparefunctions.h"
+#include "blackmisc/obfuscation.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
@@ -75,7 +76,7 @@ namespace BlackMisc
             return withPw ? dvp : dvnWithPw;
         }
 
-        const CServer &CServer::fscServer()
+        const CServer &CServer::fscFsdServer()
         {
             static const CServer fsc = []
             {
@@ -88,6 +89,14 @@ namespace BlackMisc
             return fsc;
         }
 
+        const CServer &CServer::afvFsdTestServer()
+        {
+            static const CServer afv("AFV testserver", "VATSIM AFV testserver", "afv-beta-fsd.vatsim.net", 6809,
+                                     CUser("OBF:AwLZ7f9hUmpSZhm4=", "OBF:AwJGiYV4GHQSMizchFk2=", "", ""),
+                                     CFsdSetup(), CVoiceSetup(), CEcosystem(CEcosystem::vatsim()), CServer::FSDServerVatsim);
+            return afv;
+        }
+
         const CServer &CServer::esTowerView()
         {
             static const CServer s = CServer("ES Tower", "Euroscope Tower view", "localhost", 6809,
diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h
index 33e156b71..26379c205 100644
--- a/src/blackmisc/network/server.h
+++ b/src/blackmisc/network/server.h
@@ -220,7 +220,10 @@ namespace BlackMisc
             static const CServer &swiftFsdTestServer(bool withPw = false);
 
             //! FSC server
-            static const CServer &fscServer();
+            static const CServer &fscFsdServer();
+
+            //! The AFV test server
+            static const CServer &afvFsdTestServer();
 
             //! ES tower server
             static const CServer &esTowerView();
diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h
index e12ef72d1..3f0750def 100644
--- a/src/blackmisc/network/serverlist.h
+++ b/src/blackmisc/network/serverlist.h
@@ -27,7 +27,7 @@ namespace BlackMisc
         //! Value object encapsulating a list of servers.
         class BLACKMISC_EXPORT CServerList :
             public CSequence<CServer>,
-            public BlackMisc::Mixin::MetaType<CServerList>
+            public Mixin::MetaType<CServerList>
         {
         public:
             BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CServerList)