diff options
author | Roopesh Chander <roop@roopc.net> | 2018-12-13 18:09:38 +0530 |
---|---|---|
committer | Roopesh Chander <roop@roopc.net> | 2018-12-13 18:09:38 +0530 |
commit | efd4b28a0de81a41c0d821300989bbd05ffa21c2 (patch) | |
tree | 6ed980dc737633bc46b9a3e9a08ac050a68f8e7c /WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift | |
parent | Logging: file_log doesn't need the message type (diff) | |
download | wireguard-apple-efd4b28a0de81a41c0d821300989bbd05ffa21c2.tar.xz wireguard-apple-efd4b28a0de81a41c0d821300989bbd05ffa21c2.zip |
Logging: Write versions from both app and extension
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift | 19 |
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 { |