Bump golang.org/x/net from 0.9.0 to 0.23.0

.gitignore

@@ -0,0 +1,2 @@
+/.idea/
+.DS_Store

alignedbuff/alignedbuff.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 )
 
 // ErrEOF signals trying to read beyond the available payload information.
@@ -289,10 +289,12 @@ func (a *AlignedBuff) alignWrite(m int) {
 }
 
 // This is ... ugly.
-var uint16AlignMask = int(unsafe.Alignof(uint16(0)) - 1)
-var uint32AlignMask = int(unsafe.Alignof(uint32(0)) - 1)
-var uint64AlignMask = int(unsafe.Alignof(uint64(0)) - 1)
-var padding = bytes.Repeat([]byte{0}, uint64AlignMask)
+var (
+	uint16AlignMask = int(unsafe.Alignof(uint16(0)) - 1)
+	uint32AlignMask = int(unsafe.Alignof(uint32(0)) - 1)
+	uint64AlignMask = int(unsafe.Alignof(uint64(0)) - 1)
+	padding         = bytes.Repeat([]byte{0}, uint64AlignMask)
+)
 
 var int32AlignMask = int(unsafe.Alignof(int32(0)) - 1)
 

chain.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

compat_policy.go

@@ -3,12 +3,14 @@ package nftables
 import (
 	"fmt"
 
-	"github.com/google/nftables/expr"
+	"github.com/sagernet/nftables/expr"
 	"golang.org/x/sys/unix"
 )
 
-const nft_RULE_COMPAT_F_INV uint32 = (1 << 1)
-const nft_RULE_COMPAT_F_MASK uint32 = nft_RULE_COMPAT_F_INV
+const (
+	nft_RULE_COMPAT_F_INV  uint32 = (1 << 1)
+	nft_RULE_COMPAT_F_MASK uint32 = nft_RULE_COMPAT_F_INV
+)
 
 // Used by xt match or target like xt_tcpudp to set compat policy between xtables and nftables
 // https://elixir.bootlin.com/linux/v5.12/source/net/netfilter/nft_compat.c#L187

compat_policy_test.go

@@ -3,8 +3,8 @@ package nftables
 import (
 	"testing"
 
-	"github.com/google/nftables/expr"
-	"github.com/google/nftables/xt"
+	"github.com/sagernet/nftables/expr"
+	"github.com/sagernet/nftables/xt"
 	"golang.org/x/sys/unix"
 )
 

conn.go

@@ -20,10 +20,11 @@ import (
 	"os"
 	"sync"
 
-	"github.com/google/nftables/binaryutil"
-	"github.com/google/nftables/expr"
+	"github.com/sagernet/nftables/binaryutil"
+	"github.com/sagernet/nftables/expr"
 	"github.com/mdlayher/netlink"
 	"github.com/mdlayher/netlink/nltest"
+	E "github.com/sagernet/sing/common/exceptions"
 	"golang.org/x/sys/unix"
 )
 
@@ -258,7 +259,7 @@ func (cc *Conn) Flush() error {
 				// Kernel will only send one permission error to user space.
 				return err
 			}
-			errs = errors.Join(errs, err)
+			errs = E.Errors(errs, err)
 		}
 	}
 

counter.go

