diff --git a/Tun/Punchnet/Actors/SDLContextActor.swift b/Tun/Punchnet/Actors/SDLContextActor.swift index 0e4608d..f57607e 100644 --- a/Tun/Punchnet/Actors/SDLContextActor.swift +++ b/Tun/Punchnet/Actors/SDLContextActor.swift @@ -163,12 +163,12 @@ actor SDLContextActor { SDLLogger.log("[SDLContext] udp closed!!!!") } - await self.supervisor.addWorker(name: "udpHoleV6") { - let udpHoleV6 = try await self.startUDPHoleV6() - SDLLogger.log("[SDLContext] udp v6 running!!!!") - try await udpHoleV6.waitClose() - SDLLogger.log("[SDLContext] udp v6 closed!!!!") - } +// await self.supervisor.addWorker(name: "udpHoleV6") { +// let udpHoleV6 = try await self.startUDPHoleV6() +// SDLLogger.log("[SDLContext] udp v6 running!!!!") +// try await udpHoleV6.waitClose() +// SDLLogger.log("[SDLContext] udp v6 closed!!!!") +// } } public func waitForReady() async throws { diff --git a/Tun/Punchnet/Actors/SDLLayerPacketForwarder.swift b/Tun/Punchnet/Actors/SDLLayerPacketForwarder.swift index 649f349..7922214 100644 --- a/Tun/Punchnet/Actors/SDLLayerPacketForwarder.swift +++ b/Tun/Punchnet/Actors/SDLLayerPacketForwarder.swift @@ -59,6 +59,7 @@ struct SDLLayerPacketForwarder { dataPacket.dstMac = dstMac dataPacket.ttl = 255 dataPacket.identityID = self.identityID + dataPacket.isP2P = true dataPacket.data = encodedPacket return try dataPacket.serializedData() diff --git a/dmg.sh b/dmg.sh index 82241bd..91afa53 100755 --- a/dmg.sh +++ b/dmg.sh @@ -1,3 +1,3 @@ #! /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 diff --git a/punchnet/Features/Auth/AuthService.swift b/punchnet/Features/Auth/AuthService.swift index 0cdb27b..cb404d6 100644 --- a/punchnet/Features/Auth/AuthService.swift +++ b/punchnet/Features/Auth/AuthService.swift @@ -34,22 +34,27 @@ struct AuthService { var params: [String: Any] = [ "username": username, "password": password, + "hostname": Host.current().name ?? "", "system": SystemConfig.systemInfo, "version": SystemConfig.version_name ] params.merge(baseParams) {$1} + return try await SDLAPIClient.doPost(path: "/auth/login", params: params, as: NetworkSession.self) } static func loginWithToken(token: String) async throws -> NetworkSession { var params: [String: Any] = [ "token": token, + "hostname": Host.current().name ?? "", "system": SystemConfig.systemInfo, "version": SystemConfig.version_name ] params.merge(baseParams) {$1} + NSLog("login params: \(params)") + return try await SDLAPIClient.doPost(path: "/auth/token", params: params, as: NetworkSession.self) }