Unify upstream method

netbirdio · Jan 29, 2024 · 5a37bf3 · 5a37bf3
1 parent 631fa43
commit 5a37bf3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/client/internal/dns/upstream.go b/client/internal/dns/upstream.go
@@ -25,7 +25,6 @@ const (
 const testRecord = "."
 
 type upstreamClient interface {
-	exchange(upstream string, r *dns.Msg) (*dns.Msg, time.Duration, error)
 	exchangeContext(ctx context.Context, upstream string, r *dns.Msg) (*dns.Msg, time.Duration, error)
 }
 
@@ -253,6 +252,13 @@ func (u *upstreamResolverBase) disable() {
 	}
 }
 
+func (u *upstreamResolverBase) exchange(upstream string, r *dns.Msg) (rm *dns.Msg, t time.Duration, err error) {
+	// default upstream timeout
+	ctx, cancel := context.WithTimeout(context.Background(), u.upstreamTimeout)
+	defer cancel()
+	return u.upstreamClient.exchangeContext(ctx, upstream, r)
+}
+
 func (u *upstreamResolverBase) testNameserver(server string) error {
 	ctx, cancel := context.WithTimeout(u.ctx, probeTimeout)
 	defer cancel()

diff --git a/client/internal/dns/upstream_ios.go b/client/internal/dns/upstream_ios.go
@@ -40,12 +40,6 @@ func newUpstreamResolver(parentCTX context.Context, interfaceName string, ip net
 	return ios, nil
 }
 
-func (u *upstreamResolverIOS) exchange(upstream string, r *dns.Msg) (rm *dns.Msg, t time.Duration, err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), u.upstreamTimeout)
-	defer cancel()
-	return u.exchangeContext(ctx, upstream, r)
-}
-
 func (u *upstreamResolverIOS) exchangeContext(ctx context.Context, upstream string, r *dns.Msg) (rm *dns.Msg, t time.Duration, err error) {
 	client := &dns.Client{}
 	upstreamHost, _, err := net.SplitHostPort(upstream)

diff --git a/client/internal/dns/upstream_nonios.go b/client/internal/dns/upstream_nonios.go
@@ -23,13 +23,6 @@ func newUpstreamResolver(parentCTX context.Context, interfaceName string, ip net
 	return nonIOS, nil
 }
 
-func (u *upstreamResolverNonIOS) exchange(upstream string, r *dns.Msg) (rm *dns.Msg, t time.Duration, err error) {
-	// default upstream timeout
-	ctx, cancel := context.WithTimeout(u.ctx, u.upstreamTimeout)
-	defer cancel()
-	return u.exchangeContext(ctx, upstream, r)
-}
-
 func (u *upstreamResolverNonIOS) exchangeContext(ctx context.Context, upstream string, r *dns.Msg) (rm *dns.Msg, t time.Duration, err error) {
 	upstreamExchangeClient := &dns.Client{}
 	return upstreamExchangeClient.ExchangeContext(ctx, r, upstream)