diff --git a/cmd/main.go b/cmd/main.go index c7f9ca6..21d093f 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -12,18 +12,15 @@ import ( "syscall" "time" - "github.com/xjasonlyu/tun2socks/common/log" "github.com/xjasonlyu/tun2socks/core" "github.com/xjasonlyu/tun2socks/filter" + "github.com/xjasonlyu/tun2socks/log" "github.com/xjasonlyu/tun2socks/proxy" "github.com/xjasonlyu/tun2socks/tun" D "github.com/xjasonlyu/tun2socks/common/dns" S "github.com/xjasonlyu/tun2socks/common/stats" C "github.com/xjasonlyu/tun2socks/constant" - - // init logger - _ "github.com/xjasonlyu/tun2socks/common/log/simple" ) const MTU = 1500 diff --git a/cmd/main_fakedns.go b/cmd/main_fakedns.go index 471901f..ee0b3e7 100644 --- a/cmd/main_fakedns.go +++ b/cmd/main_fakedns.go @@ -6,7 +6,7 @@ import ( "flag" "github.com/xjasonlyu/tun2socks/common/dns/fakedns" - "github.com/xjasonlyu/tun2socks/common/log" + "github.com/xjasonlyu/tun2socks/log" ) func init() { diff --git a/common/dns/fakedns/server.go b/common/dns/fakedns/server.go index 03deefc..79d1564 100644 --- a/common/dns/fakedns/server.go +++ b/common/dns/fakedns/server.go @@ -6,7 +6,7 @@ import ( D "github.com/miekg/dns" "github.com/xjasonlyu/tun2socks/common/fakeip" - "github.com/xjasonlyu/tun2socks/common/log" + "github.com/xjasonlyu/tun2socks/log" ) const ( diff --git a/common/stats/session/session.go b/common/stats/session/session.go index 2ab85f7..2ee229a 100644 --- a/common/stats/session/session.go +++ b/common/stats/session/session.go @@ -9,10 +9,10 @@ import ( "sync" "sync/atomic" - "github.com/xjasonlyu/tun2socks/common/log" "github.com/xjasonlyu/tun2socks/common/queue" "github.com/xjasonlyu/tun2socks/common/stats" C "github.com/xjasonlyu/tun2socks/constant" + "github.com/xjasonlyu/tun2socks/log" ) const maxCompletedSessions = 100 diff --git a/filter/icmp.go b/filter/icmp.go index 8d44c31..af7af95 100644 --- a/filter/icmp.go +++ b/filter/icmp.go @@ -3,8 +3,8 @@ package filter import ( "io" - "github.com/xjasonlyu/tun2socks/common/log" "github.com/xjasonlyu/tun2socks/common/packet" + "github.com/xjasonlyu/tun2socks/log" ) type icmpFilter struct { diff --git a/proxy/tcp.go b/proxy/tcp.go index b3d28d0..a6b9bd7 100644 --- a/proxy/tcp.go +++ b/proxy/tcp.go @@ -8,11 +8,11 @@ import ( "time" "github.com/xjasonlyu/tun2socks/common/dns" - "github.com/xjasonlyu/tun2socks/common/log" "github.com/xjasonlyu/tun2socks/common/lsof" "github.com/xjasonlyu/tun2socks/common/pool" "github.com/xjasonlyu/tun2socks/common/stats" "github.com/xjasonlyu/tun2socks/core" + "github.com/xjasonlyu/tun2socks/log" ) type tcpHandler struct { diff --git a/proxy/udp.go b/proxy/udp.go index 97c9288..204ddb2 100644 --- a/proxy/udp.go +++ b/proxy/udp.go @@ -8,11 +8,11 @@ import ( "time" "github.com/xjasonlyu/tun2socks/common/dns" - "github.com/xjasonlyu/tun2socks/common/log" "github.com/xjasonlyu/tun2socks/common/lsof" "github.com/xjasonlyu/tun2socks/common/pool" "github.com/xjasonlyu/tun2socks/common/stats" "github.com/xjasonlyu/tun2socks/core" + "github.com/xjasonlyu/tun2socks/log" ) type udpHandler struct {