diff --git a/Tun/Punchnet/Context/SDLContextActor.swift b/Tun/Punchnet/Context/SDLContextActor.swift index 54a106a..6d59abe 100644 --- a/Tun/Punchnet/Context/SDLContextActor.swift +++ b/Tun/Punchnet/Context/SDLContextActor.swift @@ -63,7 +63,7 @@ actor SDLContextActor { // 加密算法相关 nonisolated let rsaCipher: RSACipher - private var dnsService: SDLDNSService? + private var dnsService: DNSService? private let superServiceProxy: SDLSuperServiceProxy private let udpHoleServiceProxy: SDLUDPHoleServiceProxy private let packetOutboundActor: PacketOutboundActor @@ -157,7 +157,7 @@ actor SDLContextActor { await self.puncherActor.start() await self.arpResolver.start() - let dnsService = SDLDNSService(serverHost: self.config.serverHost, publicDnsServers: self.publicDnsServers) { [weak self] event in + let dnsService = DNSService(serverHost: self.config.serverHost, publicDnsServers: self.publicDnsServers) { [weak self] event in await self?.handleDNSEvent(event) } self.dnsService = dnsService @@ -444,7 +444,7 @@ extension SDLContextActor { // MARK: DNS service events extension SDLContextActor { - private func handleDNSEvent(_ event: SDLDNSService.Event) async { + private func handleDNSEvent(_ event: DNSService.Event) async { switch event { case .packet(let packet): let nePacket = NEPacket(data: packet, protocolFamily: 2) diff --git a/Tun/Punchnet/DNS/SDLDNSService.swift b/Tun/Punchnet/DNS/DNSService.swift similarity index 97% rename from Tun/Punchnet/DNS/SDLDNSService.swift rename to Tun/Punchnet/DNS/DNSService.swift index 6244a1e..d1c7df7 100644 --- a/Tun/Punchnet/DNS/SDLDNSService.swift +++ b/Tun/Punchnet/DNS/DNSService.swift @@ -1,7 +1,7 @@ import Foundation import NetworkExtension -actor SDLDNSService { +actor DNSService { enum Event { case packet(Data) } @@ -115,7 +115,7 @@ actor SDLDNSService { let dnsLocalClient = DNSLocalClient(host: dnsServer) await dnsLocalClient.start() self.dnsLocalClient = dnsLocalClient - SDLLogger.log("[SDLDNSService] dnsLocalClient started") + SDLLogger.log("[DNSService] dnsLocalClient started") defer { if self.dnsLocalClient === dnsLocalClient { diff --git a/Tun/Punchnet/Outbound/PacketOutboundActor.swift b/Tun/Punchnet/Outbound/PacketOutboundActor.swift index 9378a77..2b1b6a0 100644 --- a/Tun/Punchnet/Outbound/PacketOutboundActor.swift +++ b/Tun/Punchnet/Outbound/PacketOutboundActor.swift @@ -34,7 +34,7 @@ actor PacketOutboundActor { private var exitNode: SDLConfiguration.ExitNode? private var stunSocketAddress: SocketAddress private var dataCipher: CCDataCipher? - private var dnsService: SDLDNSService? + private var dnsService: DNSService? init(provider: NEPacketTunnelProvider, config: SDLConfiguration, @@ -69,7 +69,7 @@ actor PacketOutboundActor { self.dataCipher = dataCipher } - func updateDNSService(_ dnsService: SDLDNSService?) { + func updateDNSService(_ dnsService: DNSService?) { self.dnsService = dnsService }