From 95e20fc6fe97b7ab87bfe4904f12898948f69b05 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 21 May 2026 13:42:43 +0800 Subject: [PATCH] fix address --- Tun/Punchnet/Context/SDLContextActor.swift | 4 +-- Tun/Punchnet/DNS/DNSCloudClient.swift | 6 ++--- Tun/Punchnet/DNS/DNSService.swift | 8 +++--- Tun/Punchnet/SDLConfiguration.swift | 29 +++++++++++++--------- Tun/Punchnet/Super/SDLSuperClient.swift | 17 ++++++------- Tun/Punchnet/Super/SDLSuperService.swift | 12 ++++----- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Tun/Punchnet/Context/SDLContextActor.swift b/Tun/Punchnet/Context/SDLContextActor.swift index a807199..9be6168 100644 --- a/Tun/Punchnet/Context/SDLContextActor.swift +++ b/Tun/Punchnet/Context/SDLContextActor.swift @@ -157,7 +157,7 @@ actor SDLContextActor { await self.puncherActor.start() await self.arpResolver.start() - let dnsService = DNSService(serverAddress: self.config.serverAddress, publicDnsServers: self.publicDnsServers) { [weak self] event in + let dnsService = DNSService(serverIP: self.config.serverEndpoint.ip, publicDnsServers: self.publicDnsServers) { [weak self] event in await self?.handleDNSEvent(event) } self.dnsService = dnsService @@ -173,7 +173,7 @@ actor SDLContextActor { await self.udpHoleServiceProxy.replace(udpHoleService) await udpHoleService.start(includeV6: false) - let superService = SDLSuperService(serverName: self.config.serverName, serverAddress: self.config.serverAddress) { [weak self] message in + let superService = SDLSuperService(serverEndpoint: self.config.serverEndpoint) { [weak self] message in await self?.handleSuperMessage(message: message) } await self.superServiceProxy.replace(superService) diff --git a/Tun/Punchnet/DNS/DNSCloudClient.swift b/Tun/Punchnet/DNS/DNSCloudClient.swift index 3046b11..58040ac 100644 --- a/Tun/Punchnet/DNS/DNSCloudClient.swift +++ b/Tun/Punchnet/DNS/DNSCloudClient.swift @@ -32,10 +32,10 @@ final class DNSCloudClient { private let packetContinuation: AsyncThrowingStream.Continuation private var isPacketContinuationFinished: Bool = false - /// - Parameter serverAddress: 你的 sn-server 地址 (如 "8.8.8.8") + /// - Parameter serverIP: 你的 sn-server IP 地址 (如 "8.8.8.8") /// - Parameter port: 端口 (如 53) - init(serverAddress: String, port: UInt16) { - self.dnsServerAddress = .hostPort(host: Self.makeEndpointHost(address: serverAddress), port: NWEndpoint.Port(integerLiteral: port)) + init(serverIP: String, port: UInt16) { + self.dnsServerAddress = .hostPort(host: Self.makeEndpointHost(address: serverIP), port: NWEndpoint.Port(integerLiteral: port)) let packetPair = AsyncThrowingStream.makeStream(of: Data.self) self.packetFlow = packetPair.stream diff --git a/Tun/Punchnet/DNS/DNSService.swift b/Tun/Punchnet/DNS/DNSService.swift index 8ff60be..5647217 100644 --- a/Tun/Punchnet/DNS/DNSService.swift +++ b/Tun/Punchnet/DNS/DNSService.swift @@ -8,7 +8,7 @@ actor DNSService { typealias EventHandler = @Sendable (Event) async -> Void - private let serverAddress: String + private let serverIP: String private let publicDnsServers: [String] private let onEvent: EventHandler @@ -18,8 +18,8 @@ actor DNSService { private var dnsLocalClient: DNSLocalClient? private var dnsLocalMonitorTask: Task? - init(serverAddress: String, publicDnsServers: [String], onEvent: @escaping EventHandler) { - self.serverAddress = serverAddress + init(serverIP: String, publicDnsServers: [String], onEvent: @escaping EventHandler) { + self.serverIP = serverIP self.publicDnsServers = publicDnsServers self.onEvent = onEvent } @@ -88,7 +88,7 @@ actor DNSService { } private func runCloud() async throws { - let dnsClient = DNSCloudClient(serverAddress: self.serverAddress, port: 15353) + let dnsClient = DNSCloudClient(serverIP: self.serverIP, port: 15353) self.dnsClient = dnsClient dnsClient.start() diff --git a/Tun/Punchnet/SDLConfiguration.swift b/Tun/Punchnet/SDLConfiguration.swift index 9b5ccc6..f02cfd0 100644 --- a/Tun/Punchnet/SDLConfiguration.swift +++ b/Tun/Punchnet/SDLConfiguration.swift @@ -44,12 +44,17 @@ public class SDLConfiguration { public struct ExitNode { let exitNodeIp: UInt32 } + + // 解析的服务器地址信息 + public struct ResolvedServerEndpoint: Sendable { + let host: String + let ip: String + } // 当前的客户端版本 let version: Int - let serverName: String - let serverAddress: String + let serverEndpoint: ResolvedServerEndpoint let stunSocketAddress: SocketAddress @@ -65,8 +70,7 @@ public class SDLConfiguration { var exitNode: ExitNode? public init(version: Int, - serverName: String, - serverAddress: String, + serverEndpoint: ResolvedServerEndpoint, stunServers: [String], clientId: String, networkAddress: NetworkAddress, @@ -75,9 +79,8 @@ public class SDLConfiguration { identityId: UInt32, exitNode: ExitNode?) { self.version = version - self.serverName = serverName - self.serverAddress = serverAddress - let stunHosts = stunServers.isEmpty ? [serverAddress] : stunServers + self.serverEndpoint = serverEndpoint + let stunHosts = stunServers.isEmpty ? [serverEndpoint.ip] : stunServers self.stunSocketAddress = Self.makeStunSocketAddress(host: stunHosts[0], port: 1365) self.stunProbeSocketAddressArray = stunHosts.map { stunServer in [ @@ -113,7 +116,7 @@ extension SDLConfiguration { static func parse(options: [String: NSObject]) -> SDLConfiguration? { guard let version = options["version"] as? Int, - let serverName = options["server_host"] as? String, + let serverHost = options["server_host"] as? String, let stunAssistHost = options["stun_assist_host"] as? String, let accessToken = options["access_token"] as? String, let identityId = options["identity_id"] as? UInt32, @@ -133,12 +136,14 @@ extension SDLConfiguration { exitNode = .init(exitNodeIp: exitNodeIp) } - let serverAddress = Self.resolveHostAddress(host: serverName, port: 1443) + let serverEndpoint = ResolvedServerEndpoint( + host: serverHost, + ip: Self.resolveHostAddress(host: serverHost, port: 1443) + ) return SDLConfiguration(version: version, - serverName: serverName, - serverAddress: serverAddress, - stunServers: [serverName, stunAssistHost], + serverEndpoint: serverEndpoint, + stunServers: [serverHost, stunAssistHost], clientId: clientId, networkAddress: networkAddress, hostname: hostname, diff --git a/Tun/Punchnet/Super/SDLSuperClient.swift b/Tun/Punchnet/Super/SDLSuperClient.swift index 1257e61..86b1acd 100644 --- a/Tun/Punchnet/Super/SDLSuperClient.swift +++ b/Tun/Punchnet/Super/SDLSuperClient.swift @@ -45,13 +45,11 @@ actor SDLSuperClient { private var connection: NWConnection? - private let serverName: String - private let serverAddress: String + private let serverEndpoint: SDLConfiguration.ResolvedServerEndpoint private let port: UInt16 - init(serverName: String, serverAddress: String, port: UInt16, maxBufferSize: Int = 2 * 1024 * 1024) { - self.serverName = serverName - self.serverAddress = serverAddress + init(serverEndpoint: SDLConfiguration.ResolvedServerEndpoint, port: UInt16, maxBufferSize: Int = 2 * 1024 * 1024) { + self.serverEndpoint = serverEndpoint self.port = port self.frameParser = SDLQUICFrameParser(maxBufferSize: maxBufferSize) @@ -59,12 +57,11 @@ actor SDLSuperClient { } func start() { - let serverName = self.serverName - let serverAddress = self.serverAddress + let serverEndpoint = self.serverEndpoint let queue = DispatchQueue(label: "com.sdl.SuperClient.queue") // 专用队列保证线程安全 let options = NWProtocolTLS.Options() - serverName.withCString { + serverEndpoint.host.withCString { sec_protocol_options_set_tls_server_name(options.securityProtocolOptions, $0) } sec_protocol_options_add_tls_application_protocol( @@ -77,7 +74,7 @@ actor SDLSuperClient { options.securityProtocolOptions, { _, trust, complete in // 执行公钥校验 - complete(TLSVerifier.verify(trust: trust, host: serverName)) + complete(TLSVerifier.verify(trust: trust, host: serverEndpoint.host)) }, queue ) @@ -87,7 +84,7 @@ actor SDLSuperClient { // 关键：让 Network.framework 忽略系统代理 params.preferNoProxies = true - let connection = NWConnection(host: Self.makeEndpointHost(address: serverAddress), port: .init(rawValue: port)!, using: params) + let connection = NWConnection(host: Self.makeEndpointHost(address: serverEndpoint.ip), port: .init(rawValue: port)!, using: params) connection.stateUpdateHandler = { [weak self] state in SDLLogger.log("[SDLSuperClient] new state: \(state)", for: .debug) diff --git a/Tun/Punchnet/Super/SDLSuperService.swift b/Tun/Punchnet/Super/SDLSuperService.swift index 23066ab..a02a368 100644 --- a/Tun/Punchnet/Super/SDLSuperService.swift +++ b/Tun/Punchnet/Super/SDLSuperService.swift @@ -3,17 +3,15 @@ import Foundation actor SDLSuperService { typealias MessageHandler = @Sendable (SDLQUICInboundMessage) async -> Void - private let serverName: String - private let serverAddress: String + private let serverEndpoint: SDLConfiguration.ResolvedServerEndpoint private let port: UInt16 private let onMessage: MessageHandler private var superClient: SDLSuperClient? private var monitorTask: Task? - init(serverName: String, serverAddress: String, port: UInt16 = 1443, onMessage: @escaping MessageHandler) { - self.serverName = serverName - self.serverAddress = serverAddress + init(serverEndpoint: SDLConfiguration.ResolvedServerEndpoint, port: UInt16 = 1443, onMessage: @escaping MessageHandler) { + self.serverEndpoint = serverEndpoint self.port = port self.onMessage = onMessage } @@ -51,7 +49,7 @@ actor SDLSuperService { } private func runOnce() async throws { - let superClient = SDLSuperClient(serverName: self.serverName, serverAddress: self.serverAddress, port: self.port) + let superClient = SDLSuperClient(serverEndpoint: self.serverEndpoint, port: self.port) self.superClient = superClient await superClient.start() @@ -74,7 +72,7 @@ actor SDLSuperService { try await Task.sleep(for: .seconds(0.5)) try Task.checkCancellation() - SDLLogger.log("[SDLSuperService] start super client: \(self.serverAddress)") + SDLLogger.log("[SDLSuperService] start super client: \(self.serverEndpoint.ip)") try await withThrowingTaskGroup(of: Void.self) { group in defer {