Adjusted callback API

OperatorFoundation · Jan 11, 2018 · 1bfcf07 · 1bfcf07
1 parent 4c5ffad
commit 1bfcf07
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/Sources/Transport/PacketTunnelProvider.swift b/Sources/Transport/PacketTunnelProvider.swift
@@ -10,21 +10,14 @@ import Foundation
 import NetworkExtension
 
 extension NEPacketTunnelProvider: PacketTunnelProvider {
-    public func createTCPConnectionThroughTunnel(to remoteEndpoint: NWEndpoint, enableTLS: Bool, tlsParameters TLSParameters: NWTLSParameters?, delegate: Any?, stateCallback: @escaping (NWTCPConnectionState, Error?) -> Void) -> TCPConnection? {
-        let tunnel = createTCPConnectionThroughTunnel(to: remoteEndpoint, enableTLS: enableTLS, tlsParameters: TLSParameters, delegate: delegate)
-        let _ = tunnel.observe(\NWTCPConnection.state) {
-            (conn, change) in
-
-            stateCallback(change.newValue!, nil)
-        }
-        return tunnel
+    public func createTCPConnectionThroughTunnel(to remoteEndpoint: NWEndpoint, enableTLS: Bool, tlsParameters TLSParameters: NWTLSParameters?, delegate: Any?) -> TCPConnection? {
+        return createTCPConnectionThroughTunnel(to: remoteEndpoint, enableTLS: enableTLS, tlsParameters: TLSParameters, delegate: delegate)
     }
 }
 
 public protocol PacketTunnelProvider {
     func createTCPConnectionThroughTunnel(to remoteEndpoint: NWEndpoint,
                                           enableTLS: Bool,
                                           tlsParameters TLSParameters: NWTLSParameters?,
-                                          delegate: Any?,
-                                          stateCallback: @escaping (NWTCPConnectionState, Error?) -> Void) -> TCPConnection?
+                                          delegate: Any?) -> TCPConnection?
 }
diff --git a/Sources/Transport/UDPSession.swift b/Sources/Transport/UDPSession.swift
@@ -0,0 +1,32 @@
+//
+//  UDPSession.swift
+//  Transport
+//
+//  Created by Brandon Wiley on 1/11/18.
+//
+
+import Foundation
+import NetworkExtension
+
+extension NWUDPSession: UDPSession {}
+
+public protocol UDPSession {
+    var state: NWUDPSessionState { get }
+    var isViable: Bool { get }
+
+    var resolvedEndpoint: NWEndpoint? { get }
+    func tryNextResolvedEndpoint()
+
+    func setReadHandler(_ handler: @escaping ([Data]?, Error?) -> Void,
+                        maxDatagrams: Int)
+    func writeDatagram(_ datagram: Data,
+                       completionHandler: @escaping (Error?) -> Void)
+    func writeMultipleDatagrams(_ datagramArray: [Data],
+                                completionHandler: @escaping (Error?) -> Void)
+    var maximumDatagramLength: Int { get }
+
+    func cancel()
+
+    var hasBetterPath: Bool { get }
+    init(upgradeFor session: NWUDPSession)
+}