2 Commits

Author SHA1 Message Date
Gregor Schulte
3d3b6017b8 Namespace correction 2025-02-24 15:54:31 +01:00
Gregor Schulte
e28a5cc364 Namespace changed 2025-02-24 15:43:54 +01:00
33 changed files with 57 additions and 57 deletions

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 (

View File

@@ -12,7 +12,7 @@ import (
"net/netip" "net/netip"
"os" "os"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
) )
type ChannelBind struct { type ChannelBind struct {

View File

@@ -8,7 +8,7 @@ package device
import ( import (
"errors" "errors"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
) )
type DummyDatagram struct { type DummyDatagram struct {

View File

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

View File

@@ -20,10 +20,10 @@ import (
"testing" "testing"
"time" "time"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
"golang.zx2c4.com/wireguard/conn/bindtest" "github.com/Lordy82/wireguard-go/conn/bindtest"
"golang.zx2c4.com/wireguard/tun" "github.com/Lordy82/wireguard-go/tun"
"golang.zx2c4.com/wireguard/tun/tuntest" "github.com/Lordy82/wireguard-go/tun/tuntest"
) )
// uapiCfg returns a string that contains cfg formatted use with IpcSet. // uapiCfg returns a string that contains cfg formatted use with IpcSet.

View File

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

View File

@@ -15,7 +15,7 @@ import (
"golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/chacha20poly1305"
"golang.org/x/crypto/poly1305" "golang.org/x/crypto/poly1305"
"golang.zx2c4.com/wireguard/tai64n" "github.com/Lordy82/wireguard-go/tai64n"
) )
type handshakeState int type handshakeState int

View File

@@ -10,8 +10,8 @@ import (
"encoding/binary" "encoding/binary"
"testing" "testing"
"golang.zx2c4.com/wireguard/conn" "github.com/Lordy82/wireguard-go/conn"
"golang.zx2c4.com/wireguard/tun/tuntest" "github.com/Lordy82/wireguard-go/tun/tuntest"
) )
func TestCurveWrappers(t *testing.T) { func TestCurveWrappers(t *testing.T) {

View File

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

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 */

View File

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

View File

@@ -13,10 +13,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/Lordy82/wireguard-go/conn"
"golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/chacha20poly1305"
"golang.org/x/net/ipv4" "golang.org/x/net/ipv4"
"golang.org/x/net/ipv6" "golang.org/x/net/ipv6"
"golang.zx2c4.com/wireguard/conn"
) )
type QueueHandshakeElement struct { type QueueHandshakeElement struct {

View File

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

View File

@@ -3,8 +3,8 @@
package device package device
import ( import (
"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) {

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) {

View File

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

View File

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

3
go.mod
View File

@@ -1,4 +1,4 @@
module golang.zx2c4.com/wireguard module github.com/Lordy82/wireguard-go
go 1.23.1 go 1.23.1
@@ -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=

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 {

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 {

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

View File

@@ -14,11 +14,11 @@ import (
"runtime" "runtime"
"strconv" "strconv"
"github.com/Lordy82/wireguard-go/conn"
"github.com/Lordy82/wireguard-go/device"
"github.com/Lordy82/wireguard-go/ipc"
"github.com/Lordy82/wireguard-go/tun"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/ipc"
"golang.zx2c4.com/wireguard/tun"
) )
const ( const (

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 (

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() {

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() {

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() {

View File

@@ -22,7 +22,7 @@ import (
"syscall" "syscall"
"time" "time"
"golang.zx2c4.com/wireguard/tun" "github.com/Lordy82/wireguard-go/tun"
"gvisor.dev/gvisor/pkg/buffer" "gvisor.dev/gvisor/pkg/buffer"
"gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet" "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"

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

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"
) )

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 (

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 (

View File

@@ -11,7 +11,7 @@ import (
"net/netip" "net/netip"
"os" "os"
"golang.zx2c4.com/wireguard/tun" "github.com/Lordy82/wireguard-go/tun"
) )
func Ping(dst, src netip.Addr) []byte { func Ping(dst, src netip.Addr) []byte {