lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

Move log into common

Browse Source
This commit is contained in:
V2Ray 2015-09-20 00:50:21 +02:00
parent d03cac9670
commit a887fd01b8
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/io/encryption.go
View File

@ -4,7 +4,7 @@ import (
"crypto/cipher" "crypto/cipher"
"io" "io"
"github.com/v2ray/v2ray-core/log" "github.com/v2ray/v2ray-core/common/log"
) )
// CryptionReader is a general purpose reader that applies // CryptionReader is a general purpose reader that applies

0
log/log.go → common/log/log.go
View File

2
config/json/json.go
View File

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
"github.com/v2ray/v2ray-core/log" "github.com/v2ray/v2ray-core/common/log"
) )
type ConnectionConfig struct { type ConnectionConfig struct {

2
point.go
View File

@ -1,8 +1,8 @@
package core package core
import ( import (
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/log"
) )
var ( var (

2
proxy/freedom/freedom.go
View File

@ -4,8 +4,8 @@ import (
"net" "net"
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/log"
) )
type FreedomConnection struct { type FreedomConnection struct {

2
proxy/socks/protocol/socks.go
View File

@ -6,8 +6,8 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/log"
) )
const ( const (

2
proxy/socks/socks.go
View File

@ -8,8 +8,8 @@ import (
"strconv" "strconv"
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/log"
protocol "github.com/v2ray/v2ray-core/proxy/socks/protocol" protocol "github.com/v2ray/v2ray-core/proxy/socks/protocol"
) )

4
proxy/vmess/config.go
View File

@ -4,9 +4,9 @@ import (
"encoding/json" "encoding/json"
"net" "net"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" 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 { type VMessUser struct {

2
proxy/vmess/protocol/user/id.go
View File

@ -4,7 +4,7 @@ import (
"crypto/md5" "crypto/md5"
"encoding/hex" "encoding/hex"
"github.com/v2ray/v2ray-core/log" "github.com/v2ray/v2ray-core/common/log"
) )
const ( const (

2
proxy/vmess/protocol/user/userset.go
View File

@ -4,7 +4,7 @@ import (
"container/heap" "container/heap"
"time" "time"
"github.com/v2ray/v2ray-core/log" "github.com/v2ray/v2ray-core/common/log"
) )
const ( const (

4
proxy/vmess/protocol/vmess.go
View File

@ -13,9 +13,9 @@ import (
"time" "time"
v2io "github.com/v2ray/v2ray-core/common/io" v2io "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" 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 ( const (

2
proxy/vmess/protocol/vmess_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
v2net "github.com/v2ray/v2ray-core/common/net" 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/mocks"
"github.com/v2ray/v2ray-core/testing/unit" "github.com/v2ray/v2ray-core/testing/unit"
) )

4
proxy/vmess/vmessin.go
View File

@ -8,10 +8,10 @@ import (
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
v2io "github.com/v2ray/v2ray-core/common/io" v2io "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" 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"
"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
) )
type VMessInboundHandler struct { type VMessInboundHandler struct {

8
proxy/vmess/vmessout.go
View File

@ -9,16 +9,16 @@ import (
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
v2io "github.com/v2ray/v2ray-core/common/io" v2io "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" 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"
"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. // VNext is the next Point server in the connection chain.
type VNextServer struct { type VNextServer struct {
Address v2net.Address // Address of VNext server Address v2net.Address // Address of VNext server
Users []user.User // User accounts for accessing VNext. Users []user.User // User accounts for accessing VNext.
} }
type VMessOutboundHandler struct { type VMessOutboundHandler struct {

2
release/server/main.go
View File

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
"github.com/v2ray/v2ray-core/common/log"
jsonconf "github.com/v2ray/v2ray-core/config/json" 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. // The following are neccesary as they register handlers in their init functions.
_ "github.com/v2ray/v2ray-core/proxy/freedom" _ "github.com/v2ray/v2ray-core/proxy/freedom"