SchultesDev/wireguard-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Namespace correction

Browse Source
This commit is contained in:
Gregor Schulte
2025-02-24 15:54:31 +01:00
parent e28a5cc364
commit 3d3b6017b8
16 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conn/bind_windows.go
View File

@@ -17,7 +17,7 @@ import (
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/conn/winrio" "github.com/Lordy82/wireguard-go/conn/winrio"
) )
const ( const (

2
device/queueconstants_android.go
View File

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

4
device/sticky_linux.go
View File

@@ -20,8 +20,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
"golang.zx2c4.com/wireguard/rwcancel" "github.com/Lordy82/wireguard-go/rwcancel"
) )
func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) { func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {

1
go.mod
View File

@@ -8,7 +8,6 @@ require (
golang.org/x/crypto v0.34.0 golang.org/x/crypto v0.34.0
golang.org/x/net v0.35.0 golang.org/x/net v0.35.0
golang.org/x/sys v0.30.0 golang.org/x/sys v0.30.0
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
gvisor.dev/gvisor v0.0.0-20250218181608-84670a4fc612 gvisor.dev/gvisor v0.0.0-20250218181608-84670a4fc612
) )

2
go.sum
View File

@@ -14,5 +14,7 @@ golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
gvisor.dev/gvisor v0.0.0-20250218181608-84670a4fc612 h1:Ah91Og1rlLUY0Sm/fP3vQsAtFoWrOoPTJ+4320GDL2k= gvisor.dev/gvisor v0.0.0-20250218181608-84670a4fc612 h1:Ah91Og1rlLUY0Sm/fP3vQsAtFoWrOoPTJ+4320GDL2k=
gvisor.dev/gvisor v0.0.0-20250218181608-84670a4fc612/go.mod h1:5DMfjtclAbTIjbXqO1qCe2K5GKKxWz2JHvCChuTcJEM= gvisor.dev/gvisor v0.0.0-20250218181608-84670a4fc612/go.mod h1:5DMfjtclAbTIjbXqO1qCe2K5GKKxWz2JHvCChuTcJEM=

2
ipc/namedpipe/namedpipe_test.go
View File

@@ -20,8 +20,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/Lordy82/wireguard-go/ipc/namedpipe"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/ipc/namedpipe"
) )
func randomPipePath() string { func randomPipePath() string {

2
ipc/uapi_linux.go
View File

@@ -9,8 +9,8 @@ import (
"net" "net"
"os" "os"
"github.com/Lordy82/wireguard-go/rwcancel"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/rwcancel"
) )
type UAPIListener struct { type UAPIListener struct {

2
ipc/uapi_windows.go
View File

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

9
main_windows.go
View File

@@ -12,11 +12,10 @@ import (
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
"golang.zx2c4.com/wireguard/device" "github.com/Lordy82/wireguard-go/device"
"golang.zx2c4.com/wireguard/ipc" "github.com/Lordy82/wireguard-go/ipc"
"github.com/Lordy82/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun"
) )
const ( const (

6
tun/netstack/examples/http_client.go
View File

@@ -13,9 +13,9 @@ import (
"net/http" "net/http"
"net/netip" "net/netip"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
"golang.zx2c4.com/wireguard/device" "github.com/Lordy82/wireguard-go/device"
"golang.zx2c4.com/wireguard/tun/netstack" "github.com/Lordy82/wireguard-go/tun/netstack"
) )
func main() { func main() {

6
tun/netstack/examples/http_server.go
View File

@@ -14,9 +14,9 @@ import (
"net/http" "net/http"
"net/netip" "net/netip"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
"golang.zx2c4.com/wireguard/device" "github.com/Lordy82/wireguard-go/device"
"golang.zx2c4.com/wireguard/tun/netstack" "github.com/Lordy82/wireguard-go/tun/netstack"
) )
func main() { func main() {

6
tun/netstack/examples/ping_client.go
View File

@@ -17,9 +17,9 @@ import (
"golang.org/x/net/icmp" "golang.org/x/net/icmp"
"golang.org/x/net/ipv4" "golang.org/x/net/ipv4"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
"golang.zx2c4.com/wireguard/device" "github.com/Lordy82/wireguard-go/device"
"golang.zx2c4.com/wireguard/tun/netstack" "github.com/Lordy82/wireguard-go/tun/netstack"
) )
func main() { func main() {

2
tun/offload_linux.go
View File

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

2
tun/offload_linux_test.go
View File

@@ -9,8 +9,8 @@ import (
"net/netip" "net/netip"
"testing" "testing"
"github.com/Lordy82/wireguard-go/conn"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/conn"
"gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/header" "gvisor.dev/gvisor/pkg/tcpip/header"
) )

4
tun/tun_linux.go
View File

@@ -17,9 +17,9 @@ import (
"time" "time"
"unsafe" "unsafe"
"github.com/Lordy82/wireguard-go/conn"
"github.com/Lordy82/wireguard-go/rwcancel"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/rwcancel"
) )
const ( const (

2
tun/tun_windows.go
View File

@@ -14,8 +14,8 @@ import (
"time" "time"
_ "unsafe" _ "unsafe"
"github.com/Lordy82/wireguard-go/wintun"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"golang.zx2c4.com/wintun"
) )
const ( const (