passepartoutvpn/wireguard-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/wireguard-apple.git synced 2025-02-16 12:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract log config to a function and base log level on wg level.

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts 2018-08-28 14:03:53 +02:00
parent 88d84f702b
commit 0c19d713f2
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
WireGuardNetworkExtension/PacketTunnelProvider.swift
View File

@ -42,15 +42,9 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
guard let firstEndpoint = validatedEndpoints.first else { guard let firstEndpoint = validatedEndpoints.first else {
startTunnelCompletionHandler(PacketTunnelProviderError.tunnelSetupFailed) startTunnelCompletionHandler(PacketTunnelProviderError.tunnelSetupFailed)
return return
}
wgSetLogger { (level, tagCStr, msgCStr) in
let tag = (tagCStr != nil) ? String(cString: tagCStr!) : ""
let msg = (msgCStr != nil) ? String(cString: msgCStr!) : ""
NSLog("wg log: \(level): \(tag): \(msg)")
} }
configureLogger()
let handle = withStringsAsGoStrings(interfaceName, settings) { (nameGoStr, settingsGoStr) -> Int32 in let handle = withStringsAsGoStrings(interfaceName, settings) { (nameGoStr, settingsGoStr) -> Int32 in
return withUnsafeMutablePointer(to: &wgContext) { (wgCtxPtr) -> Int32 in return withUnsafeMutablePointer(to: &wgContext) { (wgCtxPtr) -> Int32 in
@ -167,6 +161,26 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
let responseData = "Hello app".data(using: String.Encoding.utf8) let responseData = "Hello app".data(using: String.Encoding.utf8)
completionHandler?(responseData) completionHandler?(responseData)
} }
private func configureLogger() {
wgSetLogger { (level, tagCStr, msgCStr) in
let logType: OSLogType
switch level {
case 0:
logType = .debug
case 1:
logType = .info
case 2:
logType = .error
default:
logType = .default
}
let tag = (tagCStr != nil) ? String(cString: tagCStr!) : ""
let msg = (msgCStr != nil) ? String(cString: msgCStr!) : ""
os_log("wg log: %{public}s: %{public}s", log: Log.general, type: logType, tag, msg)
}
}
} }
class WireGuardContext { class WireGuardContext {