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-02-25 00:42:10 +08:00
parent 703d4e191f
commit 616ba21662
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Tun/Punchnet/Actors/SDLContextActor.swift
View File

@ -385,8 +385,6 @@ actor SDLContextActor {
self.aesKey = try! self.rsaCipher.decode(data: Data(registerSuperAck.aesKey)) self.aesKey = try! self.rsaCipher.decode(data: Data(registerSuperAck.aesKey))
self.sessionToken = registerSuperAck.sessionToken self.sessionToken = registerSuperAck.sessionToken
await self.triggerPolicy()
SDLLogger.shared.log("[SDLContext] get registerSuperAck, aes_key len: \(self.aesKey!.count)", level: .info) SDLLogger.shared.log("[SDLContext] get registerSuperAck, aes_key len: \(self.aesKey!.count)", level: .info)
// 服务器分配的tun网卡信息 // 服务器分配的tun网卡信息
do { do {
@ -680,9 +678,7 @@ actor SDLContextActor {
self.flowTracer.inc(num: data.count, type: .forward) self.flowTracer.inc(num: data.count, type: .forward)
// 尝试打洞 // 尝试打洞
Task.detached { await self.puncherActor.submitRegisterRequest(quicClient: self.quicClient, request: .init(srcMac: networkAddr.mac, dstMac: dstMac, networkId: networkAddr.networkId))
await self.puncherActor.submitRegisterRequest(quicClient: self.quicClient, request: .init(srcMac: networkAddr.mac, dstMac: dstMac, networkId: networkAddr.networkId))
}
} }
} }
} }
@ -715,14 +711,6 @@ actor SDLContextActor {
try await self.provider.setTunnelNetworkSettings(networkSettings) try await self.provider.setTunnelNetworkSettings(networkSettings)
} }
// 开始读取数据, 用单独的线程处理packetFlow
func readPackets() async -> [Data] {
let (packets, numbers) = await self.provider.packetFlow.readPackets()
return zip(packets, numbers).compactMap { (data, number) in
return number == 2 ? data : nil
}
}
// 探测当前网络的类型 // 探测当前网络的类型
private func probeNatType() { private func probeNatType() {
Task { Task {
@ -749,16 +737,6 @@ actor SDLContextActor {
} }
} }
// todo 测试代码
private func triggerPolicy() async {
// 向服务器请求权限逻辑
var policyRequest = SDLPolicyRequest()
policyRequest.srcIdentityID = 1234
policyRequest.dstIdentityID = self.config.identityId
await self.policyRequesterActor.submitPolicyRequest(using: self.quicClient, request: &policyRequest)
}
deinit { deinit {
self.udpHole = nil self.udpHole = nil
self.dnsClient = nil self.dnsClient = nil