bepass-org · markpash · Mar 14, 2024 · Mar 14, 2024
diff --git a/conn/bind_std.go → wireguard/conn/bind_std.go b/conn/bind_std.go → wireguard/conn/bind_std.go
diff --git a/conn/bind_std_test.go → wireguard/conn/bind_std_test.go b/conn/bind_std_test.go → wireguard/conn/bind_std_test.go
diff --git a/conn/bind_windows.go → wireguard/conn/bind_windows.go b/conn/bind_windows.go → wireguard/conn/bind_windows.go
@@ -17,7 +17,7 @@ import (
 
 	"golang.org/x/sys/windows"
 
-	"github.com/bepass-org/wireguard-go/conn/winrio"
+	"github.com/bepass-org/wireguard-go/wireguard/conn/winrio"
 )
 
 const (

diff --git a/conn/bindtest/bindtest.go → wireguard/conn/bindtest/bindtest.go b/conn/bindtest/bindtest.go → wireguard/conn/bindtest/bindtest.go
@@ -12,7 +12,7 @@ import (
 	"net/netip"
 	"os"
 
-	"github.com/bepass-org/wireguard-go/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
 )
 
 type ChannelBind struct {

diff --git a/conn/boundif_android.go → wireguard/conn/boundif_android.go b/conn/boundif_android.go → wireguard/conn/boundif_android.go
diff --git a/conn/conn.go → wireguard/conn/conn.go b/conn/conn.go → wireguard/conn/conn.go
diff --git a/conn/conn_test.go → wireguard/conn/conn_test.go b/conn/conn_test.go → wireguard/conn/conn_test.go
diff --git a/conn/controlfns.go → wireguard/conn/controlfns.go b/conn/controlfns.go → wireguard/conn/controlfns.go
diff --git a/conn/controlfns_linux.go → wireguard/conn/controlfns_linux.go b/conn/controlfns_linux.go → wireguard/conn/controlfns_linux.go
diff --git a/conn/controlfns_unix.go → wireguard/conn/controlfns_unix.go b/conn/controlfns_unix.go → wireguard/conn/controlfns_unix.go
diff --git a/conn/controlfns_windows.go → wireguard/conn/controlfns_windows.go b/conn/controlfns_windows.go → wireguard/conn/controlfns_windows.go
diff --git a/conn/default.go → wireguard/conn/default.go b/conn/default.go → wireguard/conn/default.go
diff --git a/conn/errors_default.go → wireguard/conn/errors_default.go b/conn/errors_default.go → wireguard/conn/errors_default.go
diff --git a/conn/errors_linux.go → wireguard/conn/errors_linux.go b/conn/errors_linux.go → wireguard/conn/errors_linux.go
diff --git a/conn/features_default.go → wireguard/conn/features_default.go b/conn/features_default.go → wireguard/conn/features_default.go
diff --git a/conn/features_linux.go → wireguard/conn/features_linux.go b/conn/features_linux.go → wireguard/conn/features_linux.go
diff --git a/conn/gso_default.go → wireguard/conn/gso_default.go b/conn/gso_default.go → wireguard/conn/gso_default.go
diff --git a/conn/gso_linux.go → wireguard/conn/gso_linux.go b/conn/gso_linux.go → wireguard/conn/gso_linux.go
diff --git a/conn/mark_default.go → wireguard/conn/mark_default.go b/conn/mark_default.go → wireguard/conn/mark_default.go
diff --git a/conn/mark_unix.go → wireguard/conn/mark_unix.go b/conn/mark_unix.go → wireguard/conn/mark_unix.go
diff --git a/conn/sticky_default.go → wireguard/conn/sticky_default.go b/conn/sticky_default.go → wireguard/conn/sticky_default.go
diff --git a/conn/sticky_linux.go → wireguard/conn/sticky_linux.go b/conn/sticky_linux.go → wireguard/conn/sticky_linux.go
diff --git a/conn/sticky_linux_test.go → wireguard/conn/sticky_linux_test.go b/conn/sticky_linux_test.go → wireguard/conn/sticky_linux_test.go
diff --git a/conn/winrio/rio_windows.go → wireguard/conn/winrio/rio_windows.go b/conn/winrio/rio_windows.go → wireguard/conn/winrio/rio_windows.go
diff --git a/device/allowedips.go → wireguard/device/allowedips.go b/device/allowedips.go → wireguard/device/allowedips.go
diff --git a/device/allowedips_rand_test.go → wireguard/device/allowedips_rand_test.go b/device/allowedips_rand_test.go → wireguard/device/allowedips_rand_test.go
diff --git a/device/allowedips_test.go → wireguard/device/allowedips_test.go b/device/allowedips_test.go → wireguard/device/allowedips_test.go
diff --git a/device/bind_test.go → wireguard/device/bind_test.go b/device/bind_test.go → wireguard/device/bind_test.go
@@ -8,7 +8,7 @@ package device
 import (
 	"errors"
 
-	"github.com/bepass-org/wireguard-go/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
 )
 
 type DummyDatagram struct {

diff --git a/device/channels.go → wireguard/device/channels.go b/device/channels.go → wireguard/device/channels.go
diff --git a/device/constants.go → wireguard/device/constants.go b/device/constants.go → wireguard/device/constants.go
diff --git a/device/cookie.go → wireguard/device/cookie.go b/device/cookie.go → wireguard/device/cookie.go
diff --git a/device/cookie_test.go → wireguard/device/cookie_test.go b/device/cookie_test.go → wireguard/device/cookie_test.go
diff --git a/device/device.go → wireguard/device/device.go b/device/device.go → wireguard/device/device.go
@@ -11,10 +11,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/ratelimiter"
-	"github.com/bepass-org/wireguard-go/rwcancel"
-	"github.com/bepass-org/wireguard-go/tun"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/ratelimiter"
+	"github.com/bepass-org/wireguard-go/wireguard/rwcancel"
+	"github.com/bepass-org/wireguard-go/wireguard/tun"
 )
 
 type Device struct {

diff --git a/device/device_test.go → wireguard/device/device_test.go b/device/device_test.go → wireguard/device/device_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/conn/bindtest"
-	"github.com/bepass-org/wireguard-go/tun"
-	"github.com/bepass-org/wireguard-go/tun/tuntest"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/conn/bindtest"
+	"github.com/bepass-org/wireguard-go/wireguard/tun"
+	"github.com/bepass-org/wireguard-go/wireguard/tun/tuntest"
 )
 
 // uapiCfg returns a string that contains cfg formatted use with IpcSet.

diff --git a/device/devicestate_string.go → wireguard/device/devicestate_string.go b/device/devicestate_string.go → wireguard/device/devicestate_string.go
diff --git a/device/endpoint_test.go → wireguard/device/endpoint_test.go b/device/endpoint_test.go → wireguard/device/endpoint_test.go
diff --git a/device/indextable.go → wireguard/device/indextable.go b/device/indextable.go → wireguard/device/indextable.go
diff --git a/device/ip.go → wireguard/device/ip.go b/device/ip.go → wireguard/device/ip.go
diff --git a/device/kdf_test.go → wireguard/device/kdf_test.go b/device/kdf_test.go → wireguard/device/kdf_test.go
diff --git a/device/keypair.go → wireguard/device/keypair.go b/device/keypair.go → wireguard/device/keypair.go
@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/replay"
+	"github.com/bepass-org/wireguard-go/wireguard/replay"
 )
 
 /* Due to limitations in Go and /x/crypto there is currently

diff --git a/device/logger.go → wireguard/device/logger.go b/device/logger.go → wireguard/device/logger.go
diff --git a/device/mobilequirks.go → wireguard/device/mobilequirks.go b/device/mobilequirks.go → wireguard/device/mobilequirks.go
diff --git a/device/noise-helpers.go → wireguard/device/noise-helpers.go b/device/noise-helpers.go → wireguard/device/noise-helpers.go
diff --git a/device/noise-protocol.go → wireguard/device/noise-protocol.go b/device/noise-protocol.go → wireguard/device/noise-protocol.go
@@ -15,7 +15,7 @@ import (
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/crypto/poly1305"
 
-	"github.com/bepass-org/wireguard-go/tai64n"
+	"github.com/bepass-org/wireguard-go/wireguard/tai64n"
 )
 
 type handshakeState int

diff --git a/device/noise-types.go → wireguard/device/noise-types.go b/device/noise-types.go → wireguard/device/noise-types.go
diff --git a/device/noise_test.go → wireguard/device/noise_test.go b/device/noise_test.go → wireguard/device/noise_test.go
@@ -10,8 +10,8 @@ import (
 	"encoding/binary"
 	"testing"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/tun/tuntest"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/tun/tuntest"
 )
 
 func TestCurveWrappers(t *testing.T) {

diff --git a/device/peer.go → wireguard/device/peer.go b/device/peer.go → wireguard/device/peer.go
@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
 )
 
 type Peer struct {

diff --git a/device/pools.go → wireguard/device/pools.go b/device/pools.go → wireguard/device/pools.go
diff --git a/device/pools_test.go → wireguard/device/pools_test.go b/device/pools_test.go → wireguard/device/pools_test.go
diff --git a/device/queueconstants_android.go → wireguard/device/queueconstants_android.go b/device/queueconstants_android.go → wireguard/device/queueconstants_android.go
@@ -5,7 +5,7 @@
 
 package device
 
-import "github.com/bepass-org/wireguard-go/conn"
+import "github.com/bepass-org/wireguard-go/wireguard/conn"
 
 /* Reduce memory consumption for Android */
 

diff --git a/device/queueconstants_default.go → wireguard/device/queueconstants_default.go b/device/queueconstants_default.go → wireguard/device/queueconstants_default.go
@@ -7,7 +7,7 @@
 
 package device
 
-import "github.com/bepass-org/wireguard-go/conn"
+import "github.com/bepass-org/wireguard-go/wireguard/conn"
 
 const (
 	QueueStagedSize            = conn.IdealBatchSize

diff --git a/device/queueconstants_ios.go → wireguard/device/queueconstants_ios.go b/device/queueconstants_ios.go → wireguard/device/queueconstants_ios.go
diff --git a/device/queueconstants_windows.go → wireguard/device/queueconstants_windows.go b/device/queueconstants_windows.go → wireguard/device/queueconstants_windows.go
diff --git a/device/race_disabled_test.go → wireguard/device/race_disabled_test.go b/device/race_disabled_test.go → wireguard/device/race_disabled_test.go
diff --git a/device/race_enabled_test.go → wireguard/device/race_enabled_test.go b/device/race_enabled_test.go → wireguard/device/race_enabled_test.go
diff --git a/device/receive.go → wireguard/device/receive.go b/device/receive.go → wireguard/device/receive.go
@@ -13,7 +13,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/ipv6"

diff --git a/device/send.go → wireguard/device/send.go b/device/send.go → wireguard/device/send.go
@@ -16,8 +16,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/tun"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/tun"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/ipv6"

diff --git a/device/sticky_default.go → wireguard/device/sticky_default.go b/device/sticky_default.go → wireguard/device/sticky_default.go
@@ -3,8 +3,8 @@
 package device
 
 import (
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/rwcancel"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/rwcancel"
 )
 
 func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {

diff --git a/device/sticky_linux.go → wireguard/device/sticky_linux.go b/device/sticky_linux.go → wireguard/device/sticky_linux.go
@@ -20,8 +20,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/rwcancel"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/rwcancel"
 )
 
 func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {

diff --git a/device/timers.go → wireguard/device/timers.go b/device/timers.go → wireguard/device/timers.go
diff --git a/device/tun.go → wireguard/device/tun.go b/device/tun.go → wireguard/device/tun.go
@@ -8,7 +8,7 @@ package device
 import (
 	"fmt"
 
-	"github.com/bepass-org/wireguard-go/tun"
+	"github.com/bepass-org/wireguard-go/wireguard/tun"
 )
 
 const DefaultMTU = 1420

diff --git a/device/uapi.go → wireguard/device/uapi.go b/device/uapi.go → wireguard/device/uapi.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipc"
+	"github.com/bepass-org/wireguard-go/wireguard/ipc"
 )
 
 type IPCError struct {

diff --git a/ipc/namedpipe/file.go → wireguard/ipc/namedpipe/file.go b/ipc/namedpipe/file.go → wireguard/ipc/namedpipe/file.go
diff --git a/ipc/namedpipe/namedpipe.go → wireguard/ipc/namedpipe/namedpipe.go b/ipc/namedpipe/namedpipe.go → wireguard/ipc/namedpipe/namedpipe.go
diff --git a/ipc/namedpipe/namedpipe_test.go → wireguard/ipc/namedpipe/namedpipe_test.go b/ipc/namedpipe/namedpipe_test.go → wireguard/ipc/namedpipe/namedpipe_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/ipc/namedpipe"
+	"github.com/bepass-org/wireguard-go/wireguard/ipc/namedpipe"
 	"golang.org/x/sys/windows"
 )
 

diff --git a/ipc/uapi_bsd.go → wireguard/ipc/uapi_bsd.go b/ipc/uapi_bsd.go → wireguard/ipc/uapi_bsd.go
diff --git a/ipc/uapi_linux.go → wireguard/ipc/uapi_linux.go b/ipc/uapi_linux.go → wireguard/ipc/uapi_linux.go
@@ -9,7 +9,7 @@ import (
 	"net"
 	"os"
 
-	"github.com/bepass-org/wireguard-go/rwcancel"
+	"github.com/bepass-org/wireguard-go/wireguard/rwcancel"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/ipc/uapi_unix.go → wireguard/ipc/uapi_unix.go b/ipc/uapi_unix.go → wireguard/ipc/uapi_unix.go
diff --git a/ipc/uapi_wasm.go → wireguard/ipc/uapi_wasm.go b/ipc/uapi_wasm.go → wireguard/ipc/uapi_wasm.go
diff --git a/ipc/uapi_windows.go → wireguard/ipc/uapi_windows.go b/ipc/uapi_windows.go → wireguard/ipc/uapi_windows.go
@@ -8,7 +8,7 @@ package ipc
 import (
 	"net"
 
-	"github.com/bepass-org/wireguard-go/ipc/namedpipe"
+	"github.com/bepass-org/wireguard-go/wireguard/ipc/namedpipe"
 	"golang.org/x/sys/windows"
 )
 

diff --git a/ratelimiter/ratelimiter.go → wireguard/ratelimiter/ratelimiter.go b/ratelimiter/ratelimiter.go → wireguard/ratelimiter/ratelimiter.go
diff --git a/ratelimiter/ratelimiter_test.go → wireguard/ratelimiter/ratelimiter_test.go b/ratelimiter/ratelimiter_test.go → wireguard/ratelimiter/ratelimiter_test.go
diff --git a/replay/replay.go → wireguard/replay/replay.go b/replay/replay.go → wireguard/replay/replay.go
diff --git a/replay/replay_test.go → wireguard/replay/replay_test.go b/replay/replay_test.go → wireguard/replay/replay_test.go
diff --git a/rwcancel/rwcancel.go → wireguard/rwcancel/rwcancel.go b/rwcancel/rwcancel.go → wireguard/rwcancel/rwcancel.go
diff --git a/rwcancel/rwcancel_stub.go → wireguard/rwcancel/rwcancel_stub.go b/rwcancel/rwcancel_stub.go → wireguard/rwcancel/rwcancel_stub.go
diff --git a/tai64n/tai64n.go → wireguard/tai64n/tai64n.go b/tai64n/tai64n.go → wireguard/tai64n/tai64n.go
diff --git a/tai64n/tai64n_test.go → wireguard/tai64n/tai64n_test.go b/tai64n/tai64n_test.go → wireguard/tai64n/tai64n_test.go
diff --git a/tun/alignment_windows_test.go → wireguard/tun/alignment_windows_test.go b/tun/alignment_windows_test.go → wireguard/tun/alignment_windows_test.go
diff --git a/tun/checksum.go → wireguard/tun/checksum.go b/tun/checksum.go → wireguard/tun/checksum.go
diff --git a/tun/checksum_test.go → wireguard/tun/checksum_test.go b/tun/checksum_test.go → wireguard/tun/checksum_test.go
diff --git a/tun/errors.go → wireguard/tun/errors.go b/tun/errors.go → wireguard/tun/errors.go
diff --git a/tun/netstack/examples/http_client.go → ...uard/tun/netstack/examples/http_client.go b/tun/netstack/examples/http_client.go → ...uard/tun/netstack/examples/http_client.go
@@ -13,9 +13,9 @@ import (
 	"net/http"
 	"net/netip"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/device"
-	"github.com/bepass-org/wireguard-go/tun/netstack"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/device"
+	"github.com/bepass-org/wireguard-go/wireguard/tun/netstack"
 )
 
 func main() {

diff --git a/tun/netstack/examples/http_server.go → ...uard/tun/netstack/examples/http_server.go b/tun/netstack/examples/http_server.go → ...uard/tun/netstack/examples/http_server.go
@@ -14,9 +14,9 @@ import (
 	"net/http"
 	"net/netip"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/device"
-	"github.com/bepass-org/wireguard-go/tun/netstack"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/device"
+	"github.com/bepass-org/wireguard-go/wireguard/tun/netstack"
 )
 
 func main() {

diff --git a/tun/netstack/examples/ping_client.go → ...uard/tun/netstack/examples/ping_client.go b/tun/netstack/examples/ping_client.go → ...uard/tun/netstack/examples/ping_client.go
@@ -17,9 +17,9 @@ import (
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/device"
-	"github.com/bepass-org/wireguard-go/tun/netstack"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/device"
+	"github.com/bepass-org/wireguard-go/wireguard/tun/netstack"
 )
 
 func main() {

diff --git a/tun/netstack/tun.go → wireguard/tun/netstack/tun.go b/tun/netstack/tun.go → wireguard/tun/netstack/tun.go
@@ -22,7 +22,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/bepass-org/wireguard-go/tun"
+	"github.com/bepass-org/wireguard-go/wireguard/tun"
 
 	"golang.org/x/net/dns/dnsmessage"
 	"gvisor.dev/gvisor/pkg/buffer"

diff --git a/tun/offload_linux.go → wireguard/tun/offload_linux.go b/tun/offload_linux.go → wireguard/tun/offload_linux.go
@@ -12,7 +12,7 @@ import (
 	"io"
 	"unsafe"
 
-	"github.com/bepass-org/wireguard-go/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/tun/offload_linux_test.go → wireguard/tun/offload_linux_test.go b/tun/offload_linux_test.go → wireguard/tun/offload_linux_test.go
@@ -9,7 +9,7 @@ import (
 	"net/netip"
 	"testing"
 
-	"github.com/bepass-org/wireguard-go/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
 	"golang.org/x/sys/unix"
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/header"

diff --git a/tun/operateonfd.go → wireguard/tun/operateonfd.go b/tun/operateonfd.go → wireguard/tun/operateonfd.go
diff --git a/tun/tun.go → wireguard/tun/tun.go b/tun/tun.go → wireguard/tun/tun.go
diff --git a/tun/tun_darwin.go → wireguard/tun/tun_darwin.go b/tun/tun_darwin.go → wireguard/tun/tun_darwin.go
diff --git a/tun/tun_freebsd.go → wireguard/tun/tun_freebsd.go b/tun/tun_freebsd.go → wireguard/tun/tun_freebsd.go
diff --git a/tun/tun_linux.go → wireguard/tun/tun_linux.go b/tun/tun_linux.go → wireguard/tun/tun_linux.go
@@ -17,8 +17,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/rwcancel"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/rwcancel"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/tun/tun_openbsd.go → wireguard/tun/tun_openbsd.go b/tun/tun_openbsd.go → wireguard/tun/tun_openbsd.go
diff --git a/tun/tun_windows.go → wireguard/tun/tun_windows.go b/tun/tun_windows.go → wireguard/tun/tun_windows.go
diff --git a/tun/tuntest/tuntest.go → wireguard/tun/tuntest/tuntest.go b/tun/tuntest/tuntest.go → wireguard/tun/tuntest/tuntest.go
@@ -11,7 +11,7 @@ import (
 	"net/netip"
 	"os"
 
-	"github.com/bepass-org/wireguard-go/tun"
+	"github.com/bepass-org/wireguard-go/wireguard/tun"
 )
 
 func Ping(dst, src netip.Addr) []byte {

diff --git a/wiresocks/proxy.go b/wiresocks/proxy.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/bepass-org/proxy/pkg/mixed"
 	"github.com/bepass-org/proxy/pkg/statute"
-	"github.com/bepass-org/wireguard-go/device"
-	"github.com/bepass-org/wireguard-go/tun/netstack"
+	"github.com/bepass-org/wireguard-go/wireguard/device"
+	"github.com/bepass-org/wireguard-go/wireguard/tun/netstack"
 )
 
 // VirtualTun stores a reference to netstack network and DNS configuration

diff --git a/wiresocks/wiresocks.go b/wiresocks/wiresocks.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"net/netip"
 
-	"github.com/bepass-org/wireguard-go/conn"
-	"github.com/bepass-org/wireguard-go/device"
-	"github.com/bepass-org/wireguard-go/tun/netstack"
+	"github.com/bepass-org/wireguard-go/wireguard/conn"
+	"github.com/bepass-org/wireguard-go/wireguard/device"
+	"github.com/bepass-org/wireguard-go/wireguard/tun/netstack"
 )
 
 // DeviceSetting contains the parameters for setting up a tun interface
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ import ( @@
     	"golang.org/x/sys/windows"
-    	"github.com/bepass-org/wireguard-go/conn/winrio"
+    	"github.com/bepass-org/wireguard-go/wireguard/conn/winrio"
     )
     const (
@@ Expand Down @@