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

fix

Browse Source
This commit is contained in:
anlicheng 2026-03-27 13:35:02 +08:00
parent 5358d9a2b7
commit 2e311cbf9e
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Tun/Punchnet/Actors/SDLPuncherActor.swift
View File

@ -41,7 +41,7 @@ actor SDLPuncherActor {
return return
} }
pendingRequests[dstMac] = .init(expireAt: Date().addingTimeInterval(cooldownInterval), request: request) self.pendingRequests[dstMac] = .init(expireAt: Date().addingTimeInterval(cooldownInterval), request: request)
// 触发一次打洞 // 触发一次打洞
var queryInfo = SDLQueryInfo() var queryInfo = SDLQueryInfo()
queryInfo.dstMac = request.dstMac queryInfo.dstMac = request.dstMac
@ -51,20 +51,27 @@ actor SDLPuncherActor {
} }
func handlePeerInfo(using udpHole: SDLUDPHole?, peerInfo: SDLPeerInfo) async { func handlePeerInfo(using udpHole: SDLUDPHole?, peerInfo: SDLPeerInfo) async {
guard let udpHole, let requestContext = pendingRequests.removeValue(forKey: peerInfo.dstMac), // 如果服务器返回了值，优先删除掉; 避免数据堆积
let remoteAddress = try? await peerInfo.v4Info.socketAddress() else { guard let requestContext = pendingRequests.removeValue(forKey: peerInfo.dstMac) else {
return return
} }
SDLLogger.shared.log("[SDLContext] hole sock address: \(remoteAddress)", level: .debug) // 判断必要的值是否存在
// 发送register包 guard let udpHole, peerInfo.hasV4Info else {
var register = SDLRegister() return
register.networkID = requestContext.request.networkId }
register.srcMac = requestContext.request.srcMac
register.dstMac = requestContext.request.dstMac
if let registerData = try? register.serializedData() { if let remoteAddress = try? await peerInfo.v4Info.socketAddress() {
udpHole.send(type: .register, data: registerData, remoteAddress: remoteAddress) SDLLogger.shared.log("[SDLContext] hole sock address: \(remoteAddress)", level: .debug)
// 发送register包
var register = SDLRegister()
register.networkID = requestContext.request.networkId
register.srcMac = requestContext.request.srcMac
register.dstMac = requestContext.request.dstMac
if let registerData = try? register.serializedData() {
udpHole.send(type: .register, data: registerData, remoteAddress: remoteAddress)
}
} }
} }