From 8bcd11f688f397cf486658bb9747789821caf316 Mon Sep 17 00:00:00 2001 From: Mark Pashmfouroush Date: Thu, 14 Mar 2024 11:25:38 +0000 Subject: [PATCH] wireguard: move wireguard code to wireguard dir Signed-off-by: Mark Pashmfouroush --- {conn => wireguard/conn}/bind_std.go | 0 {conn => wireguard/conn}/bind_std_test.go | 0 {conn => wireguard/conn}/bind_windows.go | 2 +- {conn => wireguard/conn}/bindtest/bindtest.go | 2 +- {conn => wireguard/conn}/boundif_android.go | 0 {conn => wireguard/conn}/conn.go | 0 {conn => wireguard/conn}/conn_test.go | 0 {conn => wireguard/conn}/controlfns.go | 0 {conn => wireguard/conn}/controlfns_linux.go | 0 {conn => wireguard/conn}/controlfns_unix.go | 0 {conn => wireguard/conn}/controlfns_windows.go | 0 {conn => wireguard/conn}/default.go | 0 {conn => wireguard/conn}/errors_default.go | 0 {conn => wireguard/conn}/errors_linux.go | 0 {conn => wireguard/conn}/features_default.go | 0 {conn => wireguard/conn}/features_linux.go | 0 {conn => wireguard/conn}/gso_default.go | 0 {conn => wireguard/conn}/gso_linux.go | 0 {conn => wireguard/conn}/mark_default.go | 0 {conn => wireguard/conn}/mark_unix.go | 0 {conn => wireguard/conn}/sticky_default.go | 0 {conn => wireguard/conn}/sticky_linux.go | 0 {conn => wireguard/conn}/sticky_linux_test.go | 0 {conn => wireguard/conn}/winrio/rio_windows.go | 0 {device => wireguard/device}/allowedips.go | 0 {device => wireguard/device}/allowedips_rand_test.go | 0 {device => wireguard/device}/allowedips_test.go | 0 {device => wireguard/device}/bind_test.go | 2 +- {device => wireguard/device}/channels.go | 0 {device => wireguard/device}/constants.go | 0 {device => wireguard/device}/cookie.go | 0 {device => wireguard/device}/cookie_test.go | 0 {device => wireguard/device}/device.go | 8 ++++---- {device => wireguard/device}/device_test.go | 8 ++++---- {device => wireguard/device}/devicestate_string.go | 0 {device => wireguard/device}/endpoint_test.go | 0 {device => wireguard/device}/indextable.go | 0 {device => wireguard/device}/ip.go | 0 {device => wireguard/device}/kdf_test.go | 0 {device => wireguard/device}/keypair.go | 2 +- {device => wireguard/device}/logger.go | 0 {device => wireguard/device}/mobilequirks.go | 0 {device => wireguard/device}/noise-helpers.go | 0 {device => wireguard/device}/noise-protocol.go | 2 +- {device => wireguard/device}/noise-types.go | 0 {device => wireguard/device}/noise_test.go | 4 ++-- {device => wireguard/device}/peer.go | 2 +- {device => wireguard/device}/pools.go | 0 {device => wireguard/device}/pools_test.go | 0 {device => wireguard/device}/queueconstants_android.go | 2 +- {device => wireguard/device}/queueconstants_default.go | 2 +- {device => wireguard/device}/queueconstants_ios.go | 0 {device => wireguard/device}/queueconstants_windows.go | 0 {device => wireguard/device}/race_disabled_test.go | 0 {device => wireguard/device}/race_enabled_test.go | 0 {device => wireguard/device}/receive.go | 2 +- {device => wireguard/device}/send.go | 4 ++-- {device => wireguard/device}/sticky_default.go | 4 ++-- {device => wireguard/device}/sticky_linux.go | 4 ++-- {device => wireguard/device}/timers.go | 0 {device => wireguard/device}/tun.go | 2 +- {device => wireguard/device}/uapi.go | 2 +- {ipc => wireguard/ipc}/namedpipe/file.go | 0 {ipc => wireguard/ipc}/namedpipe/namedpipe.go | 0 {ipc => wireguard/ipc}/namedpipe/namedpipe_test.go | 2 +- {ipc => wireguard/ipc}/uapi_bsd.go | 0 {ipc => wireguard/ipc}/uapi_linux.go | 2 +- {ipc => wireguard/ipc}/uapi_unix.go | 0 {ipc => wireguard/ipc}/uapi_wasm.go | 0 {ipc => wireguard/ipc}/uapi_windows.go | 2 +- {ratelimiter => wireguard/ratelimiter}/ratelimiter.go | 0 .../ratelimiter}/ratelimiter_test.go | 0 {replay => wireguard/replay}/replay.go | 0 {replay => wireguard/replay}/replay_test.go | 0 {rwcancel => wireguard/rwcancel}/rwcancel.go | 0 {rwcancel => wireguard/rwcancel}/rwcancel_stub.go | 0 {tai64n => wireguard/tai64n}/tai64n.go | 0 {tai64n => wireguard/tai64n}/tai64n_test.go | 0 {tun => wireguard/tun}/alignment_windows_test.go | 0 {tun => wireguard/tun}/checksum.go | 0 {tun => wireguard/tun}/checksum_test.go | 0 {tun => wireguard/tun}/errors.go | 0 {tun => wireguard/tun}/netstack/examples/http_client.go | 6 +++--- {tun => wireguard/tun}/netstack/examples/http_server.go | 6 +++--- {tun => wireguard/tun}/netstack/examples/ping_client.go | 6 +++--- {tun => wireguard/tun}/netstack/tun.go | 2 +- {tun => wireguard/tun}/offload_linux.go | 2 +- {tun => wireguard/tun}/offload_linux_test.go | 2 +- {tun => wireguard/tun}/operateonfd.go | 0 {tun => wireguard/tun}/tun.go | 0 {tun => wireguard/tun}/tun_darwin.go | 0 {tun => wireguard/tun}/tun_freebsd.go | 0 {tun => wireguard/tun}/tun_linux.go | 4 ++-- {tun => wireguard/tun}/tun_openbsd.go | 0 {tun => wireguard/tun}/tun_windows.go | 0 {tun => wireguard/tun}/tuntest/tuntest.go | 2 +- wiresocks/proxy.go | 4 ++-- wiresocks/wiresocks.go | 6 +++--- 98 files changed, 50 insertions(+), 50 deletions(-) rename {conn => wireguard/conn}/bind_std.go (100%) rename {conn => wireguard/conn}/bind_std_test.go (100%) rename {conn => wireguard/conn}/bind_windows.go (99%) rename {conn => wireguard/conn}/bindtest/bindtest.go (98%) rename {conn => wireguard/conn}/boundif_android.go (100%) rename {conn => wireguard/conn}/conn.go (100%) rename {conn => wireguard/conn}/conn_test.go (100%) rename {conn => wireguard/conn}/controlfns.go (100%) rename {conn => wireguard/conn}/controlfns_linux.go (100%) rename {conn => wireguard/conn}/controlfns_unix.go (100%) rename {conn => wireguard/conn}/controlfns_windows.go (100%) rename {conn => wireguard/conn}/default.go (100%) rename {conn => wireguard/conn}/errors_default.go (100%) rename {conn => wireguard/conn}/errors_linux.go (100%) rename {conn => wireguard/conn}/features_default.go (100%) rename {conn => wireguard/conn}/features_linux.go (100%) rename {conn => wireguard/conn}/gso_default.go (100%) rename {conn => wireguard/conn}/gso_linux.go (100%) rename {conn => wireguard/conn}/mark_default.go (100%) rename {conn => wireguard/conn}/mark_unix.go (100%) rename {conn => wireguard/conn}/sticky_default.go (100%) rename {conn => wireguard/conn}/sticky_linux.go (100%) rename {conn => wireguard/conn}/sticky_linux_test.go (100%) rename {conn => wireguard/conn}/winrio/rio_windows.go (100%) rename {device => wireguard/device}/allowedips.go (100%) rename {device => wireguard/device}/allowedips_rand_test.go (100%) rename {device => wireguard/device}/allowedips_test.go (100%) rename {device => wireguard/device}/bind_test.go (94%) rename {device => wireguard/device}/channels.go (100%) rename {device => wireguard/device}/constants.go (100%) rename {device => wireguard/device}/cookie.go (100%) rename {device => wireguard/device}/cookie_test.go (100%) rename {device => wireguard/device}/device.go (98%) rename {device => wireguard/device}/device_test.go (98%) rename {device => wireguard/device}/devicestate_string.go (100%) rename {device => wireguard/device}/endpoint_test.go (100%) rename {device => wireguard/device}/indextable.go (100%) rename {device => wireguard/device}/ip.go (100%) rename {device => wireguard/device}/kdf_test.go (100%) rename {device => wireguard/device}/keypair.go (94%) rename {device => wireguard/device}/logger.go (100%) rename {device => wireguard/device}/mobilequirks.go (100%) rename {device => wireguard/device}/noise-helpers.go (100%) rename {device => wireguard/device}/noise-protocol.go (99%) rename {device => wireguard/device}/noise-types.go (100%) rename {device => wireguard/device}/noise_test.go (96%) rename {device => wireguard/device}/peer.go (99%) rename {device => wireguard/device}/pools.go (100%) rename {device => wireguard/device}/pools_test.go (100%) rename {device => wireguard/device}/queueconstants_android.go (88%) rename {device => wireguard/device}/queueconstants_default.go (89%) rename {device => wireguard/device}/queueconstants_ios.go (100%) rename {device => wireguard/device}/queueconstants_windows.go (100%) rename {device => wireguard/device}/race_disabled_test.go (100%) rename {device => wireguard/device}/race_enabled_test.go (100%) rename {device => wireguard/device}/receive.go (99%) rename {device => wireguard/device}/send.go (99%) rename {device => wireguard/device}/sticky_default.go (58%) rename {device => wireguard/device}/sticky_linux.go (98%) rename {device => wireguard/device}/timers.go (100%) rename {device => wireguard/device}/tun.go (95%) rename {device => wireguard/device}/uapi.go (99%) rename {ipc => wireguard/ipc}/namedpipe/file.go (100%) rename {ipc => wireguard/ipc}/namedpipe/namedpipe.go (100%) rename {ipc => wireguard/ipc}/namedpipe/namedpipe_test.go (99%) rename {ipc => wireguard/ipc}/uapi_bsd.go (100%) rename {ipc => wireguard/ipc}/uapi_linux.go (97%) rename {ipc => wireguard/ipc}/uapi_unix.go (100%) rename {ipc => wireguard/ipc}/uapi_wasm.go (100%) rename {ipc => wireguard/ipc}/uapi_windows.go (96%) rename {ratelimiter => wireguard/ratelimiter}/ratelimiter.go (100%) rename {ratelimiter => wireguard/ratelimiter}/ratelimiter_test.go (100%) rename {replay => wireguard/replay}/replay.go (100%) rename {replay => wireguard/replay}/replay_test.go (100%) rename {rwcancel => wireguard/rwcancel}/rwcancel.go (100%) rename {rwcancel => wireguard/rwcancel}/rwcancel_stub.go (100%) rename {tai64n => wireguard/tai64n}/tai64n.go (100%) rename {tai64n => wireguard/tai64n}/tai64n_test.go (100%) rename {tun => wireguard/tun}/alignment_windows_test.go (100%) rename {tun => wireguard/tun}/checksum.go (100%) rename {tun => wireguard/tun}/checksum_test.go (100%) rename {tun => wireguard/tun}/errors.go (100%) rename {tun => wireguard/tun}/netstack/examples/http_client.go (86%) rename {tun => wireguard/tun}/netstack/examples/http_server.go (87%) rename {tun => wireguard/tun}/netstack/examples/ping_client.go (91%) rename {tun => wireguard/tun}/netstack/tun.go (99%) rename {tun => wireguard/tun}/offload_linux.go (99%) rename {tun => wireguard/tun}/offload_linux_test.go (99%) rename {tun => wireguard/tun}/operateonfd.go (100%) rename {tun => wireguard/tun}/tun.go (100%) rename {tun => wireguard/tun}/tun_darwin.go (100%) rename {tun => wireguard/tun}/tun_freebsd.go (100%) rename {tun => wireguard/tun}/tun_linux.go (99%) rename {tun => wireguard/tun}/tun_openbsd.go (100%) rename {tun => wireguard/tun}/tun_windows.go (100%) rename {tun => wireguard/tun}/tuntest/tuntest.go (98%) diff --git a/conn/bind_std.go b/wireguard/conn/bind_std.go similarity index 100% rename from conn/bind_std.go rename to wireguard/conn/bind_std.go diff --git a/conn/bind_std_test.go b/wireguard/conn/bind_std_test.go similarity index 100% rename from conn/bind_std_test.go rename to wireguard/conn/bind_std_test.go diff --git a/conn/bind_windows.go b/wireguard/conn/bind_windows.go similarity index 99% rename from conn/bind_windows.go rename to wireguard/conn/bind_windows.go index cbedc86f6..92d11d04d 100644 --- a/conn/bind_windows.go +++ b/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 b/wireguard/conn/bindtest/bindtest.go similarity index 98% rename from conn/bindtest/bindtest.go rename to wireguard/conn/bindtest/bindtest.go index 87e481c83..cb2e1b198 100644 --- a/conn/bindtest/bindtest.go +++ b/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 b/wireguard/conn/boundif_android.go similarity index 100% rename from conn/boundif_android.go rename to wireguard/conn/boundif_android.go diff --git a/conn/conn.go b/wireguard/conn/conn.go similarity index 100% rename from conn/conn.go rename to wireguard/conn/conn.go diff --git a/conn/conn_test.go b/wireguard/conn/conn_test.go similarity index 100% rename from conn/conn_test.go rename to wireguard/conn/conn_test.go diff --git a/conn/controlfns.go b/wireguard/conn/controlfns.go similarity index 100% rename from conn/controlfns.go rename to wireguard/conn/controlfns.go diff --git a/conn/controlfns_linux.go b/wireguard/conn/controlfns_linux.go similarity index 100% rename from conn/controlfns_linux.go rename to wireguard/conn/controlfns_linux.go diff --git a/conn/controlfns_unix.go b/wireguard/conn/controlfns_unix.go similarity index 100% rename from conn/controlfns_unix.go rename to wireguard/conn/controlfns_unix.go diff --git a/conn/controlfns_windows.go b/wireguard/conn/controlfns_windows.go similarity index 100% rename from conn/controlfns_windows.go rename to wireguard/conn/controlfns_windows.go diff --git a/conn/default.go b/wireguard/conn/default.go similarity index 100% rename from conn/default.go rename to wireguard/conn/default.go diff --git a/conn/errors_default.go b/wireguard/conn/errors_default.go similarity index 100% rename from conn/errors_default.go rename to wireguard/conn/errors_default.go diff --git a/conn/errors_linux.go b/wireguard/conn/errors_linux.go similarity index 100% rename from conn/errors_linux.go rename to wireguard/conn/errors_linux.go diff --git a/conn/features_default.go b/wireguard/conn/features_default.go similarity index 100% rename from conn/features_default.go rename to wireguard/conn/features_default.go diff --git a/conn/features_linux.go b/wireguard/conn/features_linux.go similarity index 100% rename from conn/features_linux.go rename to wireguard/conn/features_linux.go diff --git a/conn/gso_default.go b/wireguard/conn/gso_default.go similarity index 100% rename from conn/gso_default.go rename to wireguard/conn/gso_default.go diff --git a/conn/gso_linux.go b/wireguard/conn/gso_linux.go similarity index 100% rename from conn/gso_linux.go rename to wireguard/conn/gso_linux.go diff --git a/conn/mark_default.go b/wireguard/conn/mark_default.go similarity index 100% rename from conn/mark_default.go rename to wireguard/conn/mark_default.go diff --git a/conn/mark_unix.go b/wireguard/conn/mark_unix.go similarity index 100% rename from conn/mark_unix.go rename to wireguard/conn/mark_unix.go diff --git a/conn/sticky_default.go b/wireguard/conn/sticky_default.go similarity index 100% rename from conn/sticky_default.go rename to wireguard/conn/sticky_default.go diff --git a/conn/sticky_linux.go b/wireguard/conn/sticky_linux.go similarity index 100% rename from conn/sticky_linux.go rename to wireguard/conn/sticky_linux.go diff --git a/conn/sticky_linux_test.go b/wireguard/conn/sticky_linux_test.go similarity index 100% rename from conn/sticky_linux_test.go rename to wireguard/conn/sticky_linux_test.go diff --git a/conn/winrio/rio_windows.go b/wireguard/conn/winrio/rio_windows.go similarity index 100% rename from conn/winrio/rio_windows.go rename to wireguard/conn/winrio/rio_windows.go diff --git a/device/allowedips.go b/wireguard/device/allowedips.go similarity index 100% rename from device/allowedips.go rename to wireguard/device/allowedips.go diff --git a/device/allowedips_rand_test.go b/wireguard/device/allowedips_rand_test.go similarity index 100% rename from device/allowedips_rand_test.go rename to wireguard/device/allowedips_rand_test.go diff --git a/device/allowedips_test.go b/wireguard/device/allowedips_test.go similarity index 100% rename from device/allowedips_test.go rename to wireguard/device/allowedips_test.go diff --git a/device/bind_test.go b/wireguard/device/bind_test.go similarity index 94% rename from device/bind_test.go rename to wireguard/device/bind_test.go index 46c8e21b5..714b1256f 100644 --- a/device/bind_test.go +++ b/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 b/wireguard/device/channels.go similarity index 100% rename from device/channels.go rename to wireguard/device/channels.go diff --git a/device/constants.go b/wireguard/device/constants.go similarity index 100% rename from device/constants.go rename to wireguard/device/constants.go diff --git a/device/cookie.go b/wireguard/device/cookie.go similarity index 100% rename from device/cookie.go rename to wireguard/device/cookie.go diff --git a/device/cookie_test.go b/wireguard/device/cookie_test.go similarity index 100% rename from device/cookie_test.go rename to wireguard/device/cookie_test.go diff --git a/device/device.go b/wireguard/device/device.go similarity index 98% rename from device/device.go rename to wireguard/device/device.go index d3568ed1c..a421d0d66 100644 --- a/device/device.go +++ b/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 b/wireguard/device/device_test.go similarity index 98% rename from device/device_test.go rename to wireguard/device/device_test.go index 8b170a266..37d6c8c8c 100644 --- a/device/device_test.go +++ b/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 b/wireguard/device/devicestate_string.go similarity index 100% rename from device/devicestate_string.go rename to wireguard/device/devicestate_string.go diff --git a/device/endpoint_test.go b/wireguard/device/endpoint_test.go similarity index 100% rename from device/endpoint_test.go rename to wireguard/device/endpoint_test.go diff --git a/device/indextable.go b/wireguard/device/indextable.go similarity index 100% rename from device/indextable.go rename to wireguard/device/indextable.go diff --git a/device/ip.go b/wireguard/device/ip.go similarity index 100% rename from device/ip.go rename to wireguard/device/ip.go diff --git a/device/kdf_test.go b/wireguard/device/kdf_test.go similarity index 100% rename from device/kdf_test.go rename to wireguard/device/kdf_test.go diff --git a/device/keypair.go b/wireguard/device/keypair.go similarity index 94% rename from device/keypair.go rename to wireguard/device/keypair.go index 804d373f8..74fa7d457 100644 --- a/device/keypair.go +++ b/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 b/wireguard/device/logger.go similarity index 100% rename from device/logger.go rename to wireguard/device/logger.go diff --git a/device/mobilequirks.go b/wireguard/device/mobilequirks.go similarity index 100% rename from device/mobilequirks.go rename to wireguard/device/mobilequirks.go diff --git a/device/noise-helpers.go b/wireguard/device/noise-helpers.go similarity index 100% rename from device/noise-helpers.go rename to wireguard/device/noise-helpers.go diff --git a/device/noise-protocol.go b/wireguard/device/noise-protocol.go similarity index 99% rename from device/noise-protocol.go rename to wireguard/device/noise-protocol.go index 6f1eea33f..afa94efb3 100644 --- a/device/noise-protocol.go +++ b/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 b/wireguard/device/noise-types.go similarity index 100% rename from device/noise-types.go rename to wireguard/device/noise-types.go diff --git a/device/noise_test.go b/wireguard/device/noise_test.go similarity index 96% rename from device/noise_test.go rename to wireguard/device/noise_test.go index d6aae0851..4fd75a2db 100644 --- a/device/noise_test.go +++ b/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 b/wireguard/device/peer.go similarity index 99% rename from device/peer.go rename to wireguard/device/peer.go index 616efdf7a..bba242bf6 100644 --- a/device/peer.go +++ b/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 b/wireguard/device/pools.go similarity index 100% rename from device/pools.go rename to wireguard/device/pools.go diff --git a/device/pools_test.go b/wireguard/device/pools_test.go similarity index 100% rename from device/pools_test.go rename to wireguard/device/pools_test.go diff --git a/device/queueconstants_android.go b/wireguard/device/queueconstants_android.go similarity index 88% rename from device/queueconstants_android.go rename to wireguard/device/queueconstants_android.go index f8ac04493..e767055f0 100644 --- a/device/queueconstants_android.go +++ b/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 b/wireguard/device/queueconstants_default.go similarity index 89% rename from device/queueconstants_default.go rename to wireguard/device/queueconstants_default.go index 5d72af3f8..e388e497d 100644 --- a/device/queueconstants_default.go +++ b/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 b/wireguard/device/queueconstants_ios.go similarity index 100% rename from device/queueconstants_ios.go rename to wireguard/device/queueconstants_ios.go diff --git a/device/queueconstants_windows.go b/wireguard/device/queueconstants_windows.go similarity index 100% rename from device/queueconstants_windows.go rename to wireguard/device/queueconstants_windows.go diff --git a/device/race_disabled_test.go b/wireguard/device/race_disabled_test.go similarity index 100% rename from device/race_disabled_test.go rename to wireguard/device/race_disabled_test.go diff --git a/device/race_enabled_test.go b/wireguard/device/race_enabled_test.go similarity index 100% rename from device/race_enabled_test.go rename to wireguard/device/race_enabled_test.go diff --git a/device/receive.go b/wireguard/device/receive.go similarity index 99% rename from device/receive.go rename to wireguard/device/receive.go index 4b10915ec..e3d9b7891 100644 --- a/device/receive.go +++ b/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 b/wireguard/device/send.go similarity index 99% rename from device/send.go rename to wireguard/device/send.go index f135b8242..99d7c931c 100644 --- a/device/send.go +++ b/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 b/wireguard/device/sticky_default.go similarity index 58% rename from device/sticky_default.go rename to wireguard/device/sticky_default.go index c668f8013..536072d81 100644 --- a/device/sticky_default.go +++ b/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 b/wireguard/device/sticky_linux.go similarity index 98% rename from device/sticky_linux.go rename to wireguard/device/sticky_linux.go index 5de83e18d..d21e4c62e 100644 --- a/device/sticky_linux.go +++ b/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 b/wireguard/device/timers.go similarity index 100% rename from device/timers.go rename to wireguard/device/timers.go diff --git a/device/tun.go b/wireguard/device/tun.go similarity index 95% rename from device/tun.go rename to wireguard/device/tun.go index 9ba2a114b..bda6fa01e 100644 --- a/device/tun.go +++ b/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 b/wireguard/device/uapi.go similarity index 99% rename from device/uapi.go rename to wireguard/device/uapi.go index 108506fb8..ad165fefe 100644 --- a/device/uapi.go +++ b/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 b/wireguard/ipc/namedpipe/file.go similarity index 100% rename from ipc/namedpipe/file.go rename to wireguard/ipc/namedpipe/file.go diff --git a/ipc/namedpipe/namedpipe.go b/wireguard/ipc/namedpipe/namedpipe.go similarity index 100% rename from ipc/namedpipe/namedpipe.go rename to wireguard/ipc/namedpipe/namedpipe.go diff --git a/ipc/namedpipe/namedpipe_test.go b/wireguard/ipc/namedpipe/namedpipe_test.go similarity index 99% rename from ipc/namedpipe/namedpipe_test.go rename to wireguard/ipc/namedpipe/namedpipe_test.go index 03ac5cf3f..905aa03ba 100644 --- a/ipc/namedpipe/namedpipe_test.go +++ b/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 b/wireguard/ipc/uapi_bsd.go similarity index 100% rename from ipc/uapi_bsd.go rename to wireguard/ipc/uapi_bsd.go diff --git a/ipc/uapi_linux.go b/wireguard/ipc/uapi_linux.go similarity index 97% rename from ipc/uapi_linux.go rename to wireguard/ipc/uapi_linux.go index 9cdf027c7..9f1bc7aa4 100644 --- a/ipc/uapi_linux.go +++ b/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 b/wireguard/ipc/uapi_unix.go similarity index 100% rename from ipc/uapi_unix.go rename to wireguard/ipc/uapi_unix.go diff --git a/ipc/uapi_wasm.go b/wireguard/ipc/uapi_wasm.go similarity index 100% rename from ipc/uapi_wasm.go rename to wireguard/ipc/uapi_wasm.go diff --git a/ipc/uapi_windows.go b/wireguard/ipc/uapi_windows.go similarity index 96% rename from ipc/uapi_windows.go rename to wireguard/ipc/uapi_windows.go index 9ac56de6a..2c2c1fe4d 100644 --- a/ipc/uapi_windows.go +++ b/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 b/wireguard/ratelimiter/ratelimiter.go similarity index 100% rename from ratelimiter/ratelimiter.go rename to wireguard/ratelimiter/ratelimiter.go diff --git a/ratelimiter/ratelimiter_test.go b/wireguard/ratelimiter/ratelimiter_test.go similarity index 100% rename from ratelimiter/ratelimiter_test.go rename to wireguard/ratelimiter/ratelimiter_test.go diff --git a/replay/replay.go b/wireguard/replay/replay.go similarity index 100% rename from replay/replay.go rename to wireguard/replay/replay.go diff --git a/replay/replay_test.go b/wireguard/replay/replay_test.go similarity index 100% rename from replay/replay_test.go rename to wireguard/replay/replay_test.go diff --git a/rwcancel/rwcancel.go b/wireguard/rwcancel/rwcancel.go similarity index 100% rename from rwcancel/rwcancel.go rename to wireguard/rwcancel/rwcancel.go diff --git a/rwcancel/rwcancel_stub.go b/wireguard/rwcancel/rwcancel_stub.go similarity index 100% rename from rwcancel/rwcancel_stub.go rename to wireguard/rwcancel/rwcancel_stub.go diff --git a/tai64n/tai64n.go b/wireguard/tai64n/tai64n.go similarity index 100% rename from tai64n/tai64n.go rename to wireguard/tai64n/tai64n.go diff --git a/tai64n/tai64n_test.go b/wireguard/tai64n/tai64n_test.go similarity index 100% rename from tai64n/tai64n_test.go rename to wireguard/tai64n/tai64n_test.go diff --git a/tun/alignment_windows_test.go b/wireguard/tun/alignment_windows_test.go similarity index 100% rename from tun/alignment_windows_test.go rename to wireguard/tun/alignment_windows_test.go diff --git a/tun/checksum.go b/wireguard/tun/checksum.go similarity index 100% rename from tun/checksum.go rename to wireguard/tun/checksum.go diff --git a/tun/checksum_test.go b/wireguard/tun/checksum_test.go similarity index 100% rename from tun/checksum_test.go rename to wireguard/tun/checksum_test.go diff --git a/tun/errors.go b/wireguard/tun/errors.go similarity index 100% rename from tun/errors.go rename to wireguard/tun/errors.go diff --git a/tun/netstack/examples/http_client.go b/wireguard/tun/netstack/examples/http_client.go similarity index 86% rename from tun/netstack/examples/http_client.go rename to wireguard/tun/netstack/examples/http_client.go index bcfe1a190..b503d128d 100644 --- a/tun/netstack/examples/http_client.go +++ b/wireguard/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 b/wireguard/tun/netstack/examples/http_server.go similarity index 87% rename from tun/netstack/examples/http_server.go rename to wireguard/tun/netstack/examples/http_server.go index 143f1e24b..44ea8a4f9 100644 --- a/tun/netstack/examples/http_server.go +++ b/wireguard/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 b/wireguard/tun/netstack/examples/ping_client.go similarity index 91% rename from tun/netstack/examples/ping_client.go rename to wireguard/tun/netstack/examples/ping_client.go index 5e3d1dc90..200f1c0a0 100644 --- a/tun/netstack/examples/ping_client.go +++ b/wireguard/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 b/wireguard/tun/netstack/tun.go similarity index 99% rename from tun/netstack/tun.go rename to wireguard/tun/netstack/tun.go index b0cb2a25b..d9ff68e84 100644 --- a/tun/netstack/tun.go +++ b/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 b/wireguard/tun/offload_linux.go similarity index 99% rename from tun/offload_linux.go rename to wireguard/tun/offload_linux.go index 90b919392..49336e6d5 100644 --- a/tun/offload_linux.go +++ b/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 b/wireguard/tun/offload_linux_test.go similarity index 99% rename from tun/offload_linux_test.go rename to wireguard/tun/offload_linux_test.go index 84bab46dd..9c82055e2 100644 --- a/tun/offload_linux_test.go +++ b/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 b/wireguard/tun/operateonfd.go similarity index 100% rename from tun/operateonfd.go rename to wireguard/tun/operateonfd.go diff --git a/tun/tun.go b/wireguard/tun/tun.go similarity index 100% rename from tun/tun.go rename to wireguard/tun/tun.go diff --git a/tun/tun_darwin.go b/wireguard/tun/tun_darwin.go similarity index 100% rename from tun/tun_darwin.go rename to wireguard/tun/tun_darwin.go diff --git a/tun/tun_freebsd.go b/wireguard/tun/tun_freebsd.go similarity index 100% rename from tun/tun_freebsd.go rename to wireguard/tun/tun_freebsd.go diff --git a/tun/tun_linux.go b/wireguard/tun/tun_linux.go similarity index 99% rename from tun/tun_linux.go rename to wireguard/tun/tun_linux.go index 2ee1dc63a..e97fa4edd 100644 --- a/tun/tun_linux.go +++ b/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 b/wireguard/tun/tun_openbsd.go similarity index 100% rename from tun/tun_openbsd.go rename to wireguard/tun/tun_openbsd.go diff --git a/tun/tun_windows.go b/wireguard/tun/tun_windows.go similarity index 100% rename from tun/tun_windows.go rename to wireguard/tun/tun_windows.go diff --git a/tun/tuntest/tuntest.go b/wireguard/tun/tuntest/tuntest.go similarity index 98% rename from tun/tuntest/tuntest.go rename to wireguard/tun/tuntest/tuntest.go index dd5e7ab44..c8d8ab691 100644 --- a/tun/tuntest/tuntest.go +++ b/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 index 634ccbd99..78f856820 100644 --- 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 index c8898d337..7a6e599c0 100644 --- 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