WireGuard for MacOS (#248)

* WireGuard for MacOS
* Fix openvpn block-outside-dns

client/constants.h

@@ -5,107 +5,31 @@
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
 
+#include "version.h"
+
 #include <stdint.h>
+#include <QObject>
 
 namespace Constants {
 
-// Returns true if we are in a production environment.
-bool inProduction();
-void setStaging();
-
-// Number of msecs for the captive-portal block alert.
-constexpr uint32_t CAPTIVE_PORTAL_ALERT_MSEC = 4000;
-
-// Number of msecs for the unsecured network alert.
-constexpr uint32_t UNSECURED_NETWORK_ALERT_MSEC = 4000;
-
-// Number of recent connections to retain.
-constexpr int RECENT_CONNECTIONS_MAX_COUNT = 5;
-
-#if defined(UNIT_TEST)
-#  define CONSTEXPR(type, functionName, releaseValue, debugValue, \
-                    testingValue)                                 \
-    inline type functionName() { return testingValue; }
-#else
-#  define CONSTEXPR(type, functionName, releaseValue, debugValue, \
-                    testingValue)                                 \
-    inline type functionName() {                                  \
-      return inProduction() ? releaseValue : debugValue;          \
-    }
-#endif
-
-// Let's refresh the IP address any 10 minutes (in milliseconds).
-CONSTEXPR(uint32_t, ipAddressTimerMsec, 600000, 10000, 0)
-
-// Let's check the connection status any second.
-CONSTEXPR(uint32_t, checkStatusTimerMsec, 1000, 1000, 0)
-
-// Number of points for the charts.
-CONSTEXPR(int, chartsMaxPoints, 30, 30, 30);
-
-// Any 6 hours, a new check
-CONSTEXPR(uint32_t, releaseMonitorMsec, 21600000, 4000, 0)
-
-// in milliseconds, how often we should fetch the server list and the account.
-CONSTEXPR(uint32_t, scheduleAccountAndServersTimerMsec, 3600000, 4000, 0)
-
-// how often we check the captive portal when the VPN is on.
-CONSTEXPR(uint32_t, captivePortalRequestTimeoutMsec, 10000, 4000, 0)
-
-// How fast the animated icon should move
-CONSTEXPR(uint32_t, statusIconAnimationMsec, 200, 200, 0)
-
-// How often glean pings are sent
-CONSTEXPR(uint32_t, gleanTimeoutMsec, 1200000, 1000, 0)
-
-// How often we check the surveys to be executed (no network requests are done
-// for this check)
-CONSTEXPR(uint32_t, surveyTimerMsec, 300000, 4000, 0)
-
-#undef CONSTEXPR
-
-#define PRODBETAEXPR(type, functionName, prod, beta) \
-  inline type functionName() { return inProduction() ? prod : beta; }
-
-constexpr const char* API_PRODUCTION_URL = "https://vpn.mozilla.org";
-constexpr const char* API_STAGING_URL =
-    "https://stage-vpn.guardian.nonprod.cloudops.mozgcp.net";
-
-constexpr const char* LOGO_URL = ":/ui/resources/logo-dock.png";
-
-PRODBETAEXPR(const char*, fxaUrl, "https://api.accounts.firefox.com",
-             "https://api-accounts.stage.mozaws.net")
-PRODBETAEXPR(
-    const char*, balrogUrl,
-    "https://aus5.mozilla.org/json/1/FirefoxVPN/%1/%2/release/update.json",
-    "https://stage.balrog.nonprod.cloudops.mozgcp.net/json/1/FirefoxVPN/%1/%2/"
-    "release-cdntest/update.json");
-PRODBETAEXPR(
-    const char*, balrogRootCertFingerprint,
-    "97e8ba9cf12fb3de53cc42a4e6577ed64df493c247b414fea036818d3823560e",
-    "3c01446abe9036cea9a09acaa3a520ac628f20a7ae32ce861cb2efb70fa0c745");
-
-#undef PRODBETAEXPR
+inline QString versionString() { return QStringLiteral(APP_VERSION); }
 
 constexpr const char* PLATFORM_NAME =
-#if defined(MVPN_IOS)
+#if defined(MZ_IOS)
     "ios"
-#elif defined(MVPN_MACOS)
+#elif defined(MZ_MACOS)
     "macos"
-#elif defined(MVPN_LINUX)
+#elif defined(MZ_LINUX)
     "linux"
-#elif defined(MVPN_ANDROID)
+#elif defined(MZ_ANDROID)
     "android"
-#elif defined(MVPN_WINDOWS)
+#elif defined(MZ_WINDOWS)
     "windows"
-#elif defined(UNIT_TEST) || defined(MVPN_DUMMY)
+#elif defined(UNIT_TEST) || defined(MZ_DUMMY)
     "dummy"
 #else
 #  error "Unsupported platform"
 #endif
     ;
-
-constexpr const char* PLACEHOLDER_USER_DNS = "127.0.0.1";
-
-};
+}
 #endif  // CONSTANTS_H