Skip to content

fix: merge address info when aliasing entries to handle out-of-order DNS records #151

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
Yanhu007 wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −1
Open

fix: merge address info when aliasing entries to handle out-of-order DNS records #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,22 @@ func ensureName(inprogress map[string]*ServiceEntry, name string) *ServiceEntry
return inp
}

// alias is used to setup an alias between two entries
// alias is used to setup an alias between two entries.
// When the destination already has an entry (e.g. an A record arrived
// before the SRV record), merge its address information into the source
// entry so that nothing is lost.
func alias(inprogress map[string]*ServiceEntry, src, dst string) {
srcEntry := ensureName(inprogress, src)
if dstEntry, ok := inprogress[dst]; ok && dstEntry != srcEntry {
// Merge address info from the existing destination entry
if srcEntry.AddrV4 == nil && dstEntry.AddrV4 != nil {
srcEntry.Addr = dstEntry.Addr
srcEntry.AddrV4 = dstEntry.AddrV4
}
if srcEntry.AddrV6IPAddr == nil && dstEntry.AddrV6IPAddr != nil {
srcEntry.AddrV6 = dstEntry.AddrV6
srcEntry.AddrV6IPAddr = dstEntry.AddrV6IPAddr
}
}
inprogress[dst] = srcEntry
}