Logging: Write versions from both app and extension

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2018-12-13 18:09:38 +05:30
parent ae565db371
commit efd4b28a0d
3 changed files with 13 additions and 17 deletions
@@ -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 {