Pull request 1962: upd-code-deps

Squashed commit of the following:

commit 7a24cf8f9c5515f642cbfc7e730b95005eeab11d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 15 14:54:16 2023 +0300

    all: upd code, deps, tools

internal/aghnet/arpdb.go

@@ -197,11 +197,7 @@ func (arp *arpdbs) Refresh() (err error) {
 		return nil
 	}
 
-	if len(errs) > 0 {
-		err = errors.List("each arpdb failed", errs...)
-	}
-
-	return err
+	return errors.Annotate(errors.Join(errs...), "each arpdb failed: %w")
 }
 
 // Neighbors implements the ARPDB interface for *arpdbs.

internal/aghnet/arpdb_test.go

@@ -82,7 +82,7 @@ func TestARPDBS(t *testing.T) {
 	t.Run("fail_only", func(t *testing.T) {
 		t.Cleanup(clnp)
 
-		wantMsg := `each arpdb failed: 2 errors: "refresh failed", "refresh failed"`
+		wantMsg := "each arpdb failed: refresh failed\nrefresh failed"
 
 		a := newARPDBs(failDB, failDB)
 		err := a.Refresh()

internal/aghnet/dhcp_unix.go

@@ -60,7 +60,7 @@ func ifaceIPv4Subnet(iface *net.Interface) (subnet netip.Prefix, err error) {
 		}
 
 		if ip = ip.To4(); ip != nil {
-			return netip.PrefixFrom(netip.AddrFrom4(*(*[4]byte)(ip)), maskLen), nil
+			return netip.PrefixFrom(netip.AddrFrom4([4]byte(ip)), maskLen), nil
 		}
 	}
 

internal/aghnet/interfaces_bsd.go

@@ -4,7 +4,6 @@ package aghnet
 
 import (
 	"context"
-	"fmt"
 	"net"
 	"os"
 	"syscall"
@@ -24,20 +23,9 @@ func reuseAddrCtrl(_, _ string, c syscall.RawConn) (err error) {
 		}
 	})
 
-	const (
-		errMsg    = "setting control options"
-		errMsgFmt = errMsg + ": %w"
-	)
+	err = errors.Join(err, cerr)
 
-	if err != nil && cerr != nil {
-		err = errors.List(errMsg, err, cerr)
-	} else if err != nil {
-		err = fmt.Errorf(errMsgFmt, err)
-	} else if cerr != nil {
-		err = fmt.Errorf(errMsgFmt, cerr)
-	}
-
-	return err
+	return errors.Annotate(err, "setting control options: %w")
 }
 
 // listenPacketReusable announces on the local network address additionally

internal/aghnet/ipset_linux.go

@@ -390,9 +390,5 @@ func (m *ipsetMgr) Close() (err error) {
 		errs = append(errs, err)
 	}
 
-	if len(errs) != 0 {
-		return errors.List("closing ipsets", errs...)
-	}
-
-	return nil
+	return errors.Annotate(errors.Join(errs...), "closing ipsets: %w")
 }