From c45470650bb9e7c20d496225a31cd2f78d51084c Mon Sep 17 00:00:00 2001 From: xjasonlyu Date: Sun, 7 Aug 2022 00:25:59 +0800 Subject: [PATCH] Chore: reorder imports --- core/device/fdbased/fd_unix.go | 4 ++-- core/device/fdbased/open_linux.go | 4 ++-- core/device/tun/tun_netstack.go | 4 ++-- core/device/tun/tun_wireguard.go | 4 ++-- core/nic.go | 4 ++-- core/route.go | 4 ++-- core/stack.go | 6 +++--- core/tcp.go | 6 +++--- core/udp.go | 6 +++--- engine/engine.go | 8 ++++---- main.go | 6 +++--- proxy/shadowsocks.go | 4 ++-- restapi/connections.go | 4 ++-- restapi/server.go | 8 ++++---- tunnel/statistic/tracker.go | 4 ++-- 15 files changed, 38 insertions(+), 38 deletions(-) diff --git a/core/device/fdbased/fd_unix.go b/core/device/fdbased/fd_unix.go index cb9617b..269ce1b 100644 --- a/core/device/fdbased/fd_unix.go +++ b/core/device/fdbased/fd_unix.go @@ -6,10 +6,10 @@ import ( "fmt" "strconv" - "github.com/xjasonlyu/tun2socks/v2/core/device" - "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/tcpip/stack" + + "github.com/xjasonlyu/tun2socks/v2/core/device" ) type FD struct { diff --git a/core/device/fdbased/open_linux.go b/core/device/fdbased/open_linux.go index 97797ca..24fd65d 100644 --- a/core/device/fdbased/open_linux.go +++ b/core/device/fdbased/open_linux.go @@ -3,9 +3,9 @@ package fdbased import ( "fmt" - "github.com/xjasonlyu/tun2socks/v2/core/device" - "gvisor.dev/gvisor/pkg/tcpip/link/fdbased" + + "github.com/xjasonlyu/tun2socks/v2/core/device" ) func open(fd int, mtu uint32) (device.Device, error) { diff --git a/core/device/tun/tun_netstack.go b/core/device/tun/tun_netstack.go index a451ae1..09718fd 100644 --- a/core/device/tun/tun_netstack.go +++ b/core/device/tun/tun_netstack.go @@ -6,13 +6,13 @@ import ( "fmt" "unsafe" - "github.com/xjasonlyu/tun2socks/v2/core/device" - "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/tcpip/link/fdbased" "gvisor.dev/gvisor/pkg/tcpip/link/rawfile" "gvisor.dev/gvisor/pkg/tcpip/link/tun" "gvisor.dev/gvisor/pkg/tcpip/stack" + + "github.com/xjasonlyu/tun2socks/v2/core/device" ) type TUN struct { diff --git a/core/device/tun/tun_wireguard.go b/core/device/tun/tun_wireguard.go index ffe6c9a..bff2d37 100644 --- a/core/device/tun/tun_wireguard.go +++ b/core/device/tun/tun_wireguard.go @@ -5,10 +5,10 @@ package tun import ( "fmt" + "golang.zx2c4.com/wireguard/tun" + "github.com/xjasonlyu/tun2socks/v2/core/device" "github.com/xjasonlyu/tun2socks/v2/core/device/iobased" - - "golang.zx2c4.com/wireguard/tun" ) type TUN struct { diff --git a/core/nic.go b/core/nic.go index e593452..ab537e7 100644 --- a/core/nic.go +++ b/core/nic.go @@ -3,10 +3,10 @@ package core import ( "fmt" - "github.com/xjasonlyu/tun2socks/v2/core/option" - "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/stack" + + "github.com/xjasonlyu/tun2socks/v2/core/option" ) const ( diff --git a/core/route.go b/core/route.go index 667e4ae..52d2e3c 100644 --- a/core/route.go +++ b/core/route.go @@ -1,11 +1,11 @@ package core import ( - "github.com/xjasonlyu/tun2socks/v2/core/option" - "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/header" "gvisor.dev/gvisor/pkg/tcpip/stack" + + "github.com/xjasonlyu/tun2socks/v2/core/option" ) func withRouteTable(nicID tcpip.NICID) option.Option { diff --git a/core/stack.go b/core/stack.go index c8beeda..f5c623b 100644 --- a/core/stack.go +++ b/core/stack.go @@ -1,9 +1,6 @@ package core import ( - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/core/option" - "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/network/ipv4" "gvisor.dev/gvisor/pkg/tcpip/network/ipv6" @@ -11,6 +8,9 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/transport/icmp" "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" ) // Config is the configuration to create *stack.Stack. diff --git a/core/tcp.go b/core/tcp.go index 4091cac..b1b0693 100644 --- a/core/tcp.go +++ b/core/tcp.go @@ -3,15 +3,15 @@ package core import ( "time" - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/core/option" - "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet" "gvisor.dev/gvisor/pkg/tcpip/header" "gvisor.dev/gvisor/pkg/tcpip/stack" "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" ) const ( diff --git a/core/udp.go b/core/udp.go index 2858db1..64df2e0 100644 --- a/core/udp.go +++ b/core/udp.go @@ -1,13 +1,13 @@ package core import ( - "github.com/xjasonlyu/tun2socks/v2/core/adapter" - "github.com/xjasonlyu/tun2socks/v2/core/option" - "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet" "gvisor.dev/gvisor/pkg/tcpip/stack" "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" ) func withUDPHandler(handle func(adapter.UDPConn), printf func(string, ...any)) option.Option { diff --git a/engine/engine.go b/engine/engine.go index 3f82c86..11d5f79 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -7,6 +7,10 @@ import ( "sync" "time" + "github.com/docker/go-units" + "gvisor.dev/gvisor/pkg/tcpip" + "gvisor.dev/gvisor/pkg/tcpip/stack" + "github.com/xjasonlyu/tun2socks/v2/component/dialer" "github.com/xjasonlyu/tun2socks/v2/core" "github.com/xjasonlyu/tun2socks/v2/core/device" @@ -16,10 +20,6 @@ import ( "github.com/xjasonlyu/tun2socks/v2/proxy" "github.com/xjasonlyu/tun2socks/v2/restapi" "github.com/xjasonlyu/tun2socks/v2/tunnel" - - "github.com/docker/go-units" - "gvisor.dev/gvisor/pkg/tcpip" - "gvisor.dev/gvisor/pkg/tcpip/stack" ) var ( diff --git a/main.go b/main.go index 09fa397..eb17ff6 100644 --- a/main.go +++ b/main.go @@ -7,13 +7,13 @@ import ( "os/signal" "syscall" + "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" - - "go.uber.org/automaxprocs/maxprocs" - "gopkg.in/yaml.v3" ) var ( diff --git a/proxy/shadowsocks.go b/proxy/shadowsocks.go index 5888c63..846d9ee 100644 --- a/proxy/shadowsocks.go +++ b/proxy/shadowsocks.go @@ -6,13 +6,13 @@ import ( "fmt" "net" + "github.com/Dreamacro/go-shadowsocks2/core" + "github.com/xjasonlyu/tun2socks/v2/component/dialer" obfs "github.com/xjasonlyu/tun2socks/v2/component/simple-obfs" M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" "github.com/xjasonlyu/tun2socks/v2/transport/socks5" - - "github.com/Dreamacro/go-shadowsocks2/core" ) var _ Proxy = (*Shadowsocks)(nil) diff --git a/restapi/connections.go b/restapi/connections.go index 8f1e7aa..b8c9c33 100644 --- a/restapi/connections.go +++ b/restapi/connections.go @@ -7,11 +7,11 @@ import ( "strconv" "time" - "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" - "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/gorilla/websocket" + + "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" ) const defaultInterval = 1000 diff --git a/restapi/server.go b/restapi/server.go index 8f18fdb..8c49504 100644 --- a/restapi/server.go +++ b/restapi/server.go @@ -10,14 +10,14 @@ import ( "strings" "time" - V "github.com/xjasonlyu/tun2socks/v2/internal/version" - "github.com/xjasonlyu/tun2socks/v2/log" - "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" - "github.com/go-chi/chi/v5" "github.com/go-chi/cors" "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" ) var ( diff --git a/tunnel/statistic/tracker.go b/tunnel/statistic/tracker.go index b0085ba..105dc5e 100644 --- a/tunnel/statistic/tracker.go +++ b/tunnel/statistic/tracker.go @@ -4,10 +4,10 @@ import ( "net" "time" - M "github.com/xjasonlyu/tun2socks/v2/metadata" - "github.com/google/uuid" "go.uber.org/atomic" + + M "github.com/xjasonlyu/tun2socks/v2/metadata" ) type tracker interface {