Rename module

conn/bind_std.go

@@ -20,9 +20,7 @@ import (
 	"golang.org/x/net/ipv6"
 )
 
-var (
+var _ Bind = (*StdNetBind)(nil)
-	_ Bind = (*StdNetBind)(nil)
-)
 
 // StdNetBind implements Bind for all platforms. While Windows has its own Bind
 // (see bind_windows.go), it may fall back to StdNetBind.
@@ -210,10 +208,8 @@ func (s *StdNetBind) getMessages() *[]ipv6.Message {
 	return s.msgsPool.Get().(*[]ipv6.Message)
 }
 
-var (
+// If compilation fails here these are no longer the same underlying type.
-	// If compilation fails here these are no longer the same underlying type.
+var _ ipv6.Message = ipv4.Message{}
-	_ ipv6.Message = ipv4.Message{}
-)
 
 type batchReader interface {
 	ReadBatch([]ipv6.Message, int) (int, error)

conn/bind_windows.go

@@ -15,9 +15,8 @@ import (
 	"sync/atomic"
 	"unsafe"
 
+	"github.com/sagernet/wireguard-go/conn/winrio"
 	"golang.org/x/sys/windows"
-
-	"golang.zx2c4.com/wireguard/conn/winrio"
 )
 
 const (

device/device.go

@@ -11,10 +11,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.zx2c4.com/wireguard/conn"
+	"github.com/sagernet/wireguard-go/conn"
-	"golang.zx2c4.com/wireguard/ratelimiter"
+	"github.com/sagernet/wireguard-go/ratelimiter"
-	"golang.zx2c4.com/wireguard/rwcancel"
+	"github.com/sagernet/wireguard-go/rwcancel"
-	"golang.zx2c4.com/wireguard/tun"
+	"github.com/sagernet/wireguard-go/tun"
 )
 
 type Device struct {

device/keypair.go

@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.zx2c4.com/wireguard/replay"
+	"github.com/sagernet/wireguard-go/replay"
 )
 
 /* Due to limitations in Go and /x/crypto there is currently

device/noise-protocol.go

@@ -12,11 +12,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sagernet/wireguard-go/tai64n"
 	"golang.org/x/crypto/blake2s"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/crypto/poly1305"
-
-	"golang.zx2c4.com/wireguard/tai64n"
 )
 
 type handshakeState int

device/peer.go

@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.zx2c4.com/wireguard/conn"
+	"github.com/sagernet/wireguard-go/conn"
 )
 
 type Peer struct {

device/queueconstants_android.go

@@ -5,7 +5,7 @@
 
 package device
 
-import "golang.zx2c4.com/wireguard/conn"
+import "github.com/sagernet/wireguard-go/conn"
 
 /* Reduce memory consumption for Android */
 

device/queueconstants_default.go

@@ -7,7 +7,7 @@
 
 package device
 
-import "golang.zx2c4.com/wireguard/conn"
+import "github.com/sagernet/wireguard-go/conn"
 
 const (
 	QueueStagedSize            = conn.IdealBatchSize

device/receive.go

@@ -12,10 +12,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sagernet/wireguard-go/conn"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/ipv6"
-	"golang.zx2c4.com/wireguard/conn"
 )
 
 type QueueHandshakeElement struct {
@@ -411,7 +411,6 @@ func (device *Device) RoutineHandshake(id int) {
 			// derive keypair
 
 			err = peer.BeginSymmetricSession()
-
 			if err != nil {
 				device.log.Errorf("%v - Failed to derive keypair: %v", peer, err)
 				goto skip

device/send.go

@@ -13,11 +13,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sagernet/wireguard-go/conn"
+	"github.com/sagernet/wireguard-go/tun"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/ipv6"
-	"golang.zx2c4.com/wireguard/conn"
-	"golang.zx2c4.com/wireguard/tun"
 )
 
 /* Outbound flow

device/sticky_default.go

@@ -3,8 +3,8 @@
 package device
 
 import (
-	"golang.zx2c4.com/wireguard/conn"
+	"github.com/sagernet/wireguard-go/conn"
-	"golang.zx2c4.com/wireguard/rwcancel"
+	"github.com/sagernet/wireguard-go/rwcancel"
 )
 
 func (device *Device) startRouteListener(_ conn.Bind) (*rwcancel.RWCancel, error) {

device/sticky_linux.go

@@ -18,10 +18,9 @@ import (
 	"sync"
 	"unsafe"
 
+	"github.com/sagernet/wireguard-go/conn"
+	"github.com/sagernet/wireguard-go/rwcancel"
 	"golang.org/x/sys/unix"
-
-	"golang.zx2c4.com/wireguard/conn"
-	"golang.zx2c4.com/wireguard/rwcancel"
 )
 
 func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {

device/tun.go

@@ -8,7 +8,7 @@ package device
 import (
 	"fmt"
 
-	"golang.zx2c4.com/wireguard/tun"
+	"github.com/sagernet/wireguard-go/tun"
 )
 
 const DefaultMTU = 1420

device/uapi.go

@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.zx2c4.com/wireguard/ipc"
+	"github.com/sagernet/wireguard-go/ipc"
 )
 
 type IPCError struct {

go.mod

@@ -1,4 +1,4 @@
-module golang.zx2c4.com/wireguard
+module github.com/sagernet/wireguard-go
 
 go 1.23.1
 

ipc/uapi_linux.go

@@ -9,8 +9,8 @@ import (
 	"net"
 	"os"
 
+	"github.com/sagernet/wireguard-go/rwcancel"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/rwcancel"
 )
 
 type UAPIListener struct {
@@ -84,7 +84,6 @@ func UAPIListen(name string, file *os.File) (net.Listener, error) {
 			unix.IN_DELETE|
 			unix.IN_DELETE_SELF,
 	)
-
 	if err != nil {
 		return nil, err
 	}

ipc/uapi_windows.go

@@ -8,8 +8,8 @@ package ipc
 import (
 	"net"
 
+	"github.com/sagernet/wireguard-go/ipc/namedpipe"
 	"golang.org/x/sys/windows"
-	"golang.zx2c4.com/wireguard/ipc/namedpipe"
 )
 
 // TODO: replace these with actual standard windows error numbers from the win package

tun/errors.go

@@ -4,9 +4,7 @@ import (
 	"errors"
 )
 
-var (
+// ErrTooManySegments is returned by Device.Read() when segmentation
-	// ErrTooManySegments is returned by Device.Read() when segmentation
+// overflows the length of supplied buffers. This error should not cause
-	// overflows the length of supplied buffers. This error should not cause
+// reads to cease.
-	// reads to cease.
+var ErrTooManySegments = errors.New("too many segments")
-	ErrTooManySegments = errors.New("too many segments")
-)

tun/offload_linux.go

@@ -12,8 +12,8 @@ import (
 	"io"
 	"unsafe"
 
+	"github.com/sagernet/wireguard-go/conn"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/conn"
 )
 
 const tcpFlagsOffset = 13

tun/tun_linux.go

@@ -17,9 +17,9 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/sagernet/wireguard-go/conn"
+	"github.com/sagernet/wireguard-go/rwcancel"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/conn"
-	"golang.zx2c4.com/wireguard/rwcancel"
 )
 
 const (
@@ -514,9 +514,7 @@ func (tun *NativeTun) initFromFlags(name string) error {
 		return err
 	}
 	if e := sc.Control(func(fd uintptr) {
-		var (
+		var ifr *unix.Ifreq
-			ifr *unix.Ifreq
-		)
 		ifr, err = unix.NewIfreq(name)
 		if err != nil {
 			return