Start wire-up of logging and tunnel system.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

3 files changed, 67 insertions, 5 deletions

diff --git a/WireGuardNetworkExtension/Log.swift b/WireGuardNetworkExtension/Log.swift
new file mode 100644
index 0000000..358874c
--- /dev/null
+++ b/WireGuardNetworkExtension/Log.swift
@@ -0,0 +1,13 @@
+//
+//  Log.swift
+//  WireGuardNetworkExtension
+//
+//  Created by Jeroen Leenarts on 07-07-18.
+//  Copyright © 2018 WireGuard. All rights reserved.
+//
+
+import os.log
+
+struct Log {
+    static var general = OSLog(subsystem: "com.wireguard.ios.WireGuard.WireGuardNetworkExtension", category: "general")
+}
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)
     }
 }
diff --git a/WireGuardNetworkExtension/WireGuardGoWrapper.m b/WireGuardNetworkExtension/WireGuardGoWrapper.m
index 4244fe9..0b854f1 100644
--- a/WireGuardNetworkExtension/WireGuardGoWrapper.m
+++ b/WireGuardNetworkExtension/WireGuardGoWrapper.m
@@ -8,12 +8,17 @@
 
 #import "WireGuardGoWrapper.h"
 
+#include <os/log.h>
 #include "wireguard.h"
 
 /// Trampoline function
 static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len);
 /// Trampoline function
 static ssize_t do_write(const void *ctx, const unsigned char *buf, size_t len);
+/// Trampoline function
+static void do_log(int level, const char *tag, const char *msg);
+
+
 
 @interface WireGuardGoWrapper ()
 
@@ -26,6 +31,9 @@ static ssize_t do_write(const void *ctx, const unsigned char *buf, size_t len);
 
 - (void) turnOnWithInterfaceName: (NSString *)interfaceName settingsString: (NSString *)settingsString
 {
+
+    wgSetLogger(do_log);
+
     const char * ifName = [interfaceName UTF8String];
     const char * settings = [settingsString UTF8String];
 
@@ -38,6 +46,16 @@ static ssize_t do_write(const void *ctx, const unsigned char *buf, size_t len);
     wgTurnOff(self.handle);
 }
 
++ (os_log_t)log {
+    static os_log_t subLog = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        subLog = os_log_create("com.wireguard.ios.WireGuard.WireGuardNetworkExtension", "WireGuard-Go");
+    });
+
+    return subLog;
+}
+
 @end
 
 static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
@@ -45,6 +63,7 @@ static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
     WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx;
     printf("Reading from instance with ctx %p into buffer %p of length %zu\n", ctx, buf, len);
     sleep(1);
+    // TODO received data from tunnel, write to Packetflow
     return wrapper.isClosed ? -1 : 0;
 }
 
@@ -54,3 +73,9 @@ static ssize_t do_write(const void *ctx, const unsigned char *buf, size_t len)
     printf("Writing from instance with ctx %p into buffer %p of length %zu\n", ctx, buf, len);
     return len;
 }
+
+static void do_log(int level, const char *tag, const char *msg)
+{
+    // TODO Get some details on the log level and distribute to matching log levels.
+    os_log([WireGuardGoWrapper log], "Log level %d for %s: %s", level, tag, msg);
+}