Logging: Write versions from both app and extension

Signed-off-by: Roopesh Chander <roop@roopc.net>

1 files changed, 2 insertions, 17 deletions

diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
index 04e3893..03da7bb 100644
--- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
+++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
@@ -48,11 +48,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         // Configure logging
         configureLogger()
 
-        wg_log(.info, message: "WireGuard for iOS version \(appVersion())")
-        wg_log(.info, message: "WireGuard Go backend version \(goBackendVersion())")
-        wg_log(.info, message: "Tunnel interface name: \(tunnelConfiguration.interface.name)")
-
-        wg_log(.info, staticMessage: "Starting tunnel")
+        wg_log(.info, message: "Starting tunnel '\(tunnelConfiguration.interface.name)'")
+        wg_log_versions_to_file()
 
         // Resolve endpoint domains
 
@@ -184,18 +181,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
             return wgTurnOn(nameGoStr, settingsGoStr, fileDescriptor)
         }
     }
-
-    func appVersion() -> String {
-        var appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown version"
-        if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
-            appVersion += " (\(appBuild))"
-        }
-        return appVersion
-    }
-
-    func goBackendVersion() -> String {
-        return WIREGUARD_GO_VERSION
-    }
 }
 
 private func withStringsAsGoStrings<R>(_ str1: String, _ str2: String, closure: (gostring_t, gostring_t) -> R) -> R {