Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conn/bind_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"golang.org/x/sys/windows"

"golang.zx2c4.com/wireguard/conn/winrio"
"github.com/tailscale/wireguard-go/conn/winrio"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion conn/bindtest/bindtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"net/netip"
"os"

"golang.zx2c4.com/wireguard/conn"
"github.com/tailscale/wireguard-go/conn"
)

type ChannelBind struct {
Expand Down
2 changes: 1 addition & 1 deletion device/bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package device
import (
"errors"

"golang.zx2c4.com/wireguard/conn"
"github.com/tailscale/wireguard-go/conn"
)

type DummyDatagram struct {
Expand Down
8 changes: 4 additions & 4 deletions device/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"sync/atomic"
"time"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/ratelimiter"
"golang.zx2c4.com/wireguard/rwcancel"
"golang.zx2c4.com/wireguard/tun"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/ratelimiter"
"github.com/tailscale/wireguard-go/rwcancel"
"github.com/tailscale/wireguard-go/tun"
)

type Device struct {
Expand Down
8 changes: 4 additions & 4 deletions device/device_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"testing"
"time"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/conn/bindtest"
"golang.zx2c4.com/wireguard/tun"
"golang.zx2c4.com/wireguard/tun/tuntest"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/conn/bindtest"
"github.com/tailscale/wireguard-go/tun"
"github.com/tailscale/wireguard-go/tun/tuntest"
)

// uapiCfg returns a string that contains cfg formatted use with IpcSet.
Expand Down
2 changes: 1 addition & 1 deletion device/keypair.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync/atomic"
"time"

"golang.zx2c4.com/wireguard/replay"
"github.com/tailscale/wireguard-go/replay"
)

/* Due to limitations in Go and /x/crypto there is currently
Expand Down
2 changes: 1 addition & 1 deletion device/noise-protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"golang.org/x/crypto/chacha20poly1305"
"golang.org/x/crypto/poly1305"

"golang.zx2c4.com/wireguard/tai64n"
"github.com/tailscale/wireguard-go/tai64n"
)

type handshakeState int
Expand Down
4 changes: 2 additions & 2 deletions device/noise_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"encoding/binary"
"testing"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/tun/tuntest"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/tun/tuntest"
)

func TestCurveWrappers(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion device/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"sync/atomic"
"time"

"golang.zx2c4.com/wireguard/conn"
"github.com/tailscale/wireguard-go/conn"
)

type Peer struct {
Expand Down
2 changes: 1 addition & 1 deletion device/queueconstants_android.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package device

import "golang.zx2c4.com/wireguard/conn"
import "github.com/tailscale/wireguard-go/conn"

/* Reduce memory consumption for Android */

Expand Down
2 changes: 1 addition & 1 deletion device/queueconstants_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

package device

import "golang.zx2c4.com/wireguard/conn"
import "github.com/tailscale/wireguard-go/conn"

const (
QueueStagedSize = conn.IdealBatchSize
Expand Down
2 changes: 1 addition & 1 deletion device/receive.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"sync"
"time"

"github.com/tailscale/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 {
Expand Down
2 changes: 1 addition & 1 deletion device/send.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"sync"
"time"

"github.com/tailscale/wireguard-go/tun"
"golang.org/x/crypto/chacha20poly1305"
"golang.org/x/net/ipv4"
"golang.org/x/net/ipv6"
"golang.zx2c4.com/wireguard/tun"
)

/* Outbound flow
Expand Down
4 changes: 2 additions & 2 deletions device/sticky_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
package device

import (
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/rwcancel"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/rwcancel"
)

func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {
Expand Down
4 changes: 2 additions & 2 deletions device/sticky_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"golang.org/x/sys/unix"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/rwcancel"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/rwcancel"
)

func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {
Expand Down
2 changes: 1 addition & 1 deletion device/tun.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package device
import (
"fmt"

"golang.zx2c4.com/wireguard/tun"
"github.com/tailscale/wireguard-go/tun"
)

const DefaultMTU = 1420
Expand Down
2 changes: 1 addition & 1 deletion device/uapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"sync"
"time"

"golang.zx2c4.com/wireguard/ipc"
"github.com/tailscale/wireguard-go/ipc"
)

type IPCError struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module golang.zx2c4.com/wireguard
module github.com/tailscale/wireguard-go

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion ipc/namedpipe/namedpipe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"
"time"

"github.com/tailscale/wireguard-go/ipc/namedpipe"
"golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/ipc/namedpipe"
)

func randomPipePath() string {
Expand Down
2 changes: 1 addition & 1 deletion ipc/uapi_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net"
"os"

"github.com/tailscale/wireguard-go/rwcancel"
"golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/rwcancel"
)

type UAPIListener struct {
Expand Down
2 changes: 1 addition & 1 deletion ipc/uapi_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package ipc
import (
"net"

"github.com/tailscale/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
Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"runtime"
"strconv"

"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/ipc"
"github.com/tailscale/wireguard-go/tun"
"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 (
Expand Down
8 changes: 4 additions & 4 deletions main_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (

"golang.org/x/sys/windows"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/ipc"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/ipc"

"golang.zx2c4.com/wireguard/tun"
"github.com/tailscale/wireguard-go/tun"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions tun/netstack/examples/http_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"net/http"
"net/netip"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/netstack"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun/netstack"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions tun/netstack/examples/http_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"net/http"
"net/netip"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/netstack"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun/netstack"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions tun/netstack/examples/ping_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"golang.org/x/net/icmp"
"golang.org/x/net/ipv4"

"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/netstack"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun/netstack"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion tun/netstack/tun.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"syscall"
"time"

"golang.zx2c4.com/wireguard/tun"
"github.com/tailscale/wireguard-go/tun"

"golang.org/x/net/dns/dnsmessage"
"gvisor.dev/gvisor/pkg/bufferv2"
Expand Down
2 changes: 1 addition & 1 deletion tun/tcp_offload_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"io"
"unsafe"

"github.com/tailscale/wireguard-go/conn"
"golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/conn"
)

const tcpFlagsOffset = 13
Expand Down
2 changes: 1 addition & 1 deletion tun/tcp_offload_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net/netip"
"testing"

"github.com/tailscale/wireguard-go/conn"
"golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/conn"
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/header"
)
Expand Down
4 changes: 2 additions & 2 deletions tun/tun_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"time"
"unsafe"

"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/rwcancel"
"golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/rwcancel"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion tun/tuntest/tuntest.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net/netip"
"os"

"golang.zx2c4.com/wireguard/tun"
"github.com/tailscale/wireguard-go/tun"
)

func Ping(dst, src netip.Addr) []byte {
Expand Down