anlicheng/punchnet-macos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix context

Browse Source
This commit is contained in:
anlicheng 2026-01-30 16:41:10 +08:00
parent b5d574ea31
commit 352dff8e19
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Tun/Punchnet/SDLContext.swift
View File

@ -13,24 +13,24 @@ import NIOCore
/* /*
1. 处理rsa的加解密逻辑 1. 处理rsa的加解密逻辑
*/ */
public class SDLContext { actor SDLContext {
let config: SDLConfiguration nonisolated let config: SDLConfiguration
// nat的网络类型 // nat的网络类型
var natType: SDLNATProberActor.NatType = .blocked var natType: SDLNATProberActor.NatType = .blocked
// AES加密，授权通过后，对象才会被创建 // AES加密，授权通过后，对象才会被创建
let aesCipher: AESCipher nonisolated let aesCipher: AESCipher
// aes // aes
var aesKey: Data = Data() var aesKey: Data = Data()
// rsa的相关配置, public_key是本地生成的 // rsa的相关配置, public_key是本地生成的
let rsaCipher: RSACipher nonisolated let rsaCipher: RSACipher
// 依赖的变量 // 依赖的变量
var udpHole: SDLUDPHole? var udpHole: SDLUDPHole?
var providerAdapter: SDLTunnelProviderAdapter nonisolated let providerAdapter: SDLTunnelProviderAdapter
var puncherActor: SDLPuncherActor? var puncherActor: SDLPuncherActor?
// dns的client对象 // dns的client对象
var dnsClient: SDLDNSClient? var dnsClient: SDLDNSClient?
@ -44,9 +44,6 @@ public class SDLContext {
private var sessionManager: SessionManager private var sessionManager: SessionManager
private var arpServer: ArpServer private var arpServer: ArpServer
// 记录最后发送的stunRequest的cookie
private var lastCookie: UInt32? = 0
// 网络状态变化的健康 // 网络状态变化的健康
private var monitor: SDLNetworkMonitor? private var monitor: SDLNetworkMonitor?
@ -54,9 +51,9 @@ public class SDLContext {
private var noticeClient: SDLNoticeClient? private var noticeClient: SDLNoticeClient?
// 流量统计 // 流量统计
private var flowTracer = SDLFlowTracer() nonisolated private let flowTracer = SDLFlowTracer()
private let logger: SDLLogger nonisolated private let logger: SDLLogger
public init(provider: NEPacketTunnelProvider, config: SDLConfiguration, rsaCipher: RSACipher, aesCipher: AESCipher, logger: SDLLogger) { public init(provider: NEPacketTunnelProvider, config: SDLConfiguration, rsaCipher: RSACipher, aesCipher: AESCipher, logger: SDLLogger) {
self.logger = logger self.logger = logger
@ -105,24 +102,22 @@ public class SDLContext {
// 处理event事件流 // 处理event事件流
group.addTask { group.addTask {
if let eventStream = self.udpHole?.eventStream { if let eventStream = await self.udpHole?.eventStream {
for try await event in eventStream { for try await event in eventStream {
try Task.checkCancellation() try Task.checkCancellation()
Task {
switch event { switch event {
case .ready: case .ready:
try await self.handleUDPHoleReady() await self.handleUDPHoleReady()
case .closed: case .closed:
() ()
} }
} }
} }
} }
}
// 处理数据流 // 处理数据流
group.addTask { group.addTask {
if let dataStream = self.udpHole?.dataStream { if let dataStream = await self.udpHole?.dataStream {
for try await data in dataStream { for try await data in dataStream {
try Task.checkCancellation() try Task.checkCancellation()
Task { Task {
@ -134,7 +129,7 @@ public class SDLContext {
// 处理signal信号流 // 处理signal信号流
group.addTask { group.addTask {
if let signalStream = self.udpHole?.signalStream { if let signalStream = await self.udpHole?.signalStream {
for try await(remoteAddress, signal) in signalStream { for try await(remoteAddress, signal) in signalStream {
try Task.checkCancellation() try Task.checkCancellation()
Task { Task {
@ -161,7 +156,7 @@ public class SDLContext {
// 处理DNS的事件流 // 处理DNS的事件流
group.addTask { group.addTask {
if let packetFlow = self.dnsClient?.packetFlow { if let packetFlow = await self.dnsClient?.packetFlow {
for await packet in packetFlow { for await packet in packetFlow {
let nePacket = NEPacket(data: packet, protocolFamily: 2) let nePacket = NEPacket(data: packet, protocolFamily: 2)
self.providerAdapter.writePackets(packets: [nePacket]) self.providerAdapter.writePackets(packets: [nePacket])
@ -171,12 +166,12 @@ public class SDLContext {
// 处理Monitor的事件流 // 处理Monitor的事件流
group.addTask { group.addTask {
for await event in self.monitor!.eventStream { for await event in await self.monitor!.eventStream {
switch event { switch event {
case .changed: case .changed:
// 需要重新探测网络的nat类型 // 需要重新探测网络的nat类型
//self.natType = await self.getNatType() //self.natType = await self.getNatType()
self.logger.log("didNetworkPathChanged, nat type is: \(self.natType)", level: .info) self.logger.log("didNetworkPathChanged, nat type is: \(await self.natType)", level: .info)
case .unreachable: case .unreachable:
self.logger.log("didNetworkPathUnreachable", level: .warning) self.logger.log("didNetworkPathUnreachable", level: .warning)
} }
@ -197,18 +192,22 @@ public class SDLContext {
self.readTask?.cancel() self.readTask?.cancel()
} }
private func handleUDPHoleReady() async throws { private func setNatType(natType: SDLNATProberActor.NatType) {
if let udpHole = self.udpHole { self.natType = natType
self.puncherActor = SDLPuncherActor(udpHole: udpHole, querySocketAddress: config.stunSocketAddress, logger: logger)
} }
await withTaskGroup(of: Void.self) { group in private func handleUDPHoleReady() async {
if let udpHole = self.udpHole {
self.puncherActor = SDLPuncherActor(udpHole: udpHole, querySocketAddress: config.stunSocketAddress, logger: logger)
self.proberActor = SDLNATProberActor(udpHole: udpHole, addressArray: self.config.stunProbeSocketAddressArray, logger: self.logger)
}
await withDiscardingTaskGroup { group in
group.addTask { group.addTask {
// 开始探测nat的类型 // 开始探测nat的类型
if let udpHoleActor = self.udpHole { if let natType = await self.proberActor?.probeNatType() {
self.proberActor = SDLNATProberActor(udpHole: udpHoleActor, addressArray: self.config.stunProbeSocketAddressArray, logger: self.logger) await self.setNatType(natType: natType)
self.natType = await self.proberActor!.probeNatType() self.logger.log("[SDLContext] nat_type is: \(natType)")
self.logger.log("[SDLContext] nat_type is: \(self.natType)")
} }
} }
@ -226,7 +225,7 @@ public class SDLContext {
if let registerSuperData = try? registerSuper.serializedData() { if let registerSuperData = try? registerSuper.serializedData() {
self.logger.log("[SDLContext] will send register super") self.logger.log("[SDLContext] will send register super")
self.udpHole?.send(type: .registerSuper, data: registerSuperData, remoteAddress: self.config.stunSocketAddress) await self.udpHole?.send(type: .registerSuper, data: registerSuperData, remoteAddress: self.config.stunSocketAddress)
} }
} }
} }
@ -265,7 +264,7 @@ public class SDLContext {
self.aesKey = aesKey self.aesKey = aesKey
} }
private func handleRegisterSuperNak(nakPacket: SDLRegisterSuperNak) async { private func handleRegisterSuperNak(nakPacket: SDLRegisterSuperNak) {
let errorMessage = nakPacket.errorMessage let errorMessage = nakPacket.errorMessage
guard let errorCode = SDLNAKErrorCode(rawValue: UInt8(nakPacket.errorCode)) else { guard let errorCode = SDLNAKErrorCode(rawValue: UInt8(nakPacket.errorCode)) else {
return return
@ -284,7 +283,7 @@ public class SDLContext {
} }
private func handleEvent(event: SDLEvent) async throws { private func handleEvent(event: SDLEvent) throws {
switch event { switch event {
case .natChanged(let natChangedEvent): case .natChanged(let natChangedEvent):
let dstMac = natChangedEvent.mac let dstMac = natChangedEvent.mac
@ -309,7 +308,7 @@ public class SDLContext {
} }
} }
private func handleRegister(remoteAddress: SocketAddress, register: SDLRegister) async throws { private func handleRegister(remoteAddress: SocketAddress, register: SDLRegister) throws {
let networkAddr = config.networkAddress let networkAddr = config.networkAddress
self.logger.log("register packet: \(register), network_address: \(networkAddr)", level: .debug) self.logger.log("register packet: \(register), network_address: \(networkAddr)", level: .debug)
@ -330,7 +329,7 @@ public class SDLContext {
} }
} }
private func handleRegisterAck(remoteAddress: SocketAddress, registerAck: SDLRegisterAck) async { private func handleRegisterAck(remoteAddress: SocketAddress, registerAck: SDLRegisterAck) {
// 判断目标地址是否是tun的网卡地址, 并且是在同一个网络下 // 判断目标地址是否是tun的网卡地址, 并且是在同一个网络下
let networkAddr = config.networkAddress let networkAddr = config.networkAddress
if registerAck.dstMac == networkAddr.mac && registerAck.networkID == networkAddr.networkId { if registerAck.dstMac == networkAddr.mac && registerAck.networkID == networkAddr.networkId {
@ -341,7 +340,7 @@ public class SDLContext {
} }
} }
private func handleData(data: SDLData) async throws { private func handleData(data: SDLData) throws {
let mac = LayerPacket.MacAddress(data: data.dstMac) let mac = LayerPacket.MacAddress(data: data.dstMac)
let networkAddr = config.networkAddress let networkAddr = config.networkAddress
@ -426,7 +425,7 @@ public class SDLContext {
await withDiscardingTaskGroup() { group in await withDiscardingTaskGroup() { group in
for packet in chunkPackets { for packet in chunkPackets {
group.addTask { group.addTask {
self.dealPacket(packet: packet) await self.dealPacket(packet: packet)
} }
} }
} }