Skip to content

Add custom dns server address support(partialy) #7376

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.

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

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion core/commands/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ The resolver can recursively resolve:
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
recursive, _ := req.Options[dnsRecursiveOptionName].(bool)
name := req.Arguments[0]
resolver := namesys.NewDNSResolver()
resolver := namesys.NewDNSResolver("")

var routing []nsopts.ResolveOpt
if !recursive {
Expand Down
23 changes: 20 additions & 3 deletions namesys/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,31 @@ type LookupTXTFunc func(name string) (txt []string, err error)

// DNSResolver implements a Resolver on DNS domains
type DNSResolver struct {
lookupTXT LookupTXTFunc
lookupTXT LookupTXTFunc
DNSAddress string
// TODO: maybe some sort of caching?
// cache would need a timeout
}

// NewDNSResolver constructs a name resolver using DNS TXT records.
func NewDNSResolver() *DNSResolver {
return &DNSResolver{lookupTXT: net.LookupTXT}
func NewDNSResolver(dnsaddress string) *DNSResolver {
var lookupTXTDNS func(ctx context.Context, name string) ([]string, error)
if dnsaddress == "" {
lookupTXTDNS = (&net.Resolver{}).LookupTXT
} else {
lookupTXTDNS = (&net.Resolver{
PreferGo: true,
Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
var d net.Dialer
return d.DialContext(ctx, "udp", dnsaddress)
},
}).LookupTXT
}
return &DNSResolver{lookupTXT: func(name string) (txt []string, err error) {
return lookupTXTDNS(context.Background(), name)
},
DNSAddress: dnsaddress,
}
}

// Resolve implements Resolver.
Expand Down
2 changes: 1 addition & 1 deletion namesys/namesys.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func NewNameSystem(r routing.ValueStore, ds ds.Datastore, cachesize int) NameSys
}

return &mpns{
dnsResolver: NewDNSResolver(),
dnsResolver: NewDNSResolver(""),
proquintResolver: new(ProquintResolver),
ipnsResolver: NewIpnsResolver(r),
ipnsPublisher: NewIpnsPublisher(r, ds),
Expand Down