From: Andrej Mihajlov <and@mullvad.net>
Date: Wed, 2 Dec 2020 12:38:38 +0000 (+0100)
Subject: WireGuardKit: Change getWireGuardVersion() -> wireGuardVersion
X-Git-Tag: 1.0.10-18~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6858bd126a60982a9364eb9a50a7ac103fd3340;p=thirdparty%2Fwireguard-apple.git

WireGuardKit: Change getWireGuardVersion() -> wireGuardVersion

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
---

diff --git a/WireGuard/Shared/Logging/Logger.swift b/WireGuard/Shared/Logging/Logger.swift
index eb144dc..f80be3c 100644
--- a/WireGuard/Shared/Logging/Logger.swift
+++ b/WireGuard/Shared/Logging/Logger.swift
@@ -50,8 +50,7 @@ public class Logger {
         if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
             appVersion += " (\(appBuild))"
         }
-        let goBackendVersion = getWireGuardVersion()
-        Logger.global?.log(message: "App version: \(appVersion); Go backend version: \(goBackendVersion)")
+        Logger.global?.log(message: "App version: \(appVersion); Go backend version: \(wireGuardVersion)")
     }
 }
 
diff --git a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
index 39a9469..6e3783a 100644
--- a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
+++ b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
@@ -209,7 +209,7 @@ extension AppDelegate {
         }
         let appVersionString = [
             tr(format: "macAppVersion (%@)", appVersion),
-            tr(format: "macGoBackendVersion (%@)", getWireGuardVersion())
+            tr(format: "macGoBackendVersion (%@)", wireGuardVersion)
         ].joined(separator: "\n")
         let donateString = NSMutableAttributedString(string: tr("donateLink"))
         donateString.addAttribute(.link, value: "https://www.wireguard.com/donations/", range: NSRange(location: 0, length: donateString.length))
diff --git a/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift b/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift
index ef7214d..505b62f 100644
--- a/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift
+++ b/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift
@@ -55,7 +55,7 @@ public class WireGuardAdapter {
         return self.packetTunnelProvider?.packetFlow.value(forKeyPath: "socket.fileDescriptor") as? Int32
     }
 
-    /// Returns a Wireguard version.
+    /// Returns a WireGuard version.
     class var version: String {
         return String(cString: wgVersion())
     }
diff --git a/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift b/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift
index 7e5b2c9..64ad192 100644
--- a/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift
+++ b/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift
@@ -3,6 +3,6 @@
 
 import Foundation
 
-public func getWireGuardVersion() -> String {
+public var wireGuardVersion: String {
     return WireGuardAdapter.version
 }