netutil: slog

AdguardTeam · Jun 25, 2024 · 695c829 · 695c829
1 parent baf088f
commit 695c829
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/internal/netutil/listenconfig.go b/internal/netutil/listenconfig.go
@@ -1,9 +1,12 @@
 package netutil
 
-import "net"
+import (
+	"log/slog"
+	"net"
+)
 
 // ListenConfig returns the default [net.ListenConfig] used by the plain-DNS
-// servers in this module.
+// servers in this module.  l must not be nil.
 //
 // TODO(a.garipov): Add tests.
 //
@@ -13,8 +16,13 @@ import "net"
 // See https://github.com/AdguardTeam/AdGuardHome/issues/5872.
 //
 // TODO(a.garipov): DRY with AdGuard DNS when we can.
-func ListenConfig() (lc *net.ListenConfig) {
+func ListenConfig(l *slog.Logger) (lc *net.ListenConfig) {
 	return &net.ListenConfig{
-		Control: defaultListenControl,
+		Control: listenControl{logger: l}.defaultListenControl,
 	}
 }
+
+// listenControl is a wrapper struct with logger.
+type listenControl struct {
+	logger *slog.Logger
+}
diff --git a/internal/netutil/listenconfig_unix.go b/internal/netutil/listenconfig_unix.go
@@ -7,14 +7,13 @@ import (
 	"syscall"
 
 	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/log"
 	"golang.org/x/sys/unix"
 )
 
 // defaultListenControl is used as a [net.ListenConfig.Control] function to set
 // the SO_REUSEADDR and SO_REUSEPORT socket options on all sockets used by the
 // DNS servers in this module.
-func defaultListenControl(_, _ string, c syscall.RawConn) (err error) {
+func (lc listenControl) defaultListenControl(_, _ string, c syscall.RawConn) (err error) {
 	var opErr error
 	err = c.Control(func(fd uintptr) {
 		opErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)
@@ -29,7 +28,7 @@ func defaultListenControl(_, _ string, c syscall.RawConn) (err error) {
 			if errors.Is(opErr, unix.ENOPROTOOPT) {
 				// Some Linux OSs do not seem to support SO_REUSEPORT, including
 				// some varieties of OpenWrt.  Issue a warning.
-				log.Info("warning: SO_REUSEPORT not supported: %s", opErr)
+				lc.logger.Warn("SO_REUSEPORT not supported: %s", opErr)
 				opErr = nil
 			} else {
 				opErr = fmt.Errorf("setting SO_REUSEPORT: %w", opErr)

diff --git a/internal/netutil/listenconfig_windows.go b/internal/netutil/listenconfig_windows.go
@@ -6,4 +6,6 @@ import "syscall"
 
 // defaultListenControl is nil on Windows, because it doesn't support
 // SO_REUSEPORT.
-var defaultListenControl func(_, _ string, _ syscall.RawConn) (_ error)
+func (lc listenControl) defaultListenControl(_, _ string, _ syscall.RawConn) (_ error) {
+	return nil
+}
diff --git a/proxy/server_tcp.go b/proxy/server_tcp.go
@@ -21,7 +21,7 @@ func (p *Proxy) createTCPListeners(ctx context.Context) (err error) {
 	for _, a := range p.TCPListenAddr {
 		p.logger.Info("creating tcp server socket", "addr", a)
 
-		lsnr, lErr := proxynetutil.ListenConfig().Listen(ctx, "tcp", a.String())
+		lsnr, lErr := proxynetutil.ListenConfig(p.logger).Listen(ctx, "tcp", a.String())
 		if lErr != nil {
 			return fmt.Errorf("listening to tcp socket: %w", lErr)
 		}

diff --git a/proxy/server_udp.go b/proxy/server_udp.go
@@ -33,7 +33,7 @@ func (p *Proxy) createUDPListeners(ctx context.Context) (err error) {
 func (p *Proxy) udpCreate(ctx context.Context, udpAddr *net.UDPAddr) (*net.UDPConn, error) {
 	p.logger.InfoContext(ctx, "creating udp server socket", "addr", udpAddr)
 
-	packetConn, err := proxynetutil.ListenConfig().ListenPacket(ctx, "udp", udpAddr.String())
+	packetConn, err := proxynetutil.ListenConfig(p.logger).ListenPacket(ctx, "udp", udpAddr.String())
 	if err != nil {
 		return nil, fmt.Errorf("listening to udp socket: %w", err)
 	}