Skip to content

DNSSD: Fix parsing of concatenated TXT records #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

DNSSD: Fix parsing of concatenated TXT records #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84fb218
DNSSD: Fix parsing of concatenated TXT records
vanyasem Jul 26, 2024
50131e5
Merge branch 'main' into dnssd-fix-concatenated-txt
PeterAdams-A Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Sources/AsyncDNSResolver/dnssd/DNSResolver_dnssd.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,14 @@ extension DNSSD {
guard let ptr = data?.assumingMemoryBound(to: UInt8.self) else {
return nil
}
let txt = String(cString: ptr.advanced(by: 1))

let bufferPtr = UnsafeBufferPointer(start: ptr, count: Int(length))
var buffer = Array(bufferPtr)[...]

guard let txt = self.readName(&buffer, separator: "") else {
throw AsyncDNSResolver.Error(code: .badResponse)
}

return TXTRecord(txt: txt)
}

Expand Down Expand Up @@ -462,15 +469,15 @@ extension DNSSD {
}

extension DNSSDQueryReplyHandler {
func readName(_ buffer: inout ArraySlice<UInt8>) -> String? {
func readName(_ buffer: inout ArraySlice<UInt8>, separator: String = ".") -> String? {
var parts: [String] = []
while let length = buffer.readInteger(as: UInt8.self),
length > 0,
let part = buffer.readString(length: Int(length)) {
parts.append(part)
}

return parts.isEmpty ? nil : parts.joined(separator: ".")
return parts.isEmpty ? nil : parts.joined(separator: separator)
}

@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
Expand Down