From 06ba79bf83db2fec53e087c7fc47fad1fc794a7e Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Sat, 13 Dec 2025 17:44:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tun/PacketTunnelProvider.swift | 4 +- Tun/Punchnet/DNSClient.swift | 15 ++++ Tun/Punchnet/DNSUtil.swift | 119 ---------------------------- Tun/Punchnet/IPPacket.swift | 5 +- Tun/Punchnet/SDLConfiguration.swift | 5 +- Tun/Punchnet/SDLContext.swift | 20 ++--- Tun/Punchnet/SDLMessage.pb.swift | 8 ++ Tun/Punchnet/UDPPacket.swift | 38 +++++++++ punchnet/Core/SystemConfig.swift | 1 + 9 files changed, 84 insertions(+), 131 deletions(-) delete mode 100644 Tun/Punchnet/DNSUtil.swift create mode 100644 Tun/Punchnet/UDPPacket.swift diff --git a/Tun/PacketTunnelProvider.swift b/Tun/PacketTunnelProvider.swift index c767591..3cfa0c0 100644 --- a/Tun/PacketTunnelProvider.swift +++ b/Tun/PacketTunnelProvider.swift @@ -39,6 +39,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider { let token = options["token"] as! String let networkCode = options["network_code"] as! String let clientId = options["client_id"] as! String + let remoteDnsServer = options["remote_dns_server"] as! String let stunServers = stunServersStr.split(separator: ";").compactMap { server -> SDLConfiguration.StunServer? in let parts = server.split(separator: ":", maxSplits: 2) @@ -69,7 +70,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider { clientId: clientId, noticePort: noticePort, token: token, - networkCode: networkCode) + networkCode: networkCode, + remoteDnsServer: remoteDnsServer) // 加密算法 let rsaCipher = try! CCRSACipher(keySize: 1024) let aesChiper = CCAESChiper() diff --git a/Tun/Punchnet/DNSClient.swift b/Tun/Punchnet/DNSClient.swift index 9e60ef1..13ff076 100644 --- a/Tun/Punchnet/DNSClient.swift +++ b/Tun/Punchnet/DNSClient.swift @@ -100,3 +100,18 @@ actor DNSClient { } } + +extension DNSClient { + + struct Helper { + static let dnsServer: String = "100.100.100.100" + // dns请求包的目标地址 + static let dnsDestIpAddr: UInt32 = 1684300900 + + // 判断是否是dns请求的数据包 + static func isDnsRequestPacket(ipPacket: IPPacket) -> Bool { + return ipPacket.header.destination == dnsDestIpAddr + } + } + +} diff --git a/Tun/Punchnet/DNSUtil.swift b/Tun/Punchnet/DNSUtil.swift deleted file mode 100644 index 0b83333..0000000 --- a/Tun/Punchnet/DNSUtil.swift +++ /dev/null @@ -1,119 +0,0 @@ -// -// DNSUtil.swift -// punchnet -// -// Created by 安礼成 on 2025/12/9. -// - -import Foundation -import Network - -struct DNSUtil { - static let dnsServers: [String] = ["100.100.100.100"] - // dns请求包的目标地址 - static let dnsDestIpAddr: UInt32 = 1684300900 - - // 判断是否是dns请求的数据包 - static func isDnsRequestPacket(ipPacket: IPPacket) -> Bool { - return ipPacket.header.destination == dnsDestIpAddr - } - -// // DNS Header 结构 -// struct DNSHeader { -// var id: UInt16 -// var flags: UInt16 -// var qdCount: UInt16 -// var anCount: UInt16 -// var nsCount: UInt16 -// var arCount: UInt16 -// } -// -// // DNS Question 结构 -// struct DNSQuestion { -// var name: String -// var type: UInt16 -// var qclass: UInt16 -// } -// -// // 解析域名（DNS Label 格式） -// func parseName(from data: Data, offset: inout Int) -> String { -// var labels: [String] = [] -// while true { -// let length = Int(data[offset]) -// offset += 1 -// if length == 0 { -// break -// } -// let labelData = data[offset..<(offset + length)] -// if let label = String(data: labelData, encoding: .utf8) { -// labels.append(label) -// } -// offset += length -// } -// return labels.joined(separator: ".") -// } -// -// // 解析 DNS 请求包 -// func parseDNSRequest(_ data: Data) -> (DNSHeader, [DNSQuestion])? { -// guard data.count >= 12 else { return nil } // DNS Header 固定 12 字节 -// -// let header = DNSHeader( -// id: data.uint16(at: 0), -// flags: data.uint16(at: 2), -// qdCount: data.uint16(at: 4), -// anCount: data.uint16(at: 6), -// nsCount: data.uint16(at: 8), -// arCount: data.uint16(at: 10) -// ) -// -// var offset = 12 -// var questions: [DNSQuestion] = [] -// -// for _ in 0.. UInt16 { - let subdata = self[offset.. Data { + return data.subdata(in: 20..(decoder: inout D) throws { @@ -571,6 +574,7 @@ extension SDLDevAddr: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio case 2: try { try decoder.decodeSingularBytesField(value: &self.mac) }() case 3: try { try decoder.decodeSingularUInt32Field(value: &self.netAddr) }() case 4: try { try decoder.decodeSingularUInt32Field(value: &self.netBitLen) }() + case 5: try { try decoder.decodeSingularStringField(value: &self.networkDomain) }() default: break } } @@ -589,6 +593,9 @@ extension SDLDevAddr: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio if self.netBitLen != 0 { try visitor.visitSingularUInt32Field(value: self.netBitLen, fieldNumber: 4) } + if !self.networkDomain.isEmpty { + try visitor.visitSingularStringField(value: self.networkDomain, fieldNumber: 5) + } try unknownFields.traverse(visitor: &visitor) } @@ -597,6 +604,7 @@ extension SDLDevAddr: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio if lhs.mac != rhs.mac {return false} if lhs.netAddr != rhs.netAddr {return false} if lhs.netBitLen != rhs.netBitLen {return false} + if lhs.networkDomain != rhs.networkDomain {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } diff --git a/Tun/Punchnet/UDPPacket.swift b/Tun/Punchnet/UDPPacket.swift new file mode 100644 index 0000000..60185e9 --- /dev/null +++ b/Tun/Punchnet/UDPPacket.swift @@ -0,0 +1,38 @@ +// +// UDPPacket.swift +// Tun +// +// Created by 安礼成 on 2025/12/13. +// + +import Foundation + +struct UDPHeader { + let sourcePort: UInt16 + let destinationPort: UInt16 + let length: UInt16 + let checksum: UInt16 +} + +struct UDPPacket { + let header: UDPHeader + let payload: Data + + init?(_ data: Data) { + // UDP header 至少 8 字节 + guard data.count >= 8 else { + return nil + } + + let header = UDPHeader(sourcePort: UInt16(bytes: (data[0], data[1])), + destinationPort: UInt16(bytes: (data[2], data[3])), + length: UInt16(bytes: (data[4], data[5])), + checksum: UInt16(bytes: (data[6], data[7])) + ) + // UDP payload = length - 8 + let payloadLength = Int(header.length) - 8 + + self.header = header + self.payload = data.subdata(in: 8..<(8 + payloadLength)) + } +} diff --git a/punchnet/Core/SystemConfig.swift b/punchnet/Core/SystemConfig.swift index a6f3834..b467ed9 100644 --- a/punchnet/Core/SystemConfig.swift +++ b/punchnet/Core/SystemConfig.swift @@ -40,6 +40,7 @@ struct SystemConfig { "super_ip": superIp as NSObject, "super_port": superPort as NSObject, "stun_servers": stunServers as NSObject, + "remote_dns_server": superIp as NSObject, "notice_port": noticePort as NSObject ]