Skip to content
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

Only warn user of --local-addr is provided explicitly by user #489

Merged
merged 7 commits into from
Dec 22, 2024
+7 −1
Merged

Only warn user of --local-addr is provided explicitly by user #489

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f748c3
only warn if user explicitly provided a local addr, otherwise info log
phillip-stephens Dec 19, 2024
094e820
lint
phillip-stephens Dec 19, 2024
2c45da7
error out if user-explicitly supplied IPs won't work
phillip-stephens Dec 19, 2024
42cfa12
Merge branch 'main' into phillip/fix-warn
phillip-stephens Dec 20, 2024
7355b56
Merge branch 'main' into phillip/fix-warn
phillip-stephens Dec 20, 2024
8ccb0d1
Merge branch 'main' into phillip/fix-warn
zakird Dec 22, 2024
4000559
Merge branch 'main' into phillip/fix-warn
zakird Dec 22, 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
8 changes: 7 additions & 1 deletion src/zdns/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,13 @@ func (r *Resolver) getConnectionInfo(nameServer *NameServer) (*ConnectionInfo, e
}
}
if localAddr != nil {
log.Warnf("none of the user-supplied local addresses could connect to name server %s, using local address %s", nameServer.String(), localAddr.String())
if (len(r.userPreferredIPv4LocalAddrs) > 0 && localAddr.To4() != nil) || (len(r.userPreferredIPv6LocalAddrs) > 0 && util.IsIPv6(localAddr)) {
// the user provided a local addr. explicitly that won't work, error
log.Fatalf("none of the user-supplied local addresses (%v) could connect to name server %s", userIPs, nameServer.String())
} else {
// user didn't explicitly provide a local addr, this is just a default. Info level so as not to alarm the user
log.Infof("none of the default local addresses could connect to name server %s, using local address %s", nameServer.String(), localAddr.String())
}
}
}
if localAddr == nil {
Expand Down
Loading