Update function linking and add error handling

hackclub · Aug 6, 2023 · 1a1cecc · 1a1cecc
1 parent efae7cc
commit 1a1cecc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Apple/NetworkExtension/PacketTunnelProvider.swift b/Apple/NetworkExtension/PacketTunnelProvider.swift
@@ -1,11 +1,21 @@
+import libburrow
 import NetworkExtension
 import OSLog
-import libburrow
 
 class PacketTunnelProvider: NEPacketTunnelProvider {
     let logger = Logger(subsystem: "com.hackclub.burrow", category: "General")
     override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
-        let fild = libburrow.start()
+        let fild = libburrow.retrieve()
+        if fild == -1 {
+            // Not sure if this is the right way to return an error
+            logger.error("Failed to retrieve file descriptor for burrow.")
+            let err = NSError(
+                domain: "com.hackclub.burrow",
+                code: 1_010,
+                userInfo: [NSLocalizedDescriptionKey: "Failed to find TunInterface"]
+            )
+            completionHandler(err)
+        }
         logger.info("fd: \(fild)")
         completionHandler(nil)
     }

diff --git a/Apple/NetworkExtension/libburrow/libburrow.h b/Apple/NetworkExtension/libburrow/libburrow.h
@@ -1 +1 @@
-int start();
+int retrieve();