WireGuardKit: Pass logHandler via constructor

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
This commit is contained in:
Andrej Mihajlov
2020-12-02 13:48:24 +01:00
parent d2c38702c8
commit 2329f712cf
2 changed files with 15 additions and 31 deletions
@@ -8,7 +8,11 @@ import os
class PacketTunnelProvider: NEPacketTunnelProvider {
private lazy var adapter = WireGuardAdapter(with: self)
private lazy var adapter: WireGuardAdapter = {
return WireGuardAdapter(with: self) { logLevel, message in
wg_log(logLevel.osLogLevel, message: message)
}
}()
override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
let activationAttemptId = options?["activationAttemptId"] as? String
@@ -25,11 +29,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
return
}
// Setup WireGuard logger
adapter.setLogHandler { logLevel, message in
wg_log(logLevel.osLogLevel, message: message)
}
// Start the tunnel
adapter.start(tunnelConfiguration: tunnelConfiguration) { adapterError in
guard let adapterError = adapterError else {