all: sync with master; upd chlog

internal/whois/whois.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghio"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
@@ -48,9 +49,8 @@ func (Empty) Process(_ context.Context, _ netip.Addr) (info *Info, changed bool)
 
 // Config is the configuration structure for Default.
 type Config struct {
-	// DialContext specifies the dial function for creating unencrypted TCP
-	// connections.
-	DialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
+	// DialContext is used to create TCP connections to WHOIS servers.
+	DialContext aghnet.DialContextFunc
 
 	// ServerAddr is the address of the WHOIS server.
 	ServerAddr string
@@ -86,9 +86,8 @@ type Default struct {
 	// resolve the same IP.
 	cache gcache.Cache
 
-	// dialContext connects to a remote server resolving hostname using our own
-	// DNS server and unecrypted TCP connection.
-	dialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
+	// dialContext is used to create TCP connections to WHOIS servers.
+	dialContext aghnet.DialContextFunc
 
 	// serverAddr is the address of the WHOIS server.
 	serverAddr string
@@ -215,7 +214,7 @@ func (w *Default) query(ctx context.Context, target, serverAddr string) (data []
 		return nil, err
 	}
 
-	_ = conn.SetReadDeadline(time.Now().Add(w.timeout))
+	_ = conn.SetDeadline(time.Now().Add(w.timeout))
 	_, err = io.WriteString(conn, target+"\r\n")
 	if err != nil {
 		// Don't wrap the error since it's informative enough as is.
@@ -310,7 +309,7 @@ func (w *Default) requestInfo(
 
 	kv, err := w.queryAll(ctx, ip.String())
 	if err != nil {
-		log.Debug("whois: quering about %q: %s", ip, err)
+		log.Debug("whois: querying %q: %s", ip, err)
 
 		return nil, true
 	}

internal/whois/whois_test.go

@@ -113,20 +113,14 @@ func TestDefault_Process(t *testing.T) {
 
 					return copy(b, tc.data), io.EOF
 				},
-				OnWrite: func(b []byte) (n int, err error) {
-					return len(b), nil
-				},
-				OnClose: func() (err error) {
-					return nil
-				},
-				OnSetReadDeadline: func(t time.Time) (err error) {
-					return nil
-				},
+				OnWrite:       func(b []byte) (n int, err error) { return len(b), nil },
+				OnClose:       func() (err error) { return nil },
+				OnSetDeadline: func(t time.Time) (err error) { return nil },
 			}
 
 			w := whois.New(&whois.Config{
 				Timeout: 5 * time.Second,
-				DialContext: func(_ context.Context, _, addr string) (_ net.Conn, _ error) {
+				DialContext: func(_ context.Context, _, _ string) (_ net.Conn, _ error) {
 					hit = 0
 
 					return fakeConn, nil