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-04-28 10:06:20 +08:00
parent 9cde9f1f38
commit 3d551a9bcf
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,12 +163,12 @@ actor SDLContextActor {
SDLLogger.log("[SDLContext] udp closed!!!!") SDLLogger.log("[SDLContext] udp closed!!!!")
} }
await self.supervisor.addWorker(name: "udpHoleV6") { // await self.supervisor.addWorker(name: "udpHoleV6") {
let udpHoleV6 = try await self.startUDPHoleV6() // let udpHoleV6 = try await self.startUDPHoleV6()
SDLLogger.log("[SDLContext] udp v6 running!!!!") // SDLLogger.log("[SDLContext] udp v6 running!!!!")
try await udpHoleV6.waitClose() // try await udpHoleV6.waitClose()
SDLLogger.log("[SDLContext] udp v6 closed!!!!") // SDLLogger.log("[SDLContext] udp v6 closed!!!!")
} // }
} }
public func waitForReady() async throws { public func waitForReady() async throws {

1
Tun/Punchnet/Actors/SDLLayerPacketForwarder.swift
View File

@ -59,6 +59,7 @@ struct SDLLayerPacketForwarder {
dataPacket.dstMac = dstMac dataPacket.dstMac = dstMac
dataPacket.ttl = 255 dataPacket.ttl = 255
dataPacket.identityID = self.identityID dataPacket.identityID = self.identityID
dataPacket.isP2P = true
dataPacket.data = encodedPacket dataPacket.data = encodedPacket
return try dataPacket.serializedData() return try dataPacket.serializedData()

2
dmg.sh
View File

@ -1,3 +1,3 @@
#! /bin/sh #! /bin/sh
create-dmg --volname "punchnet" --window-pos 200 120 --window-size 800 400 --icon "punchnet.app" 200 190 --hide-extension "punchnet.app" --app-drop-link 600 185 ~/Desktop/punchnet.dmg /Users/anlicheng/Desktop/punchnet_macos_v1 create-dmg --volname "punchnet" --window-pos 200 120 --window-size 800 400 --icon "punchnet.app" 200 190 --hide-extension "punchnet.app" --app-drop-link 600 185 ~/Desktop/punchnet.dmg /Users/anlicheng/Desktop/punchnetv3

5
punchnet/Features/Auth/AuthService.swift
View File

@ -34,22 +34,27 @@ struct AuthService {
var params: [String: Any] = [ var params: [String: Any] = [
"username": username, "username": username,
"password": password, "password": password,
"hostname": Host.current().name ?? "",
"system": SystemConfig.systemInfo, "system": SystemConfig.systemInfo,
"version": SystemConfig.version_name "version": SystemConfig.version_name
] ]
params.merge(baseParams) {$1} params.merge(baseParams) {$1}
return try await SDLAPIClient.doPost(path: "/auth/login", params: params, as: NetworkSession.self) return try await SDLAPIClient.doPost(path: "/auth/login", params: params, as: NetworkSession.self)
} }
static func loginWithToken(token: String) async throws -> NetworkSession { static func loginWithToken(token: String) async throws -> NetworkSession {
var params: [String: Any] = [ var params: [String: Any] = [
"token": token, "token": token,
"hostname": Host.current().name ?? "",
"system": SystemConfig.systemInfo, "system": SystemConfig.systemInfo,
"version": SystemConfig.version_name "version": SystemConfig.version_name
] ]
params.merge(baseParams) {$1} params.merge(baseParams) {$1}
NSLog("login params: \(params)")
return try await SDLAPIClient.doPost(path: "/auth/token", params: params, as: NetworkSession.self) return try await SDLAPIClient.doPost(path: "/auth/token", params: params, as: NetworkSession.self)
} }