Skip to content

Commit 953d025

Browse files
Fix context being ignored for some DNS requests
1 parent 28097c2 commit 953d025

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ func (opts *Options) WithDCTarget(ctx context.Context, protocol string) (*Creden
130130

131131
var dcAddr string
132132

133-
host, port, err := resolver.LookupFirstService(context.Background(), protocol, cred.Domain)
133+
host, port, err := resolver.LookupFirstService(ctx, protocol, cred.Domain)
134134
if err != nil {
135135
lookupSRVErr := fmt.Errorf("could not lookup %q service of domain %q: %w", protocol, cred.Domain, err)
136136

137-
dcAddr, err = resolver.LookupDCByDomain(context.Background(), cred.Domain)
137+
dcAddr, err = resolver.LookupDCByDomain(ctx, cred.Domain)
138138
if err != nil {
139139
return nil, nil, fmt.Errorf("could not find DC: %w and %w", lookupSRVErr, err)
140140
}

resolver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (r *resolver) LookupFirstService(ctx context.Context, protocol string, doma
5959
func (r *resolver) LookupDCByDomain(ctx context.Context, domain string) (string, error) {
6060
// Unfortunately, Go does not implement SOA lookups, so we lookup the domain
6161
// for DC IPs and reverse lookup their hostnames instead.
62-
dcAddrs, err := r.LookupIP(context.Background(), "ip", domain)
62+
dcAddrs, err := r.LookupIP(ctx, "ip", domain)
6363
if err != nil {
6464
return "", fmt.Errorf("lookup domain itself: %w", err)
6565
}
@@ -70,7 +70,7 @@ func (r *resolver) LookupDCByDomain(ctx context.Context, domain string) (string,
7070

7171
dcAddr := dcAddrs[0].String()
7272

73-
names, err := r.LookupAddr(context.Background(), dcAddr)
73+
names, err := r.LookupAddr(ctx, dcAddr)
7474
if err == nil {
7575
domain, names = splitResultsInDomainAndHostname(names, domain)
7676

0 commit comments

Comments
 (0)