Alawn/v2ray-core
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core synced 2024-02-27 03:18:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mod v4

Browse Source
This commit is contained in:
vcptr
2019-10-25 13:18:21 +08:00
parent 5e14afd293
commit 239d1b0fec
542 changed files with 1845 additions and 1845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/commander/commander.go
+4 -4
View File
@@ -11,10 +11,10 @@ import (
"google.golang.org/grpc"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/signal/done"
"v2ray.com/core/features/outbound"
"v2ray.com/core/v4"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/signal/done"
"v2ray.com/core/v4/features/outbound"
)
// Commander is a V2Ray feature that provides gRPC methods to external clients.
app/commander/config.pb.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
serial "v2ray.com/core/common/serial"
serial "v2ray.com/core/v4/common/serial"
)
// Reference imports to suppress errors if they are not otherwise used.
app/commander/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package commander
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/commander/outbound.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"context"
"sync"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/signal/done"
"v2ray.com/core/transport"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/signal/done"
"v2ray.com/core/v4/transport"
)
// OutboundListener is a net.Listener for listening gRPC connections.
app/dispatcher/default.go
+12 -12
View File
@@ -10,18 +10,18 @@ import (
"sync"
"time"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
"v2ray.com/core/common/session"
"v2ray.com/core/features/outbound"
"v2ray.com/core/features/policy"
"v2ray.com/core/features/routing"
"v2ray.com/core/features/stats"
"v2ray.com/core/transport"
"v2ray.com/core/transport/pipe"
"v2ray.com/core/v4"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/protocol"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/features/outbound"
"v2ray.com/core/v4/features/policy"
"v2ray.com/core/v4/features/routing"
"v2ray.com/core/v4/features/stats"
"v2ray.com/core/v4/transport"
"v2ray.com/core/v4/transport/pipe"
)
var (
app/dispatcher/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package dispatcher
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/dispatcher/sniffer.go
+4 -4
View File
@@ -3,10 +3,10 @@
package dispatcher
import (
"v2ray.com/core/common"
"v2ray.com/core/common/protocol/bittorrent"
"v2ray.com/core/common/protocol/http"
"v2ray.com/core/common/protocol/tls"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/protocol/bittorrent"
"v2ray.com/core/v4/common/protocol/http"
"v2ray.com/core/v4/common/protocol/tls"
)
type SniffResult interface {
app/dispatcher/stats.go
+3 -3
View File
@@ -3,9 +3,9 @@
package dispatcher
import (
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/features/stats"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/features/stats"
)
type SizeStatWriter struct {
app/dispatcher/stats_test.go
+3 -3
View File
@@ -3,9 +3,9 @@ package dispatcher_test
import (
"testing"
. "v2ray.com/core/app/dispatcher"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
. "v2ray.com/core/v4/app/dispatcher"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
)
type TestCounter int64
app/dns/config.pb.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
net "v2ray.com/core/common/net"
net "v2ray.com/core/v4/common/net"
)
// Reference imports to suppress errors if they are not otherwise used.
app/dns/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package dns
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/dns/hosts.go
+4 -4
View File
@@ -3,10 +3,10 @@
package dns
import (
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/strmatcher"
"v2ray.com/core/features"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/strmatcher"
"v2ray.com/core/v4/features"
)
// StaticHosts represents static domain-ip mapping in DNS server.
app/dns/hosts_test.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"github.com/google/go-cmp/cmp"
. "v2ray.com/core/app/dns"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
. "v2ray.com/core/v4/app/dns"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
)
func TestStaticHosts(t *testing.T) {
app/dns/nameserver.go
+2 -2
View File
@@ -5,8 +5,8 @@ package dns
import (
"context"
"v2ray.com/core/common/net"
"v2ray.com/core/features/dns/localdns"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/features/dns/localdns"
)
// IPOption is an object for IP query options.
app/dns/nameserver_test.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"testing"
"time"
. "v2ray.com/core/app/dns"
"v2ray.com/core/common"
. "v2ray.com/core/v4/app/dns"
"v2ray.com/core/v4/common"
)
func TestLocalNameServer(t *testing.T) {
app/dns/server.go
+9 -9
View File
@@ -9,15 +9,15 @@ import (
"sync"
"time"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/session"
"v2ray.com/core/common/strmatcher"
"v2ray.com/core/common/uuid"
"v2ray.com/core/features"
"v2ray.com/core/features/dns"
"v2ray.com/core/features/routing"
"v2ray.com/core/v4"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/common/strmatcher"
"v2ray.com/core/v4/common/uuid"
"v2ray.com/core/v4/features"
"v2ray.com/core/v4/features/dns"
"v2ray.com/core/v4/features/routing"
)
// Server is a DNS rely server.
app/dns/server_test.go
+12 -12
View File
@@ -7,18 +7,18 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/miekg/dns"
"v2ray.com/core"
"v2ray.com/core/app/dispatcher"
. "v2ray.com/core/app/dns"
"v2ray.com/core/app/policy"
"v2ray.com/core/app/proxyman"
_ "v2ray.com/core/app/proxyman/outbound"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/serial"
feature_dns "v2ray.com/core/features/dns"
"v2ray.com/core/proxy/freedom"
"v2ray.com/core/testing/servers/udp"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/dispatcher"
. "v2ray.com/core/v4/app/dns"
"v2ray.com/core/v4/app/policy"
"v2ray.com/core/v4/app/proxyman"
_ "v2ray.com/core/v4/app/proxyman/outbound"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/serial"
feature_dns "v2ray.com/core/v4/features/dns"
"v2ray.com/core/v4/proxy/freedom"
"v2ray.com/core/v4/testing/servers/udp"
)
type staticHandler struct {
app/dns/udpns.go
+11 -11
View File
@@ -10,17 +10,17 @@ import (
"time"
"golang.org/x/net/dns/dnsmessage"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol/dns"
udp_proto "v2ray.com/core/common/protocol/udp"
"v2ray.com/core/common/session"
"v2ray.com/core/common/signal/pubsub"
"v2ray.com/core/common/task"
dns_feature "v2ray.com/core/features/dns"
"v2ray.com/core/features/routing"
"v2ray.com/core/transport/internet/udp"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/protocol/dns"
udp_proto "v2ray.com/core/v4/common/protocol/udp"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/common/signal/pubsub"
"v2ray.com/core/v4/common/task"
dns_feature "v2ray.com/core/v4/features/dns"
"v2ray.com/core/v4/features/routing"
"v2ray.com/core/v4/transport/internet/udp"
)
type record struct {
app/log/command/command.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
grpc "google.golang.org/grpc"
"v2ray.com/core"
"v2ray.com/core/app/log"
"v2ray.com/core/common"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/log"
"v2ray.com/core/v4/common"
)
type LoggerServer struct {
app/log/command/command_test.go
+9 -9
View File
@@ -4,15 +4,15 @@ import (
"context"
"testing"
"v2ray.com/core"
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/app/log"
. "v2ray.com/core/app/log/command"
"v2ray.com/core/app/proxyman"
_ "v2ray.com/core/app/proxyman/inbound"
_ "v2ray.com/core/app/proxyman/outbound"
"v2ray.com/core/common"
"v2ray.com/core/common/serial"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/dispatcher"
"v2ray.com/core/v4/app/log"
. "v2ray.com/core/v4/app/log/command"
"v2ray.com/core/v4/app/proxyman"
_ "v2ray.com/core/v4/app/proxyman/inbound"
_ "v2ray.com/core/v4/app/proxyman/outbound"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/serial"
)
func TestLoggerRestart(t *testing.T) {
app/log/command/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package command
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/log/config.pb.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
log "v2ray.com/core/common/log"
log "v2ray.com/core/v4/common/log"
)
// Reference imports to suppress errors if they are not otherwise used.
app/log/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package log
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/log/log.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"context"
"sync"
"v2ray.com/core/common"
"v2ray.com/core/common/log"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/log"
)
// Instance is a log.Handler that handles logs.
app/log/log_creator.go
+2 -2
View File
@@ -3,8 +3,8 @@
package log
import (
"v2ray.com/core/common"
"v2ray.com/core/common/log"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/log"
)
type HandlerCreatorOptions struct {
app/log/log_test.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"testing"
"github.com/golang/mock/gomock"
"v2ray.com/core/app/log"
"v2ray.com/core/common"
clog "v2ray.com/core/common/log"
"v2ray.com/core/testing/mocks"
"v2ray.com/core/v4/app/log"
"v2ray.com/core/v4/common"
clog "v2ray.com/core/v4/common/log"
"v2ray.com/core/v4/testing/mocks"
)
func TestCustomLogHandler(t *testing.T) {
app/policy/config.go
+1 -1
View File
@@ -3,7 +3,7 @@ package policy
import (
"time"
"v2ray.com/core/features/policy"
"v2ray.com/core/v4/features/policy"
)
// Duration converts Second to time.Duration.
app/policy/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package policy
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/policy/manager.go
+2 -2
View File
@@ -3,8 +3,8 @@ package policy
import (
"context"
"v2ray.com/core/common"
"v2ray.com/core/features/policy"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/features/policy"
)
// Instance is an instance of Policy manager.
app/policy/manager_test.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"testing"
"time"
. "v2ray.com/core/app/policy"
"v2ray.com/core/common"
"v2ray.com/core/features/policy"
. "v2ray.com/core/v4/app/policy"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/features/policy"
)
func TestPolicy(t *testing.T) {
app/proxyman/command/command.go
+5 -5
View File
@@ -7,11 +7,11 @@ import (
grpc "google.golang.org/grpc"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/features/inbound"
"v2ray.com/core/features/outbound"
"v2ray.com/core/proxy"
"v2ray.com/core/v4"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/features/inbound"
"v2ray.com/core/v4/features/outbound"
"v2ray.com/core/v4/proxy"
)
// InboundOperation is the interface for operations that applies to inbound handlers.
app/proxyman/command/command.pb.go
+3 -3
View File
@@ -6,9 +6,9 @@ import (
proto "github.com/golang/protobuf/proto"
grpc "google.golang.org/grpc"
math "math"
core "v2ray.com/core"
protocol "v2ray.com/core/common/protocol"
serial "v2ray.com/core/common/serial"
core "v2ray.com/core/v4"
protocol "v2ray.com/core/v4/common/protocol"
serial "v2ray.com/core/v4/common/serial"
)
// Reference imports to suppress errors if they are not otherwise used.
app/proxyman/command/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package command
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/proxyman/config.pb.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
net "v2ray.com/core/common/net"
serial "v2ray.com/core/common/serial"
internet "v2ray.com/core/transport/internet"
net "v2ray.com/core/v4/common/net"
serial "v2ray.com/core/v4/common/serial"
internet "v2ray.com/core/v4/transport/internet"
)
// Reference imports to suppress errors if they are not otherwise used.
app/proxyman/inbound/always.go
+11 -11
View File
@@ -3,17 +3,17 @@ package inbound
import (
"context"
"v2ray.com/core"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/mux"
"v2ray.com/core/common/net"
"v2ray.com/core/features/policy"
"v2ray.com/core/features/stats"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/internet"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/proxyman"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/dice"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/common/mux"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/features/policy"
"v2ray.com/core/v4/features/stats"
"v2ray.com/core/v4/proxy"
"v2ray.com/core/v4/transport/internet"
)
func getStatCounter(v *core.Instance, tag string) (stats.Counter, stats.Counter) {
app/proxyman/inbound/dynamic.go
+8 -8
View File
@@ -5,14 +5,14 @@ import (
"sync"
"time"
"v2ray.com/core"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/mux"
"v2ray.com/core/common/net"
"v2ray.com/core/common/task"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/internet"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/proxyman"
"v2ray.com/core/v4/common/dice"
"v2ray.com/core/v4/common/mux"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/task"
"v2ray.com/core/v4/proxy"
"v2ray.com/core/v4/transport/internet"
)
type DynamicInboundHandler struct {
app/proxyman/inbound/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package inbound
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/proxyman/inbound/inbound.go
+6 -6
View File
@@ -6,12 +6,12 @@ import (
"context"
"sync"
"v2ray.com/core"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common"
"v2ray.com/core/common/serial"
"v2ray.com/core/common/session"
"v2ray.com/core/features/inbound"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/proxyman"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/serial"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/features/inbound"
)
// Manager is to manage all inbound handlers.
app/proxyman/inbound/worker.go
+15 -15
View File
@@ -6,21 +6,21 @@ import (
"sync/atomic"
"time"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/net"
"v2ray.com/core/common/serial"
"v2ray.com/core/common/session"
"v2ray.com/core/common/signal/done"
"v2ray.com/core/common/task"
"v2ray.com/core/features/routing"
"v2ray.com/core/features/stats"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/internet"
"v2ray.com/core/transport/internet/tcp"
"v2ray.com/core/transport/internet/udp"
"v2ray.com/core/transport/pipe"
"v2ray.com/core/v4/app/proxyman"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/serial"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/common/signal/done"
"v2ray.com/core/v4/common/task"
"v2ray.com/core/v4/features/routing"
"v2ray.com/core/v4/features/stats"
"v2ray.com/core/v4/proxy"
"v2ray.com/core/v4/transport/internet"
"v2ray.com/core/v4/transport/internet/tcp"
"v2ray.com/core/v4/transport/internet/udp"
"v2ray.com/core/v4/transport/pipe"
)
type worker interface {
app/proxyman/outbound/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package outbound
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/proxyman/outbound/handler.go
+11 -11
View File
@@ -3,17 +3,17 @@ package outbound
import (
"context"
"v2ray.com/core"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common"
"v2ray.com/core/common/mux"
"v2ray.com/core/common/net"
"v2ray.com/core/common/session"
"v2ray.com/core/features/outbound"
"v2ray.com/core/proxy"
"v2ray.com/core/transport"
"v2ray.com/core/transport/internet"
"v2ray.com/core/transport/pipe"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/proxyman"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/mux"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/features/outbound"
"v2ray.com/core/v4/proxy"
"v2ray.com/core/v4/transport"
"v2ray.com/core/v4/transport/internet"
"v2ray.com/core/v4/transport/pipe"
)
// Handler is an implements of outbound.Handler.
app/proxyman/outbound/handler_test.go
+2 -2
View File
@@ -3,8 +3,8 @@ package outbound_test
import (
"testing"
. "v2ray.com/core/app/proxyman/outbound"
"v2ray.com/core/features/outbound"
. "v2ray.com/core/v4/app/proxyman/outbound"
"v2ray.com/core/v4/features/outbound"
)
func TestInterfaces(t *testing.T) {
app/proxyman/outbound/outbound.go
+5 -5
View File
@@ -7,11 +7,11 @@ import (
"strings"
"sync"
"v2ray.com/core"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/features/outbound"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/proxyman"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/features/outbound"
)
// Manager is to manage all outbound handlers.
app/proxyman/proxyman.go
+1 -1
View File
@@ -4,7 +4,7 @@ package proxyman
import (
"context"
"v2ray.com/core/common/session"
"v2ray.com/core/v4/common/session"
)
// ContextWithSniffingConfig is a wrapper of session.ContextWithContent.
app/reverse/bridge.go
+7 -7
View File
@@ -7,13 +7,13 @@ import (
"time"
"github.com/golang/protobuf/proto"
"v2ray.com/core/common/mux"
"v2ray.com/core/common/net"
"v2ray.com/core/common/session"
"v2ray.com/core/common/task"
"v2ray.com/core/features/routing"
"v2ray.com/core/transport"
"v2ray.com/core/transport/pipe"
"v2ray.com/core/v4/common/mux"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/common/task"
"v2ray.com/core/v4/features/routing"
"v2ray.com/core/v4/transport"
"v2ray.com/core/v4/transport/pipe"
)
// Bridge is a component in reverse proxy, that relays connections from Portal to local address.
app/reverse/config.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"crypto/rand"
"io"
"v2ray.com/core/common/dice"
"v2ray.com/core/v4/common/dice"
)
func (c *Control) FillInRandom() {
app/reverse/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package reverse
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/reverse/portal.go
+9 -9
View File
@@ -8,15 +8,15 @@ import (
"time"
"github.com/golang/protobuf/proto"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/mux"
"v2ray.com/core/common/net"
"v2ray.com/core/common/session"
"v2ray.com/core/common/task"
"v2ray.com/core/features/outbound"
"v2ray.com/core/transport"
"v2ray.com/core/transport/pipe"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/common/mux"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/common/task"
"v2ray.com/core/v4/features/outbound"
"v2ray.com/core/v4/transport"
"v2ray.com/core/v4/transport/pipe"
)
type Portal struct {
app/reverse/portal_test.go
+2 -2
View File
@@ -3,8 +3,8 @@ package reverse_test
import (
"testing"
"v2ray.com/core/app/reverse"
"v2ray.com/core/common"
"v2ray.com/core/v4/app/reverse"
"v2ray.com/core/v4/common"
)
func TestStaticPickerEmpty(t *testing.T) {
app/reverse/reverse.go
+6 -6
View File
@@ -7,12 +7,12 @@ package reverse
import (
"context"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/net"
"v2ray.com/core/features/outbound"
"v2ray.com/core/features/routing"
"v2ray.com/core/v4"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/features/outbound"
"v2ray.com/core/v4/features/routing"
)
const (
app/router/balancing.go
+2 -2
View File
@@ -3,8 +3,8 @@
package router
import (
"v2ray.com/core/common/dice"
"v2ray.com/core/features/outbound"
"v2ray.com/core/v4/common/dice"
"v2ray.com/core/v4/features/outbound"
)
type BalancingStrategy interface {
app/router/condition.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"go.starlark.net/starlark"
"go.starlark.net/syntax"
"v2ray.com/core/common/net"
"v2ray.com/core/common/strmatcher"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/strmatcher"
)
type Condition interface {
app/router/condition_geoip.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"encoding/binary"
"sort"
"v2ray.com/core/common/net"
"v2ray.com/core/v4/common/net"
)
type ipv6 struct {
app/router/condition_geoip_test.go
+5 -5
View File
@@ -6,11 +6,11 @@ import (
"testing"
proto "github.com/golang/protobuf/proto"
"v2ray.com/core/app/router"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/platform"
"v2ray.com/core/common/platform/filesystem"
"v2ray.com/core/v4/app/router"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/platform"
"v2ray.com/core/v4/common/platform/filesystem"
)
func init() {
app/router/condition_test.go
+9 -9
View File
@@ -8,15 +8,15 @@ import (
proto "github.com/golang/protobuf/proto"
. "v2ray.com/core/app/router"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/net"
"v2ray.com/core/common/platform"
"v2ray.com/core/common/platform/filesystem"
"v2ray.com/core/common/protocol"
"v2ray.com/core/common/protocol/http"
"v2ray.com/core/common/session"
. "v2ray.com/core/v4/app/router"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/platform"
"v2ray.com/core/v4/common/platform/filesystem"
"v2ray.com/core/v4/common/protocol"
"v2ray.com/core/v4/common/protocol/http"
"v2ray.com/core/v4/common/session"
)
func init() {
app/router/config.go
+2 -2
View File
@@ -3,8 +3,8 @@
package router
import (
"v2ray.com/core/common/net"
"v2ray.com/core/features/outbound"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/features/outbound"
)
// CIDRList is an alias of []*CIDR to provide sort.Interface.
app/router/config.pb.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
net "v2ray.com/core/common/net"
net "v2ray.com/core/v4/common/net"
)
// Reference imports to suppress errors if they are not otherwise used.
app/router/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package router
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/router/router.go
+7 -7
View File
@@ -7,13 +7,13 @@ package router
import (
"context"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/session"
"v2ray.com/core/features/dns"
"v2ray.com/core/features/outbound"
"v2ray.com/core/features/routing"
"v2ray.com/core/v4"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/features/dns"
"v2ray.com/core/v4/features/outbound"
"v2ray.com/core/v4/features/routing"
)
func init() {
app/router/router_test.go
+6 -6
View File
@@ -5,12 +5,12 @@ import (
"testing"
"github.com/golang/mock/gomock"
. "v2ray.com/core/app/router"
"v2ray.com/core/common"
"v2ray.com/core/common/net"
"v2ray.com/core/common/session"
"v2ray.com/core/features/outbound"
"v2ray.com/core/testing/mocks"
. "v2ray.com/core/v4/app/router"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/common/session"
"v2ray.com/core/v4/features/outbound"
"v2ray.com/core/v4/testing/mocks"
)
type mockOutboundManager struct {
app/stats/command/command.go
+5 -5
View File
@@ -11,11 +11,11 @@ import (
grpc "google.golang.org/grpc"
"v2ray.com/core"
"v2ray.com/core/app/stats"
"v2ray.com/core/common"
"v2ray.com/core/common/strmatcher"
feature_stats "v2ray.com/core/features/stats"
"v2ray.com/core/v4"
"v2ray.com/core/v4/app/stats"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/strmatcher"
feature_stats "v2ray.com/core/v4/features/stats"
)
// statsServer is an implementation of StatsService.
app/stats/command/command_test.go
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"v2ray.com/core/app/stats"
. "v2ray.com/core/app/stats/command"
"v2ray.com/core/common"
"v2ray.com/core/v4/app/stats"
. "v2ray.com/core/v4/app/stats/command"
"v2ray.com/core/v4/common"
)
func TestGetStats(t *testing.T) {
app/stats/command/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package command
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/stats/config.go
+1 -1
View File
@@ -5,7 +5,7 @@ package stats
import (
"context"
"v2ray.com/core/common"
"v2ray.com/core/v4/common"
)
func init() {
app/stats/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package stats
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
app/stats/stats.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"sync"
"sync/atomic"
"v2ray.com/core/features/stats"
"v2ray.com/core/v4/features/stats"
)
// Counter is an implementation of stats.Counter.
app/stats/stats_test.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"context"
"testing"
. "v2ray.com/core/app/stats"
"v2ray.com/core/common"
"v2ray.com/core/features/stats"
. "v2ray.com/core/v4/app/stats"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/features/stats"
)
func TestInternface(t *testing.T) {
common/bitmask/byte_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package bitmask_test
import (
"testing"
. "v2ray.com/core/common/bitmask"
. "v2ray.com/core/v4/common/bitmask"
)
func TestBitmaskByte(t *testing.T) {
common/buf/buffer.go
+1 -1
View File
@@ -3,7 +3,7 @@ package buf
import (
"io"
"v2ray.com/core/common/bytespool"
"v2ray.com/core/v4/common/bytespool"
)
const (
common/buf/buffer_test.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"v2ray.com/core/common"
. "v2ray.com/core/common/buf"
"v2ray.com/core/v4/common"
. "v2ray.com/core/v4/common/buf"
)
func TestBufferClear(t *testing.T) {
common/buf/copy.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"io"
"time"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/signal"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/common/signal"
)
type dataHandler func(MultiBuffer)
common/buf/copy_test.go
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"github.com/golang/mock/gomock"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/errors"
"v2ray.com/core/testing/mocks"
"v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/testing/mocks"
)
func TestReadError(t *testing.T) {
common/buf/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package buf
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
common/buf/io_test.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"io"
"testing"
. "v2ray.com/core/common/buf"
"v2ray.com/core/common/net"
"v2ray.com/core/testing/servers/tcp"
. "v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/common/net"
"v2ray.com/core/v4/testing/servers/tcp"
)
func TestWriterCreation(t *testing.T) {
common/buf/multi_buffer.go
+3 -3
View File
@@ -3,9 +3,9 @@ package buf
import (
"io"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/serial"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/common/serial"
)
// ReadAllToBytes reads all content from the reader into a byte array, until EOF.
common/buf/multi_buffer_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/google/go-cmp/cmp"
"v2ray.com/core/common"
. "v2ray.com/core/common/buf"
"v2ray.com/core/v4/common"
. "v2ray.com/core/v4/common/buf"
)
func TestMultiBufferRead(t *testing.T) {
common/buf/reader.go
+2 -2
View File
@@ -3,8 +3,8 @@ package buf
import (
"io"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/errors"
)
func readOneUDP(r io.Reader) (*Buffer, error) {
common/buf/reader_test.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strings"
"testing"
"v2ray.com/core/common"
. "v2ray.com/core/common/buf"
"v2ray.com/core/transport/pipe"
"v2ray.com/core/v4/common"
. "v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/transport/pipe"
)
func TestBytesReaderWriteTo(t *testing.T) {
common/buf/readv_reader.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"runtime"
"syscall"
"v2ray.com/core/common/platform"
"v2ray.com/core/v4/common/platform"
)
type allocStrategy struct {
common/buf/readv_test.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
"github.com/google/go-cmp/cmp"
"golang.org/x/sync/errgroup"
"v2ray.com/core/common"
. "v2ray.com/core/common/buf"
"v2ray.com/core/testing/servers/tcp"
"v2ray.com/core/v4/common"
. "v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/testing/servers/tcp"
)
func TestReadvReader(t *testing.T) {
common/buf/writer.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net"
"sync"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/errors"
)
// BufferToBytesWriter is a Writer that writes alloc.Buffer into underlying writer.
common/buf/writer_test.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/google/go-cmp/cmp"
"v2ray.com/core/common"
. "v2ray.com/core/common/buf"
"v2ray.com/core/transport/pipe"
"v2ray.com/core/v4/common"
. "v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/transport/pipe"
)
func TestWriter(t *testing.T) {
common/common.go
+1 -1
View File
@@ -2,7 +2,7 @@
// See each sub-package for detail.
package common
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
//go:generate errorgen
common/common_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"errors"
"testing"
. "v2ray.com/core/common"
. "v2ray.com/core/v4/common"
)
func TestMust(t *testing.T) {
common/crypto/aes.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"crypto/aes"
"crypto/cipher"
"v2ray.com/core/common"
"v2ray.com/core/v4/common"
)
// NewAesDecryptionStream creates a new AES encryption stream based on given key and IV.
common/crypto/auth.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"io"
"math/rand"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/bytespool"
"v2ray.com/core/common/protocol"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
"v2ray.com/core/v4/common/bytespool"
"v2ray.com/core/v4/common/protocol"
)
type BytesGenerator func() []byte
common/crypto/auth_test.go
+4 -4
View File
@@ -10,10 +10,10 @@ import (
"github.com/google/go-cmp/cmp"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
. "v2ray.com/core/common/crypto"
"v2ray.com/core/common/protocol"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
. "v2ray.com/core/v4/common/crypto"
"v2ray.com/core/v4/common/protocol"
)
func TestAuthenticationReaderWriter(t *testing.T) {
common/crypto/benchmark_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"crypto/cipher"
"testing"
. "v2ray.com/core/common/crypto"
. "v2ray.com/core/v4/common/crypto"
)
const benchSize = 1024 * 1024
common/crypto/chacha20.go
+1 -1
View File
@@ -3,7 +3,7 @@ package crypto
import (
"crypto/cipher"
"v2ray.com/core/common/crypto/internal"
"v2ray.com/core/v4/common/crypto/internal"
)
// NewChaCha20Stream creates a new Chacha20 encryption/descryption stream based on give key and IV.
common/crypto/chacha20_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/google/go-cmp/cmp"
"v2ray.com/core/common"
. "v2ray.com/core/common/crypto"
"v2ray.com/core/v4/common"
. "v2ray.com/core/v4/common/crypto"
)
func mustDecodeHex(s string) []byte {
common/crypto/chunk.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"encoding/binary"
"io"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
)
// ChunkSizeDecoder is a utility class to decode size value from bytes.
common/crypto/chunk_test.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"io"
"testing"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
. "v2ray.com/core/common/crypto"
"v2ray.com/core/v4/common"
"v2ray.com/core/v4/common/buf"
. "v2ray.com/core/v4/common/crypto"
)
func TestChunkStreamIO(t *testing.T) {
common/crypto/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package crypto
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
common/crypto/io.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"crypto/cipher"
"io"
"v2ray.com/core/common/buf"
"v2ray.com/core/v4/common/buf"
)
type CryptionReader struct {
common/dice/dice_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"math/rand"
"testing"
. "v2ray.com/core/common/dice"
. "v2ray.com/core/v4/common/dice"
)
func BenchmarkRoll1(b *testing.B) {
common/errors.generated.go
+1 -1
View File
@@ -1,6 +1,6 @@
package common
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
type errPathObjHolder struct{}
common/errors/errors.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"reflect"
"strings"
"v2ray.com/core/common/log"
"v2ray.com/core/common/serial"
"v2ray.com/core/v4/common/log"
"v2ray.com/core/v4/common/serial"
)
type hasInnerError interface {
common/errors/errors_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/google/go-cmp/cmp"
. "v2ray.com/core/common/errors"
"v2ray.com/core/common/log"
. "v2ray.com/core/v4/common/errors"
"v2ray.com/core/v4/common/log"
)
func TestError(t *testing.T) {
common/interfaces.go
+1 -1
View File
@@ -1,6 +1,6 @@
package common
import "v2ray.com/core/common/errors"
import "v2ray.com/core/v4/common/errors"
// Closable is the interface for objects that can release its resources.
//
common/log/access.go
+1 -1
View File
@@ -3,7 +3,7 @@ package log
import (
"strings"
"v2ray.com/core/common/serial"
"v2ray.com/core/v4/common/serial"
)
type AccessStatus string

Some files were not shown because too many files have changed in this diff Show More