diff options
author | Roopesh Chander <roop@roopc.net> | 2018-12-13 15:38:10 +0530 |
---|---|---|
committer | Roopesh Chander <roop@roopc.net> | 2018-12-13 17:37:14 +0530 |
commit | ae7fb7323faf6321d07dd855ea4f7641d2424ec0 (patch) | |
tree | e06c8af688ca2de4c0464b7d206a140d9cf92f3d /WireGuard/WireGuardNetworkExtension | |
parent | Avoid using 'VPN' in code where possible (diff) | |
download | wireguard-apple-ae7fb7323faf6321d07dd855ea4f7641d2424ec0.tar.xz wireguard-apple-ae7fb7323faf6321d07dd855ea4f7641d2424ec0.zip |
Logging: Use ringlogger for logging from the extension
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to 'WireGuard/WireGuardNetworkExtension')
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift | 41 | ||||
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h | 1 |
2 files changed, 3 insertions, 39 deletions
diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift index 5cac333..04e3893 100644 --- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -153,15 +153,9 @@ class PacketTunnelProvider: NEPacketTunnelProvider { private func configureLogger() { // Setup writing the log to a file - if let networkExtensionLogFileURL = FileManager.networkExtensionLogFileURL { - let fileManager = FileManager.default - let filePath = networkExtensionLogFileURL.path - fileManager.createFile(atPath: filePath, contents: nil) // Create the file if it doesn't already exist - if let fileHandle = FileHandle(forWritingAtPath: filePath) { - logFileHandle = fileHandle - } else { + if let networkExtensionLogFilePath = FileManager.networkExtensionLogFileURL?.path { + if !Logger.configure(withFilePath: networkExtensionLogFilePath) { os_log("Can't open log file for writing. Log is not saved to file.", log: OSLog.default, type: .error) - logFileHandle = nil } } else { os_log("Can't obtain log file URL. Log is not saved to file.", log: OSLog.default, type: .error) @@ -213,34 +207,3 @@ private func withStringsAsGoStrings<R>(_ str1: String, _ str2: String, closure: } } } - -private func wg_log(_ type: OSLogType, staticMessage msg: StaticString) { - // Write to os log - os_log(msg, log: OSLog.default, type: type) - // Write to file log - let msgString: String = msg.withUTF8Buffer { (ptr: UnsafeBufferPointer<UInt8>) -> String in - return String(decoding: ptr, as: UTF8.self) - } - file_log(type: type, message: msgString) -} - -private func wg_log(_ type: OSLogType, message msg: String) { - // Write to os log - os_log("%{public}s", log: OSLog.default, type: type, msg) - // Write to file log - file_log(type: type, message: msg) -} - -private func file_log(type: OSLogType, message: String) { - let formatter = DateFormatter() - formatter.dateFormat = "yyyy-MM-dd HH:mm:ss.SSS: " - var msgLine = formatter.string(from: Date()) + message - if msgLine.last! != "\n" { - msgLine.append("\n") - } - let data = msgLine.data(using: .utf8) - if let data = data, let logFileHandle = logFileHandle { - logFileHandle.write(data) - logFileHandle.synchronizeFile() - } -} diff --git a/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h b/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h index 95d3f4b..2c6a2d0 100644 --- a/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h +++ b/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h @@ -1,2 +1,3 @@ #include "../../wireguard-go-bridge/wireguard.h" #include "wireguard-go-version.h" +#include "ringlogger.h" |