diff options
author | Jeroen Leenarts <jeroen.leenarts@gmail.com> | 2018-07-07 22:54:44 +0200 |
---|---|---|
committer | Jeroen Leenarts <jeroen.leenarts@gmail.com> | 2018-07-07 22:54:44 +0200 |
commit | b7cf84b7fa12d0d82bb45653b68747061e7e2f82 (patch) | |
tree | 50e9d1accdc3fe5ab37422c8834891dd340ea9ae /WireGuardNetworkExtension/PacketTunnelProvider.swift | |
parent | Fix bizarre name (diff) | |
download | wireguard-apple-b7cf84b7fa12d0d82bb45653b68747061e7e2f82.tar.xz wireguard-apple-b7cf84b7fa12d0d82bb45653b68747061e7e2f82.zip |
Start wire-up of logging and tunnel system.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'WireGuardNetworkExtension/PacketTunnelProvider.swift')
-rw-r--r-- | WireGuardNetworkExtension/PacketTunnelProvider.swift | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuardNetworkExtension/PacketTunnelProvider.swift index 07fd8d3..14ddbb8 100644 --- a/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -7,16 +7,31 @@ // import NetworkExtension +import os.log class PacketTunnelProvider: NEPacketTunnelProvider { + let wireGuardWrapper = WireGuardGoWrapper() + + private let tunnelQueue = DispatchQueue(label: PacketTunnelProvider.description()) + + //TODO create a way to transfer config into extension override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) { + os_log("Starting tunnel", log: Log.general, type: .info) // Add code here to start the process of connecting the tunnel. + //TODO get a settings string in here. + tunnelQueue.sync { + wireGuardWrapper.turnOn(withInterfaceName: "TODO", settingsString: "TODO") + } } override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) { + os_log("Stopping tunnel", log: Log.general, type: .info) // Add code here to start the process of stopping the tunnel. + tunnelQueue.sync { + wireGuardWrapper.turnOff() + } completionHandler() } @@ -27,12 +42,21 @@ class PacketTunnelProvider: NEPacketTunnelProvider { } } - override func sleep(completionHandler: @escaping () -> Void) { - // Add code here to get ready to sleep. - completionHandler() + private func loopReadPackets(_ handler: @escaping ([Data]?, Error?) -> Void) { + packetFlow.readPackets { [weak self] (_, _) in + // TODO write packets into the tunnel + self?.loopReadPackets(handler) + } + } + + func writePacket(_ packet: Data, completionHandler: ((Error?) -> Void)?) { + packetFlow.writePackets([packet], withProtocols: [AF_INET] as [NSNumber]) + completionHandler?(nil) } - override func wake() { - // Add code here to wake up. + func writePackets(_ packets: [Data], completionHandler: ((Error?) -> Void)?) { + let protocols = [Int32](repeating: AF_INET, count: packets.count) as [NSNumber] + packetFlow.writePackets(packets, withProtocols: protocols) + completionHandler?(nil) } } |