diff --git a/common/io/encryption.go b/common/io/encryption.go index 100e9f24..000558fa 100644 --- a/common/io/encryption.go +++ b/common/io/encryption.go @@ -4,7 +4,7 @@ import ( "crypto/cipher" "io" - "github.com/v2ray/v2ray-core/log" + "github.com/v2ray/v2ray-core/common/log" ) // CryptionReader is a general purpose reader that applies diff --git a/log/log.go b/common/log/log.go similarity index 100% rename from log/log.go rename to common/log/log.go diff --git a/config/json/json.go b/config/json/json.go index 59d8a6d8..76ff0d0d 100644 --- a/config/json/json.go +++ b/config/json/json.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/v2ray/v2ray-core" - "github.com/v2ray/v2ray-core/log" + "github.com/v2ray/v2ray-core/common/log" ) type ConnectionConfig struct { diff --git a/point.go b/point.go index ec46a0de..c0337602 100644 --- a/point.go +++ b/point.go @@ -1,8 +1,8 @@ package core import ( + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" ) var ( diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go index 99bdc90d..8b18844b 100644 --- a/proxy/freedom/freedom.go +++ b/proxy/freedom/freedom.go @@ -4,8 +4,8 @@ import ( "net" "github.com/v2ray/v2ray-core" + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" ) type FreedomConnection struct { diff --git a/proxy/socks/protocol/socks.go b/proxy/socks/protocol/socks.go index 76803bf3..64934646 100644 --- a/proxy/socks/protocol/socks.go +++ b/proxy/socks/protocol/socks.go @@ -6,8 +6,8 @@ import ( "fmt" "io" + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" ) const ( diff --git a/proxy/socks/socks.go b/proxy/socks/socks.go index af0e97b8..62954a54 100644 --- a/proxy/socks/socks.go +++ b/proxy/socks/socks.go @@ -8,8 +8,8 @@ import ( "strconv" "github.com/v2ray/v2ray-core" + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" protocol "github.com/v2ray/v2ray-core/proxy/socks/protocol" ) diff --git a/proxy/vmess/config.go b/proxy/vmess/config.go index 87fc00d4..1eac61f2 100644 --- a/proxy/vmess/config.go +++ b/proxy/vmess/config.go @@ -4,9 +4,9 @@ import ( "encoding/json" "net" + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" - "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" + "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" ) type VMessUser struct { diff --git a/proxy/vmess/protocol/user/id.go b/proxy/vmess/protocol/user/id.go index c99e29b0..ec3af7e9 100644 --- a/proxy/vmess/protocol/user/id.go +++ b/proxy/vmess/protocol/user/id.go @@ -4,7 +4,7 @@ import ( "crypto/md5" "encoding/hex" - "github.com/v2ray/v2ray-core/log" + "github.com/v2ray/v2ray-core/common/log" ) const ( diff --git a/proxy/vmess/protocol/user/userset.go b/proxy/vmess/protocol/user/userset.go index d944fb6a..6088f685 100644 --- a/proxy/vmess/protocol/user/userset.go +++ b/proxy/vmess/protocol/user/userset.go @@ -4,7 +4,7 @@ import ( "container/heap" "time" - "github.com/v2ray/v2ray-core/log" + "github.com/v2ray/v2ray-core/common/log" ) const ( diff --git a/proxy/vmess/protocol/vmess.go b/proxy/vmess/protocol/vmess.go index c165b30a..282db56e 100644 --- a/proxy/vmess/protocol/vmess.go +++ b/proxy/vmess/protocol/vmess.go @@ -13,9 +13,9 @@ import ( "time" v2io "github.com/v2ray/v2ray-core/common/io" + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" - "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" + "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" ) const ( diff --git a/proxy/vmess/protocol/vmess_test.go b/proxy/vmess/protocol/vmess_test.go index 0cb90abc..7318f1cb 100644 --- a/proxy/vmess/protocol/vmess_test.go +++ b/proxy/vmess/protocol/vmess_test.go @@ -6,7 +6,7 @@ import ( "testing" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" + "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" "github.com/v2ray/v2ray-core/testing/mocks" "github.com/v2ray/v2ray-core/testing/unit" ) diff --git a/proxy/vmess/vmessin.go b/proxy/vmess/vmessin.go index b1ae34fc..338809fc 100644 --- a/proxy/vmess/vmessin.go +++ b/proxy/vmess/vmessin.go @@ -8,10 +8,10 @@ import ( "github.com/v2ray/v2ray-core" v2io "github.com/v2ray/v2ray-core/common/io" + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" "github.com/v2ray/v2ray-core/proxy/vmess/protocol" - "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" + "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" ) type VMessInboundHandler struct { diff --git a/proxy/vmess/vmessout.go b/proxy/vmess/vmessout.go index 74117aa2..eb7ecce9 100644 --- a/proxy/vmess/vmessout.go +++ b/proxy/vmess/vmessout.go @@ -9,16 +9,16 @@ import ( "github.com/v2ray/v2ray-core" v2io "github.com/v2ray/v2ray-core/common/io" + "github.com/v2ray/v2ray-core/common/log" v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/log" "github.com/v2ray/v2ray-core/proxy/vmess/protocol" - "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" + "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" ) // VNext is the next Point server in the connection chain. type VNextServer struct { - Address v2net.Address // Address of VNext server - Users []user.User // User accounts for accessing VNext. + Address v2net.Address // Address of VNext server + Users []user.User // User accounts for accessing VNext. } type VMessOutboundHandler struct { diff --git a/release/server/main.go b/release/server/main.go index 74389b78..1a6961c0 100644 --- a/release/server/main.go +++ b/release/server/main.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/v2ray/v2ray-core" + "github.com/v2ray/v2ray-core/common/log" jsonconf "github.com/v2ray/v2ray-core/config/json" - "github.com/v2ray/v2ray-core/log" // The following are neccesary as they register handlers in their init functions. _ "github.com/v2ray/v2ray-core/proxy/freedom"