@@ -15,7 +15,7 @@
 package nftables
 
 import (
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/bitwise.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/bitwise_test.go

@@ -35,7 +35,6 @@ func TestBitwise(t *testing.T) {
 			data, err := tt.bw.marshal(0 /* don't care in this test */)
 			if err != nil {
 				t.Fatalf("marshal error: %+v", err)
-
 			}
 			ad, err := netlink.NewAttributeDecoder(data)
 			if err != nil {

expr/byteorder.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"fmt"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/connlimit.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/counter.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/ct.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/dup.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )
@@ -38,7 +38,6 @@ func (e *Dup) marshal(fam byte) ([]byte, error) {
 	}
 
 	data, err := netlink.MarshalAttributes(attrs)
-
 	if err != nil {
 		return nil, err
 	}

expr/dynset.go

@@ -18,8 +18,8 @@ import (
 	"encoding/binary"
 	"time"
 
-	"github.com/google/nftables/binaryutil"
-	"github.com/google/nftables/internal/parseexprfunc"
+	"github.com/sagernet/nftables/binaryutil"
+	"github.com/sagernet/nftables/internal/parseexprfunc"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/expr.go

@@ -18,8 +18,8 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
-	"github.com/google/nftables/internal/parseexprfunc"
+	"github.com/sagernet/nftables/binaryutil"
+	"github.com/sagernet/nftables/internal/parseexprfunc"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )
@@ -305,22 +305,25 @@ func (e *Masq) marshal(fam byte) ([]byte, error) {
 		}
 		if flags != 0 {
 			flagsData, err := netlink.MarshalAttributes([]netlink.Attribute{
-				{Type: unix.NFTA_MASQ_FLAGS, Data: binaryutil.BigEndian.PutUint32(flags)}})
+				{Type: unix.NFTA_MASQ_FLAGS, Data: binaryutil.BigEndian.PutUint32(flags)},
+			})
 			if err != nil {
 				return nil, err
 			}
 			msgData = append(msgData, flagsData...)
 		}
 	} else {
 		regsData, err := netlink.MarshalAttributes([]netlink.Attribute{
-			{Type: unix.NFTA_MASQ_REG_PROTO_MIN, Data: binaryutil.BigEndian.PutUint32(e.RegProtoMin)}})
+			{Type: unix.NFTA_MASQ_REG_PROTO_MIN, Data: binaryutil.BigEndian.PutUint32(e.RegProtoMin)},
+		})
 		if err != nil {
 			return nil, err
 		}
 		msgData = append(msgData, regsData...)
 		if e.RegProtoMax != 0 {
 			regsData, err := netlink.MarshalAttributes([]netlink.Attribute{
-				{Type: unix.NFTA_MASQ_REG_PROTO_MAX, Data: binaryutil.BigEndian.PutUint32(e.RegProtoMax)}})
+				{Type: unix.NFTA_MASQ_REG_PROTO_MAX, Data: binaryutil.BigEndian.PutUint32(e.RegProtoMax)},
+			})
 			if err != nil {
 				return nil, err
 			}

expr/exthdr.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )
@@ -46,10 +46,12 @@ func (e *Exthdr) marshal(fam byte) ([]byte, error) {
 	// or DestRegister is set. Mixing them results in EOPNOTSUPP.
 	if e.SourceRegister != 0 {
 		attr = []netlink.Attribute{
-			{Type: unix.NFTA_EXTHDR_SREG, Data: binaryutil.BigEndian.PutUint32(e.SourceRegister)}}
+			{Type: unix.NFTA_EXTHDR_SREG, Data: binaryutil.BigEndian.PutUint32(e.SourceRegister)},
+		}
 	} else {
 		attr = []netlink.Attribute{
-			{Type: unix.NFTA_EXTHDR_DREG, Data: binaryutil.BigEndian.PutUint32(e.DestRegister)}}
+			{Type: unix.NFTA_EXTHDR_DREG, Data: binaryutil.BigEndian.PutUint32(e.DestRegister)},
+		}
 	}
 
 	attr = append(attr,

expr/exthdr_test.go

@@ -47,7 +47,6 @@ func TestExthdr(t *testing.T) {
 			data, err := tt.eh.marshal(0 /* don't care in this test */)
 			if err != nil {
 				t.Fatalf("marshal error: %+v", err)
-
 			}
 			ad, err := netlink.NewAttributeDecoder(data)
 			if err != nil {

expr/fib.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/hash.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/immediate.go

@@ -18,7 +18,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/limit.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/log.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/lookup.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/match.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
-	"github.com/google/nftables/xt"
+	"github.com/sagernet/nftables/binaryutil"
+	"github.com/sagernet/nftables/xt"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/match_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/google/nftables/xt"
+	"github.com/sagernet/nftables/xt"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )
@@ -33,7 +33,6 @@ func TestMatch(t *testing.T) {
 			data, err := tt.mtch.marshal(0 /* don't care in this test */)
 			if err != nil {
 				t.Fatalf("marshal error: %+v", err)
-
 			}
 			ad, err := netlink.NewAttributeDecoder(data)
 			if err != nil {

expr/meta_test.go

@@ -39,7 +39,6 @@ func TestMeta(t *testing.T) {
 			data, err := tt.meta.marshal(0 /* don't care in this test */)
 			if err != nil {
 				t.Fatalf("marshal error: %+v", err)
-
 			}
 			ad, err := netlink.NewAttributeDecoder(data)
 			if err != nil {

expr/nat.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/notrack.go

@@ -29,7 +29,6 @@ func (e *Notrack) marshal(fam byte) ([]byte, error) {
 
 func (e *Notrack) unmarshal(fam byte, data []byte) error {
 	ad, err := netlink.NewAttributeDecoder(data)
-
 	if err != nil {
 		return err
 	}

expr/numgen.go

@@ -18,7 +18,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )

expr/objref.go

@@ -17,7 +17,7 @@ package expr
 import (
 	"encoding/binary"
 
-	"github.com/google/nftables/binaryutil"
+	"github.com/sagernet/nftables/binaryutil"
 	"github.com/mdlayher/netlink"
 	"golang.org/x/sys/unix"
 )