diff --git a/Sources/sdlan/LayerPacket.swift b/Sources/sdlan/LayerPacket.swift index 07860c7..3237acd 100644 --- a/Sources/sdlan/LayerPacket.swift +++ b/Sources/sdlan/LayerPacket.swift @@ -69,19 +69,6 @@ struct LayerPacket { throw LayerPacketError.invalidLength } - /* - let idx = layerData.count - 4 - let playload = layerData.subdata(in: 0.. Void) { - // host: "192.168.0.101", port: 1265 - guard let options else { - return - } - - let token = options["token"] as! String - //let version = options["version"] as! Int - let installed_channel = options["installed_channel"] as! String - - let superIp = options["super_ip"] as! String - Task { - SDLLogger.logLevel = .debug - do { - self.context = try SDLContext(provider: self, config: .init( - version: 1, - installedChannel: installed_channel, - //superHost: "118.178.229.213", - superHost: superIp, - superPort: 18083, - stunServers: [.init(host: superIp, ports: [1265, 1266]), .init(host: "118.178.229.213", ports: [1265, 1266])], - clientId: SDLContext.getUUID(), - token: "" - //token: token - )) - - try await self.context?.start() - completionHandler(nil) - } catch let err { - NSLog("SDLContext start get error: \(err)") - - completionHandler(err) - } - } - } - - override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) { - // Add code here to start the process of stopping the tunnel. - completionHandler() - } - - override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)?) { - // Add code here to handle the message. - if let handler = completionHandler { - handler(messageData) - } - } - - override func sleep(completionHandler: @escaping () -> Void) { - // Add code here to get ready to sleep. - completionHandler() - } - - override func wake() { - // Add code here to wake up. - } - -} - -// 获取物理网卡ip地址 -extension PacketTunnelProvider { - - public static var viaInterface: NetworkInterface? = { - let interfaces = NetworkInterfaceManager.getInterfaces() - - return interfaces.first {$0.name == "en0"} - }() - -} diff --git a/Sources/sdlan/SDLContext.swift b/Sources/sdlan/SDLContext.swift index 685d22f..7871c71 100644 --- a/Sources/sdlan/SDLContext.swift +++ b/Sources/sdlan/SDLContext.swift @@ -101,7 +101,7 @@ class SDLContext { // 数据包读取任务 private var readTask: Task<(), Never>? - let provider: PacketTunnelProvider + let provider: NEPacketTunnelProvider private var sessionManager: SessionManager private var holerManager: HolerManager @@ -124,7 +124,8 @@ class SDLContext { private var flowTracer = SDLFlowTracerActor() private var flowTracerCancel: AnyCancellable? - init(provider: PacketTunnelProvider, config: Configuration) throws { + init(provider: NEPacketTunnelProvider, config: Configuration) throws { + self.config = config self.rsaCipher = try RSACipher(keySize: 1024)