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

fix dnsClient

Browse Source
This commit is contained in:
anlicheng 2026-05-05 12:54:24 +08:00
parent dde40ceb68
commit 968b86755b
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,7 +327,6 @@ actor SDLContextActor {
let nePacket = NEPacket(data: packet, protocolFamily: 2) let nePacket = NEPacket(data: packet, protocolFamily: 2)
self.provider.packetFlow.writePacketObjects([nePacket]) self.provider.packetFlow.writePacketObjects([nePacket])
} }
throw SDLContextError.dnsClientClosed
} onCancel: { } onCancel: {
dnsClient.stop() dnsClient.stop()
} }
@ -342,8 +341,10 @@ actor SDLContextActor {
self.dnsLocalClient = dnsLocalClient self.dnsLocalClient = dnsLocalClient
defer { defer {
Task {
self.dnsLocalClient = nil self.dnsLocalClient = nil
//dnsLocalClient.stop() await dnsLocalClient.stop()
}
} }
try await withTaskCancellationHandler { try await withTaskCancellationHandler {
@ -354,7 +355,6 @@ actor SDLContextActor {
let nePacket = NEPacket(data: packet, protocolFamily: 2) let nePacket = NEPacket(data: packet, protocolFamily: 2)
self.provider.packetFlow.writePacketObjects([nePacket]) self.provider.packetFlow.writePacketObjects([nePacket])
} }
throw SDLContextError.dnsLocalClientClosed
} onCancel: { } onCancel: {
Task { Task {
await dnsLocalClient.stop() await dnsLocalClient.stop()

9
Tun/Punchnet/DNS/DNSLocalClient.swift
View File

@ -37,7 +37,6 @@ actor DNSLocalClient {
private let timeoutInterval: TimeInterval = 3.0 private let timeoutInterval: TimeInterval = 3.0
nonisolated let packetFlow: AsyncThrowingStream<Data, Error> nonisolated let packetFlow: AsyncThrowingStream<Data, Error>
@ObservationIgnored
private let packetContinuation: AsyncThrowingStream<Data, Error>.Continuation private let packetContinuation: AsyncThrowingStream<Data, Error>.Continuation
private var isPacketContinuationFinished: Bool = false private var isPacketContinuationFinished: Bool = false
@ -87,10 +86,6 @@ actor DNSLocalClient {
} }
func query(tracker: DNSTracker, dnsPayload: Data) { func query(tracker: DNSTracker, dnsPayload: Data) {
let transactionID: UInt16
let connection: NWConnection
let rewrittenPayload: Data
guard self.state != .stopped, guard self.state != .stopped,
let connection = self.connection, connection.state == .ready, dnsPayload.count >= 2 else { let connection = self.connection, connection.state == .ready, dnsPayload.count >= 2 else {
return return
@ -101,9 +96,9 @@ actor DNSLocalClient {
return return
} }
transactionID = allocatedTransactionID let transactionID = allocatedTransactionID
self.pendingRequests[transactionID] = PendingRequest(tracker: tracker) self.pendingRequests[transactionID] = PendingRequest(tracker: tracker)
rewrittenPayload = Self.rewriteTransactionID(in: dnsPayload, to: transactionID) let rewrittenPayload = Self.rewriteTransactionID(in: dnsPayload, to: transactionID)
connection.send(content: rewrittenPayload, completion: .contentProcessed { [weak self] error in connection.send(content: rewrittenPayload, completion: .contentProcessed { [weak self] error in
if let error { if let error {