diff --git a/Makefile b/Makefile index e661ca5..0b470ed 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BINARY := tun2socks -MODULE := github.com/xjasonlyu/tun2socks/v2 +MODULE := github.com/amnezia-vpn/amnezia-tun2socks/v2 BUILD_DIR := build BUILD_TAGS := diff --git a/core/device/fdbased/fd_unix.go b/core/device/fdbased/fd_unix.go index 678bf1e..3e82ce3 100644 --- a/core/device/fdbased/fd_unix.go +++ b/core/device/fdbased/fd_unix.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/tcpip/stack" - "github.com/xjasonlyu/tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" ) const defaultMTU = 1500 diff --git a/core/device/fdbased/fd_windows.go b/core/device/fdbased/fd_windows.go index 897108b..8569273 100644 --- a/core/device/fdbased/fd_windows.go +++ b/core/device/fdbased/fd_windows.go @@ -3,7 +3,7 @@ package fdbased import ( "errors" - "github.com/xjasonlyu/tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" ) func Open(name string, mtu uint32) (device.Device, error) { diff --git a/core/device/fdbased/open_linux.go b/core/device/fdbased/open_linux.go index fc3e771..b229d86 100644 --- a/core/device/fdbased/open_linux.go +++ b/core/device/fdbased/open_linux.go @@ -1,5 +1,3 @@ -//go:build (linux && amd64) || (linux && arm64) - package fdbased import ( @@ -7,7 +5,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/link/fdbased" - "github.com/xjasonlyu/tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" ) func open(fd int, mtu uint32) (device.Device, error) { diff --git a/core/device/fdbased/open_others.go b/core/device/fdbased/open_others.go index bf514d9..020e50a 100644 --- a/core/device/fdbased/open_others.go +++ b/core/device/fdbased/open_others.go @@ -1,4 +1,4 @@ -//go:build !(linux && amd64) && !(linux && arm64) && !windows +//go:build !linux && !windows package fdbased @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/xjasonlyu/tun2socks/v2/core/device" - "github.com/xjasonlyu/tun2socks/v2/core/device/iobased" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/iobased" ) func open(fd int, mtu uint32) (device.Device, error) { diff --git a/core/device/tun/tun.go b/core/device/tun/tun.go index 9d4b1e3..e86843d 100644 --- a/core/device/tun/tun.go +++ b/core/device/tun/tun.go @@ -2,7 +2,7 @@ package tun import ( - "github.com/xjasonlyu/tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" ) const Driver = "tun" diff --git a/core/device/tun/tun_netstack.go b/core/device/tun/tun_netstack.go index 08ce429..1ada89c 100644 --- a/core/device/tun/tun_netstack.go +++ b/core/device/tun/tun_netstack.go @@ -1,4 +1,4 @@ -//go:build (linux && amd64) || (linux && arm64) +//go:build linux package tun @@ -11,7 +11,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/link/tun" "gvisor.dev/gvisor/pkg/tcpip/stack" - "github.com/xjasonlyu/tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" ) type TUN struct { diff --git a/core/device/tun/tun_wireguard.go b/core/device/tun/tun_wireguard.go index e6ae398..06c3ea0 100644 --- a/core/device/tun/tun_wireguard.go +++ b/core/device/tun/tun_wireguard.go @@ -1,4 +1,4 @@ -//go:build !(linux && amd64) && !(linux && arm64) +//go:build !linux package tun @@ -6,10 +6,10 @@ import ( "fmt" "sync" - "golang.zx2c4.com/wireguard/tun" + "github.com/amnezia-vpn/amneziawg-go/tun" - "github.com/xjasonlyu/tun2socks/v2/core/device" - "github.com/xjasonlyu/tun2socks/v2/core/device/iobased" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/iobased" ) type TUN struct { diff --git a/core/device/tun/tun_wireguard_linux.go b/core/device/tun/tun_wireguard_linux.go index 45cc6e4..cadfdce 100644 --- a/core/device/tun/tun_wireguard_linux.go +++ b/core/device/tun/tun_wireguard_linux.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "golang.zx2c4.com/wireguard/tun" + "github.com/amnezia-vpn/amneziawg-go/tun" gun "gvisor.dev/gvisor/pkg/tcpip/link/tun" ) diff --git a/core/device/tun/tun_wireguard_unix.go b/core/device/tun/tun_wireguard_unix.go index fa00dd7..0aad162 100644 --- a/core/device/tun/tun_wireguard_unix.go +++ b/core/device/tun/tun_wireguard_unix.go @@ -3,7 +3,7 @@ package tun import ( - "golang.zx2c4.com/wireguard/tun" + "github.com/amnezia-vpn/amneziawg-go/tun" ) const ( diff --git a/core/device/tun/tun_wireguard_windows.go b/core/device/tun/tun_wireguard_windows.go index cc5598a..166ad4d 100644 --- a/core/device/tun/tun_wireguard_windows.go +++ b/core/device/tun/tun_wireguard_windows.go @@ -1,7 +1,7 @@ package tun import ( - "golang.zx2c4.com/wireguard/tun" + "github.com/amnezia-vpn/amneziawg-go/tun" ) const ( diff --git a/core/nic.go b/core/nic.go index ab537e7..c77817a 100644 --- a/core/nic.go +++ b/core/nic.go @@ -6,7 +6,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/stack" - "github.com/xjasonlyu/tun2socks/v2/core/option" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option" ) const ( diff --git a/core/route.go b/core/route.go index 52d2e3c..32b8a2f 100644 --- a/core/route.go +++ b/core/route.go @@ -5,7 +5,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/header" "gvisor.dev/gvisor/pkg/tcpip/stack" - "github.com/xjasonlyu/tun2socks/v2/core/option" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option" ) func withRouteTable(nicID tcpip.NICID) option.Option { diff --git a/core/stack.go b/core/stack.go index 8f2b9f6..7c927c3 100644 --- a/core/stack.go +++ b/core/stack.go @@ -9,8 +9,8 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/transport/tcp" "gvisor.dev/gvisor/pkg/tcpip/transport/udp" - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/core/option" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option" ) // Config is the configuration to create *stack.Stack. diff --git a/core/tcp.go b/core/tcp.go index 7195fa1..37fcb1e 100644 --- a/core/tcp.go +++ b/core/tcp.go @@ -11,8 +11,8 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/transport/tcp" "gvisor.dev/gvisor/pkg/waiter" - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/core/option" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option" ) const ( diff --git a/core/udp.go b/core/udp.go index 288cc9b..ec29293 100644 --- a/core/udp.go +++ b/core/udp.go @@ -7,8 +7,8 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/transport/udp" "gvisor.dev/gvisor/pkg/waiter" - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/core/option" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option" ) func withUDPHandler(handle func(adapter.UDPConn)) option.Option { diff --git a/dns/resolver.go b/dns/resolver.go index 8748aa4..ef093c4 100644 --- a/dns/resolver.go +++ b/dns/resolver.go @@ -3,7 +3,7 @@ package dns import ( "net" - "github.com/xjasonlyu/tun2socks/v2/dialer" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer" ) func init() { diff --git a/engine/engine.go b/engine/engine.go index 35f79c4..5bdea30 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -12,15 +12,15 @@ import ( "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/stack" - "github.com/xjasonlyu/tun2socks/v2/core" - "github.com/xjasonlyu/tun2socks/v2/core/device" - "github.com/xjasonlyu/tun2socks/v2/core/option" - "github.com/xjasonlyu/tun2socks/v2/dialer" - "github.com/xjasonlyu/tun2socks/v2/engine/mirror" - "github.com/xjasonlyu/tun2socks/v2/log" - "github.com/xjasonlyu/tun2socks/v2/proxy" - "github.com/xjasonlyu/tun2socks/v2/restapi" - "github.com/xjasonlyu/tun2socks/v2/tunnel" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/engine/mirror" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/log" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/restapi" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel" ) var ( @@ -60,6 +60,14 @@ func Insert(k *Key) { _engineMu.Unlock() } +func StartTun2Socks() error { + return start() +} + +func StopTun2Socks() error { + return stop() +} + func start() error { _engineMu.Lock() if _defaultKey == nil { diff --git a/engine/mirror/tunnel.go b/engine/mirror/tunnel.go index b753ac3..7c0763e 100644 --- a/engine/mirror/tunnel.go +++ b/engine/mirror/tunnel.go @@ -1,8 +1,8 @@ package mirror import ( - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/tunnel" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel" ) var _ adapter.TransportHandler = (*Tunnel)(nil) diff --git a/engine/parse.go b/engine/parse.go index ec96d7e..7a1e8b8 100644 --- a/engine/parse.go +++ b/engine/parse.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "github.com/xjasonlyu/tun2socks/v2/core/device" - "github.com/xjasonlyu/tun2socks/v2/core/device/fdbased" - "github.com/xjasonlyu/tun2socks/v2/core/device/tun" - "github.com/xjasonlyu/tun2socks/v2/proxy" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/fdbased" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/tun" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" ) func parseRestAPI(s string) (*url.URL, error) { diff --git a/go.mod b/go.mod index 938d39f..6f24e31 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,10 @@ -module github.com/xjasonlyu/tun2socks/v2 +module github.com/amnezia-vpn/amnezia-tun2socks/v2 -go 1.20 +go 1.22.3 require ( github.com/Dreamacro/go-shadowsocks2 v0.1.8 + github.com/amnezia-vpn/amneziawg-go v0.2.11 github.com/docker/go-units v0.5.0 github.com/go-chi/chi/v5 v5.0.8 github.com/go-chi/cors v1.2.1 @@ -14,11 +15,10 @@ require ( github.com/stretchr/testify v1.7.1 go.uber.org/atomic v1.11.0 go.uber.org/automaxprocs v1.5.2 - golang.org/x/sys v0.8.0 + golang.org/x/sys v0.18.0 golang.org/x/time v0.3.0 - golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b gopkg.in/yaml.v3 v3.0.1 - gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33 + gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 ) require ( @@ -27,7 +27,7 @@ require ( github.com/google/btree v1.1.2 // indirect github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/crypto v0.9.0 // indirect - golang.org/x/net v0.10.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.21.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect ) diff --git a/go.sum b/go.sum index a82357c..73cb505 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/Dreamacro/go-shadowsocks2 v0.1.8 h1:Ixejp5JscEc866gAvm/l6TFd7BOBvDviK github.com/Dreamacro/go-shadowsocks2 v0.1.8/go.mod h1:51y4Q6tJoCE7e8TmYXcQRqfoxPfE9Cvn79V6pB6Df7Y= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/amnezia-vpn/amneziawg-go v0.2.11 h1:JNGsxX4NIaYC/PpbUdwk23534HgS2SRMPgru6/K+364= +github.com/amnezia-vpn/amneziawg-go v0.2.11/go.mod h1:d7WpNfzCRLy7ufGElJBYpD58WRmNjyLyt3IDHPY8AmM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -21,11 +23,13 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -36,23 +40,22 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME= go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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/wireguard v0.0.0-20230325221338-052af4a8072b h1:J1CaxgLerRR5lgx3wnr6L04cJFbWoceSK9JWBdglINo= -golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33 h1:64QentohifmKGeTgJCHilDgfmQVuYE45fsaS9psJ3zY= -gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33/go.mod h1:sQuqOkxbfJq/GS2uSnqHphtXclHyk/ZrAGhZBxxsq6g= +gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 h1:TbRPT0HtzFP3Cno1zZo7yPzEEnfu8EjLfl6IU9VfqkQ= +gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259/go.mod h1:AVgIgHMwK63XvmAzWG9vLQ41YnVHN0du0tEC46fI7yY= diff --git a/log/event.go b/log/event.go index d3fb68a..0c7841b 100644 --- a/log/event.go +++ b/log/event.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/xjasonlyu/tun2socks/v2/common/observable" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/common/observable" ) var ( diff --git a/main.go b/main.go index 7cc4b1f..368b9af 100644 --- a/main.go +++ b/main.go @@ -10,10 +10,10 @@ import ( "go.uber.org/automaxprocs/maxprocs" "gopkg.in/yaml.v3" - _ "github.com/xjasonlyu/tun2socks/v2/dns" - "github.com/xjasonlyu/tun2socks/v2/engine" - "github.com/xjasonlyu/tun2socks/v2/internal/version" - "github.com/xjasonlyu/tun2socks/v2/log" + _ "github.com/amnezia-vpn/amnezia-tun2socks/v2/dns" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/engine" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/log" ) var ( diff --git a/proxy/base.go b/proxy/base.go index 90b19ee..a35b333 100644 --- a/proxy/base.go +++ b/proxy/base.go @@ -5,8 +5,8 @@ import ( "errors" "net" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" ) var _ Proxy = (*Base)(nil) diff --git a/proxy/direct.go b/proxy/direct.go index 70a5ad8..426fdb7 100644 --- a/proxy/direct.go +++ b/proxy/direct.go @@ -4,9 +4,9 @@ import ( "context" "net" - "github.com/xjasonlyu/tun2socks/v2/dialer" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" ) var _ Proxy = (*Direct)(nil) diff --git a/proxy/http.go b/proxy/http.go index 7e7668d..bdab2c3 100644 --- a/proxy/http.go +++ b/proxy/http.go @@ -11,9 +11,9 @@ import ( "net/http" "net/url" - "github.com/xjasonlyu/tun2socks/v2/dialer" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" ) type HTTP struct { diff --git a/proxy/proxy.go b/proxy/proxy.go index 27cafc7..874da3e 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -6,8 +6,8 @@ import ( "net" "time" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" ) const ( diff --git a/proxy/reject.go b/proxy/reject.go index 3509a71..dd8b3d6 100644 --- a/proxy/reject.go +++ b/proxy/reject.go @@ -6,8 +6,8 @@ import ( "net" "time" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" ) var _ Proxy = (*Reject)(nil) diff --git a/proxy/shadowsocks.go b/proxy/shadowsocks.go index f481e60..e837e53 100644 --- a/proxy/shadowsocks.go +++ b/proxy/shadowsocks.go @@ -8,11 +8,11 @@ import ( "github.com/Dreamacro/go-shadowsocks2/core" - "github.com/xjasonlyu/tun2socks/v2/dialer" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" - obfs "github.com/xjasonlyu/tun2socks/v2/transport/simple-obfs" - "github.com/xjasonlyu/tun2socks/v2/transport/socks5" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" + obfs "github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/simple-obfs" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/socks5" ) var _ Proxy = (*Shadowsocks)(nil) diff --git a/proxy/socks4.go b/proxy/socks4.go index 52c3ce5..57215b2 100644 --- a/proxy/socks4.go +++ b/proxy/socks4.go @@ -5,10 +5,10 @@ import ( "fmt" "net" - "github.com/xjasonlyu/tun2socks/v2/dialer" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" - "github.com/xjasonlyu/tun2socks/v2/transport/socks4" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/socks4" ) var _ Proxy = (*Socks4)(nil) diff --git a/proxy/socks5.go b/proxy/socks5.go index 02401bc..61cc22f 100644 --- a/proxy/socks5.go +++ b/proxy/socks5.go @@ -7,10 +7,10 @@ import ( "io" "net" - "github.com/xjasonlyu/tun2socks/v2/dialer" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy/proto" - "github.com/xjasonlyu/tun2socks/v2/transport/socks5" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/socks5" ) var _ Proxy = (*Socks5)(nil) diff --git a/restapi/connections.go b/restapi/connections.go index b8c9c33..e836cbd 100644 --- a/restapi/connections.go +++ b/restapi/connections.go @@ -11,7 +11,7 @@ import ( "github.com/go-chi/render" "github.com/gorilla/websocket" - "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic" ) const defaultInterval = 1000 diff --git a/restapi/server.go b/restapi/server.go index 3db92e4..78abd77 100644 --- a/restapi/server.go +++ b/restapi/server.go @@ -13,9 +13,9 @@ import ( "github.com/go-chi/render" "github.com/gorilla/websocket" - V "github.com/xjasonlyu/tun2socks/v2/internal/version" - "github.com/xjasonlyu/tun2socks/v2/log" - "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" + V "github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/log" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic" ) var ( diff --git a/transport/simple-obfs/http.go b/transport/simple-obfs/http.go index f9a2ed1..9cdcbe9 100644 --- a/transport/simple-obfs/http.go +++ b/transport/simple-obfs/http.go @@ -10,7 +10,7 @@ import ( "net" "net/http" - "github.com/xjasonlyu/tun2socks/v2/common/pool" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool" ) // HTTPObfs is shadowsocks http simple-obfs implementation diff --git a/transport/simple-obfs/tls.go b/transport/simple-obfs/tls.go index b3d5d1c..4340434 100644 --- a/transport/simple-obfs/tls.go +++ b/transport/simple-obfs/tls.go @@ -8,7 +8,7 @@ import ( "net" "time" - "github.com/xjasonlyu/tun2socks/v2/common/pool" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool" ) const ( diff --git a/tunnel/statistic/tracker.go b/tunnel/statistic/tracker.go index 393c200..0b284be 100644 --- a/tunnel/statistic/tracker.go +++ b/tunnel/statistic/tracker.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "go.uber.org/atomic" - M "github.com/xjasonlyu/tun2socks/v2/metadata" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" ) type tracker interface { diff --git a/tunnel/tcp.go b/tunnel/tcp.go index 03cebab..d6c856f 100644 --- a/tunnel/tcp.go +++ b/tunnel/tcp.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "github.com/xjasonlyu/tun2socks/v2/common/pool" - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/log" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy" - "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/log" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic" ) const ( diff --git a/tunnel/tunnel.go b/tunnel/tunnel.go index 8ced53f..afb498b 100644 --- a/tunnel/tunnel.go +++ b/tunnel/tunnel.go @@ -1,7 +1,7 @@ package tunnel import ( - "github.com/xjasonlyu/tun2socks/v2/core/adapter" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter" ) // Unbuffered TCP/UDP queues. diff --git a/tunnel/udp.go b/tunnel/udp.go index a10e2d4..c3a70e3 100644 --- a/tunnel/udp.go +++ b/tunnel/udp.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "github.com/xjasonlyu/tun2socks/v2/common/pool" - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/log" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/xjasonlyu/tun2socks/v2/proxy" - "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/log" + M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy" + "github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic" ) // _udpSessionTimeout is the default timeout for each UDP session.