diff --git a/.github/linters/.golangci.yml b/.github/linters/.golangci.yml index de49f0198..7ef370942 100644 --- a/.github/linters/.golangci.yml +++ b/.github/linters/.golangci.yml @@ -4,7 +4,7 @@ run: - generated.* issues: - new: true + new: false exclude-rules: - linters: - staticcheck diff --git a/app/browserforwarder/config.pb.go b/app/browserforwarder/config.pb.go index b40cadaab..693d02c71 100644 --- a/app/browserforwarder/config.pb.go +++ b/app/browserforwarder/config.pb.go @@ -7,7 +7,7 @@ package browserforwarder import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -97,7 +97,7 @@ var file_app_browserforwarder_config_proto_rawDesc = []byte{ 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x62, 0x72, 0x6f, 0x77, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x72, 0xaa, 0x02, 0x1f, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x72, 0x62, 0x06, diff --git a/app/browserforwarder/config.proto b/app/browserforwarder/config.proto index 0f5bfd774..983e24e80 100644 --- a/app/browserforwarder/config.proto +++ b/app/browserforwarder/config.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package v2ray.core.app.browserforwarder; option csharp_namespace = "V2Ray.Core.App.Browserforwarder"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/browserforwarder"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/browserforwarder"; option java_package = "com.v2ray.core.app.browserforwarder"; option java_multiple_files = true; diff --git a/app/browserforwarder/errors.generated.go b/app/browserforwarder/errors.generated.go index 3cb13350a..916628729 100644 --- a/app/browserforwarder/errors.generated.go +++ b/app/browserforwarder/errors.generated.go @@ -1,6 +1,6 @@ package browserforwarder -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/browserforwarder/forwarder.go b/app/browserforwarder/forwarder.go index a8c7bb8cc..771e9419c 100644 --- a/app/browserforwarder/forwarder.go +++ b/app/browserforwarder/forwarder.go @@ -10,14 +10,14 @@ import ( "github.com/v2fly/BrowserBridge/handler" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform/securedload" - "github.com/v2fly/v2ray-core/v4/features/extension" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform/securedload" + "github.com/v2fly/v2ray-core/v5/features/extension" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type Forwarder struct { ctx context.Context diff --git a/app/commander/commander.go b/app/commander/commander.go index 2d98da2e7..8b1ca61aa 100644 --- a/app/commander/commander.go +++ b/app/commander/commander.go @@ -1,6 +1,6 @@ package commander -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -9,12 +9,12 @@ import ( "google.golang.org/grpc" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/infra/conf/v5cfg" ) // Commander is a V2Ray feature that provides gRPC methods to external clients. diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go index 8c1be642c..1dfb89cf5 100644 --- a/app/commander/config.pb.go +++ b/app/commander/config.pb.go @@ -7,7 +7,7 @@ package commander import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -202,7 +202,7 @@ var file_app_commander_config_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, - 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, + 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0xaa, 0x02, 0x18, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, diff --git a/app/commander/config.proto b/app/commander/config.proto index 1d3fd0daf..9a17b91e3 100644 --- a/app/commander/config.proto +++ b/app/commander/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.commander; option csharp_namespace = "V2Ray.Core.App.Commander"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/commander"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/commander"; option java_package = "com.v2ray.core.app.commander"; option java_multiple_files = true; diff --git a/app/commander/errors.generated.go b/app/commander/errors.generated.go index 972bdd518..8ad658304 100644 --- a/app/commander/errors.generated.go +++ b/app/commander/errors.generated.go @@ -1,6 +1,6 @@ package commander -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/commander/outbound.go b/app/commander/outbound.go index 638640843..c7dde67e6 100644 --- a/app/commander/outbound.go +++ b/app/commander/outbound.go @@ -4,10 +4,10 @@ import ( "context" "sync" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/transport" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/transport" ) // OutboundListener is a net.Listener for listening gRPC connections. diff --git a/app/commander/service.go b/app/commander/service.go index b34b0a229..0ea35d25e 100644 --- a/app/commander/service.go +++ b/app/commander/service.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/reflection" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) // Service is a Commander service. diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go index 81ab4cc32..2f2f21c37 100644 --- a/app/dispatcher/config.pb.go +++ b/app/dispatcher/config.pb.go @@ -122,7 +122,7 @@ var file_app_dispatcher_config_proto_rawDesc = []byte{ 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, - 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, + 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0xaa, 0x02, 0x19, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/dispatcher/config.proto b/app/dispatcher/config.proto index 9e6295abd..ddb7dd161 100644 --- a/app/dispatcher/config.proto +++ b/app/dispatcher/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.dispatcher; option csharp_namespace = "V2Ray.Core.App.Dispatcher"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/dispatcher"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/dispatcher"; option java_package = "com.v2ray.core.app.dispatcher"; option java_multiple_files = true; diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go index 50058e76f..557b5151d 100644 --- a/app/dispatcher/default.go +++ b/app/dispatcher/default.go @@ -1,6 +1,6 @@ package dispatcher -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -8,20 +8,20 @@ import ( "sync" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - routing_session "github.com/v2fly/v2ray-core/v4/features/routing/session" - "github.com/v2fly/v2ray-core/v4/features/stats" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + routing_session "github.com/v2fly/v2ray-core/v5/features/routing/session" + "github.com/v2fly/v2ray-core/v5/features/stats" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) var errSniffingTimeout = newError("timeout on sniffing") diff --git a/app/dispatcher/dispatcher.go b/app/dispatcher/dispatcher.go index 4404aee9b..22b7bb057 100644 --- a/app/dispatcher/dispatcher.go +++ b/app/dispatcher/dispatcher.go @@ -1,3 +1,3 @@ package dispatcher -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/app/dispatcher/errors.generated.go b/app/dispatcher/errors.generated.go index b0b0ed878..9484980e5 100644 --- a/app/dispatcher/errors.generated.go +++ b/app/dispatcher/errors.generated.go @@ -1,6 +1,6 @@ package dispatcher -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/dispatcher/fakednssniffer.go b/app/dispatcher/fakednssniffer.go index 9f9cfbd7d..8c0909206 100644 --- a/app/dispatcher/fakednssniffer.go +++ b/app/dispatcher/fakednssniffer.go @@ -7,11 +7,11 @@ import ( "context" "strings" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/dns" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/dns" ) // newFakeDNSSniffer Creates a Fake DNS metadata sniffer diff --git a/app/dispatcher/sniffer.go b/app/dispatcher/sniffer.go index 72ba883cc..b08397bef 100644 --- a/app/dispatcher/sniffer.go +++ b/app/dispatcher/sniffer.go @@ -3,12 +3,12 @@ package dispatcher import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/bittorrent" - "github.com/v2fly/v2ray-core/v4/common/protocol/http" - "github.com/v2fly/v2ray-core/v4/common/protocol/quic" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/bittorrent" + "github.com/v2fly/v2ray-core/v5/common/protocol/http" + "github.com/v2fly/v2ray-core/v5/common/protocol/quic" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls" ) type SniffResult interface { diff --git a/app/dispatcher/stats.go b/app/dispatcher/stats.go index 33ad54560..ec62f8c57 100644 --- a/app/dispatcher/stats.go +++ b/app/dispatcher/stats.go @@ -1,9 +1,9 @@ package dispatcher import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/features/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/features/stats" ) type SizeStatWriter struct { diff --git a/app/dispatcher/stats_test.go b/app/dispatcher/stats_test.go index 841b2d873..b7b089475 100644 --- a/app/dispatcher/stats_test.go +++ b/app/dispatcher/stats_test.go @@ -3,9 +3,9 @@ package dispatcher_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" + . "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" ) type TestCounter int64 diff --git a/app/dns/config.go b/app/dns/config.go index 4d9c68f76..b960a8473 100644 --- a/app/dns/config.go +++ b/app/dns/config.go @@ -4,9 +4,9 @@ package dns import ( - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/strmatcher" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) var typeMap = map[DomainMatchingType]strmatcher.Type{ diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go index 2987768c7..450d4b2b9 100644 --- a/app/dns/config.pb.go +++ b/app/dns/config.pb.go @@ -7,9 +7,9 @@ package dns import ( - routercommon "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + routercommon "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -1090,7 +1090,7 @@ var file_app_dns_config_proto_rawDesc = []byte{ 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x64, 0x6e, 0x73, 0x50, 0x01, 0x5a, 0x26, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0xaa, 0x02, 0x12, 0x56, 0x32, 0x52, 0x61, + 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0xaa, 0x02, 0x12, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/app/dns/config.proto b/app/dns/config.proto index 575661a72..21e16d6f2 100644 --- a/app/dns/config.proto +++ b/app/dns/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.dns; option csharp_namespace = "V2Ray.Core.App.Dns"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/dns"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/dns"; option java_package = "com.v2ray.core.app.dns"; option java_multiple_files = true; diff --git a/app/dns/dns.go b/app/dns/dns.go index b7c4f59e5..aa1e4a776 100644 --- a/app/dns/dns.go +++ b/app/dns/dns.go @@ -4,7 +4,7 @@ // Package dns is an implementation of core.DNS feature. package dns -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -12,17 +12,17 @@ import ( "strings" "sync" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/strmatcher" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" ) // DNS is a DNS rely server. diff --git a/app/dns/dns_test.go b/app/dns/dns_test.go index 2b461b95a..9ec5c9c8a 100644 --- a/app/dns/dns_test.go +++ b/app/dns/dns_test.go @@ -8,19 +8,19 @@ import ( "github.com/miekg/dns" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - . "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/app/policy" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - feature_dns "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + . "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/app/policy" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + feature_dns "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" ) type staticHandler struct{} diff --git a/app/dns/dnscommon.go b/app/dns/dnscommon.go index ca7413fcf..64c9d598a 100644 --- a/app/dns/dnscommon.go +++ b/app/dns/dnscommon.go @@ -7,10 +7,10 @@ import ( "golang.org/x/net/dns/dnsmessage" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" ) // Fqdn normalizes domain make sure it ends with '.' diff --git a/app/dns/dnscommon_test.go b/app/dns/dnscommon_test.go index 1e195b74a..0fce61ddc 100644 --- a/app/dns/dnscommon_test.go +++ b/app/dns/dnscommon_test.go @@ -9,9 +9,9 @@ import ( "github.com/miekg/dns" "golang.org/x/net/dns/dnsmessage" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" ) func Test_parseResponse(t *testing.T) { diff --git a/app/dns/errors.generated.go b/app/dns/errors.generated.go index 438eb646e..e69b94752 100644 --- a/app/dns/errors.generated.go +++ b/app/dns/errors.generated.go @@ -1,6 +1,6 @@ package dns -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/dns/fakedns/errors.generated.go b/app/dns/fakedns/errors.generated.go index c03d2a865..0668dbe47 100644 --- a/app/dns/fakedns/errors.generated.go +++ b/app/dns/fakedns/errors.generated.go @@ -1,6 +1,6 @@ package fakedns -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/dns/fakedns/fake.go b/app/dns/fakedns/fake.go index bd09f5841..124de4abc 100644 --- a/app/dns/fakedns/fake.go +++ b/app/dns/fakedns/fake.go @@ -9,10 +9,10 @@ import ( "math/big" gonet "net" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/cache" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/cache" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/dns" ) type Holder struct { diff --git a/app/dns/fakedns/fakedns.go b/app/dns/fakedns/fakedns.go index ee4ce59e0..1b38b903a 100644 --- a/app/dns/fakedns/fakedns.go +++ b/app/dns/fakedns/fakedns.go @@ -3,4 +3,4 @@ package fakedns -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/app/dns/fakedns/fakedns.pb.go b/app/dns/fakedns/fakedns.pb.go index 0c583fb27..af540e1e9 100644 --- a/app/dns/fakedns/fakedns.pb.go +++ b/app/dns/fakedns/fakedns.pb.go @@ -7,7 +7,7 @@ package fakedns import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -149,7 +149,7 @@ var file_app_dns_fakedns_fakedns_proto_rawDesc = []byte{ 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, - 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0x2f, 0x66, 0x61, 0x6b, 0x65, + 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0x2f, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/dns/fakedns/fakedns.proto b/app/dns/fakedns/fakedns.proto index 411635400..eb6683ec0 100644 --- a/app/dns/fakedns/fakedns.proto +++ b/app/dns/fakedns/fakedns.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.dns.fakedns; option csharp_namespace = "V2Ray.Core.App.Dns.Fakedns"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/dns/fakedns"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/dns/fakedns"; option java_package = "com.v2ray.core.app.dns.fakedns"; option java_multiple_files = true; diff --git a/app/dns/fakedns/fakedns_test.go b/app/dns/fakedns/fakedns_test.go index b36747cdb..48defb83f 100644 --- a/app/dns/fakedns/fakedns_test.go +++ b/app/dns/fakedns/fakedns_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) func TestNewFakeDnsHolder(_ *testing.T) { diff --git a/app/dns/hosts.go b/app/dns/hosts.go index 82a53d684..2032ee1a1 100644 --- a/app/dns/hosts.go +++ b/app/dns/hosts.go @@ -1,11 +1,11 @@ package dns import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/strmatcher" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/dns" ) // StaticHosts represents static domain-ip mapping in DNS server. diff --git a/app/dns/hosts_test.go b/app/dns/hosts_test.go index 64790f7e4..bb6a0dc6f 100644 --- a/app/dns/hosts_test.go +++ b/app/dns/hosts_test.go @@ -5,10 +5,10 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/dns" + . "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/dns" ) func TestStaticHosts(t *testing.T) { diff --git a/app/dns/nameserver.go b/app/dns/nameserver.go index 25c8fb951..a47a7e82b 100644 --- a/app/dns/nameserver.go +++ b/app/dns/nameserver.go @@ -6,13 +6,13 @@ import ( "strings" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/strmatcher" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/routing" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/routing" ) // Server is the interface for Name Server. diff --git a/app/dns/nameserver_doh.go b/app/dns/nameserver_doh.go index fc6d30588..63809ac1f 100644 --- a/app/dns/nameserver_doh.go +++ b/app/dns/nameserver_doh.go @@ -16,15 +16,15 @@ import ( "golang.org/x/net/dns/dnsmessage" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/dns" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/pubsub" - "github.com/v2fly/v2ray-core/v4/common/task" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/dns" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/pubsub" + "github.com/v2fly/v2ray-core/v5/common/task" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // DoHNameServer implemented DNS over HTTPS (RFC8484) Wire Format, diff --git a/app/dns/nameserver_doh_test.go b/app/dns/nameserver_doh_test.go index 535d150f4..f53effb43 100644 --- a/app/dns/nameserver_doh_test.go +++ b/app/dns/nameserver_doh_test.go @@ -8,10 +8,10 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" + . "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" ) func TestDoHLocalNameServer(t *testing.T) { diff --git a/app/dns/nameserver_fakedns.go b/app/dns/nameserver_fakedns.go index 92ab1e5a8..1b81fd0cc 100644 --- a/app/dns/nameserver_fakedns.go +++ b/app/dns/nameserver_fakedns.go @@ -6,9 +6,9 @@ package dns import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/dns" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/dns" ) type FakeDNSServer struct { diff --git a/app/dns/nameserver_local.go b/app/dns/nameserver_local.go index 49afcce31..c03ddf972 100644 --- a/app/dns/nameserver_local.go +++ b/app/dns/nameserver_local.go @@ -6,9 +6,9 @@ package dns import ( "context" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/dns/localdns" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/dns/localdns" ) // LocalNameServer is an wrapper over local DNS feature. diff --git a/app/dns/nameserver_local_test.go b/app/dns/nameserver_local_test.go index b7c6e266d..ea00e0b09 100644 --- a/app/dns/nameserver_local_test.go +++ b/app/dns/nameserver_local_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - . "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/dns" + . "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/dns" ) func TestLocalNameServer(t *testing.T) { diff --git a/app/dns/nameserver_quic.go b/app/dns/nameserver_quic.go index 122ecef93..a84b5989b 100644 --- a/app/dns/nameserver_quic.go +++ b/app/dns/nameserver_quic.go @@ -11,15 +11,15 @@ import ( "golang.org/x/net/dns/dnsmessage" "golang.org/x/net/http2" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/dns" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/pubsub" - "github.com/v2fly/v2ray-core/v4/common/task" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/dns" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/pubsub" + "github.com/v2fly/v2ray-core/v5/common/task" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) // NextProtoDQ - During connection establishment, DNS/QUIC support is indicated diff --git a/app/dns/nameserver_quic_test.go b/app/dns/nameserver_quic_test.go index 880e626d0..4bf1d1595 100644 --- a/app/dns/nameserver_quic_test.go +++ b/app/dns/nameserver_quic_test.go @@ -8,10 +8,10 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" + . "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" ) func TestQUICNameServer(t *testing.T) { diff --git a/app/dns/nameserver_tcp.go b/app/dns/nameserver_tcp.go index ff34509c1..8348dc7ee 100644 --- a/app/dns/nameserver_tcp.go +++ b/app/dns/nameserver_tcp.go @@ -14,16 +14,16 @@ import ( "golang.org/x/net/dns/dnsmessage" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/dns" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/pubsub" - "github.com/v2fly/v2ray-core/v4/common/task" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/dns" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/pubsub" + "github.com/v2fly/v2ray-core/v5/common/task" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // TCPNameServer implemented DNS over TCP (RFC7766). diff --git a/app/dns/nameserver_tcp_test.go b/app/dns/nameserver_tcp_test.go index a68712195..1ceaf2f6a 100644 --- a/app/dns/nameserver_tcp_test.go +++ b/app/dns/nameserver_tcp_test.go @@ -8,10 +8,10 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" + . "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" ) func TestTCPLocalNameServer(t *testing.T) { diff --git a/app/dns/nameserver_udp.go b/app/dns/nameserver_udp.go index 6610e8068..b16c344a5 100644 --- a/app/dns/nameserver_udp.go +++ b/app/dns/nameserver_udp.go @@ -12,17 +12,17 @@ import ( "golang.org/x/net/dns/dnsmessage" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/dns" - udp_proto "github.com/v2fly/v2ray-core/v4/common/protocol/udp" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/pubsub" - "github.com/v2fly/v2ray-core/v4/common/task" - dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/dns" + udp_proto "github.com/v2fly/v2ray-core/v5/common/protocol/udp" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/pubsub" + "github.com/v2fly/v2ray-core/v5/common/task" + dns_feature "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet/udp" ) // ClassicNameServer implemented traditional UDP DNS. diff --git a/app/instman/command/command.go b/app/instman/command/command.go index 465c7fe51..47d94ce65 100644 --- a/app/instman/command/command.go +++ b/app/instman/command/command.go @@ -6,9 +6,9 @@ import ( "google.golang.org/grpc" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/extension" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/extension" ) type service struct { diff --git a/app/instman/command/command.pb.go b/app/instman/command/command.pb.go index e84dcff59..f418b0010 100644 --- a/app/instman/command/command.pb.go +++ b/app/instman/command/command.pb.go @@ -7,7 +7,7 @@ package command import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -385,7 +385,7 @@ var file_app_instman_command_command_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x69, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, - 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, + 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0xaa, 0x02, 0x1e, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, diff --git a/app/instman/command/command.proto b/app/instman/command/command.proto index 383e1da88..4507badf3 100644 --- a/app/instman/command/command.proto +++ b/app/instman/command/command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.instman.command; option csharp_namespace = "V2Ray.Core.App.Instman.Command"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/instman/command"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/instman/command"; option java_package = "com.v2ray.core.app.observatory.instman"; option java_multiple_files = true; diff --git a/app/instman/command/command_grpc.pb.go b/app/instman/command/command_grpc.pb.go index 4de4d7903..db63cbb8b 100644 --- a/app/instman/command/command_grpc.pb.go +++ b/app/instman/command/command_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.17.3 +// source: app/instman/command/command.proto package command diff --git a/app/instman/config.pb.go b/app/instman/config.pb.go index 71a8b0eef..951fb40cb 100644 --- a/app/instman/config.pb.go +++ b/app/instman/config.pb.go @@ -7,7 +7,7 @@ package instman import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -73,7 +73,7 @@ var file_app_instman_config_proto_rawDesc = []byte{ 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x69, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, - 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x69, + 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x69, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0xaa, 0x02, 0x16, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/instman/config.proto b/app/instman/config.proto index 6aa6894bb..96263e6f7 100644 --- a/app/instman/config.proto +++ b/app/instman/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.instman; option csharp_namespace = "V2Ray.Core.App.Instman"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/instman"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/instman"; option java_package = "com.v2ray.core.app.instman"; option java_multiple_files = true; diff --git a/app/instman/errors.generated.go b/app/instman/errors.generated.go index 18a7601b9..2fd479f89 100644 --- a/app/instman/errors.generated.go +++ b/app/instman/errors.generated.go @@ -1,6 +1,6 @@ package instman -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/instman/instman.go b/app/instman/instman.go index e2d007f96..80ee701e1 100644 --- a/app/instman/instman.go +++ b/app/instman/instman.go @@ -3,12 +3,12 @@ package instman import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/extension" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/extension" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type InstanceMgr struct { config *Config // nolint: structcheck diff --git a/app/log/command/command.go b/app/log/command/command.go index 9fd576233..c6e4481ee 100644 --- a/app/log/command/command.go +++ b/app/log/command/command.go @@ -1,6 +1,6 @@ package command -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -8,10 +8,10 @@ import ( grpc "google.golang.org/grpc" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/common" - cmlog "github.com/v2fly/v2ray-core/v4/common/log" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/common" + cmlog "github.com/v2fly/v2ray-core/v5/common/log" ) // LoggerServer is the implemention of LoggerService diff --git a/app/log/command/command_test.go b/app/log/command/command_test.go index d8d551c87..a733bca23 100644 --- a/app/log/command/command_test.go +++ b/app/log/command/command_test.go @@ -6,15 +6,15 @@ import ( "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/log" - . "github.com/v2fly/v2ray-core/v4/app/log/command" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/inbound" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/serial" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/log" + . "github.com/v2fly/v2ray-core/v5/app/log/command" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/inbound" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/serial" ) func TestLoggerRestart(t *testing.T) { diff --git a/app/log/command/config.pb.go b/app/log/command/config.pb.go index 36720d0f3..b407c9de2 100644 --- a/app/log/command/config.pb.go +++ b/app/log/command/config.pb.go @@ -253,7 +253,7 @@ var file_app_log_command_config_proto_rawDesc = []byte{ 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x6c, 0x6f, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, - 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6c, 0x6f, 0x67, 0x2f, 0x63, 0x6f, 0x6d, + 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6c, 0x6f, 0x67, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4c, 0x6f, 0x67, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/log/command/config.proto b/app/log/command/config.proto index 3a337321e..1cc19e10a 100644 --- a/app/log/command/config.proto +++ b/app/log/command/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.log.command; option csharp_namespace = "V2Ray.Core.App.Log.Command"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/log/command"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/log/command"; option java_package = "com.v2ray.core.app.log.command"; option java_multiple_files = true; diff --git a/app/log/command/config_grpc.pb.go b/app/log/command/config_grpc.pb.go index 756c40f8f..5f0e61dec 100644 --- a/app/log/command/config_grpc.pb.go +++ b/app/log/command/config_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.17.3 +// source: app/log/command/config.proto package command diff --git a/app/log/command/errors.generated.go b/app/log/command/errors.generated.go index 3b1f040e5..668365807 100644 --- a/app/log/command/errors.generated.go +++ b/app/log/command/errors.generated.go @@ -1,6 +1,6 @@ package command -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/log/config.pb.go b/app/log/config.pb.go index 3e47ed862..8d65d6e44 100644 --- a/app/log/config.pb.go +++ b/app/log/config.pb.go @@ -7,8 +7,8 @@ package log import ( - log "github.com/v2fly/v2ray-core/v4/common/log" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + log "github.com/v2fly/v2ray-core/v5/common/log" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -229,7 +229,7 @@ var file_app_log_config_proto_rawDesc = []byte{ 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x6c, 0x6f, 0x67, 0x50, 0x01, 0x5a, 0x26, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6c, 0x6f, 0x67, 0xaa, 0x02, 0x12, 0x56, 0x32, 0x52, 0x61, + 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6c, 0x6f, 0x67, 0xaa, 0x02, 0x12, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4c, 0x6f, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/app/log/config.proto b/app/log/config.proto index 901e044c9..9f7a52326 100644 --- a/app/log/config.proto +++ b/app/log/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.log; option csharp_namespace = "V2Ray.Core.App.Log"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/log"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/log"; option java_package = "com.v2ray.core.app.log"; option java_multiple_files = true; diff --git a/app/log/errors.generated.go b/app/log/errors.generated.go index e5ffeaa3f..f2c379f7c 100644 --- a/app/log/errors.generated.go +++ b/app/log/errors.generated.go @@ -1,6 +1,6 @@ package log -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/log/log.go b/app/log/log.go index 16b3c8ebe..042e76f3f 100644 --- a/app/log/log.go +++ b/app/log/log.go @@ -1,14 +1,14 @@ package log -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "reflect" "sync" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/log" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/log" ) // Instance is a log.Handler that handles logs. diff --git a/app/log/log_creator.go b/app/log/log_creator.go index f8930d6dc..044f20103 100644 --- a/app/log/log_creator.go +++ b/app/log/log_creator.go @@ -1,8 +1,8 @@ package log import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/log" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/log" ) type HandlerCreatorOptions struct { diff --git a/app/log/log_test.go b/app/log/log_test.go index 1f5feaab1..ce3fe6a10 100644 --- a/app/log/log_test.go +++ b/app/log/log_test.go @@ -6,10 +6,10 @@ import ( "github.com/golang/mock/gomock" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/testing/mocks" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/testing/mocks" ) func TestCustomLogHandler(t *testing.T) { diff --git a/app/observatory/burst/burst.go b/app/observatory/burst/burst.go index be3bc7265..9f1ff39b7 100644 --- a/app/observatory/burst/burst.go +++ b/app/observatory/burst/burst.go @@ -5,7 +5,7 @@ import ( "time" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen const ( rttFailed = time.Duration(math.MaxInt64 - iota) diff --git a/app/observatory/burst/burstobserver.go b/app/observatory/burst/burstobserver.go index ab4ca5bef..6b462a15e 100644 --- a/app/observatory/burst/burstobserver.go +++ b/app/observatory/burst/burstobserver.go @@ -6,12 +6,12 @@ import ( "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/observatory" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/features/extension" - "github.com/v2fly/v2ray-core/v4/features/outbound" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/observatory" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/features/extension" + "github.com/v2fly/v2ray-core/v5/features/outbound" ) type Observer struct { diff --git a/app/observatory/burst/config.pb.go b/app/observatory/burst/config.pb.go index ea401f4cb..5b6e634d3 100644 --- a/app/observatory/burst/config.pb.go +++ b/app/observatory/burst/config.pb.go @@ -7,7 +7,7 @@ package burst import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -198,7 +198,7 @@ var file_app_observatory_burst_config_proto_rawDesc = []byte{ 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x62, 0x75, 0x72, 0x73, 0x74, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, - 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6f, + 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2f, 0x62, 0x75, 0x72, 0x73, 0x74, 0xaa, 0x02, 0x20, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x42, 0x75, diff --git a/app/observatory/burst/config.proto b/app/observatory/burst/config.proto index 92441f0b3..6448ffcf0 100644 --- a/app/observatory/burst/config.proto +++ b/app/observatory/burst/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.observatory.burst; option csharp_namespace = "V2Ray.Core.App.Observatory.Burst"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/observatory/burst"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/observatory/burst"; option java_package = "com.v2ray.core.app.observatory.burst"; option java_multiple_files = true; diff --git a/app/observatory/burst/errors.generated.go b/app/observatory/burst/errors.generated.go index f2eaabf39..57c08f2ac 100644 --- a/app/observatory/burst/errors.generated.go +++ b/app/observatory/burst/errors.generated.go @@ -1,6 +1,6 @@ package burst -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/observatory/burst/healthping.go b/app/observatory/burst/healthping.go index a59a61487..8e50e46e6 100644 --- a/app/observatory/burst/healthping.go +++ b/app/observatory/burst/healthping.go @@ -7,7 +7,7 @@ import ( sync "sync" "time" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common/dice" ) // HealthPingSettings holds settings for health Checker diff --git a/app/observatory/burst/healthping_result_test.go b/app/observatory/burst/healthping_result_test.go index 1b4fdc3ca..d56f1c2b9 100644 --- a/app/observatory/burst/healthping_result_test.go +++ b/app/observatory/burst/healthping_result_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/app/observatory/burst" + "github.com/v2fly/v2ray-core/v5/app/observatory/burst" ) func TestHealthPingResults(t *testing.T) { diff --git a/app/observatory/burst/ping.go b/app/observatory/burst/ping.go index 6641ecb7e..51f9bc9c4 100644 --- a/app/observatory/burst/ping.go +++ b/app/observatory/burst/ping.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet/tagged" ) type pingClient struct { diff --git a/app/observatory/command/command.go b/app/observatory/command/command.go index 50243c059..9d7e97a3e 100644 --- a/app/observatory/command/command.go +++ b/app/observatory/command/command.go @@ -3,7 +3,7 @@ package command -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -11,11 +11,11 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/grpc" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/observatory" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/extension" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/observatory" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/extension" ) type service struct { diff --git a/app/observatory/command/command.pb.go b/app/observatory/command/command.pb.go index 224df06e8..9c614b403 100644 --- a/app/observatory/command/command.pb.go +++ b/app/observatory/command/command.pb.go @@ -7,7 +7,7 @@ package command import ( - observatory "github.com/v2fly/v2ray-core/v4/app/observatory" + observatory "github.com/v2fly/v2ray-core/v5/app/observatory" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -187,7 +187,7 @@ var file_app_observatory_command_command_proto_rawDesc = []byte{ 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, - 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, + 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0xaa, 0x02, 0x22, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, diff --git a/app/observatory/command/command.proto b/app/observatory/command/command.proto index 70cd681e0..e5ff38bb6 100644 --- a/app/observatory/command/command.proto +++ b/app/observatory/command/command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.observatory.command; option csharp_namespace = "V2Ray.Core.App.Observatory.Command"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/observatory/command"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/observatory/command"; option java_package = "com.v2ray.core.app.observatory.command"; option java_multiple_files = true; diff --git a/app/observatory/command/command_grpc.pb.go b/app/observatory/command/command_grpc.pb.go index b3692fae3..917b69613 100644 --- a/app/observatory/command/command_grpc.pb.go +++ b/app/observatory/command/command_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.17.3 +// source: app/observatory/command/command.proto package command diff --git a/app/observatory/command/errors.generated.go b/app/observatory/command/errors.generated.go index 3b1f040e5..668365807 100644 --- a/app/observatory/command/errors.generated.go +++ b/app/observatory/command/errors.generated.go @@ -1,6 +1,6 @@ package command -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/observatory/config.pb.go b/app/observatory/config.pb.go index b2256d3ea..4e9422d9c 100644 --- a/app/observatory/config.pb.go +++ b/app/observatory/config.pb.go @@ -7,7 +7,7 @@ package observatory import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -513,7 +513,7 @@ var file_app_observatory_config_proto_rawDesc = []byte{ 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, - 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, + 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, diff --git a/app/observatory/config.proto b/app/observatory/config.proto index 5811796e9..1186a290c 100644 --- a/app/observatory/config.proto +++ b/app/observatory/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.observatory; option csharp_namespace = "V2Ray.Core.App.Observatory"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/observatory"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/observatory"; option java_package = "com.v2ray.core.app.observatory"; option java_multiple_files = true; diff --git a/app/observatory/errors.generated.go b/app/observatory/errors.generated.go index 05169e048..db81beb36 100644 --- a/app/observatory/errors.generated.go +++ b/app/observatory/errors.generated.go @@ -1,6 +1,6 @@ package observatory -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/observatory/explainErrors.go b/app/observatory/explainErrors.go index 00aa5261d..4f4fe118a 100644 --- a/app/observatory/explainErrors.go +++ b/app/observatory/explainErrors.go @@ -1,6 +1,6 @@ package observatory -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errorCollector struct { errors *errors.Error diff --git a/app/observatory/multiobservatory/config.pb.go b/app/observatory/multiobservatory/config.pb.go index 81c0f41c0..65da14243 100644 --- a/app/observatory/multiobservatory/config.pb.go +++ b/app/observatory/multiobservatory/config.pb.go @@ -7,8 +7,8 @@ package multiobservatory import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" - taggedfeatures "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" + taggedfeatures "github.com/v2fly/v2ray-core/v5/common/taggedfeatures" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -94,7 +94,7 @@ var file_app_observatory_multiobservatory_config_proto_rawDesc = []byte{ 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x01, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, - 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, + 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0xaa, 0x02, 0x2b, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, diff --git a/app/observatory/multiobservatory/config.proto b/app/observatory/multiobservatory/config.proto index d1a983365..216102b81 100644 --- a/app/observatory/multiobservatory/config.proto +++ b/app/observatory/multiobservatory/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.observatory.multiobservatory; option csharp_namespace = "V2Ray.Core.App.Observatory.MultiObservatory"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/observatory/multiobservatory"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/observatory/multiobservatory"; option java_package = "com.v2ray.core.app.observatory.multiObservatory"; option java_multiple_files = true; diff --git a/app/observatory/multiobservatory/multi.go b/app/observatory/multiobservatory/multi.go index aa1f7a5d0..054460f48 100644 --- a/app/observatory/multiobservatory/multi.go +++ b/app/observatory/multiobservatory/multi.go @@ -6,10 +6,10 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/extension" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/taggedfeatures" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/extension" ) type Observer struct { diff --git a/app/observatory/observatory.go b/app/observatory/observatory.go index 937bcf96f..3485e1e67 100644 --- a/app/observatory/observatory.go +++ b/app/observatory/observatory.go @@ -1,3 +1,3 @@ package observatory -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/app/observatory/observer.go b/app/observatory/observer.go index 21bb56933..690d3c525 100644 --- a/app/observatory/observer.go +++ b/app/observatory/observer.go @@ -14,15 +14,15 @@ import ( "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - v2net "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/extension" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + v2net "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/extension" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/transport/internet/tagged" ) type Observer struct { diff --git a/app/policy/config.go b/app/policy/config.go index 715c97b06..6e83bc92f 100644 --- a/app/policy/config.go +++ b/app/policy/config.go @@ -3,7 +3,7 @@ package policy import ( "time" - "github.com/v2fly/v2ray-core/v4/features/policy" + "github.com/v2fly/v2ray-core/v5/features/policy" ) // Duration converts Second to time.Duration. diff --git a/app/policy/config.pb.go b/app/policy/config.pb.go index c1bae32ab..595f03fc6 100644 --- a/app/policy/config.pb.go +++ b/app/policy/config.pb.go @@ -7,7 +7,7 @@ package policy import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -562,7 +562,7 @@ var file_app_policy_config_proto_rawDesc = []byte{ 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, - 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0xaa, + 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/app/policy/config.proto b/app/policy/config.proto index 689a5f566..42ec110cb 100644 --- a/app/policy/config.proto +++ b/app/policy/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.policy; option csharp_namespace = "V2Ray.Core.App.Policy"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/policy"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/policy"; option java_package = "com.v2ray.core.app.policy"; option java_multiple_files = true; diff --git a/app/policy/errors.generated.go b/app/policy/errors.generated.go index f320ff8cd..d54d5c11d 100644 --- a/app/policy/errors.generated.go +++ b/app/policy/errors.generated.go @@ -1,6 +1,6 @@ package policy -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/policy/manager.go b/app/policy/manager.go index 84ebda7b6..ece2b816d 100644 --- a/app/policy/manager.go +++ b/app/policy/manager.go @@ -3,8 +3,8 @@ package policy import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/policy" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/policy" ) // Instance is an instance of Policy manager. diff --git a/app/policy/manager_test.go b/app/policy/manager_test.go index a091ae2bf..da12c825d 100644 --- a/app/policy/manager_test.go +++ b/app/policy/manager_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - . "github.com/v2fly/v2ray-core/v4/app/policy" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/policy" + . "github.com/v2fly/v2ray-core/v5/app/policy" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/policy" ) func TestPolicy(t *testing.T) { diff --git a/app/policy/policy.go b/app/policy/policy.go index 8082e23fc..e5568c80f 100644 --- a/app/policy/policy.go +++ b/app/policy/policy.go @@ -1,4 +1,4 @@ // Package policy is an implementation of policy.Manager feature. package policy -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/app/proxyman/command/command.go b/app/proxyman/command/command.go index fd9a907ff..fdc013839 100644 --- a/app/proxyman/command/command.go +++ b/app/proxyman/command/command.go @@ -5,12 +5,12 @@ import ( grpc "google.golang.org/grpc" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/features/inbound" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/proxy" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/features/inbound" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/proxy" ) // InboundOperation is the interface for operations that applies to inbound handlers. diff --git a/app/proxyman/command/command.pb.go b/app/proxyman/command/command.pb.go index 543bbb961..bcda3324d 100644 --- a/app/proxyman/command/command.pb.go +++ b/app/proxyman/command/command.pb.go @@ -7,9 +7,9 @@ package command import ( - v4 "github.com/v2fly/v2ray-core/v4" - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + v5 "github.com/v2fly/v2ray-core/v5" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -123,7 +123,7 @@ type AddInboundRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Inbound *v4.InboundHandlerConfig `protobuf:"bytes,1,opt,name=inbound,proto3" json:"inbound,omitempty"` + Inbound *v5.InboundHandlerConfig `protobuf:"bytes,1,opt,name=inbound,proto3" json:"inbound,omitempty"` } func (x *AddInboundRequest) Reset() { @@ -158,7 +158,7 @@ func (*AddInboundRequest) Descriptor() ([]byte, []int) { return file_app_proxyman_command_command_proto_rawDescGZIP(), []int{2} } -func (x *AddInboundRequest) GetInbound() *v4.InboundHandlerConfig { +func (x *AddInboundRequest) GetInbound() *v5.InboundHandlerConfig { if x != nil { return x.Inbound } @@ -386,7 +386,7 @@ type AddOutboundRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Outbound *v4.OutboundHandlerConfig `protobuf:"bytes,1,opt,name=outbound,proto3" json:"outbound,omitempty"` + Outbound *v5.OutboundHandlerConfig `protobuf:"bytes,1,opt,name=outbound,proto3" json:"outbound,omitempty"` } func (x *AddOutboundRequest) Reset() { @@ -421,7 +421,7 @@ func (*AddOutboundRequest) Descriptor() ([]byte, []int) { return file_app_proxyman_command_command_proto_rawDescGZIP(), []int{8} } -func (x *AddOutboundRequest) GetOutbound() *v4.OutboundHandlerConfig { +func (x *AddOutboundRequest) GetOutbound() *v5.OutboundHandlerConfig { if x != nil { return x.Outbound } @@ -796,7 +796,7 @@ var file_app_proxyman_command_command_proto_rawDesc = []byte{ 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0x2f, 0x63, + 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0xaa, 0x02, 0x1f, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, @@ -832,9 +832,9 @@ var file_app_proxyman_command_command_proto_goTypes = []interface{}{ (*AlterOutboundResponse)(nil), // 13: v2ray.core.app.proxyman.command.AlterOutboundResponse (*Config)(nil), // 14: v2ray.core.app.proxyman.command.Config (*protocol.User)(nil), // 15: v2ray.core.common.protocol.User - (*v4.InboundHandlerConfig)(nil), // 16: v2ray.core.InboundHandlerConfig + (*v5.InboundHandlerConfig)(nil), // 16: v2ray.core.InboundHandlerConfig (*anypb.Any)(nil), // 17: google.protobuf.Any - (*v4.OutboundHandlerConfig)(nil), // 18: v2ray.core.OutboundHandlerConfig + (*v5.OutboundHandlerConfig)(nil), // 18: v2ray.core.OutboundHandlerConfig } var file_app_proxyman_command_command_proto_depIdxs = []int32{ 15, // 0: v2ray.core.app.proxyman.command.AddUserOperation.user:type_name -> v2ray.core.common.protocol.User diff --git a/app/proxyman/command/command.proto b/app/proxyman/command/command.proto index 1e9cb5cf2..7c28056d8 100644 --- a/app/proxyman/command/command.proto +++ b/app/proxyman/command/command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.proxyman.command; option csharp_namespace = "V2Ray.Core.App.Proxyman.Command"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/proxyman/command"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/proxyman/command"; option java_package = "com.v2ray.core.app.proxyman.command"; option java_multiple_files = true; diff --git a/app/proxyman/command/command_grpc.pb.go b/app/proxyman/command/command_grpc.pb.go index e0ff28902..6f6640d8a 100644 --- a/app/proxyman/command/command_grpc.pb.go +++ b/app/proxyman/command/command_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.17.3 +// source: app/proxyman/command/command.proto package command diff --git a/app/proxyman/command/doc.go b/app/proxyman/command/doc.go index dabcfaf5e..0210f7a3d 100644 --- a/app/proxyman/command/doc.go +++ b/app/proxyman/command/doc.go @@ -1,3 +1,3 @@ package command -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/app/proxyman/command/errors.generated.go b/app/proxyman/command/errors.generated.go index 3b1f040e5..668365807 100644 --- a/app/proxyman/command/errors.generated.go +++ b/app/proxyman/command/errors.generated.go @@ -1,6 +1,6 @@ package command -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go index da2cbe82e..4c4d80990 100644 --- a/app/proxyman/config.pb.go +++ b/app/proxyman/config.pb.go @@ -7,8 +7,8 @@ package proxyman import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - internet "github.com/v2fly/v2ray-core/v4/transport/internet" + net "github.com/v2fly/v2ray-core/v5/common/net" + internet "github.com/v2fly/v2ray-core/v5/transport/internet" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -850,7 +850,7 @@ var file_app_proxyman_config_proto_rawDesc = []byte{ 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0xaa, 0x02, + 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0xaa, 0x02, 0x17, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x6d, 0x61, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/app/proxyman/config.proto b/app/proxyman/config.proto index 686496be7..fd7d631e4 100644 --- a/app/proxyman/config.proto +++ b/app/proxyman/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.proxyman; option csharp_namespace = "V2Ray.Core.App.Proxyman"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/proxyman"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/proxyman"; option java_package = "com.v2ray.core.app.proxyman"; option java_multiple_files = true; diff --git a/app/proxyman/inbound/always.go b/app/proxyman/inbound/always.go index 8be2f3f18..aefc6de63 100644 --- a/app/proxyman/inbound/always.go +++ b/app/proxyman/inbound/always.go @@ -3,17 +3,17 @@ package inbound import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/stats" - "github.com/v2fly/v2ray-core/v4/proxy" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/stats" + "github.com/v2fly/v2ray-core/v5/proxy" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func getStatCounter(v *core.Instance, tag string) (stats.Counter, stats.Counter) { diff --git a/app/proxyman/inbound/dynamic.go b/app/proxyman/inbound/dynamic.go index 275033724..2c3abd1d8 100644 --- a/app/proxyman/inbound/dynamic.go +++ b/app/proxyman/inbound/dynamic.go @@ -5,14 +5,14 @@ import ( "sync" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/proxy" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/proxy" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type DynamicInboundHandler struct { diff --git a/app/proxyman/inbound/errors.generated.go b/app/proxyman/inbound/errors.generated.go index 91f661e21..2ced900b1 100644 --- a/app/proxyman/inbound/errors.generated.go +++ b/app/proxyman/inbound/errors.generated.go @@ -1,6 +1,6 @@ package inbound -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/proxyman/inbound/inbound.go b/app/proxyman/inbound/inbound.go index 54444b945..3fe5597ca 100644 --- a/app/proxyman/inbound/inbound.go +++ b/app/proxyman/inbound/inbound.go @@ -1,17 +1,17 @@ package inbound -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "sync" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/inbound" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/inbound" ) // Manager is to manage all inbound handlers. diff --git a/app/proxyman/inbound/worker.go b/app/proxyman/inbound/worker.go index eac983e7e..b2d74c892 100644 --- a/app/proxyman/inbound/worker.go +++ b/app/proxyman/inbound/worker.go @@ -6,21 +6,21 @@ import ( "sync/atomic" "time" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/features/stats" - "github.com/v2fly/v2ray-core/v4/proxy" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tcp" - "github.com/v2fly/v2ray-core/v4/transport/internet/udp" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/features/stats" + "github.com/v2fly/v2ray-core/v5/proxy" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tcp" + "github.com/v2fly/v2ray-core/v5/transport/internet/udp" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) type worker interface { diff --git a/app/proxyman/outbound/errors.generated.go b/app/proxyman/outbound/errors.generated.go index 1d0f494bd..44135e859 100644 --- a/app/proxyman/outbound/errors.generated.go +++ b/app/proxyman/outbound/errors.generated.go @@ -1,6 +1,6 @@ package outbound -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/proxyman/outbound/handler.go b/app/proxyman/outbound/handler.go index ad6d4ed13..f82db8fd2 100644 --- a/app/proxyman/outbound/handler.go +++ b/app/proxyman/outbound/handler.go @@ -3,21 +3,21 @@ package outbound import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/stats" - "github.com/v2fly/v2ray-core/v4/proxy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/stats" + "github.com/v2fly/v2ray-core/v5/proxy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) func getStatCounter(v *core.Instance, tag string) (stats.Counter, stats.Counter) { diff --git a/app/proxyman/outbound/handler_test.go b/app/proxyman/outbound/handler_test.go index 815e9d622..a609c5872 100644 --- a/app/proxyman/outbound/handler_test.go +++ b/app/proxyman/outbound/handler_test.go @@ -7,15 +7,15 @@ import ( "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/policy" - . "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" - "github.com/v2fly/v2ray-core/v4/app/stats" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/policy" + . "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound" + "github.com/v2fly/v2ray-core/v5/app/stats" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func TestInterfaces(t *testing.T) { @@ -23,7 +23,7 @@ func TestInterfaces(t *testing.T) { _ = (outbound.Manager)(new(Manager)) } -//go:linkname toContext github.com/v2fly/v2ray-core/v4.toContext +//go:linkname toContext github.com/v2fly/v2ray-core/v5.toContext func toContext(ctx context.Context, v *core.Instance) context.Context func TestOutboundWithoutStatCounter(t *testing.T) { diff --git a/app/proxyman/outbound/outbound.go b/app/proxyman/outbound/outbound.go index d771b606d..f44691a81 100644 --- a/app/proxyman/outbound/outbound.go +++ b/app/proxyman/outbound/outbound.go @@ -1,17 +1,17 @@ package outbound -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "strings" "sync" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/features/outbound" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/features/outbound" ) // Manager is to manage all outbound handlers. diff --git a/app/restfulapi/config.go b/app/restfulapi/config.go index fef0ee960..833f62ca6 100644 --- a/app/restfulapi/config.go +++ b/app/restfulapi/config.go @@ -3,7 +3,7 @@ package restfulapi import ( "context" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) func init() { diff --git a/app/restfulapi/config.pb.go b/app/restfulapi/config.pb.go index 67c5e027d..56288a3b3 100644 --- a/app/restfulapi/config.pb.go +++ b/app/restfulapi/config.pb.go @@ -7,7 +7,7 @@ package restfulapi import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -104,7 +104,7 @@ var file_app_restfulapi_config_proto_rawDesc = []byte{ 0x42, 0x61, 0x0a, 0x1a, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x72, 0x65, 0x73, 0x74, 0x61, 0x70, 0x69, 0x50, 0x01, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, - 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, + 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x72, 0x65, 0x73, 0x74, 0x66, 0x75, 0x6c, 0x61, 0x70, 0x69, 0xaa, 0x02, 0x11, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x52, 0x65, 0x73, 0x74, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/restfulapi/config.proto b/app/restfulapi/config.proto index 9d5def4a9..0407049c5 100644 --- a/app/restfulapi/config.proto +++ b/app/restfulapi/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.app.restfulapi; option csharp_namespace = "V2Ray.App.Restapi"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/restfulapi"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/restfulapi"; option java_package = "com.v2ray.core.app.restapi"; option java_multiple_files = true; diff --git a/app/restfulapi/errors.generated.go b/app/restfulapi/errors.generated.go index 34f32d6cb..84c7b5fa6 100644 --- a/app/restfulapi/errors.generated.go +++ b/app/restfulapi/errors.generated.go @@ -1,6 +1,6 @@ package restfulapi -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/restfulapi/restful_api.go b/app/restfulapi/restful_api.go index 9e1bb1e7b..40baf4867 100644 --- a/app/restfulapi/restful_api.go +++ b/app/restfulapi/restful_api.go @@ -9,9 +9,9 @@ import ( "github.com/go-chi/render" "github.com/go-playground/validator/v10" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) var validate *validator.Validate diff --git a/app/restfulapi/service.go b/app/restfulapi/service.go index 4c4234599..1c7390a6b 100644 --- a/app/restfulapi/service.go +++ b/app/restfulapi/service.go @@ -5,12 +5,12 @@ import ( "net" "sync" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/features" - feature_stats "github.com/v2fly/v2ray-core/v4/features/stats" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/features" + feature_stats "github.com/v2fly/v2ray-core/v5/features/stats" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type restfulService struct { listener net.Listener diff --git a/app/reverse/bridge.go b/app/reverse/bridge.go index a34309dee..523306252 100644 --- a/app/reverse/bridge.go +++ b/app/reverse/bridge.go @@ -6,13 +6,13 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) // Bridge is a component in reverse proxy, that relays connections from Portal to local address. diff --git a/app/reverse/config.go b/app/reverse/config.go index 8d6124d78..48de60979 100644 --- a/app/reverse/config.go +++ b/app/reverse/config.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "io" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common/dice" ) func (c *Control) FillInRandom() { diff --git a/app/reverse/config.pb.go b/app/reverse/config.pb.go index 12a7d71df..7543ec5c3 100644 --- a/app/reverse/config.pb.go +++ b/app/reverse/config.pb.go @@ -7,7 +7,7 @@ package reverse import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -326,7 +326,7 @@ var file_app_reverse_config_proto_rawDesc = []byte{ 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x72, 0x65, 0x76, 0x65, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0xaa, 0x02, 0x18, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x52, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/reverse/config.proto b/app/reverse/config.proto index 6092a5d83..ed0323388 100644 --- a/app/reverse/config.proto +++ b/app/reverse/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.reverse; option csharp_namespace = "V2Ray.Core.Proxy.Reverse"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/reverse"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/reverse"; option java_package = "com.v2ray.core.proxy.reverse"; option java_multiple_files = true; diff --git a/app/reverse/errors.generated.go b/app/reverse/errors.generated.go index 7300553a2..7b3f4e9d9 100644 --- a/app/reverse/errors.generated.go +++ b/app/reverse/errors.generated.go @@ -1,6 +1,6 @@ package reverse -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/reverse/portal.go b/app/reverse/portal.go index 02e915e76..0b8a7cf13 100644 --- a/app/reverse/portal.go +++ b/app/reverse/portal.go @@ -7,15 +7,15 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) type Portal struct { diff --git a/app/reverse/portal_test.go b/app/reverse/portal_test.go index 27bf10832..2a409bc13 100644 --- a/app/reverse/portal_test.go +++ b/app/reverse/portal_test.go @@ -3,8 +3,8 @@ package reverse_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/app/reverse" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/app/reverse" + "github.com/v2fly/v2ray-core/v5/common" ) func TestStaticPickerEmpty(t *testing.T) { diff --git a/app/reverse/reverse.go b/app/reverse/reverse.go index 3beb18ede..168533df1 100644 --- a/app/reverse/reverse.go +++ b/app/reverse/reverse.go @@ -1,16 +1,16 @@ package reverse -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/features/routing" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/features/routing" ) const ( diff --git a/app/router/balancing.go b/app/router/balancing.go index 73d3ac101..fb4123fe0 100644 --- a/app/router/balancing.go +++ b/app/router/balancing.go @@ -6,8 +6,8 @@ package router import ( "context" - "github.com/v2fly/v2ray-core/v4/features/extension" - "github.com/v2fly/v2ray-core/v4/features/outbound" + "github.com/v2fly/v2ray-core/v5/features/extension" + "github.com/v2fly/v2ray-core/v5/features/outbound" ) type BalancingStrategy interface { diff --git a/app/router/command/command.go b/app/router/command/command.go index b18a5b654..466abc413 100644 --- a/app/router/command/command.go +++ b/app/router/command/command.go @@ -1,6 +1,6 @@ package command -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -8,10 +8,10 @@ import ( "google.golang.org/grpc" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/features/stats" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/features/stats" ) // routingServer is an implementation of RoutingService. diff --git a/app/router/command/command.pb.go b/app/router/command/command.pb.go index 246722f32..647d7e759 100644 --- a/app/router/command/command.pb.go +++ b/app/router/command/command.pb.go @@ -7,8 +7,8 @@ package command import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -804,7 +804,7 @@ var file_app_router_command_command_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, - 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x72, + 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0xaa, 0x02, 0x1d, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x62, 0x06, 0x70, diff --git a/app/router/command/command.proto b/app/router/command/command.proto index 295ead10d..f705ad969 100644 --- a/app/router/command/command.proto +++ b/app/router/command/command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.router.command; option csharp_namespace = "V2Ray.Core.App.Router.Command"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/router/command"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/router/command"; option java_package = "com.v2ray.core.app.router.command"; option java_multiple_files = true; diff --git a/app/router/command/command_grpc.pb.go b/app/router/command/command_grpc.pb.go index fd6547758..9a8b04e44 100644 --- a/app/router/command/command_grpc.pb.go +++ b/app/router/command/command_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.17.3 +// source: app/router/command/command.proto package command diff --git a/app/router/command/command_test.go b/app/router/command/command_test.go index 1d305e712..db2a64528 100644 --- a/app/router/command/command_test.go +++ b/app/router/command/command_test.go @@ -11,14 +11,14 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" - "github.com/v2fly/v2ray-core/v4/app/router" - . "github.com/v2fly/v2ray-core/v4/app/router/command" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/app/stats" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/testing/mocks" + "github.com/v2fly/v2ray-core/v5/app/router" + . "github.com/v2fly/v2ray-core/v5/app/router/command" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/app/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/testing/mocks" ) func TestServiceSubscribeRoutingStats(t *testing.T) { diff --git a/app/router/command/config.go b/app/router/command/config.go index 20aa425c5..35c316ce0 100644 --- a/app/router/command/config.go +++ b/app/router/command/config.go @@ -3,8 +3,8 @@ package command import ( "strings" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/routing" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/routing" ) // routingContext is an wrapper of protobuf RoutingContext as implementation of routing.Context and routing.Route. diff --git a/app/router/command/errors.generated.go b/app/router/command/errors.generated.go index 3b1f040e5..668365807 100644 --- a/app/router/command/errors.generated.go +++ b/app/router/command/errors.generated.go @@ -1,6 +1,6 @@ package command -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/router/condition.go b/app/router/condition.go index 499d47e96..ca2e148a3 100644 --- a/app/router/condition.go +++ b/app/router/condition.go @@ -6,10 +6,10 @@ import ( "go.starlark.net/starlark" "go.starlark.net/syntax" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/strmatcher" - "github.com/v2fly/v2ray-core/v4/features/routing" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/features/routing" ) type Condition interface { diff --git a/app/router/condition_geoip.go b/app/router/condition_geoip.go index 3dd8d92d6..762caa79d 100644 --- a/app/router/condition_geoip.go +++ b/app/router/condition_geoip.go @@ -3,8 +3,8 @@ package router import ( "inet.af/netaddr" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/net" ) type GeoIPMatcher struct { diff --git a/app/router/condition_geoip_test.go b/app/router/condition_geoip_test.go index bfbef8afb..834923e46 100644 --- a/app/router/condition_geoip_test.go +++ b/app/router/condition_geoip_test.go @@ -10,11 +10,11 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" ) func init() { diff --git a/app/router/condition_test.go b/app/router/condition_test.go index 44e264f00..0e0f0a09a 100644 --- a/app/router/condition_test.go +++ b/app/router/condition_test.go @@ -11,16 +11,16 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/protocol/http" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/routing" - routing_session "github.com/v2fly/v2ray-core/v4/features/routing/session" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/protocol/http" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/routing" + routing_session "github.com/v2fly/v2ray-core/v5/features/routing/session" ) func init() { diff --git a/app/router/config.go b/app/router/config.go index c201f469d..88149caae 100644 --- a/app/router/config.go +++ b/app/router/config.go @@ -9,12 +9,12 @@ import ( "github.com/golang/protobuf/jsonpb" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/infra/conf/v5cfg" ) type Rule struct { diff --git a/app/router/config.pb.go b/app/router/config.pb.go index 9d152e341..fbb6ae8c6 100644 --- a/app/router/config.pb.go +++ b/app/router/config.pb.go @@ -7,9 +7,9 @@ package router import ( - routercommon "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + routercommon "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -1156,7 +1156,7 @@ var file_app_router_config_proto_rawDesc = []byte{ 0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, - 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, + 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/router/config.proto b/app/router/config.proto index 42720d8cf..52a3cab58 100644 --- a/app/router/config.proto +++ b/app/router/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.router; option csharp_namespace = "V2Ray.Core.App.Router"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/router"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/router"; option java_package = "com.v2ray.core.app.router"; option java_multiple_files = true; diff --git a/app/router/errors.generated.go b/app/router/errors.generated.go index 839616b18..ed13fde7e 100644 --- a/app/router/errors.generated.go +++ b/app/router/errors.generated.go @@ -1,6 +1,6 @@ package router -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/router/router.go b/app/router/router.go index 0cafdc15f..2314228c9 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -1,20 +1,20 @@ package router -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/features/routing" - routing_dns "github.com/v2fly/v2ray-core/v4/features/routing/dns" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/features/routing" + routing_dns "github.com/v2fly/v2ray-core/v5/features/routing/dns" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" ) // Router is an implementation of routing.Router. diff --git a/app/router/router_test.go b/app/router/router_test.go index 49d6efcb6..6c981fbdf 100644 --- a/app/router/router_test.go +++ b/app/router/router_test.go @@ -6,14 +6,14 @@ import ( "github.com/golang/mock/gomock" - . "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/outbound" - routing_session "github.com/v2fly/v2ray-core/v4/features/routing/session" - "github.com/v2fly/v2ray-core/v4/testing/mocks" + . "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/outbound" + routing_session "github.com/v2fly/v2ray-core/v5/features/routing/session" + "github.com/v2fly/v2ray-core/v5/testing/mocks" ) type mockOutboundManager struct { diff --git a/app/router/routercommon/common.pb.go b/app/router/routercommon/common.pb.go index 7ac0ea8f6..1a0107bf8 100644 --- a/app/router/routercommon/common.pb.go +++ b/app/router/routercommon/common.pb.go @@ -7,7 +7,7 @@ package routercommon import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -642,7 +642,7 @@ var file_app_router_routercommon_common_proto_rawDesc = []byte{ 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, - 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, + 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0xaa, 0x02, 0x22, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, diff --git a/app/router/routercommon/common.proto b/app/router/routercommon/common.proto index b957a9277..a7a456cf1 100644 --- a/app/router/routercommon/common.proto +++ b/app/router/routercommon/common.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.router.routercommon; option csharp_namespace = "V2Ray.Core.App.Router.Routercommon"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/router/routercommon"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/router/routercommon"; option java_package = "com.v2ray.core.app.router.routercommon"; option java_multiple_files = true; diff --git a/app/router/strategy_leastload.go b/app/router/strategy_leastload.go index fe34557cc..b9a7071f0 100644 --- a/app/router/strategy_leastload.go +++ b/app/router/strategy_leastload.go @@ -8,12 +8,12 @@ import ( "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/observatory" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/extension" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/observatory" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/extension" ) // LeastLoadStrategy represents a least load balancing strategy diff --git a/app/router/strategy_leastping.go b/app/router/strategy_leastping.go index 10a8b3990..184335c47 100644 --- a/app/router/strategy_leastping.go +++ b/app/router/strategy_leastping.go @@ -6,11 +6,11 @@ package router import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/observatory" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/extension" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/observatory" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/extension" ) type LeastPingStrategy struct { diff --git a/app/router/strategy_random.go b/app/router/strategy_random.go index 55c70e1fb..78a5a2b7d 100644 --- a/app/router/strategy_random.go +++ b/app/router/strategy_random.go @@ -1,8 +1,8 @@ package router import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" ) // RandomStrategy represents a random balancing strategy diff --git a/app/router/weight_test.go b/app/router/weight_test.go index 78fb69259..3e28da847 100644 --- a/app/router/weight_test.go +++ b/app/router/weight_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/v2fly/v2ray-core/v4/app/router" + "github.com/v2fly/v2ray-core/v5/app/router" ) func TestWeight(t *testing.T) { diff --git a/app/stats/channel.go b/app/stats/channel.go index 10e4490f7..29015ee04 100644 --- a/app/stats/channel.go +++ b/app/stats/channel.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) // Channel is an implementation of stats.Channel. diff --git a/app/stats/channel_test.go b/app/stats/channel_test.go index ae332ac4b..879b662ce 100644 --- a/app/stats/channel_test.go +++ b/app/stats/channel_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - . "github.com/v2fly/v2ray-core/v4/app/stats" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/stats" + . "github.com/v2fly/v2ray-core/v5/app/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/stats" ) func TestStatsChannel(t *testing.T) { diff --git a/app/stats/command/command.go b/app/stats/command/command.go index b91351b5b..1ef8c9e62 100644 --- a/app/stats/command/command.go +++ b/app/stats/command/command.go @@ -1,6 +1,6 @@ package command -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -9,11 +9,11 @@ import ( grpc "google.golang.org/grpc" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/stats" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/strmatcher" - feature_stats "github.com/v2fly/v2ray-core/v4/features/stats" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/strmatcher" + feature_stats "github.com/v2fly/v2ray-core/v5/features/stats" ) // statsServer is an implementation of StatsService. diff --git a/app/stats/command/command.pb.go b/app/stats/command/command.pb.go index bb32817d8..59e220adb 100644 --- a/app/stats/command/command.pb.go +++ b/app/stats/command/command.pb.go @@ -7,7 +7,7 @@ package command import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -575,7 +575,7 @@ var file_app_stats_command_command_proto_rawDesc = []byte{ 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, - 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x73, + 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0xaa, 0x02, 0x1c, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, diff --git a/app/stats/command/command.proto b/app/stats/command/command.proto index ea37c3729..07695a293 100644 --- a/app/stats/command/command.proto +++ b/app/stats/command/command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.stats.command; option csharp_namespace = "V2Ray.Core.App.Stats.Command"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/stats/command"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/stats/command"; option java_package = "com.v2ray.core.app.stats.command"; option java_multiple_files = true; diff --git a/app/stats/command/command_grpc.pb.go b/app/stats/command/command_grpc.pb.go index 7bf51d98b..2fe8f22d1 100644 --- a/app/stats/command/command_grpc.pb.go +++ b/app/stats/command/command_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.17.3 +// source: app/stats/command/command.proto package command diff --git a/app/stats/command/command_test.go b/app/stats/command/command_test.go index 387fd6e8b..fe41ca6ff 100644 --- a/app/stats/command/command_test.go +++ b/app/stats/command/command_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/v2fly/v2ray-core/v4/app/stats" - . "github.com/v2fly/v2ray-core/v4/app/stats/command" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/app/stats" + . "github.com/v2fly/v2ray-core/v5/app/stats/command" + "github.com/v2fly/v2ray-core/v5/common" ) func TestGetStats(t *testing.T) { diff --git a/app/stats/command/errors.generated.go b/app/stats/command/errors.generated.go index 3b1f040e5..668365807 100644 --- a/app/stats/command/errors.generated.go +++ b/app/stats/command/errors.generated.go @@ -1,6 +1,6 @@ package command -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/stats/config.pb.go b/app/stats/config.pb.go index 2b6ed8929..494af2897 100644 --- a/app/stats/config.pb.go +++ b/app/stats/config.pb.go @@ -7,7 +7,7 @@ package stats import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -143,7 +143,7 @@ var file_app_stats_config_proto_rawDesc = []byte{ 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x73, 0x50, 0x01, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, - 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x73, 0x74, + 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x73, 0xaa, 0x02, 0x14, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/app/stats/config.proto b/app/stats/config.proto index c9e029228..188ee2143 100644 --- a/app/stats/config.proto +++ b/app/stats/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.app.stats; option csharp_namespace = "V2Ray.Core.App.Stats"; -option go_package = "github.com/v2fly/v2ray-core/v4/app/stats"; +option go_package = "github.com/v2fly/v2ray-core/v5/app/stats"; option java_package = "com.v2ray.core.app.stats"; option java_multiple_files = true; diff --git a/app/stats/counter_test.go b/app/stats/counter_test.go index 80d56c206..2e1275408 100644 --- a/app/stats/counter_test.go +++ b/app/stats/counter_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - . "github.com/v2fly/v2ray-core/v4/app/stats" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/stats" + . "github.com/v2fly/v2ray-core/v5/app/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/stats" ) func TestStatsCounter(t *testing.T) { diff --git a/app/stats/errors.generated.go b/app/stats/errors.generated.go index 5ded551d1..f46092bc9 100644 --- a/app/stats/errors.generated.go +++ b/app/stats/errors.generated.go @@ -1,6 +1,6 @@ package stats -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/app/stats/stats.go b/app/stats/stats.go index 85ad12318..3828ae7d7 100644 --- a/app/stats/stats.go +++ b/app/stats/stats.go @@ -1,14 +1,14 @@ package stats -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "sync" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/features/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/features/stats" ) // Manager is an implementation of stats.Manager. diff --git a/app/stats/stats_test.go b/app/stats/stats_test.go index d6f166bb9..b27e3d37b 100644 --- a/app/stats/stats_test.go +++ b/app/stats/stats_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - . "github.com/v2fly/v2ray-core/v4/app/stats" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features/stats" + . "github.com/v2fly/v2ray-core/v5/app/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features/stats" ) func TestInterface(t *testing.T) { diff --git a/common/bitmask/byte_test.go b/common/bitmask/byte_test.go index 3bdaf8b01..687b512ee 100644 --- a/common/bitmask/byte_test.go +++ b/common/bitmask/byte_test.go @@ -3,7 +3,7 @@ package bitmask_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/bitmask" + . "github.com/v2fly/v2ray-core/v5/common/bitmask" ) func TestBitmaskByte(t *testing.T) { diff --git a/common/buf/buf.go b/common/buf/buf.go index 5d0679723..b75253b96 100644 --- a/common/buf/buf.go +++ b/common/buf/buf.go @@ -1,4 +1,4 @@ // Package buf provides a light-weight memory allocation mechanism. package buf -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/common/buf/buffer.go b/common/buf/buffer.go index fe03eb9bb..b29b0e5c7 100644 --- a/common/buf/buffer.go +++ b/common/buf/buffer.go @@ -3,7 +3,7 @@ package buf import ( "io" - "github.com/v2fly/v2ray-core/v4/common/bytespool" + "github.com/v2fly/v2ray-core/v5/common/bytespool" ) const ( diff --git a/common/buf/buffer_test.go b/common/buf/buffer_test.go index a9fc09643..75f7b7db5 100644 --- a/common/buf/buffer_test.go +++ b/common/buf/buffer_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/buf" ) func TestBufferClear(t *testing.T) { diff --git a/common/buf/copy.go b/common/buf/copy.go index 38c33028e..619639bba 100644 --- a/common/buf/copy.go +++ b/common/buf/copy.go @@ -4,8 +4,8 @@ import ( "io" "time" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/signal" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/signal" ) type dataHandler func(MultiBuffer) diff --git a/common/buf/copy_test.go b/common/buf/copy_test.go index 3da4008c4..b4bcdcc08 100644 --- a/common/buf/copy_test.go +++ b/common/buf/copy_test.go @@ -7,9 +7,9 @@ import ( "github.com/golang/mock/gomock" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/testing/mocks" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/testing/mocks" ) func TestReadError(t *testing.T) { diff --git a/common/buf/errors.generated.go b/common/buf/errors.generated.go index fd16e0c3b..5c9bc7c71 100644 --- a/common/buf/errors.generated.go +++ b/common/buf/errors.generated.go @@ -1,6 +1,6 @@ package buf -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/buf/io_test.go b/common/buf/io_test.go index dd0c8f3c9..98f20f10a 100644 --- a/common/buf/io_test.go +++ b/common/buf/io_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - . "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + . "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func TestWriterCreation(t *testing.T) { diff --git a/common/buf/multi_buffer.go b/common/buf/multi_buffer.go index bdfb0d684..7a62ec48e 100644 --- a/common/buf/multi_buffer.go +++ b/common/buf/multi_buffer.go @@ -3,9 +3,9 @@ package buf import ( "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/serial" ) // ReadAllToBytes reads all content from the reader into a byte array, until EOF. diff --git a/common/buf/multi_buffer_test.go b/common/buf/multi_buffer_test.go index cfd355235..98f803195 100644 --- a/common/buf/multi_buffer_test.go +++ b/common/buf/multi_buffer_test.go @@ -10,8 +10,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/buf" ) func TestMultiBufferRead(t *testing.T) { diff --git a/common/buf/reader.go b/common/buf/reader.go index db032ffb7..99d271476 100644 --- a/common/buf/reader.go +++ b/common/buf/reader.go @@ -3,8 +3,8 @@ package buf import ( "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" ) func readOneUDP(r io.Reader) (*Buffer, error) { diff --git a/common/buf/reader_test.go b/common/buf/reader_test.go index d9cea2769..2ef00a56e 100644 --- a/common/buf/reader_test.go +++ b/common/buf/reader_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) func TestBytesReaderWriteTo(t *testing.T) { diff --git a/common/buf/readv_reader.go b/common/buf/readv_reader.go index a1f75a489..7801e7f89 100644 --- a/common/buf/readv_reader.go +++ b/common/buf/readv_reader.go @@ -8,7 +8,7 @@ import ( "runtime" "syscall" - "github.com/v2fly/v2ray-core/v4/common/platform" + "github.com/v2fly/v2ray-core/v5/common/platform" ) type allocStrategy struct { diff --git a/common/buf/readv_test.go b/common/buf/readv_test.go index 2e8a7457c..9b08ba6b2 100644 --- a/common/buf/readv_test.go +++ b/common/buf/readv_test.go @@ -11,9 +11,9 @@ import ( "github.com/google/go-cmp/cmp" "golang.org/x/sync/errgroup" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func TestReadvReader(t *testing.T) { diff --git a/common/buf/writer.go b/common/buf/writer.go index 60ef104c0..28f7022aa 100644 --- a/common/buf/writer.go +++ b/common/buf/writer.go @@ -5,8 +5,8 @@ import ( "net" "sync" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" ) // BufferToBytesWriter is a Writer that writes alloc.Buffer into underlying writer. diff --git a/common/buf/writer_test.go b/common/buf/writer_test.go index 1e11609b1..30ece589e 100644 --- a/common/buf/writer_test.go +++ b/common/buf/writer_test.go @@ -9,9 +9,9 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) func TestWriter(t *testing.T) { diff --git a/common/cache/lru_test.go b/common/cache/lru_test.go index 0e0516f0e..90c79851d 100644 --- a/common/cache/lru_test.go +++ b/common/cache/lru_test.go @@ -3,7 +3,7 @@ package cache_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/cache" + . "github.com/v2fly/v2ray-core/v5/common/cache" ) func TestLruReplaceValue(t *testing.T) { diff --git a/common/cmdarg/arg.go b/common/cmdarg/arg.go index 4b448651a..c18869854 100644 --- a/common/cmdarg/arg.go +++ b/common/cmdarg/arg.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) // LoadArg loads one arg, maybe an remote url, or local file path diff --git a/common/cmdarg/errors.generated.go b/common/cmdarg/errors.generated.go index 098f98f46..1d069528b 100644 --- a/common/cmdarg/errors.generated.go +++ b/common/cmdarg/errors.generated.go @@ -1,6 +1,6 @@ package cmdarg -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/common.go b/common/common.go index edb9e74a6..b8bb2101b 100644 --- a/common/common.go +++ b/common/common.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/v2fly/v2ray-core/v4/common/errors" + "github.com/v2fly/v2ray-core/v5/common/errors" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen // ErrNoClue is for the situation that existing information is not enough to make a decision. For example, Router may return this error when there is no suitable route. var ErrNoClue = errors.New("not enough information for making a decision") diff --git a/common/common_test.go b/common/common_test.go index f1868bf08..23b3642ea 100644 --- a/common/common_test.go +++ b/common/common_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - . "github.com/v2fly/v2ray-core/v4/common" + . "github.com/v2fly/v2ray-core/v5/common" ) func TestMust(t *testing.T) { diff --git a/common/crypto/aes.go b/common/crypto/aes.go index 1137c5bdc..1e101e3a4 100644 --- a/common/crypto/aes.go +++ b/common/crypto/aes.go @@ -4,7 +4,7 @@ import ( "crypto/aes" "crypto/cipher" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) // NewAesDecryptionStream creates a new AES encryption stream based on given key and IV. diff --git a/common/crypto/auth.go b/common/crypto/auth.go index da30d7454..b06a2d17d 100644 --- a/common/crypto/auth.go +++ b/common/crypto/auth.go @@ -5,11 +5,11 @@ import ( "io" "math/rand" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/bytespool" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/bytespool" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) type BytesGenerator func() []byte diff --git a/common/crypto/auth_test.go b/common/crypto/auth_test.go index fbd654848..c71a54a81 100644 --- a/common/crypto/auth_test.go +++ b/common/crypto/auth_test.go @@ -10,10 +10,10 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/common/crypto" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/common/crypto" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) func TestAuthenticationReaderWriter(t *testing.T) { diff --git a/common/crypto/benchmark_test.go b/common/crypto/benchmark_test.go index 6a888eb2b..72f880f09 100644 --- a/common/crypto/benchmark_test.go +++ b/common/crypto/benchmark_test.go @@ -4,7 +4,7 @@ import ( "crypto/cipher" "testing" - . "github.com/v2fly/v2ray-core/v4/common/crypto" + . "github.com/v2fly/v2ray-core/v5/common/crypto" ) const benchSize = 1024 * 1024 diff --git a/common/crypto/chacha20.go b/common/crypto/chacha20.go index 2fe0b697f..5d768b537 100644 --- a/common/crypto/chacha20.go +++ b/common/crypto/chacha20.go @@ -3,7 +3,7 @@ package crypto import ( "crypto/cipher" - "github.com/v2fly/v2ray-core/v4/common/crypto/internal" + "github.com/v2fly/v2ray-core/v5/common/crypto/internal" ) // NewChaCha20Stream creates a new Chacha20 encryption/descryption stream based on give key and IV. diff --git a/common/crypto/chacha20_test.go b/common/crypto/chacha20_test.go index cf0e15bde..bf0155755 100644 --- a/common/crypto/chacha20_test.go +++ b/common/crypto/chacha20_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/crypto" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/crypto" ) func mustDecodeHex(s string) []byte { diff --git a/common/crypto/chunk.go b/common/crypto/chunk.go index 64410d191..ec4118452 100644 --- a/common/crypto/chunk.go +++ b/common/crypto/chunk.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" ) // ChunkSizeDecoder is a utility class to decode size value from bytes. diff --git a/common/crypto/chunk_test.go b/common/crypto/chunk_test.go index 55e4b9cca..5ef63079e 100644 --- a/common/crypto/chunk_test.go +++ b/common/crypto/chunk_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/common/crypto" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/common/crypto" ) func TestChunkStreamIO(t *testing.T) { diff --git a/common/crypto/crypto.go b/common/crypto/crypto.go index 74b5df88d..726d4f5b0 100644 --- a/common/crypto/crypto.go +++ b/common/crypto/crypto.go @@ -1,4 +1,4 @@ // Package crypto provides common crypto libraries for V2Ray. package crypto -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/common/crypto/errors.generated.go b/common/crypto/errors.generated.go index 8143bd36c..dadb16a01 100644 --- a/common/crypto/errors.generated.go +++ b/common/crypto/errors.generated.go @@ -1,6 +1,6 @@ package crypto -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/crypto/io.go b/common/crypto/io.go index 871cb8c28..b2f2c167d 100644 --- a/common/crypto/io.go +++ b/common/crypto/io.go @@ -4,7 +4,7 @@ import ( "crypto/cipher" "io" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) type CryptionReader struct { diff --git a/common/dice/dice_test.go b/common/dice/dice_test.go index b1a128b46..8c5e61bc9 100644 --- a/common/dice/dice_test.go +++ b/common/dice/dice_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - . "github.com/v2fly/v2ray-core/v4/common/dice" + . "github.com/v2fly/v2ray-core/v5/common/dice" ) func BenchmarkRoll1(b *testing.B) { diff --git a/common/drain/drain.go b/common/drain/drain.go index d48d067ae..e4c1c3803 100644 --- a/common/drain/drain.go +++ b/common/drain/drain.go @@ -2,7 +2,7 @@ package drain import "io" -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type Drainer interface { AcknowledgeReceive(size int) diff --git a/common/drain/drainer.go b/common/drain/drainer.go index e92c4363d..c8af94c46 100644 --- a/common/drain/drainer.go +++ b/common/drain/drainer.go @@ -3,7 +3,7 @@ package drain import ( "io" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common/dice" ) type BehaviorSeedLimitedDrainer struct { diff --git a/common/drain/errors.generated.go b/common/drain/errors.generated.go index 9406d35f6..0a0260abb 100644 --- a/common/drain/errors.generated.go +++ b/common/drain/errors.generated.go @@ -1,6 +1,6 @@ package drain -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/environment/app.go b/common/environment/app.go index 7d4dd081b..face9836f 100644 --- a/common/environment/app.go +++ b/common/environment/app.go @@ -1,7 +1,7 @@ package environment import ( - "github.com/v2fly/v2ray-core/v4/features/extension/storage" + "github.com/v2fly/v2ray-core/v5/features/extension/storage" ) type AppEnvironmentCapabilitySet interface { diff --git a/common/environment/base.go b/common/environment/base.go index 5635a2014..bbc5474f2 100644 --- a/common/environment/base.go +++ b/common/environment/base.go @@ -1,10 +1,10 @@ package environment import ( - "github.com/v2fly/v2ray-core/v4/common/environment/filesystemcap" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" + "github.com/v2fly/v2ray-core/v5/common/environment/filesystemcap" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tagged" ) type BaseEnvironmentCapabilitySet interface { diff --git a/common/environment/connection.go b/common/environment/connection.go index 8691b7570..1116cbe5d 100644 --- a/common/environment/connection.go +++ b/common/environment/connection.go @@ -1,6 +1,6 @@ package environment -import "github.com/v2fly/v2ray-core/v4/common/log" +import "github.com/v2fly/v2ray-core/v5/common/log" type ConnectionCapabilitySet interface { ConnectionLogCapabilitySet diff --git a/common/environment/envimpl/fs.go b/common/environment/envimpl/fs.go index 9d130a407..afb23c10c 100644 --- a/common/environment/envimpl/fs.go +++ b/common/environment/envimpl/fs.go @@ -1,9 +1,9 @@ package envimpl import ( - "github.com/v2fly/v2ray-core/v4/common/environment" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem/fsifce" + "github.com/v2fly/v2ray-core/v5/common/environment" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem/fsifce" ) type fileSystemDefaultImpl struct{} diff --git a/common/environment/filesystemcap/fscap.go b/common/environment/filesystemcap/fscap.go index a08dccd22..e45b25e3e 100644 --- a/common/environment/filesystemcap/fscap.go +++ b/common/environment/filesystemcap/fscap.go @@ -1,6 +1,6 @@ package filesystemcap -import "github.com/v2fly/v2ray-core/v4/common/platform/filesystem/fsifce" +import "github.com/v2fly/v2ray-core/v5/common/platform/filesystem/fsifce" type FileSystemCapabilitySet interface { OpenFileForReadSeek() fsifce.FileSeekerFunc diff --git a/common/environment/proxy.go b/common/environment/proxy.go index f46d9f69a..49b63f478 100644 --- a/common/environment/proxy.go +++ b/common/environment/proxy.go @@ -1,7 +1,7 @@ package environment import ( - "github.com/v2fly/v2ray-core/v4/features/extension/storage" + "github.com/v2fly/v2ray-core/v5/features/extension/storage" ) type ProxyEnvironmentCapabilitySet interface { diff --git a/common/environment/transport.go b/common/environment/transport.go index f026f2c0f..5df017c6b 100644 --- a/common/environment/transport.go +++ b/common/environment/transport.go @@ -1,7 +1,7 @@ package environment import ( - "github.com/v2fly/v2ray-core/v4/features/extension/storage" + "github.com/v2fly/v2ray-core/v5/features/extension/storage" ) type TransportEnvironmentCapacitySet interface { diff --git a/common/errors.generated.go b/common/errors.generated.go index 37cb33a03..cdab40ba8 100644 --- a/common/errors.generated.go +++ b/common/errors.generated.go @@ -1,6 +1,6 @@ package common -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/errors/errorgen/main.go b/common/errors/errorgen/main.go index fc64a5237..e97759c05 100644 --- a/common/errors/errorgen/main.go +++ b/common/errors/errorgen/main.go @@ -26,7 +26,7 @@ func main() { fmt.Fprintf(file, `package %s -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/errors/errors.go b/common/errors/errors.go index 09878578e..ece5ad695 100644 --- a/common/errors/errors.go +++ b/common/errors/errors.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type hasInnerError interface { @@ -39,8 +39,8 @@ func (err *Error) pkgPath() string { } path := reflect.TypeOf(err.pathObj).PkgPath() // TODO update required on release - path = strings.TrimPrefix(path, "github.com/v2fly/v2ray-core/v4/") - path = strings.TrimPrefix(path, "github.com/v2fly/v2ray-core/v4") + path = strings.TrimPrefix(path, "github.com/v2fly/v2ray-core/v5/") + path = strings.TrimPrefix(path, "github.com/v2fly/v2ray-core/v5") return path } diff --git a/common/errors/errors_test.go b/common/errors/errors_test.go index 6b1cffcdc..503da7143 100644 --- a/common/errors/errors_test.go +++ b/common/errors/errors_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/log" + . "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/log" ) func TestError(t *testing.T) { diff --git a/common/interfaces.go b/common/interfaces.go index 299d65d67..74d678c1c 100644 --- a/common/interfaces.go +++ b/common/interfaces.go @@ -1,6 +1,6 @@ package common -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" // Closable is the interface for objects that can release its resources. // diff --git a/common/log/access.go b/common/log/access.go index aaa0b448a..56661507e 100644 --- a/common/log/access.go +++ b/common/log/access.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type logKey int diff --git a/common/log/log.go b/common/log/log.go index ca59532af..5fe66ac3b 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -3,7 +3,7 @@ package log import ( "sync" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/serial" ) // Message is the interface for all log messages. diff --git a/common/log/log.pb.go b/common/log/log.pb.go index 7a178f8f1..ac4f38385 100644 --- a/common/log/log.pb.go +++ b/common/log/log.pb.go @@ -89,7 +89,7 @@ var file_common_log_log_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6c, 0x6f, 0x67, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, - 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6c, 0x6f, 0x67, 0xaa, 0x02, 0x15, + 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6c, 0x6f, 0x67, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/common/log/log.proto b/common/log/log.proto index 7556f25ae..f58173ab7 100644 --- a/common/log/log.proto +++ b/common/log/log.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.log; option csharp_namespace = "V2Ray.Core.Common.Log"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/log"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/log"; option java_package = "com.v2ray.core.common.log"; option java_multiple_files = true; diff --git a/common/log/log_test.go b/common/log/log_test.go index d29fe67ed..0aca0343e 100644 --- a/common/log/log_test.go +++ b/common/log/log_test.go @@ -5,8 +5,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" ) type testLogger struct { diff --git a/common/log/logger.go b/common/log/logger.go index e15dffc04..f7cf6a984 100644 --- a/common/log/logger.go +++ b/common/log/logger.go @@ -6,9 +6,9 @@ import ( "os" "time" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/common/signal/semaphore" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/common/signal/semaphore" ) // Writer is the interface for writing logs. diff --git a/common/log/logger_test.go b/common/log/logger_test.go index fcb91ad6c..3e430226a 100644 --- a/common/log/logger_test.go +++ b/common/log/logger_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/common/log" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/common/log" ) func TestFileLogger(t *testing.T) { diff --git a/common/mux/client.go b/common/mux/client.go index 1e0bfdf12..4abdecf38 100644 --- a/common/mux/client.go +++ b/common/mux/client.go @@ -6,18 +6,18 @@ import ( "sync" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/proxy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/proxy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) type ClientManager struct { diff --git a/common/mux/client_test.go b/common/mux/client_test.go index 7dc1687e1..0dc121156 100644 --- a/common/mux/client_test.go +++ b/common/mux/client_test.go @@ -7,14 +7,14 @@ import ( "github.com/golang/mock/gomock" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/testing/mocks" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/testing/mocks" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) func TestIncrementalPickerFailure(t *testing.T) { diff --git a/common/mux/errors.generated.go b/common/mux/errors.generated.go index defb66a58..335f5aff1 100644 --- a/common/mux/errors.generated.go +++ b/common/mux/errors.generated.go @@ -1,6 +1,6 @@ package mux -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/mux/frame.go b/common/mux/frame.go index cabf11415..6cbbd017c 100644 --- a/common/mux/frame.go +++ b/common/mux/frame.go @@ -4,12 +4,12 @@ import ( "encoding/binary" "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/bitmask" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/bitmask" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type SessionStatus byte diff --git a/common/mux/frame_test.go b/common/mux/frame_test.go index c072f48a5..61ef3b7f5 100644 --- a/common/mux/frame_test.go +++ b/common/mux/frame_test.go @@ -3,10 +3,10 @@ package mux_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" ) func BenchmarkFrameWrite(b *testing.B) { diff --git a/common/mux/mux.go b/common/mux/mux.go index 7e204c9ef..ec11c8297 100644 --- a/common/mux/mux.go +++ b/common/mux/mux.go @@ -1,3 +1,3 @@ package mux -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/common/mux/mux_test.go b/common/mux/mux_test.go index 045b6fa79..ff52592f5 100644 --- a/common/mux/mux_test.go +++ b/common/mux/mux_test.go @@ -6,12 +6,12 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/common/mux" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/common/mux" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) func readAll(reader buf.Reader) (buf.MultiBuffer, error) { diff --git a/common/mux/reader.go b/common/mux/reader.go index ac7fb1692..0314bb29d 100644 --- a/common/mux/reader.go +++ b/common/mux/reader.go @@ -3,9 +3,9 @@ package mux import ( "io" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/crypto" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/crypto" + "github.com/v2fly/v2ray-core/v5/common/serial" ) // PacketReader is an io.Reader that reads whole chunk of Mux frames every time. diff --git a/common/mux/server.go b/common/mux/server.go index 233e15bfe..5dc86538d 100644 --- a/common/mux/server.go +++ b/common/mux/server.go @@ -4,17 +4,17 @@ import ( "context" "io" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) type Server struct { diff --git a/common/mux/session.go b/common/mux/session.go index 5565b573d..f1e918fa4 100644 --- a/common/mux/session.go +++ b/common/mux/session.go @@ -3,9 +3,9 @@ package mux import ( "sync" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) type SessionManager struct { diff --git a/common/mux/session_test.go b/common/mux/session_test.go index 26e75a2de..f02f77b67 100644 --- a/common/mux/session_test.go +++ b/common/mux/session_test.go @@ -3,7 +3,7 @@ package mux_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/mux" + . "github.com/v2fly/v2ray-core/v5/common/mux" ) func TestSessionManagerAdd(t *testing.T) { diff --git a/common/mux/writer.go b/common/mux/writer.go index d9172c529..1044ea287 100644 --- a/common/mux/writer.go +++ b/common/mux/writer.go @@ -1,12 +1,12 @@ package mux import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type Writer struct { diff --git a/common/net/address.pb.go b/common/net/address.pb.go index 427ac1d76..6c258717d 100644 --- a/common/net/address.pb.go +++ b/common/net/address.pb.go @@ -118,7 +118,7 @@ var file_common_net_address_proto_rawDesc = []byte{ 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, - 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, + 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/common/net/address.proto b/common/net/address.proto index 5f53a42c8..e68962b39 100644 --- a/common/net/address.proto +++ b/common/net/address.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/net"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/net"; option java_package = "com.v2ray.core.common.net"; option java_multiple_files = true; diff --git a/common/net/address_test.go b/common/net/address_test.go index 740d89c67..c8c84e3ff 100644 --- a/common/net/address_test.go +++ b/common/net/address_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/common/net" + . "github.com/v2fly/v2ray-core/v5/common/net" ) func TestAddressProperty(t *testing.T) { diff --git a/common/net/connection.go b/common/net/connection.go index 02c373ff4..cf9c46602 100644 --- a/common/net/connection.go +++ b/common/net/connection.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/signal/done" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/signal/done" ) type ConnectionOption func(*connection) diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go index 328680c7a..66ee7b31f 100644 --- a/common/net/destination.pb.go +++ b/common/net/destination.pb.go @@ -106,7 +106,7 @@ var file_common_net_destination_proto_rawDesc = []byte{ 0x74, 0x42, 0x60, 0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, - 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, + 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/common/net/destination.proto b/common/net/destination.proto index 9aab13b2c..58d82f4f5 100644 --- a/common/net/destination.proto +++ b/common/net/destination.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/net"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/net"; option java_package = "com.v2ray.core.common.net"; option java_multiple_files = true; diff --git a/common/net/destination_test.go b/common/net/destination_test.go index 45ac96dc0..69e0a0ebc 100644 --- a/common/net/destination_test.go +++ b/common/net/destination_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/common/net" + . "github.com/v2fly/v2ray-core/v5/common/net" ) func TestDestinationProperty(t *testing.T) { diff --git a/common/net/errors.generated.go b/common/net/errors.generated.go index 5884f2ce2..3796f289f 100644 --- a/common/net/errors.generated.go +++ b/common/net/errors.generated.go @@ -1,6 +1,6 @@ package net -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/net/net.go b/common/net/net.go index b1fc15352..70f263166 100644 --- a/common/net/net.go +++ b/common/net/net.go @@ -1,4 +1,4 @@ // Package net is a drop-in replacement to Golang's net package, with some more functionalities. package net -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/common/net/network.pb.go b/common/net/network.pb.go index d241d1d59..f08378a33 100644 --- a/common/net/network.pb.go +++ b/common/net/network.pb.go @@ -142,7 +142,7 @@ var file_common_net_network_proto_rawDesc = []byte{ 0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, - 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, + 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/common/net/network.proto b/common/net/network.proto index 8510ee925..1a3634406 100644 --- a/common/net/network.proto +++ b/common/net/network.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/net"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/net"; option java_package = "com.v2ray.core.common.net"; option java_multiple_files = true; diff --git a/common/net/port.pb.go b/common/net/port.pb.go index ff2ac1048..20be491e0 100644 --- a/common/net/port.pb.go +++ b/common/net/port.pb.go @@ -143,7 +143,7 @@ var file_common_net_port_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, - 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x15, + 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/common/net/port.proto b/common/net/port.proto index aba741d1d..cd50a1142 100644 --- a/common/net/port.proto +++ b/common/net/port.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.net; option csharp_namespace = "V2Ray.Core.Common.Net"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/net"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/net"; option java_package = "com.v2ray.core.common.net"; option java_multiple_files = true; diff --git a/common/net/port_test.go b/common/net/port_test.go index 9acc9a9a7..9f9b59db6 100644 --- a/common/net/port_test.go +++ b/common/net/port_test.go @@ -3,7 +3,7 @@ package net_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/net" + . "github.com/v2fly/v2ray-core/v5/common/net" ) func TestPortRangeContains(t *testing.T) { diff --git a/common/platform/filesystem/file.go b/common/platform/filesystem/file.go index 73689e31d..c05f0aa46 100644 --- a/common/platform/filesystem/file.go +++ b/common/platform/filesystem/file.go @@ -4,9 +4,9 @@ import ( "io" "os" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem/fsifce" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem/fsifce" ) var NewFileSeeker fsifce.FileSeekerFunc = func(path string) (io.ReadSeekCloser, error) { diff --git a/common/platform/platform_test.go b/common/platform/platform_test.go index ef0bb5495..028bda307 100644 --- a/common/platform/platform_test.go +++ b/common/platform/platform_test.go @@ -8,8 +8,8 @@ import ( "runtime" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/platform" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/platform" ) func TestNormalizeEnvName(t *testing.T) { diff --git a/common/platform/securedload/embeddedhash.go b/common/platform/securedload/embeddedhash.go index d39df50be..88184fdaf 100644 --- a/common/platform/securedload/embeddedhash.go +++ b/common/platform/securedload/embeddedhash.go @@ -10,8 +10,8 @@ import ( "github.com/v2fly/VSign/insmgr" "github.com/v2fly/VSign/signerVerify" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" ) type EmbeddedHashProtectedLoader struct { diff --git a/common/platform/securedload/errors.generated.go b/common/platform/securedload/errors.generated.go index 83d7c7cbb..ef4acb02c 100644 --- a/common/platform/securedload/errors.generated.go +++ b/common/platform/securedload/errors.generated.go @@ -1,6 +1,6 @@ package securedload -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/platform/securedload/securedload.go b/common/platform/securedload/securedload.go index af4e95758..f9094f5d5 100644 --- a/common/platform/securedload/securedload.go +++ b/common/platform/securedload/securedload.go @@ -1,3 +1,3 @@ package securedload -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/common/protocol/address.go b/common/protocol/address.go index e547d63ff..bbf923f26 100644 --- a/common/protocol/address.go +++ b/common/protocol/address.go @@ -3,10 +3,10 @@ package protocol import ( "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type AddressOption func(*option) diff --git a/common/protocol/address_test.go b/common/protocol/address_test.go index ae86a224a..85b4f932d 100644 --- a/common/protocol/address_test.go +++ b/common/protocol/address_test.go @@ -6,10 +6,10 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - . "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + . "github.com/v2fly/v2ray-core/v5/common/protocol" ) func TestAddressReading(t *testing.T) { diff --git a/common/protocol/bittorrent/bittorrent.go b/common/protocol/bittorrent/bittorrent.go index 26d800626..1a3cb4749 100644 --- a/common/protocol/bittorrent/bittorrent.go +++ b/common/protocol/bittorrent/bittorrent.go @@ -6,8 +6,8 @@ import ( "math" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" ) type SniffHeader struct{} diff --git a/common/protocol/dns/errors.generated.go b/common/protocol/dns/errors.generated.go index 438eb646e..e69b94752 100644 --- a/common/protocol/dns/errors.generated.go +++ b/common/protocol/dns/errors.generated.go @@ -1,6 +1,6 @@ package dns -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/protocol/dns/io.go b/common/protocol/dns/io.go index 7a15296a9..c88f2498b 100644 --- a/common/protocol/dns/io.go +++ b/common/protocol/dns/io.go @@ -6,9 +6,9 @@ import ( "golang.org/x/net/dns/dnsmessage" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/serial" ) func PackMessage(msg *dnsmessage.Message) (*buf.Buffer, error) { diff --git a/common/protocol/errors.generated.go b/common/protocol/errors.generated.go index 0c545173e..6a8e44d8b 100644 --- a/common/protocol/errors.generated.go +++ b/common/protocol/errors.generated.go @@ -1,6 +1,6 @@ package protocol -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/protocol/headers.go b/common/protocol/headers.go index 6ea8f08a7..ee2622e62 100644 --- a/common/protocol/headers.go +++ b/common/protocol/headers.go @@ -3,9 +3,9 @@ package protocol import ( "runtime" - "github.com/v2fly/v2ray-core/v4/common/bitmask" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common/bitmask" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) // RequestCommand is a custom command in a proxy request. diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go index 5fecb2bfd..fe2204c09 100644 --- a/common/protocol/headers.pb.go +++ b/common/protocol/headers.pb.go @@ -150,7 +150,7 @@ var file_common_protocol_headers_proto_rawDesc = []byte{ 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, - 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, + 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, diff --git a/common/protocol/headers.proto b/common/protocol/headers.proto index 725b3cc5d..5aa4ad0b0 100644 --- a/common/protocol/headers.proto +++ b/common/protocol/headers.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.protocol; option csharp_namespace = "V2Ray.Core.Common.Protocol"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/protocol"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/protocol"; option java_package = "com.v2ray.core.common.protocol"; option java_multiple_files = true; diff --git a/common/protocol/http/headers.go b/common/protocol/http/headers.go index d87e8dbf6..59e946e9c 100644 --- a/common/protocol/http/headers.go +++ b/common/protocol/http/headers.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) // ParseXForwardedFor parses X-Forwarded-For header in http headers, and return the IP list in it. diff --git a/common/protocol/http/headers_test.go b/common/protocol/http/headers_test.go index 8c4539097..485573a97 100644 --- a/common/protocol/http/headers_test.go +++ b/common/protocol/http/headers_test.go @@ -8,9 +8,9 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - . "github.com/v2fly/v2ray-core/v4/common/protocol/http" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + . "github.com/v2fly/v2ray-core/v5/common/protocol/http" ) func TestParseXForwardedFor(t *testing.T) { diff --git a/common/protocol/http/sniff.go b/common/protocol/http/sniff.go index af2781c05..98e4e908e 100644 --- a/common/protocol/http/sniff.go +++ b/common/protocol/http/sniff.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" ) type version byte diff --git a/common/protocol/http/sniff_test.go b/common/protocol/http/sniff_test.go index 3e7eb154c..5f500e28a 100644 --- a/common/protocol/http/sniff_test.go +++ b/common/protocol/http/sniff_test.go @@ -3,7 +3,7 @@ package http_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/protocol/http" + . "github.com/v2fly/v2ray-core/v5/common/protocol/http" ) func TestHTTPHeaders(t *testing.T) { diff --git a/common/protocol/id.go b/common/protocol/id.go index 6d15970b3..744ca5abb 100644 --- a/common/protocol/id.go +++ b/common/protocol/id.go @@ -5,8 +5,8 @@ import ( "crypto/md5" "hash" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) const ( diff --git a/common/protocol/id_test.go b/common/protocol/id_test.go index 94969adad..07f09a8ff 100644 --- a/common/protocol/id_test.go +++ b/common/protocol/id_test.go @@ -3,8 +3,8 @@ package protocol_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" + . "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) func TestIdEquals(t *testing.T) { diff --git a/common/protocol/protocol.go b/common/protocol/protocol.go index 90f3b89cb..3bef51ddd 100644 --- a/common/protocol/protocol.go +++ b/common/protocol/protocol.go @@ -1,3 +1,3 @@ package protocol -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/common/protocol/quic/sniff.go b/common/protocol/quic/sniff.go index 776e6283b..0a78050b5 100644 --- a/common/protocol/quic/sniff.go +++ b/common/protocol/quic/sniff.go @@ -11,10 +11,10 @@ import ( "github.com/marten-seemann/qtls-go1-17" "golang.org/x/crypto/hkdf" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - ptls "github.com/v2fly/v2ray-core/v4/common/protocol/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + ptls "github.com/v2fly/v2ray-core/v5/common/protocol/tls" ) type SniffHeader struct { diff --git a/common/protocol/quic/sniff_test.go b/common/protocol/quic/sniff_test.go index f33cc4394..b461e037e 100644 --- a/common/protocol/quic/sniff_test.go +++ b/common/protocol/quic/sniff_test.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol/quic" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol/quic" ) func TestSniffQUIC(t *testing.T) { diff --git a/common/protocol/server_picker_test.go b/common/protocol/server_picker_test.go index 7adb294c2..eef64151a 100644 --- a/common/protocol/server_picker_test.go +++ b/common/protocol/server_picker_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common/net" - . "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/net" + . "github.com/v2fly/v2ray-core/v5/common/protocol" ) func TestServerList(t *testing.T) { diff --git a/common/protocol/server_spec.go b/common/protocol/server_spec.go index 4cdf1517c..dd3c7ad22 100644 --- a/common/protocol/server_spec.go +++ b/common/protocol/server_spec.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/net" ) type ValidationStrategy interface { diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go index 92743bd6d..4bcb087ea 100644 --- a/common/protocol/server_spec.pb.go +++ b/common/protocol/server_spec.pb.go @@ -7,7 +7,7 @@ package protocol import ( - net "github.com/v2fly/v2ray-core/v4/common/net" + net "github.com/v2fly/v2ray-core/v5/common/net" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -108,7 +108,7 @@ var file_common_protocol_server_spec_proto_rawDesc = []byte{ 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, - 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/common/protocol/server_spec.proto b/common/protocol/server_spec.proto index bf01c19a7..c47c8ab3c 100644 --- a/common/protocol/server_spec.proto +++ b/common/protocol/server_spec.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.protocol; option csharp_namespace = "V2Ray.Core.Common.Protocol"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/protocol"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/protocol"; option java_package = "com.v2ray.core.common.protocol"; option java_multiple_files = true; diff --git a/common/protocol/server_spec_test.go b/common/protocol/server_spec_test.go index 55e9d6bc6..16ea375e7 100644 --- a/common/protocol/server_spec_test.go +++ b/common/protocol/server_spec_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - . "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + . "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" ) func TestAlwaysValidStrategy(t *testing.T) { diff --git a/common/protocol/time.go b/common/protocol/time.go index 19ab60079..f0c6bd5fb 100644 --- a/common/protocol/time.go +++ b/common/protocol/time.go @@ -3,7 +3,7 @@ package protocol import ( "time" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common/dice" ) type Timestamp int64 diff --git a/common/protocol/time_test.go b/common/protocol/time_test.go index 82fac10c9..facc17e58 100644 --- a/common/protocol/time_test.go +++ b/common/protocol/time_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - . "github.com/v2fly/v2ray-core/v4/common/protocol" + . "github.com/v2fly/v2ray-core/v5/common/protocol" ) func TestGenerateRandomInt64InRange(t *testing.T) { diff --git a/common/protocol/tls/cert/cert.go b/common/protocol/tls/cert/cert.go index 5cbc5a7cd..c5972aadd 100644 --- a/common/protocol/tls/cert/cert.go +++ b/common/protocol/tls/cert/cert.go @@ -12,10 +12,10 @@ import ( "math/big" "time" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type Certificate struct { // Certificate in ASN.1 DER format diff --git a/common/protocol/tls/cert/cert_test.go b/common/protocol/tls/cert/cert_test.go index 91271c6d0..efc292bd3 100644 --- a/common/protocol/tls/cert/cert_test.go +++ b/common/protocol/tls/cert/cert_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/task" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/task" ) func TestGenerate(t *testing.T) { diff --git a/common/protocol/tls/cert/errors.generated.go b/common/protocol/tls/cert/errors.generated.go index a8ba360ef..62c2d90c8 100644 --- a/common/protocol/tls/cert/errors.generated.go +++ b/common/protocol/tls/cert/errors.generated.go @@ -1,6 +1,6 @@ package cert -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/protocol/tls/sniff.go b/common/protocol/tls/sniff.go index 832e53df8..608905fd0 100644 --- a/common/protocol/tls/sniff.go +++ b/common/protocol/tls/sniff.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) type SniffHeader struct { diff --git a/common/protocol/tls/sniff_test.go b/common/protocol/tls/sniff_test.go index b0e50ce1d..96bbb90f7 100644 --- a/common/protocol/tls/sniff_test.go +++ b/common/protocol/tls/sniff_test.go @@ -3,7 +3,7 @@ package tls_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/protocol/tls" + . "github.com/v2fly/v2ray-core/v5/common/protocol/tls" ) func TestTLSHeaders(t *testing.T) { diff --git a/common/protocol/udp/packet.go b/common/protocol/udp/packet.go index c5aded72a..ab9a031ee 100644 --- a/common/protocol/udp/packet.go +++ b/common/protocol/udp/packet.go @@ -1,8 +1,8 @@ package udp import ( - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" ) // Packet is a UDP packet together with its source and destination address. diff --git a/common/protocol/user.go b/common/protocol/user.go index b039a2dc0..13eb4690b 100644 --- a/common/protocol/user.go +++ b/common/protocol/user.go @@ -1,6 +1,6 @@ package protocol -import "github.com/v2fly/v2ray-core/v4/common/serial" +import "github.com/v2fly/v2ray-core/v5/common/serial" func (u *User) GetTypedAccount() (Account, error) { if u.GetAccount() == nil { diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go index 5e29fe498..dfab6c18c 100644 --- a/common/protocol/user.pb.go +++ b/common/protocol/user.pb.go @@ -105,7 +105,7 @@ var file_common_protocol_user_proto_rawDesc = []byte{ 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, - 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, + 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/common/protocol/user.proto b/common/protocol/user.proto index 24d89fe9b..a20739dc0 100644 --- a/common/protocol/user.proto +++ b/common/protocol/user.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.protocol; option csharp_namespace = "V2Ray.Core.Common.Protocol"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/protocol"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/protocol"; option java_package = "com.v2ray.core.common.protocol"; option java_multiple_files = true; diff --git a/common/protoext/errors.generated.go b/common/protoext/errors.generated.go index 6ca31f0db..2a7e82ec6 100644 --- a/common/protoext/errors.generated.go +++ b/common/protoext/errors.generated.go @@ -1,6 +1,6 @@ package protoext -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/protoext/extensions.go b/common/protoext/extensions.go index bf8006583..93a347b0f 100644 --- a/common/protoext/extensions.go +++ b/common/protoext/extensions.go @@ -6,7 +6,7 @@ import ( "google.golang.org/protobuf/types/descriptorpb" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen func GetMessageOptions(msgDesc protoreflect.MessageDescriptor) (*MessageOpt, error) { msgOpt := msgDesc.Options().(*descriptorpb.MessageOptions) diff --git a/common/protoext/extensions.pb.go b/common/protoext/extensions.pb.go index 51aa6cd8d..c298e8d2e 100644 --- a/common/protoext/extensions.pb.go +++ b/common/protoext/extensions.pb.go @@ -269,7 +269,7 @@ var file_common_protoext_extensions_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65, 0x78, 0x74, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, - 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65, + 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65, 0x78, 0x74, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x78, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/common/protoext/extensions.proto b/common/protoext/extensions.proto index e6441685c..e7fd82140 100644 --- a/common/protoext/extensions.proto +++ b/common/protoext/extensions.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.protoext; option csharp_namespace = "V2Ray.Core.Common.ProtoExt"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/protoext"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/protoext"; option java_package = "com.v2ray.core.common.protoext"; option java_multiple_files = true; diff --git a/common/protoext/testing/extension_test.go b/common/protoext/testing/extension_test.go index 82c1561e2..e4e43de93 100644 --- a/common/protoext/testing/extension_test.go +++ b/common/protoext/testing/extension_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/v2fly/v2ray-core/v4/common/protoext" + "github.com/v2fly/v2ray-core/v5/common/protoext" ) func TestMessageOpt(t *testing.T) { diff --git a/common/protoext/testing/test.pb.go b/common/protoext/testing/test.pb.go index ac34cb213..0325e326c 100644 --- a/common/protoext/testing/test.pb.go +++ b/common/protoext/testing/test.pb.go @@ -7,7 +7,7 @@ package testing import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/common/protofilter/errors.generated.go b/common/protofilter/errors.generated.go index 5115f1f7e..44fc8eeb2 100644 --- a/common/protofilter/errors.generated.go +++ b/common/protofilter/errors.generated.go @@ -1,6 +1,6 @@ package protofilter -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/protofilter/filter.go b/common/protofilter/filter.go index 2195ff3f9..dbecfe176 100644 --- a/common/protofilter/filter.go +++ b/common/protofilter/filter.go @@ -8,12 +8,12 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/v2fly/v2ray-core/v4/common/environment/envctx" - "github.com/v2fly/v2ray-core/v4/common/environment/filesystemcap" - "github.com/v2fly/v2ray-core/v4/common/protoext" + "github.com/v2fly/v2ray-core/v5/common/environment/envctx" + "github.com/v2fly/v2ray-core/v5/common/environment/filesystemcap" + "github.com/v2fly/v2ray-core/v5/common/protoext" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen func FilterProtoConfig(ctx context.Context, config proto.Message) error { messageProtoReflect := config.ProtoReflect() diff --git a/common/registry/errors.generated.go b/common/registry/errors.generated.go index 58e743d6e..bd34de6e0 100644 --- a/common/registry/errors.generated.go +++ b/common/registry/errors.generated.go @@ -1,6 +1,6 @@ package registry -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/registry/implementation_set.go b/common/registry/implementation_set.go index 51468ee4f..adaf8513d 100644 --- a/common/registry/implementation_set.go +++ b/common/registry/implementation_set.go @@ -3,10 +3,10 @@ package registry import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protoext" + "github.com/v2fly/v2ray-core/v5/common/protoext" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type implementationSet struct { AliasLookup map[string]*implementation diff --git a/common/registry/registry.go b/common/registry/registry.go index cc5cde5a4..b62e9a0cd 100644 --- a/common/registry/registry.go +++ b/common/registry/registry.go @@ -11,9 +11,9 @@ import ( "github.com/golang/protobuf/proto" protov2 "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protoext" - "github.com/v2fly/v2ray-core/v4/common/protofilter" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/protoext" + "github.com/v2fly/v2ray-core/v5/common/protofilter" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type implementationRegistry struct { diff --git a/common/retry/errors.generated.go b/common/retry/errors.generated.go index fac5cc43b..029fed113 100644 --- a/common/retry/errors.generated.go +++ b/common/retry/errors.generated.go @@ -1,6 +1,6 @@ package retry -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/retry/retry.go b/common/retry/retry.go index 45e987254..27ced5b23 100644 --- a/common/retry/retry.go +++ b/common/retry/retry.go @@ -1,6 +1,6 @@ package retry -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "time" diff --git a/common/retry/retry_test.go b/common/retry/retry_test.go index 2575e945e..85ea41a6e 100644 --- a/common/retry/retry_test.go +++ b/common/retry/retry_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - . "github.com/v2fly/v2ray-core/v4/common/retry" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + . "github.com/v2fly/v2ray-core/v5/common/retry" ) var errorTestOnly = errors.New("this is a fake error") diff --git a/common/serial/serial_test.go b/common/serial/serial_test.go index b9c96b242..00568c649 100644 --- a/common/serial/serial_test.go +++ b/common/serial/serial_test.go @@ -6,9 +6,9 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/serial" ) func TestUint16Serial(t *testing.T) { diff --git a/common/serial/string_test.go b/common/serial/string_test.go index a7cd620c7..16ebe3921 100644 --- a/common/serial/string_test.go +++ b/common/serial/string_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" - . "github.com/v2fly/v2ray-core/v4/common/serial" + . "github.com/v2fly/v2ray-core/v5/common/serial" ) func TestToString(t *testing.T) { diff --git a/common/serial/typed_message_test.go b/common/serial/typed_message_test.go index 397b99031..1bd3f64eb 100644 --- a/common/serial/typed_message_test.go +++ b/common/serial/typed_message_test.go @@ -3,7 +3,7 @@ package serial_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/serial" + . "github.com/v2fly/v2ray-core/v5/common/serial" ) func TestGetInstance(t *testing.T) { diff --git a/common/session/session.go b/common/session/session.go index dd41c9145..25ce204c1 100644 --- a/common/session/session.go +++ b/common/session/session.go @@ -5,9 +5,9 @@ import ( "context" "math/rand" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) // ID of a session. diff --git a/common/signal/notifier_test.go b/common/signal/notifier_test.go index be87270aa..bbea8149f 100644 --- a/common/signal/notifier_test.go +++ b/common/signal/notifier_test.go @@ -3,7 +3,7 @@ package signal_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/signal" + . "github.com/v2fly/v2ray-core/v5/common/signal" ) func TestNotifierSignal(t *testing.T) { diff --git a/common/signal/pubsub/pubsub.go b/common/signal/pubsub/pubsub.go index 77b2454a1..c02ffc2b4 100644 --- a/common/signal/pubsub/pubsub.go +++ b/common/signal/pubsub/pubsub.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/common/task" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/common/task" ) type Subscriber struct { diff --git a/common/signal/pubsub/pubsub_test.go b/common/signal/pubsub/pubsub_test.go index d26848bca..2c2c63cef 100644 --- a/common/signal/pubsub/pubsub_test.go +++ b/common/signal/pubsub/pubsub_test.go @@ -3,7 +3,7 @@ package pubsub_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/common/signal/pubsub" + . "github.com/v2fly/v2ray-core/v5/common/signal/pubsub" ) func TestPubsub(t *testing.T) { diff --git a/common/signal/timer.go b/common/signal/timer.go index 47cf432fe..0f2495d11 100644 --- a/common/signal/timer.go +++ b/common/signal/timer.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/task" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/task" ) type ActivityUpdater interface { diff --git a/common/signal/timer_test.go b/common/signal/timer_test.go index 75edd58fc..9921003d9 100644 --- a/common/signal/timer_test.go +++ b/common/signal/timer_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - . "github.com/v2fly/v2ray-core/v4/common/signal" + . "github.com/v2fly/v2ray-core/v5/common/signal" ) func TestActivityTimer(t *testing.T) { diff --git a/common/strmatcher/benchmark_test.go b/common/strmatcher/benchmark_test.go index 8e15daf39..0d1ffefb9 100644 --- a/common/strmatcher/benchmark_test.go +++ b/common/strmatcher/benchmark_test.go @@ -4,8 +4,8 @@ import ( "strconv" "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) // Benchmark Domain Matcher Groups diff --git a/common/strmatcher/indexmatcher_linear_test.go b/common/strmatcher/indexmatcher_linear_test.go index baa74a56c..5c870eca6 100644 --- a/common/strmatcher/indexmatcher_linear_test.go +++ b/common/strmatcher/indexmatcher_linear_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) // See https://github.com/v2fly/v2ray-core/issues/92#issuecomment-673238489 diff --git a/common/strmatcher/matchergroup_ac_automation_test.go b/common/strmatcher/matchergroup_ac_automation_test.go index a70c1167b..fa3483882 100644 --- a/common/strmatcher/matchergroup_ac_automation_test.go +++ b/common/strmatcher/matchergroup_ac_automation_test.go @@ -3,8 +3,8 @@ package strmatcher_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) func TestACAutomatonMatcherGroup(t *testing.T) { diff --git a/common/strmatcher/matchergroup_domain_test.go b/common/strmatcher/matchergroup_domain_test.go index acd331bbf..73934dd33 100644 --- a/common/strmatcher/matchergroup_domain_test.go +++ b/common/strmatcher/matchergroup_domain_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) func TestDomainMatcherGroup(t *testing.T) { diff --git a/common/strmatcher/matchergroup_full_test.go b/common/strmatcher/matchergroup_full_test.go index b3a08fd1b..645cb349c 100644 --- a/common/strmatcher/matchergroup_full_test.go +++ b/common/strmatcher/matchergroup_full_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) func TestFullMatcherGroup(t *testing.T) { diff --git a/common/strmatcher/matchergroup_mph_test.go b/common/strmatcher/matchergroup_mph_test.go index b876227e6..d4e732fba 100644 --- a/common/strmatcher/matchergroup_mph_test.go +++ b/common/strmatcher/matchergroup_mph_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) func TestMphMatcherGroup(t *testing.T) { diff --git a/common/strmatcher/matchergroup_simple_test.go b/common/strmatcher/matchergroup_simple_test.go index 18ef806e7..67dc05175 100644 --- a/common/strmatcher/matchergroup_simple_test.go +++ b/common/strmatcher/matchergroup_simple_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) func TestSimpleMatcherGroup(t *testing.T) { diff --git a/common/strmatcher/matchergroup_substr_test.go b/common/strmatcher/matchergroup_substr_test.go index 37e90abb9..89efcef04 100644 --- a/common/strmatcher/matchergroup_substr_test.go +++ b/common/strmatcher/matchergroup_substr_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) func TestSubstrMatcherGroup(t *testing.T) { diff --git a/common/strmatcher/matchers_test.go b/common/strmatcher/matchers_test.go index a644164f2..587575e04 100644 --- a/common/strmatcher/matchers_test.go +++ b/common/strmatcher/matchers_test.go @@ -3,8 +3,8 @@ package strmatcher_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/strmatcher" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/strmatcher" ) func TestMatcher(t *testing.T) { diff --git a/common/taggedfeatures/configloader.go b/common/taggedfeatures/configloader.go index 78bb0a217..ee7d8d6ff 100644 --- a/common/taggedfeatures/configloader.go +++ b/common/taggedfeatures/configloader.go @@ -6,8 +6,8 @@ import ( "google.golang.org/protobuf/types/known/anypb" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/v5cfg" ) func LoadJSONConfig(ctx context.Context, interfaceType, defaultImpl string, message json.RawMessage) (*Config, error) { diff --git a/common/taggedfeatures/creator.go b/common/taggedfeatures/creator.go index 818ac15d4..6a2bb5525 100644 --- a/common/taggedfeatures/creator.go +++ b/common/taggedfeatures/creator.go @@ -3,9 +3,9 @@ package taggedfeatures import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/features" ) func NewHolderFromConfig(ctx context.Context, config *Config, memberType interface{}) (features.TaggedFeatures, error) { diff --git a/common/taggedfeatures/errors.generated.go b/common/taggedfeatures/errors.generated.go index 5dc5870b5..de5c303b9 100644 --- a/common/taggedfeatures/errors.generated.go +++ b/common/taggedfeatures/errors.generated.go @@ -1,6 +1,6 @@ package taggedfeatures -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/common/taggedfeatures/holder.go b/common/taggedfeatures/holder.go index 3abcec2ef..1d57c4740 100644 --- a/common/taggedfeatures/holder.go +++ b/common/taggedfeatures/holder.go @@ -5,8 +5,8 @@ import ( "reflect" "sync" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features" ) type Holder struct { diff --git a/common/taggedfeatures/skeleton.pb.go b/common/taggedfeatures/skeleton.pb.go index c2600686e..4b3cd921b 100644 --- a/common/taggedfeatures/skeleton.pb.go +++ b/common/taggedfeatures/skeleton.pb.go @@ -92,7 +92,7 @@ var file_common_taggedfeatures_skeleton_proto_rawDesc = []byte{ 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x74, 0x61, 0x67, 0x67, 0x65, 0x64, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, - 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, + 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x74, 0x61, 0x67, 0x67, 0x65, 0x64, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0xaa, 0x02, 0x20, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x67, 0x65, diff --git a/common/taggedfeatures/skeleton.proto b/common/taggedfeatures/skeleton.proto index e50206093..1fd8a9905 100644 --- a/common/taggedfeatures/skeleton.proto +++ b/common/taggedfeatures/skeleton.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.common.taggedfeatures; option csharp_namespace = "V2Ray.Core.Common.Taggedfeatures"; -option go_package = "github.com/v2fly/v2ray-core/v4/common/taggedfeatures"; +option go_package = "github.com/v2fly/v2ray-core/v5/common/taggedfeatures"; option java_package = "com.v2ray.core.common.taggedfeatures"; option java_multiple_files = true; diff --git a/common/taggedfeatures/taggedfeatures.go b/common/taggedfeatures/taggedfeatures.go index 450e72b66..ce2830632 100644 --- a/common/taggedfeatures/taggedfeatures.go +++ b/common/taggedfeatures/taggedfeatures.go @@ -1,3 +1,3 @@ package taggedfeatures -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/common/task/common.go b/common/task/common.go index a0a7a2cdd..7d34a7cc9 100644 --- a/common/task/common.go +++ b/common/task/common.go @@ -1,6 +1,6 @@ package task -import "github.com/v2fly/v2ray-core/v4/common" +import "github.com/v2fly/v2ray-core/v5/common" // Close returns a func() that closes v. func Close(v interface{}) func() error { diff --git a/common/task/periodic_test.go b/common/task/periodic_test.go index 13ac02724..fd46b45a1 100644 --- a/common/task/periodic_test.go +++ b/common/task/periodic_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/task" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/task" ) func TestPeriodicTaskStop(t *testing.T) { diff --git a/common/task/task.go b/common/task/task.go index 5483e5701..652eea938 100644 --- a/common/task/task.go +++ b/common/task/task.go @@ -3,7 +3,7 @@ package task import ( "context" - "github.com/v2fly/v2ray-core/v4/common/signal/semaphore" + "github.com/v2fly/v2ray-core/v5/common/signal/semaphore" ) // OnSuccess executes g() after f() returns nil. diff --git a/common/task/task_test.go b/common/task/task_test.go index 2e5e1ff06..ce0b97ea7 100644 --- a/common/task/task_test.go +++ b/common/task/task_test.go @@ -9,8 +9,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/task" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/task" ) func TestExecuteParallel(t *testing.T) { diff --git a/common/type.go b/common/type.go index 154432447..af8bea119 100644 --- a/common/type.go +++ b/common/type.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/v2fly/v2ray-core/v4/common/registry" + "github.com/v2fly/v2ray-core/v5/common/registry" ) // ConfigCreator is a function to create an object by a config. diff --git a/common/type_test.go b/common/type_test.go index 702dbef59..22fddd68f 100644 --- a/common/type_test.go +++ b/common/type_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - . "github.com/v2fly/v2ray-core/v4/common" + . "github.com/v2fly/v2ray-core/v5/common" ) type TConfig struct { diff --git a/common/units/bytesize_test.go b/common/units/bytesize_test.go index 8bcb307e9..75838b567 100644 --- a/common/units/bytesize_test.go +++ b/common/units/bytesize_test.go @@ -3,7 +3,7 @@ package units_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/units" + "github.com/v2fly/v2ray-core/v5/common/units" ) func TestByteSizes(t *testing.T) { diff --git a/common/uuid/uuid.go b/common/uuid/uuid.go index 58497ec7e..1b9123dc2 100644 --- a/common/uuid/uuid.go +++ b/common/uuid/uuid.go @@ -5,8 +5,8 @@ import ( "crypto/rand" "encoding/hex" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" ) var byteGroups = []int{8, 4, 4, 4, 12} diff --git a/common/uuid/uuid_test.go b/common/uuid/uuid_test.go index 9f8e606db..5e66651db 100644 --- a/common/uuid/uuid_test.go +++ b/common/uuid/uuid_test.go @@ -5,8 +5,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/common/uuid" ) func TestParseBytes(t *testing.T) { diff --git a/config.go b/config.go index 74bd80972..8bd5f1d66 100644 --- a/config.go +++ b/config.go @@ -11,9 +11,9 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" ) const ( diff --git a/config.pb.go b/config.pb.go index 87086335e..00c65060f 100644 --- a/config.pb.go +++ b/config.pb.go @@ -7,7 +7,7 @@ package core import ( - transport "github.com/v2fly/v2ray-core/v4/transport" + transport "github.com/v2fly/v2ray-core/v5/transport" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -324,7 +324,7 @@ var file_config_proto_rawDesc = []byte{ 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x44, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x50, 0x01, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, - 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x3b, 0x63, + 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0xaa, 0x02, 0x0a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/config.proto b/config.proto index 65b63c896..8bcfd5f50 100644 --- a/config.proto +++ b/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core; option csharp_namespace = "V2Ray.Core"; -option go_package = "github.com/v2fly/v2ray-core/v4;core"; +option go_package = "github.com/v2fly/v2ray-core/v5;core"; option java_package = "com.v2ray.core"; option java_multiple_files = true; diff --git a/context_test.go b/context_test.go index d9e7170e5..58d6dbbdf 100644 --- a/context_test.go +++ b/context_test.go @@ -5,7 +5,7 @@ import ( "testing" _ "unsafe" - . "github.com/v2fly/v2ray-core/v4" + . "github.com/v2fly/v2ray-core/v5" ) func TestFromContextPanic(t *testing.T) { diff --git a/core.go b/core.go index fe0224e79..0ef06da6d 100644 --- a/core.go +++ b/core.go @@ -9,12 +9,12 @@ // connections. package core -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "runtime" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/serial" ) var ( diff --git a/errors.generated.go b/errors.generated.go index 0b44be169..0df581239 100644 --- a/errors.generated.go +++ b/errors.generated.go @@ -1,6 +1,6 @@ package core -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/features/dns/client.go b/features/dns/client.go index 8822233ce..e421aacbf 100644 --- a/features/dns/client.go +++ b/features/dns/client.go @@ -1,10 +1,10 @@ package dns import ( - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/features" ) // IPOption is an object for IP query options. diff --git a/features/dns/fakedns.go b/features/dns/fakedns.go index 2e4d2bac3..af54aabb9 100644 --- a/features/dns/fakedns.go +++ b/features/dns/fakedns.go @@ -1,8 +1,8 @@ package dns import ( - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features" ) type FakeDNSEngine interface { diff --git a/features/dns/localdns/client.go b/features/dns/localdns/client.go index 36ab66a65..ac4478f03 100644 --- a/features/dns/localdns/client.go +++ b/features/dns/localdns/client.go @@ -1,8 +1,8 @@ package localdns import ( - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/dns" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/dns" ) // Client is an implementation of dns.Client, which queries localhost for DNS. diff --git a/features/dns/localdns/errors.generated.go b/features/dns/localdns/errors.generated.go index 121712517..cbe015732 100644 --- a/features/dns/localdns/errors.generated.go +++ b/features/dns/localdns/errors.generated.go @@ -1,6 +1,6 @@ package localdns -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/features/errors.generated.go b/features/errors.generated.go index 24180612e..1429c7256 100644 --- a/features/errors.generated.go +++ b/features/errors.generated.go @@ -1,6 +1,6 @@ package features -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/features/extension/instance.go b/features/extension/instance.go index f31762524..d9779c5a3 100644 --- a/features/extension/instance.go +++ b/features/extension/instance.go @@ -3,7 +3,7 @@ package extension import ( "context" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/features" ) // InstanceManagement : unstable diff --git a/features/extension/observatory.go b/features/extension/observatory.go index 55b327b83..ba9a7b547 100644 --- a/features/extension/observatory.go +++ b/features/extension/observatory.go @@ -5,7 +5,7 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/features" ) type Observatory interface { diff --git a/features/extension/storage.go b/features/extension/storage.go index f3ef432d5..576151a30 100644 --- a/features/extension/storage.go +++ b/features/extension/storage.go @@ -3,7 +3,7 @@ package extension import ( "context" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/features" ) type PersistentStorageEngine interface { diff --git a/features/feature.go b/features/feature.go index b3a047b99..0699581eb 100644 --- a/features/feature.go +++ b/features/feature.go @@ -1,8 +1,8 @@ package features -import "github.com/v2fly/v2ray-core/v4/common" +import "github.com/v2fly/v2ray-core/v5/common" -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen // Feature is the interface for V2Ray features. All features must implement this interface. // All existing features have an implementation in app directory. These features can be replaced by third-party ones. diff --git a/features/inbound/inbound.go b/features/inbound/inbound.go index 896af40dc..e3cdc067b 100644 --- a/features/inbound/inbound.go +++ b/features/inbound/inbound.go @@ -3,9 +3,9 @@ package inbound import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features" ) // Handler is the interface for handlers that process inbound connections. diff --git a/features/outbound/outbound.go b/features/outbound/outbound.go index 2a540b653..eb839ce67 100644 --- a/features/outbound/outbound.go +++ b/features/outbound/outbound.go @@ -3,9 +3,9 @@ package outbound import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/transport" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/transport" ) // Handler is the interface for handlers that process outbound connections. diff --git a/features/policy/policy.go b/features/policy/policy.go index 58d93c4f8..0e2a80ac3 100644 --- a/features/policy/policy.go +++ b/features/policy/policy.go @@ -5,8 +5,8 @@ import ( "runtime" "time" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/features" ) // Timeout contains limits for connection timeout. diff --git a/features/routing/context.go b/features/routing/context.go index 2f6d6f5d3..9918759a9 100644 --- a/features/routing/context.go +++ b/features/routing/context.go @@ -1,7 +1,7 @@ package routing import ( - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) // Context is a feature to store connection information for routing. diff --git a/features/routing/dispatcher.go b/features/routing/dispatcher.go index 8e615d6d5..0e344c50b 100644 --- a/features/routing/dispatcher.go +++ b/features/routing/dispatcher.go @@ -3,9 +3,9 @@ package routing import ( "context" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/transport" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/transport" ) // Dispatcher is a feature that dispatches inbound requests to outbound handlers based on rules. diff --git a/features/routing/dns/context.go b/features/routing/dns/context.go index 1f077ec50..2be975657 100644 --- a/features/routing/dns/context.go +++ b/features/routing/dns/context.go @@ -1,11 +1,11 @@ package dns -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/routing" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/routing" ) // ResolvableContext is an implementation of routing.Context, with domain resolving capability. diff --git a/features/routing/dns/errors.generated.go b/features/routing/dns/errors.generated.go index 438eb646e..e69b94752 100644 --- a/features/routing/dns/errors.generated.go +++ b/features/routing/dns/errors.generated.go @@ -1,6 +1,6 @@ package dns -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/features/routing/router.go b/features/routing/router.go index e9a55be7a..fbdb2d502 100644 --- a/features/routing/router.go +++ b/features/routing/router.go @@ -1,8 +1,8 @@ package routing import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features" ) // Router is a feature to choose an outbound tag for the given request. diff --git a/features/routing/session/context.go b/features/routing/session/context.go index a0aa5c6bb..8baf4baab 100644 --- a/features/routing/session/context.go +++ b/features/routing/session/context.go @@ -3,9 +3,9 @@ package session import ( "context" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/routing" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/routing" ) // Context is an implementation of routing.Context, which is a wrapper of context.context with session info. diff --git a/features/stats/errors.generated.go b/features/stats/errors.generated.go index 5ded551d1..f46092bc9 100644 --- a/features/stats/errors.generated.go +++ b/features/stats/errors.generated.go @@ -1,6 +1,6 @@ package stats -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/features/stats/stats.go b/features/stats/stats.go index f1a9ed518..d0a38bb05 100644 --- a/features/stats/stats.go +++ b/features/stats/stats.go @@ -1,12 +1,12 @@ package stats -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/features" ) // Counter is the interface for stats counters. diff --git a/functions.go b/functions.go index 559b04176..e084fc549 100644 --- a/functions.go +++ b/functions.go @@ -4,10 +4,10 @@ import ( "bytes" "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet/udp" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet/udp" ) // CreateObject creates a new object based on the given V2Ray instance and config. The V2Ray instance may be nil. diff --git a/functions_test.go b/functions_test.go index 291b16719..1f3a361c6 100644 --- a/functions_test.go +++ b/functions_test.go @@ -11,15 +11,15 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" ) func xor(b []byte) []byte { diff --git a/go.mod b/go.mod index d01fa0a25..163d44f77 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/v2fly/v2ray-core/v4 +module github.com/v2fly/v2ray-core/v5 go 1.17 diff --git a/infra/conf/cfgcommon/common.go b/infra/conf/cfgcommon/common.go index f7e766537..a5a34b620 100644 --- a/infra/conf/cfgcommon/common.go +++ b/infra/conf/cfgcommon/common.go @@ -5,11 +5,11 @@ import ( "os" "strings" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type StringList []string diff --git a/infra/conf/cfgcommon/common_test.go b/infra/conf/cfgcommon/common_test.go index ac22d9c0d..9f07dec74 100644 --- a/infra/conf/cfgcommon/common_test.go +++ b/infra/conf/cfgcommon/common_test.go @@ -8,10 +8,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" ) func TestStringListUnmarshalError(t *testing.T) { diff --git a/infra/conf/cfgcommon/duration/duration_test.go b/infra/conf/cfgcommon/duration/duration_test.go index 73f689a35..6ee18bd6e 100644 --- a/infra/conf/cfgcommon/duration/duration_test.go +++ b/infra/conf/cfgcommon/duration/duration_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/duration" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/duration" ) type testWithDuration struct { diff --git a/infra/conf/cfgcommon/errors.generated.go b/infra/conf/cfgcommon/errors.generated.go index 8b520ad79..49a83705e 100644 --- a/infra/conf/cfgcommon/errors.generated.go +++ b/infra/conf/cfgcommon/errors.generated.go @@ -1,6 +1,6 @@ package cfgcommon -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/cfgcommon/loader/errors.generated.go b/infra/conf/cfgcommon/loader/errors.generated.go index 139ee3341..a93439f9b 100644 --- a/infra/conf/cfgcommon/loader/errors.generated.go +++ b/infra/conf/cfgcommon/loader/errors.generated.go @@ -1,6 +1,6 @@ package loader -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/cfgcommon/loader/loader.go b/infra/conf/cfgcommon/loader/loader.go index 5030c3689..ef2a21e5f 100644 --- a/infra/conf/cfgcommon/loader/loader.go +++ b/infra/conf/cfgcommon/loader/loader.go @@ -5,7 +5,7 @@ import ( "strings" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type ConfigCreator func() interface{} diff --git a/infra/conf/cfgcommon/muxcfg/mux.go b/infra/conf/cfgcommon/muxcfg/mux.go index ccd3bd776..0a97e716a 100644 --- a/infra/conf/cfgcommon/muxcfg/mux.go +++ b/infra/conf/cfgcommon/muxcfg/mux.go @@ -1,6 +1,6 @@ package muxcfg -import "github.com/v2fly/v2ray-core/v4/app/proxyman" +import "github.com/v2fly/v2ray-core/v5/app/proxyman" type MuxConfig struct { Enabled bool `json:"enabled"` diff --git a/infra/conf/cfgcommon/proxycfg/errors.generated.go b/infra/conf/cfgcommon/proxycfg/errors.generated.go index f1dae4391..c2f1c5d7e 100644 --- a/infra/conf/cfgcommon/proxycfg/errors.generated.go +++ b/infra/conf/cfgcommon/proxycfg/errors.generated.go @@ -1,6 +1,6 @@ package proxycfg -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/cfgcommon/proxycfg/proxy.go b/infra/conf/cfgcommon/proxycfg/proxy.go index 239fe10ac..56c213641 100644 --- a/infra/conf/cfgcommon/proxycfg/proxy.go +++ b/infra/conf/cfgcommon/proxycfg/proxy.go @@ -1,13 +1,13 @@ package proxycfg -import "github.com/v2fly/v2ray-core/v4/transport/internet" +import "github.com/v2fly/v2ray-core/v5/transport/internet" type ProxyConfig struct { Tag string `json:"tag"` TransportLayerProxy bool `json:"transportLayer"` } -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen // Build implements Buildable. func (v *ProxyConfig) Build() (*internet.ProxyConfig, error) { diff --git a/infra/conf/cfgcommon/session.go b/infra/conf/cfgcommon/session.go index 0bd18be77..8ec23cc4e 100644 --- a/infra/conf/cfgcommon/session.go +++ b/infra/conf/cfgcommon/session.go @@ -3,8 +3,8 @@ package cfgcommon import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" ) type configureLoadingContext int diff --git a/infra/conf/cfgcommon/sniffer/errors.generated.go b/infra/conf/cfgcommon/sniffer/errors.generated.go index d8804c973..8a80c0e06 100644 --- a/infra/conf/cfgcommon/sniffer/errors.generated.go +++ b/infra/conf/cfgcommon/sniffer/errors.generated.go @@ -1,6 +1,6 @@ package sniffer -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/cfgcommon/sniffer/sniffer.go b/infra/conf/cfgcommon/sniffer/sniffer.go index 7f4557da0..0fb8ade7c 100644 --- a/infra/conf/cfgcommon/sniffer/sniffer.go +++ b/infra/conf/cfgcommon/sniffer/sniffer.go @@ -3,11 +3,11 @@ package sniffer import ( "strings" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type SniffingConfig struct { Enabled bool `json:"enabled"` diff --git a/infra/conf/cfgcommon/socketcfg/socket.go b/infra/conf/cfgcommon/socketcfg/socket.go index 3ef858f46..2d229c39e 100644 --- a/infra/conf/cfgcommon/socketcfg/socket.go +++ b/infra/conf/cfgcommon/socketcfg/socket.go @@ -3,7 +3,7 @@ package socketcfg import ( "strings" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type SocketConfig struct { diff --git a/infra/conf/cfgcommon/testassist/general.go b/infra/conf/cfgcommon/testassist/general.go index 7fe26c8d5..04543e6af 100644 --- a/infra/conf/cfgcommon/testassist/general.go +++ b/infra/conf/cfgcommon/testassist/general.go @@ -6,8 +6,8 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" ) func LoadJSON(creator func() cfgcommon.Buildable) func(string) (proto.Message, error) { diff --git a/infra/conf/cfgcommon/tlscfg/errors.generated.go b/infra/conf/cfgcommon/tlscfg/errors.generated.go index 57791cb84..fa6971d6a 100644 --- a/infra/conf/cfgcommon/tlscfg/errors.generated.go +++ b/infra/conf/cfgcommon/tlscfg/errors.generated.go @@ -1,6 +1,6 @@ package tlscfg -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/cfgcommon/tlscfg/tls.go b/infra/conf/cfgcommon/tlscfg/tls.go index b5a5a7d74..417ca6c1e 100644 --- a/infra/conf/cfgcommon/tlscfg/tls.go +++ b/infra/conf/cfgcommon/tlscfg/tls.go @@ -6,12 +6,12 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type TLSConfig struct { Insecure bool `json:"allowInsecure"` diff --git a/infra/conf/geodata/attr.go b/infra/conf/geodata/attr.go index a1e51370e..8ae978c64 100644 --- a/infra/conf/geodata/attr.go +++ b/infra/conf/geodata/attr.go @@ -3,7 +3,7 @@ package geodata import ( "strings" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" ) type AttributeList struct { diff --git a/infra/conf/geodata/errors.generated.go b/infra/conf/geodata/errors.generated.go index 2770f1a1a..e93596d4f 100644 --- a/infra/conf/geodata/errors.generated.go +++ b/infra/conf/geodata/errors.generated.go @@ -1,6 +1,6 @@ package geodata -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/geodata/geodata.go b/infra/conf/geodata/geodata.go index 1c82fcd18..7f91d54a7 100644 --- a/infra/conf/geodata/geodata.go +++ b/infra/conf/geodata/geodata.go @@ -3,7 +3,7 @@ package geodata import ( "strings" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" ) type loader struct { diff --git a/infra/conf/geodata/geodata_test.go b/infra/conf/geodata/geodata_test.go index 796b11eb9..403502b92 100644 --- a/infra/conf/geodata/geodata_test.go +++ b/infra/conf/geodata/geodata_test.go @@ -8,11 +8,11 @@ import ( "runtime" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/memconservative" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/standard" ) func init() { diff --git a/infra/conf/geodata/geodataproto.go b/infra/conf/geodata/geodataproto.go index 057dd9b57..526e096db 100644 --- a/infra/conf/geodata/geodataproto.go +++ b/infra/conf/geodata/geodataproto.go @@ -1,10 +1,10 @@ package geodata import ( - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type LoaderImplementation interface { LoadSite(filename, list string) ([]*routercommon.Domain, error) diff --git a/infra/conf/geodata/memconservative/cache.go b/infra/conf/geodata/memconservative/cache.go index b197bd03e..386086cb7 100644 --- a/infra/conf/geodata/memconservative/cache.go +++ b/infra/conf/geodata/memconservative/cache.go @@ -6,8 +6,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/platform" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/platform" ) type GeoIPCache map[string]*routercommon.GeoIP diff --git a/infra/conf/geodata/memconservative/decode.go b/infra/conf/geodata/memconservative/decode.go index 7e431ca6f..69de83cb0 100644 --- a/infra/conf/geodata/memconservative/decode.go +++ b/infra/conf/geodata/memconservative/decode.go @@ -7,7 +7,7 @@ import ( "google.golang.org/protobuf/encoding/protowire" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" ) var ( diff --git a/infra/conf/geodata/memconservative/decode_test.go b/infra/conf/geodata/memconservative/decode_test.go index 64e66fb0e..0ff76e4ad 100644 --- a/infra/conf/geodata/memconservative/decode_test.go +++ b/infra/conf/geodata/memconservative/decode_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" ) func init() { diff --git a/infra/conf/geodata/memconservative/errors.generated.go b/infra/conf/geodata/memconservative/errors.generated.go index d561ce053..ea2f9d0ae 100644 --- a/infra/conf/geodata/memconservative/errors.generated.go +++ b/infra/conf/geodata/memconservative/errors.generated.go @@ -1,6 +1,6 @@ package memconservative -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/geodata/memconservative/memc.go b/infra/conf/geodata/memconservative/memc.go index 218f812c2..83226bf20 100644 --- a/infra/conf/geodata/memconservative/memc.go +++ b/infra/conf/geodata/memconservative/memc.go @@ -3,11 +3,11 @@ package memconservative import ( "runtime" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen type memConservativeLoader struct { geoipcache GeoIPCache diff --git a/infra/conf/geodata/standard/errors.generated.go b/infra/conf/geodata/standard/errors.generated.go index 5fd35e26c..ff66d38d5 100644 --- a/infra/conf/geodata/standard/errors.generated.go +++ b/infra/conf/geodata/standard/errors.generated.go @@ -1,6 +1,6 @@ package standard -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/geodata/standard/standard.go b/infra/conf/geodata/standard/standard.go index 4cd456380..c5bff3c23 100644 --- a/infra/conf/geodata/standard/standard.go +++ b/infra/conf/geodata/standard/standard.go @@ -5,12 +5,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen func loadIP(filename, country string) ([]*routercommon.CIDR, error) { geoipBytes, err := filesystem.ReadAsset(filename) diff --git a/infra/conf/json/reader.go b/infra/conf/json/reader.go index f143d1591..ca6c4cb93 100644 --- a/infra/conf/json/reader.go +++ b/infra/conf/json/reader.go @@ -3,7 +3,7 @@ package json import ( "io" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) // State is the internal state of parser. diff --git a/infra/conf/json/reader_test.go b/infra/conf/json/reader_test.go index 74210c443..5bc7d1158 100644 --- a/infra/conf/json/reader_test.go +++ b/infra/conf/json/reader_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/infra/conf/json" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/infra/conf/json" ) func TestReader(t *testing.T) { diff --git a/infra/conf/jsonpb/errors.generated.go b/infra/conf/jsonpb/errors.generated.go index 8b2213167..543c06745 100644 --- a/infra/conf/jsonpb/errors.generated.go +++ b/infra/conf/jsonpb/errors.generated.go @@ -1,6 +1,6 @@ package jsonpb -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/jsonpb/jsonpb.go b/infra/conf/jsonpb/jsonpb.go index c674db095..27b4b74c7 100644 --- a/infra/conf/jsonpb/jsonpb.go +++ b/infra/conf/jsonpb/jsonpb.go @@ -7,14 +7,14 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" - "github.com/v2fly/v2ray-core/v4/common/serial" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" + "github.com/v2fly/v2ray-core/v5/common/serial" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen func loadJSONPB(data io.Reader) (*core.Config, error) { coreconf := &core.Config{} diff --git a/infra/conf/merge/errors.generated.go b/infra/conf/merge/errors.generated.go index 1ce5f76f9..d9b6d91cc 100644 --- a/infra/conf/merge/errors.generated.go +++ b/infra/conf/merge/errors.generated.go @@ -1,6 +1,6 @@ package merge -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/merge/merge.go b/infra/conf/merge/merge.go index abac771cb..db0ffe564 100644 --- a/infra/conf/merge/merge.go +++ b/infra/conf/merge/merge.go @@ -19,7 +19,7 @@ import ( "bytes" "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/serial" ) // JSONs merges multiple json contents into one json. diff --git a/infra/conf/merge/merge_test.go b/infra/conf/merge/merge_test.go index 49beafce4..6f393a9e3 100644 --- a/infra/conf/merge/merge_test.go +++ b/infra/conf/merge/merge_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/v2fly/v2ray-core/v4/infra/conf/merge" - "github.com/v2fly/v2ray-core/v4/infra/conf/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/merge" + "github.com/v2fly/v2ray-core/v5/infra/conf/serial" ) func TestMergeV2Style(t *testing.T) { diff --git a/infra/conf/mergers/errors.generated.go b/infra/conf/mergers/errors.generated.go index 877b2ed7e..a394703a3 100644 --- a/infra/conf/mergers/errors.generated.go +++ b/infra/conf/mergers/errors.generated.go @@ -1,6 +1,6 @@ package mergers -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/mergers/merge.go b/infra/conf/mergers/merge.go index d89399421..91898e848 100644 --- a/infra/conf/mergers/merge.go +++ b/infra/conf/mergers/merge.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" ) // MergeAs load input and merge as specified format into m diff --git a/infra/conf/mergers/merger_base.go b/infra/conf/mergers/merger_base.go index aa9987e37..c633ff842 100644 --- a/infra/conf/mergers/merger_base.go +++ b/infra/conf/mergers/merger_base.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" - "github.com/v2fly/v2ray-core/v4/infra/conf/merge" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" + "github.com/v2fly/v2ray-core/v5/infra/conf/merge" ) type jsonConverter func(v []byte) ([]byte, error) diff --git a/infra/conf/mergers/mergers.go b/infra/conf/mergers/mergers.go index 1f5f0c8a9..f05ce11bd 100644 --- a/infra/conf/mergers/mergers.go +++ b/infra/conf/mergers/mergers.go @@ -1,13 +1,13 @@ package mergers -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "strings" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/infra/conf/json" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/infra/conf/json" ) func init() { diff --git a/infra/conf/rule/errors.generated.go b/infra/conf/rule/errors.generated.go index 061cef0c4..a8f3f34b9 100644 --- a/infra/conf/rule/errors.generated.go +++ b/infra/conf/rule/errors.generated.go @@ -1,6 +1,6 @@ package rule -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/rule/rule.go b/infra/conf/rule/rule.go index 045ade964..c43f8f9aa 100644 --- a/infra/conf/rule/rule.go +++ b/infra/conf/rule/rule.go @@ -6,13 +6,13 @@ import ( "strconv" "strings" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen func parseDomainRule(ctx context.Context, domain string) ([]*routercommon.Domain, error) { cfgEnv := cfgcommon.GetConfigureLoadingEnvironment(ctx) diff --git a/infra/conf/rule/rule_test.go b/infra/conf/rule/rule_test.go index c7dbab14b..622ce2630 100644 --- a/infra/conf/rule/rule_test.go +++ b/infra/conf/rule/rule_test.go @@ -8,13 +8,13 @@ import ( "path/filepath" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" - "github.com/v2fly/v2ray-core/v4/infra/conf/rule" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/standard" + "github.com/v2fly/v2ray-core/v5/infra/conf/rule" ) func init() { diff --git a/infra/conf/serial/errors.generated.go b/infra/conf/serial/errors.generated.go index 6e9546f3b..e9854c496 100644 --- a/infra/conf/serial/errors.generated.go +++ b/infra/conf/serial/errors.generated.go @@ -1,6 +1,6 @@ package serial -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/serial/loader.go b/infra/conf/serial/loader.go index d51a6be74..d6b9b2ebf 100644 --- a/infra/conf/serial/loader.go +++ b/infra/conf/serial/loader.go @@ -5,10 +5,10 @@ import ( "encoding/json" "io" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common/errors" - json_reader "github.com/v2fly/v2ray-core/v4/infra/conf/json" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common/errors" + json_reader "github.com/v2fly/v2ray-core/v5/infra/conf/json" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" ) type offset struct { diff --git a/infra/conf/serial/loader_test.go b/infra/conf/serial/loader_test.go index ebe52b79c..aa78f9952 100644 --- a/infra/conf/serial/loader_test.go +++ b/infra/conf/serial/loader_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/v2fly/v2ray-core/v4/infra/conf/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/serial" ) func TestLoaderError(t *testing.T) { diff --git a/infra/conf/serial/serial.go b/infra/conf/serial/serial.go index 27d6c5349..14a37dfe7 100644 --- a/infra/conf/serial/serial.go +++ b/infra/conf/serial/serial.go @@ -1,3 +1,3 @@ package serial -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/infra/conf/synthetic/dns/dns.go b/infra/conf/synthetic/dns/dns.go index 44691e9bd..07ff9c7d0 100644 --- a/infra/conf/synthetic/dns/dns.go +++ b/infra/conf/synthetic/dns/dns.go @@ -1,6 +1,6 @@ package dns -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -8,13 +8,13 @@ import ( "sort" "strings" - "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - rule2 "github.com/v2fly/v2ray-core/v4/infra/conf/rule" + "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" + rule2 "github.com/v2fly/v2ray-core/v5/infra/conf/rule" ) type NameServerConfig struct { diff --git a/infra/conf/synthetic/dns/dns_test.go b/infra/conf/synthetic/dns/dns_test.go index d20e1efea..022ab66d5 100644 --- a/infra/conf/synthetic/dns/dns_test.go +++ b/infra/conf/synthetic/dns/dns_test.go @@ -10,13 +10,13 @@ import ( "google.golang.org/protobuf/runtime/protoiface" - "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" - dns2 "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/dns" + "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform/filesystem" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/standard" + dns2 "github.com/v2fly/v2ray-core/v5/infra/conf/synthetic/dns" ) func init() { diff --git a/infra/conf/synthetic/dns/errors.generated.go b/infra/conf/synthetic/dns/errors.generated.go index 438eb646e..e69b94752 100644 --- a/infra/conf/synthetic/dns/errors.generated.go +++ b/infra/conf/synthetic/dns/errors.generated.go @@ -1,6 +1,6 @@ package dns -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/synthetic/log/log.go b/infra/conf/synthetic/log/log.go index 3786c115b..2834df21f 100644 --- a/infra/conf/synthetic/log/log.go +++ b/infra/conf/synthetic/log/log.go @@ -3,8 +3,8 @@ package log import ( "strings" - "github.com/v2fly/v2ray-core/v4/app/log" - clog "github.com/v2fly/v2ray-core/v4/common/log" + "github.com/v2fly/v2ray-core/v5/app/log" + clog "github.com/v2fly/v2ray-core/v5/common/log" ) func DefaultLogConfig() *log.Config { diff --git a/infra/conf/synthetic/router/errors.generated.go b/infra/conf/synthetic/router/errors.generated.go index 839616b18..ed13fde7e 100644 --- a/infra/conf/synthetic/router/errors.generated.go +++ b/infra/conf/synthetic/router/errors.generated.go @@ -1,6 +1,6 @@ package router -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/synthetic/router/router.go b/infra/conf/synthetic/router/router.go index 31ae3080d..b32519c80 100644 --- a/infra/conf/synthetic/router/router.go +++ b/infra/conf/synthetic/router/router.go @@ -1,6 +1,6 @@ package router -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -9,12 +9,12 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - rule2 "github.com/v2fly/v2ray-core/v4/infra/conf/rule" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" + rule2 "github.com/v2fly/v2ray-core/v5/infra/conf/rule" ) type RouterRulesConfig struct { // nolint: revive diff --git a/infra/conf/synthetic/router/router_strategy.go b/infra/conf/synthetic/router/router_strategy.go index 736d52a2f..4cb463004 100644 --- a/infra/conf/synthetic/router/router_strategy.go +++ b/infra/conf/synthetic/router/router_strategy.go @@ -3,10 +3,10 @@ package router import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/observatory/burst" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/duration" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" + "github.com/v2fly/v2ray-core/v5/app/observatory/burst" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/duration" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/loader" ) const ( diff --git a/infra/conf/synthetic/router/router_test.go b/infra/conf/synthetic/router/router_test.go index 26b9e249f..c54b4791c 100644 --- a/infra/conf/synthetic/router/router_test.go +++ b/infra/conf/synthetic/router/router_test.go @@ -8,16 +8,16 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" // Geo loaders - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" - router2 "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/memconservative" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/standard" + router2 "github.com/v2fly/v2ray-core/v5/infra/conf/synthetic/router" ) func TestRouterConfig(t *testing.T) { diff --git a/infra/conf/v2jsonpb/errors.generated.go b/infra/conf/v2jsonpb/errors.generated.go index c92632f0d..ebd42200b 100644 --- a/infra/conf/v2jsonpb/errors.generated.go +++ b/infra/conf/v2jsonpb/errors.generated.go @@ -1,6 +1,6 @@ package v2jsonpb -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/v2jsonpb/follower.go b/infra/conf/v2jsonpb/follower.go index 4def263c3..19d333b3d 100644 --- a/infra/conf/v2jsonpb/follower.go +++ b/infra/conf/v2jsonpb/follower.go @@ -5,7 +5,7 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/known/anypb" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type V2JsonProtobufFollowerFieldDescriptor struct { diff --git a/infra/conf/v2jsonpb/v2jsonpb.go b/infra/conf/v2jsonpb/v2jsonpb.go index 1efe913b1..d383a34e5 100644 --- a/infra/conf/v2jsonpb/v2jsonpb.go +++ b/infra/conf/v2jsonpb/v2jsonpb.go @@ -6,14 +6,14 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" - "github.com/v2fly/v2ray-core/v4/common/serial" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" + "github.com/v2fly/v2ray-core/v5/common/serial" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen func loadV2JsonPb(data []byte) (*core.Config, error) { coreconf := &core.Config{} diff --git a/infra/conf/v4/api.go b/infra/conf/v4/api.go index 5aa0c9499..4cae227be 100644 --- a/infra/conf/v4/api.go +++ b/infra/conf/v4/api.go @@ -7,13 +7,13 @@ import ( "github.com/jhump/protoreflect/dynamic" "google.golang.org/protobuf/types/known/anypb" - "github.com/v2fly/v2ray-core/v4/app/commander" - loggerservice "github.com/v2fly/v2ray-core/v4/app/log/command" - observatoryservice "github.com/v2fly/v2ray-core/v4/app/observatory/command" - handlerservice "github.com/v2fly/v2ray-core/v4/app/proxyman/command" - routerservice "github.com/v2fly/v2ray-core/v4/app/router/command" - statsservice "github.com/v2fly/v2ray-core/v4/app/stats/command" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/app/commander" + loggerservice "github.com/v2fly/v2ray-core/v5/app/log/command" + observatoryservice "github.com/v2fly/v2ray-core/v5/app/observatory/command" + handlerservice "github.com/v2fly/v2ray-core/v5/app/proxyman/command" + routerservice "github.com/v2fly/v2ray-core/v5/app/router/command" + statsservice "github.com/v2fly/v2ray-core/v5/app/stats/command" + "github.com/v2fly/v2ray-core/v5/common/serial" ) type APIConfig struct { diff --git a/infra/conf/v4/blackhole.go b/infra/conf/v4/blackhole.go index bb19f8fc7..06ed6a00b 100644 --- a/infra/conf/v4/blackhole.go +++ b/infra/conf/v4/blackhole.go @@ -5,10 +5,10 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/loader" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" ) type NoneResponse struct{} diff --git a/infra/conf/v4/blackhole_test.go b/infra/conf/v4/blackhole_test.go index c8f8561d9..738da7c41 100644 --- a/infra/conf/v4/blackhole_test.go +++ b/infra/conf/v4/blackhole_test.go @@ -3,11 +3,11 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" ) func TestHTTPResponseJSON(t *testing.T) { diff --git a/infra/conf/v4/browser_forwarder.go b/infra/conf/v4/browser_forwarder.go index 80190bc79..a467f501f 100644 --- a/infra/conf/v4/browser_forwarder.go +++ b/infra/conf/v4/browser_forwarder.go @@ -5,7 +5,7 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/browserforwarder" + "github.com/v2fly/v2ray-core/v5/app/browserforwarder" ) type BrowserForwarderConfig struct { diff --git a/infra/conf/v4/conf.go b/infra/conf/v4/conf.go index 3182412d0..8553b3753 100644 --- a/infra/conf/v4/conf.go +++ b/infra/conf/v4/conf.go @@ -1,3 +1,3 @@ package v4 -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/infra/conf/v4/dns_proxy.go b/infra/conf/v4/dns_proxy.go index 437636c41..38f20b21b 100644 --- a/infra/conf/v4/dns_proxy.go +++ b/infra/conf/v4/dns_proxy.go @@ -3,9 +3,9 @@ package v4 import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/dns" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/dns" ) type DNSOutboundConfig struct { diff --git a/infra/conf/v4/dns_proxy_test.go b/infra/conf/v4/dns_proxy_test.go index 7af88d493..2d4ce75d4 100644 --- a/infra/conf/v4/dns_proxy_test.go +++ b/infra/conf/v4/dns_proxy_test.go @@ -3,11 +3,11 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/dns" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/dns" ) func TestDnsProxyConfig(t *testing.T) { diff --git a/infra/conf/v4/dokodemo.go b/infra/conf/v4/dokodemo.go index ca68e3b01..5658a3fc4 100644 --- a/infra/conf/v4/dokodemo.go +++ b/infra/conf/v4/dokodemo.go @@ -3,8 +3,8 @@ package v4 import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" ) type DokodemoConfig struct { diff --git a/infra/conf/v4/dokodemo_test.go b/infra/conf/v4/dokodemo_test.go index 5670f80e3..c0b96b3a3 100644 --- a/infra/conf/v4/dokodemo_test.go +++ b/infra/conf/v4/dokodemo_test.go @@ -3,11 +3,11 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" ) func TestDokodemoConfig(t *testing.T) { diff --git a/infra/conf/v4/errors.generated.go b/infra/conf/v4/errors.generated.go index 84e5e761e..d1eb8e550 100644 --- a/infra/conf/v4/errors.generated.go +++ b/infra/conf/v4/errors.generated.go @@ -1,6 +1,6 @@ package v4 -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/v4/fakedns.go b/infra/conf/v4/fakedns.go index b86c593f3..9bde534eb 100644 --- a/infra/conf/v4/fakedns.go +++ b/infra/conf/v4/fakedns.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - "github.com/v2fly/v2ray-core/v4/app/dns/fakedns" + "github.com/v2fly/v2ray-core/v5/app/dns/fakedns" ) type FakeDNSPoolElementConfig struct { diff --git a/infra/conf/v4/freedom.go b/infra/conf/v4/freedom.go index 62dbe419d..a56bc256d 100644 --- a/infra/conf/v4/freedom.go +++ b/infra/conf/v4/freedom.go @@ -6,9 +6,9 @@ import ( "github.com/golang/protobuf/proto" - v2net "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" + v2net "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" ) type FreedomConfig struct { diff --git a/infra/conf/v4/freedom_test.go b/infra/conf/v4/freedom_test.go index b015914f3..042ac40a5 100644 --- a/infra/conf/v4/freedom_test.go +++ b/infra/conf/v4/freedom_test.go @@ -3,12 +3,12 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" ) func TestFreedomConfig(t *testing.T) { diff --git a/infra/conf/v4/gun.go b/infra/conf/v4/gun.go index 4a2be9aca..059e3b4c4 100644 --- a/infra/conf/v4/gun.go +++ b/infra/conf/v4/gun.go @@ -3,7 +3,7 @@ package v4 import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/transport/internet/grpc" + "github.com/v2fly/v2ray-core/v5/transport/internet/grpc" ) type GunConfig struct { diff --git a/infra/conf/v4/http.go b/infra/conf/v4/http.go index c8352e874..02827a8b8 100644 --- a/infra/conf/v4/http.go +++ b/infra/conf/v4/http.go @@ -5,10 +5,10 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/http" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/http" ) type HTTPAccount struct { diff --git a/infra/conf/v4/http_test.go b/infra/conf/v4/http_test.go index fe005ba44..ed7dbda7e 100644 --- a/infra/conf/v4/http_test.go +++ b/infra/conf/v4/http_test.go @@ -3,10 +3,10 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/http" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/http" ) func TestHTTPServerConfig(t *testing.T) { diff --git a/infra/conf/v4/loopback.go b/infra/conf/v4/loopback.go index 57b55a495..4394e8e57 100644 --- a/infra/conf/v4/loopback.go +++ b/infra/conf/v4/loopback.go @@ -3,7 +3,7 @@ package v4 import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/proxy/loopback" + "github.com/v2fly/v2ray-core/v5/proxy/loopback" ) type LoopbackConfig struct { diff --git a/infra/conf/v4/observatory.go b/infra/conf/v4/observatory.go index d3f4c6a7f..1a7bdd3f1 100644 --- a/infra/conf/v4/observatory.go +++ b/infra/conf/v4/observatory.go @@ -6,13 +6,13 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/v2fly/v2ray-core/v4/app/observatory" - "github.com/v2fly/v2ray-core/v4/app/observatory/burst" - "github.com/v2fly/v2ray-core/v4/app/observatory/multiobservatory" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/duration" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" + "github.com/v2fly/v2ray-core/v5/app/observatory" + "github.com/v2fly/v2ray-core/v5/app/observatory/burst" + "github.com/v2fly/v2ray-core/v5/app/observatory/multiobservatory" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/taggedfeatures" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/duration" + "github.com/v2fly/v2ray-core/v5/infra/conf/synthetic/router" ) type ObservatoryConfig struct { diff --git a/infra/conf/v4/policy.go b/infra/conf/v4/policy.go index 3419d4ddf..2bb3111e8 100644 --- a/infra/conf/v4/policy.go +++ b/infra/conf/v4/policy.go @@ -1,7 +1,7 @@ package v4 import ( - "github.com/v2fly/v2ray-core/v4/app/policy" + "github.com/v2fly/v2ray-core/v5/app/policy" ) type Policy struct { diff --git a/infra/conf/v4/policy_test.go b/infra/conf/v4/policy_test.go index 7befce24c..e3a3a942d 100644 --- a/infra/conf/v4/policy_test.go +++ b/infra/conf/v4/policy_test.go @@ -3,8 +3,8 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/common" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" ) func TestBufferSize(t *testing.T) { diff --git a/infra/conf/v4/reverse.go b/infra/conf/v4/reverse.go index 997a53a27..a327600b1 100644 --- a/infra/conf/v4/reverse.go +++ b/infra/conf/v4/reverse.go @@ -3,7 +3,7 @@ package v4 import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/app/reverse" + "github.com/v2fly/v2ray-core/v5/app/reverse" ) type BridgeConfig struct { diff --git a/infra/conf/v4/reverse_test.go b/infra/conf/v4/reverse_test.go index ffe72ba9a..c442177ae 100644 --- a/infra/conf/v4/reverse_test.go +++ b/infra/conf/v4/reverse_test.go @@ -3,10 +3,10 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/app/reverse" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/app/reverse" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" ) func TestReverseConfig(t *testing.T) { diff --git a/infra/conf/v4/services.go b/infra/conf/v4/services.go index c5bc9c5f6..190fbce42 100644 --- a/infra/conf/v4/services.go +++ b/infra/conf/v4/services.go @@ -8,7 +8,7 @@ import ( "github.com/jhump/protoreflect/dynamic" "google.golang.org/protobuf/types/known/anypb" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/serial" ) func (c *Config) BuildServices(service map[string]*json.RawMessage) ([]*anypb.Any, error) { diff --git a/infra/conf/v4/shadowsocks.go b/infra/conf/v4/shadowsocks.go index 6af6bf5dc..ecfc506e5 100644 --- a/infra/conf/v4/shadowsocks.go +++ b/infra/conf/v4/shadowsocks.go @@ -3,10 +3,10 @@ package v4 import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks" ) type ShadowsocksServerConfig struct { diff --git a/infra/conf/v4/shadowsocks_test.go b/infra/conf/v4/shadowsocks_test.go index 36eec081b..d9877cc3a 100644 --- a/infra/conf/v4/shadowsocks_test.go +++ b/infra/conf/v4/shadowsocks_test.go @@ -3,13 +3,13 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks" ) func TestShadowsocksServerConfigParsing(t *testing.T) { diff --git a/infra/conf/v4/socks.go b/infra/conf/v4/socks.go index fa8811216..2a8754195 100644 --- a/infra/conf/v4/socks.go +++ b/infra/conf/v4/socks.go @@ -6,10 +6,10 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/socks" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/socks" ) type SocksAccount struct { diff --git a/infra/conf/v4/socks_test.go b/infra/conf/v4/socks_test.go index 9524fe0db..1d4a881a7 100644 --- a/infra/conf/v4/socks_test.go +++ b/infra/conf/v4/socks_test.go @@ -3,13 +3,13 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/socks" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/socks" ) func TestSocksInboundConfig(t *testing.T) { diff --git a/infra/conf/v4/transport.go b/infra/conf/v4/transport.go index 1e58c20d3..081fa833e 100644 --- a/infra/conf/v4/transport.go +++ b/infra/conf/v4/transport.go @@ -1,9 +1,9 @@ package v4 import ( - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type TransportConfig struct { diff --git a/infra/conf/v4/transport_authenticators.go b/infra/conf/v4/transport_authenticators.go index ba4fcddc9..82b67004d 100644 --- a/infra/conf/v4/transport_authenticators.go +++ b/infra/conf/v4/transport_authenticators.go @@ -5,14 +5,14 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/noop" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/srtp" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/tls" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/utp" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wechat" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wireguard" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/noop" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/srtp" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/tls" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/utp" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wechat" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wireguard" ) type NoOpAuthenticator struct{} diff --git a/infra/conf/v4/transport_internet.go b/infra/conf/v4/transport_internet.go index d560108e8..1a18a45d7 100644 --- a/infra/conf/v4/transport_internet.go +++ b/infra/conf/v4/transport_internet.go @@ -6,20 +6,20 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/socketcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/tlscfg" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket" - httpheader "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" - "github.com/v2fly/v2ray-core/v4/transport/internet/quic" - "github.com/v2fly/v2ray-core/v4/transport/internet/tcp" - "github.com/v2fly/v2ray-core/v4/transport/internet/websocket" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/loader" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/socketcfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/tlscfg" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/domainsocket" + httpheader "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" + "github.com/v2fly/v2ray-core/v5/transport/internet/quic" + "github.com/v2fly/v2ray-core/v5/transport/internet/tcp" + "github.com/v2fly/v2ray-core/v5/transport/internet/websocket" ) var ( diff --git a/infra/conf/v4/transport_test.go b/infra/conf/v4/transport_test.go index 1e0ca9000..f342a1258 100644 --- a/infra/conf/v4/transport_test.go +++ b/infra/conf/v4/transport_test.go @@ -6,20 +6,20 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/socketcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/noop" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/tls" - "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" - "github.com/v2fly/v2ray-core/v4/transport/internet/quic" - "github.com/v2fly/v2ray-core/v4/transport/internet/tcp" - "github.com/v2fly/v2ray-core/v4/transport/internet/websocket" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/socketcfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/noop" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/tls" + "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" + "github.com/v2fly/v2ray-core/v5/transport/internet/quic" + "github.com/v2fly/v2ray-core/v5/transport/internet/tcp" + "github.com/v2fly/v2ray-core/v5/transport/internet/websocket" ) func TestSocketConfig(t *testing.T) { diff --git a/infra/conf/v4/trojan.go b/infra/conf/v4/trojan.go index 3bf2a53f0..b54cace47 100644 --- a/infra/conf/v4/trojan.go +++ b/infra/conf/v4/trojan.go @@ -8,11 +8,11 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/trojan" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/trojan" ) // TrojanServerTarget is configuration of a single trojan server diff --git a/infra/conf/v4/v2ray.go b/infra/conf/v4/v2ray.go index 24194cd0f..54df610b1 100644 --- a/infra/conf/v4/v2ray.go +++ b/infra/conf/v4/v2ray.go @@ -6,19 +6,19 @@ import ( "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/app/stats" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/loader" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/proxycfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/sniffer" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/dns" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/log" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/router" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/app/stats" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/loader" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/muxcfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/proxycfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/sniffer" + "github.com/v2fly/v2ray-core/v5/infra/conf/synthetic/dns" + "github.com/v2fly/v2ray-core/v5/infra/conf/synthetic/log" + "github.com/v2fly/v2ray-core/v5/infra/conf/synthetic/router" ) var ( diff --git a/infra/conf/v4/v2ray_test.go b/infra/conf/v4/v2ray_test.go index 3e4db1dfd..0bfcb7ec5 100644 --- a/infra/conf/v4/v2ray_test.go +++ b/infra/conf/v4/v2ray_test.go @@ -8,33 +8,33 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/muxcfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" // Geo loaders - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - dns_proxy "github.com/v2fly/v2ray-core/v4/proxy/dns" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "github.com/v2fly/v2ray-core/v4/transport/internet/websocket" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/memconservative" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/standard" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + dns_proxy "github.com/v2fly/v2ray-core/v5/proxy/dns" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/transport/internet/websocket" ) func TestV2RayConfig(t *testing.T) { diff --git a/infra/conf/v4/vless.go b/infra/conf/v4/vless.go index 453c75ef6..bb2fcb853 100644 --- a/infra/conf/v4/vless.go +++ b/infra/conf/v4/vless.go @@ -8,13 +8,13 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/vless" - "github.com/v2fly/v2ray-core/v4/proxy/vless/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vless/outbound" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/vless" + "github.com/v2fly/v2ray-core/v5/proxy/vless/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vless/outbound" ) type VLessInboundFallback struct { diff --git a/infra/conf/v4/vless_test.go b/infra/conf/v4/vless_test.go index 01995614b..b1caff1db 100644 --- a/infra/conf/v4/vless_test.go +++ b/infra/conf/v4/vless_test.go @@ -3,15 +3,15 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/vless" - "github.com/v2fly/v2ray-core/v4/proxy/vless/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vless/outbound" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/vless" + "github.com/v2fly/v2ray-core/v5/proxy/vless/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vless/outbound" ) func TestVLessOutbound(t *testing.T) { diff --git a/infra/conf/v4/vmess.go b/infra/conf/v4/vmess.go index 11b7181b5..4d33d14b6 100644 --- a/infra/conf/v4/vmess.go +++ b/infra/conf/v4/vmess.go @@ -6,12 +6,12 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" ) type VMessAccount struct { diff --git a/infra/conf/v4/vmess_test.go b/infra/conf/v4/vmess_test.go index 339529d32..6ab24e46d 100644 --- a/infra/conf/v4/vmess_test.go +++ b/infra/conf/v4/vmess_test.go @@ -3,15 +3,15 @@ package v4_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/testassist" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/testassist" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" ) func TestVMessOutbound(t *testing.T) { diff --git a/infra/conf/v5cfg/common.go b/infra/conf/v5cfg/common.go index bb1e1d2bc..050b568ba 100644 --- a/infra/conf/v5cfg/common.go +++ b/infra/conf/v5cfg/common.go @@ -6,9 +6,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/environment/envctx" - "github.com/v2fly/v2ray-core/v4/common/environment/envimpl" - "github.com/v2fly/v2ray-core/v4/common/registry" + "github.com/v2fly/v2ray-core/v5/common/environment/envctx" + "github.com/v2fly/v2ray-core/v5/common/environment/envimpl" + "github.com/v2fly/v2ray-core/v5/common/registry" ) func loadHeterogeneousConfigFromRawJSON(interfaceType, name string, rawJSON json.RawMessage) (proto.Message, error) { diff --git a/infra/conf/v5cfg/errors.generated.go b/infra/conf/v5cfg/errors.generated.go index 65b8de82a..02362e5f4 100644 --- a/infra/conf/v5cfg/errors.generated.go +++ b/infra/conf/v5cfg/errors.generated.go @@ -1,6 +1,6 @@ package v5cfg -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/infra/conf/v5cfg/inbound.go b/infra/conf/v5cfg/inbound.go index b28725d47..3fcab814b 100644 --- a/infra/conf/v5cfg/inbound.go +++ b/infra/conf/v5cfg/inbound.go @@ -5,11 +5,11 @@ import ( "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func (c InboundConfig) BuildV5(ctx context.Context) (proto.Message, error) { diff --git a/infra/conf/v5cfg/init.go b/infra/conf/v5cfg/init.go index 50a0a3627..2b528c5c4 100644 --- a/infra/conf/v5cfg/init.go +++ b/infra/conf/v5cfg/init.go @@ -3,10 +3,10 @@ package v5cfg import ( "io" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" ) const jsonV5 = "jsonv5" diff --git a/infra/conf/v5cfg/outbound.go b/infra/conf/v5cfg/outbound.go index e923d1558..5302b197f 100644 --- a/infra/conf/v5cfg/outbound.go +++ b/infra/conf/v5cfg/outbound.go @@ -5,10 +5,10 @@ import ( "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func (c OutboundConfig) BuildV5(ctx context.Context) (proto.Message, error) { diff --git a/infra/conf/v5cfg/root.go b/infra/conf/v5cfg/root.go index 87a417a39..ae05f925e 100644 --- a/infra/conf/v5cfg/root.go +++ b/infra/conf/v5cfg/root.go @@ -7,14 +7,14 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/geodata" - "github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/log" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/geodata" + "github.com/v2fly/v2ray-core/v5/infra/conf/synthetic/log" ) func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) { diff --git a/infra/conf/v5cfg/skeleton.go b/infra/conf/v5cfg/skeleton.go index f03ec55f5..0f0158f0a 100644 --- a/infra/conf/v5cfg/skeleton.go +++ b/infra/conf/v5cfg/skeleton.go @@ -3,11 +3,11 @@ package v5cfg import ( "encoding/json" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/muxcfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/proxycfg" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/sniffer" - "github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon/socketcfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/muxcfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/proxycfg" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/sniffer" + "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon/socketcfg" ) type RootConfig struct { diff --git a/infra/conf/v5cfg/stream.go b/infra/conf/v5cfg/stream.go index 71684ba9b..c5e338dee 100644 --- a/infra/conf/v5cfg/stream.go +++ b/infra/conf/v5cfg/stream.go @@ -5,8 +5,8 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func (s StreamConfig) BuildV5(ctx context.Context) (proto.Message, error) { diff --git a/infra/conf/v5cfg/v5cfg.go b/infra/conf/v5cfg/v5cfg.go index 0ccde455b..65324b156 100644 --- a/infra/conf/v5cfg/v5cfg.go +++ b/infra/conf/v5cfg/v5cfg.go @@ -1,3 +1,3 @@ package v5cfg -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/main/commands/all/api/api.go b/main/commands/all/api/api.go index 8a2b7418f..447522bea 100644 --- a/main/commands/all/api/api.go +++ b/main/commands/all/api/api.go @@ -1,7 +1,7 @@ package api import ( - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) // CmdAPI calls an API in an V2Ray process diff --git a/main/commands/all/api/balancer_info.go b/main/commands/all/api/balancer_info.go index e74e35551..927ea7661 100644 --- a/main/commands/all/api/balancer_info.go +++ b/main/commands/all/api/balancer_info.go @@ -5,8 +5,8 @@ import ( "os" "strings" - routerService "github.com/v2fly/v2ray-core/v4/app/router/command" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + routerService "github.com/v2fly/v2ray-core/v5/app/router/command" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) // TODO: support "-json" flag for json output diff --git a/main/commands/all/api/balancer_override.go b/main/commands/all/api/balancer_override.go index 98cee5e38..fcb195c08 100644 --- a/main/commands/all/api/balancer_override.go +++ b/main/commands/all/api/balancer_override.go @@ -1,8 +1,8 @@ package api import ( - routerService "github.com/v2fly/v2ray-core/v4/app/router/command" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + routerService "github.com/v2fly/v2ray-core/v5/app/router/command" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var cmdBalancerOverride = &base.Command{ diff --git a/main/commands/all/api/jsonv4/inbounds_add.go b/main/commands/all/api/jsonv4/inbounds_add.go index c3886856c..7f0315b8b 100644 --- a/main/commands/all/api/jsonv4/inbounds_add.go +++ b/main/commands/all/api/jsonv4/inbounds_add.go @@ -3,10 +3,10 @@ package jsonv4 import ( "fmt" - handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command" - "github.com/v2fly/v2ray-core/v4/main/commands/all/api" - "github.com/v2fly/v2ray-core/v4/main/commands/base" - "github.com/v2fly/v2ray-core/v4/main/commands/helpers" + handlerService "github.com/v2fly/v2ray-core/v5/app/proxyman/command" + "github.com/v2fly/v2ray-core/v5/main/commands/all/api" + "github.com/v2fly/v2ray-core/v5/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/helpers" ) var cmdAddInbounds = &base.Command{ diff --git a/main/commands/all/api/jsonv4/inbounds_remove.go b/main/commands/all/api/jsonv4/inbounds_remove.go index 1bd76b43d..07e18ca9e 100644 --- a/main/commands/all/api/jsonv4/inbounds_remove.go +++ b/main/commands/all/api/jsonv4/inbounds_remove.go @@ -3,10 +3,10 @@ package jsonv4 import ( "fmt" - handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command" - "github.com/v2fly/v2ray-core/v4/main/commands/all/api" - "github.com/v2fly/v2ray-core/v4/main/commands/base" - "github.com/v2fly/v2ray-core/v4/main/commands/helpers" + handlerService "github.com/v2fly/v2ray-core/v5/app/proxyman/command" + "github.com/v2fly/v2ray-core/v5/main/commands/all/api" + "github.com/v2fly/v2ray-core/v5/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/helpers" ) var cmdRemoveInbounds = &base.Command{ diff --git a/main/commands/all/api/jsonv4/init.go b/main/commands/all/api/jsonv4/init.go index 884475f59..98918b959 100644 --- a/main/commands/all/api/jsonv4/init.go +++ b/main/commands/all/api/jsonv4/init.go @@ -1,6 +1,6 @@ package jsonv4 -import "github.com/v2fly/v2ray-core/v4/main/commands/all/api" +import "github.com/v2fly/v2ray-core/v5/main/commands/all/api" func init() { api.CmdAPI.Commands = append(api.CmdAPI.Commands, diff --git a/main/commands/all/api/jsonv4/outbounds_add.go b/main/commands/all/api/jsonv4/outbounds_add.go index 2e1361250..cf8360d2e 100644 --- a/main/commands/all/api/jsonv4/outbounds_add.go +++ b/main/commands/all/api/jsonv4/outbounds_add.go @@ -3,10 +3,10 @@ package jsonv4 import ( "fmt" - handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command" - "github.com/v2fly/v2ray-core/v4/main/commands/all/api" - "github.com/v2fly/v2ray-core/v4/main/commands/base" - "github.com/v2fly/v2ray-core/v4/main/commands/helpers" + handlerService "github.com/v2fly/v2ray-core/v5/app/proxyman/command" + "github.com/v2fly/v2ray-core/v5/main/commands/all/api" + "github.com/v2fly/v2ray-core/v5/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/helpers" ) var cmdAddOutbounds = &base.Command{ diff --git a/main/commands/all/api/jsonv4/outbounds_remove.go b/main/commands/all/api/jsonv4/outbounds_remove.go index 961df94b5..e07558301 100644 --- a/main/commands/all/api/jsonv4/outbounds_remove.go +++ b/main/commands/all/api/jsonv4/outbounds_remove.go @@ -3,10 +3,10 @@ package jsonv4 import ( "fmt" - handlerService "github.com/v2fly/v2ray-core/v4/app/proxyman/command" - "github.com/v2fly/v2ray-core/v4/main/commands/all/api" - "github.com/v2fly/v2ray-core/v4/main/commands/base" - "github.com/v2fly/v2ray-core/v4/main/commands/helpers" + handlerService "github.com/v2fly/v2ray-core/v5/app/proxyman/command" + "github.com/v2fly/v2ray-core/v5/main/commands/all/api" + "github.com/v2fly/v2ray-core/v5/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/helpers" ) var cmdRemoveOutbounds = &base.Command{ diff --git a/main/commands/all/api/log.go b/main/commands/all/api/log.go index f96bc28e0..65b4ea7cc 100644 --- a/main/commands/all/api/log.go +++ b/main/commands/all/api/log.go @@ -5,8 +5,8 @@ import ( "log" "os" - logService "github.com/v2fly/v2ray-core/v4/app/log/command" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + logService "github.com/v2fly/v2ray-core/v5/app/log/command" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var cmdLog = &base.Command{ diff --git a/main/commands/all/api/shared.go b/main/commands/all/api/shared.go index fa49ac220..b3f8b9afe 100644 --- a/main/commands/all/api/shared.go +++ b/main/commands/all/api/shared.go @@ -11,8 +11,8 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var ( diff --git a/main/commands/all/api/stats.go b/main/commands/all/api/stats.go index 243fcb1b3..c7ec7fc4b 100644 --- a/main/commands/all/api/stats.go +++ b/main/commands/all/api/stats.go @@ -7,9 +7,9 @@ import ( "strings" "time" - statsService "github.com/v2fly/v2ray-core/v4/app/stats/command" - "github.com/v2fly/v2ray-core/v4/common/units" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + statsService "github.com/v2fly/v2ray-core/v5/app/stats/command" + "github.com/v2fly/v2ray-core/v5/common/units" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var cmdStats = &base.Command{ diff --git a/main/commands/all/commands.go b/main/commands/all/commands.go index af7e937a4..b483ddde4 100644 --- a/main/commands/all/commands.go +++ b/main/commands/all/commands.go @@ -1,9 +1,9 @@ package all import ( - "github.com/v2fly/v2ray-core/v4/main/commands/all/api" - "github.com/v2fly/v2ray-core/v4/main/commands/all/tls" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/all/api" + "github.com/v2fly/v2ray-core/v5/main/commands/all/tls" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) //go:generate go run v2ray.com/core/common/errors/errorgen diff --git a/main/commands/all/engineering/convertpb.go b/main/commands/all/engineering/convertpb.go index 2b12822b1..09f352cc6 100644 --- a/main/commands/all/engineering/convertpb.go +++ b/main/commands/all/engineering/convertpb.go @@ -8,9 +8,9 @@ import ( "google.golang.org/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var ( diff --git a/main/commands/all/engineering/engineering.go b/main/commands/all/engineering/engineering.go index 4e754c727..d1883d1e1 100644 --- a/main/commands/all/engineering/engineering.go +++ b/main/commands/all/engineering/engineering.go @@ -1,8 +1,8 @@ package engineering -import "github.com/v2fly/v2ray-core/v4/main/commands/base" +import "github.com/v2fly/v2ray-core/v5/main/commands/base" -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen var cmdEngineering = &base.Command{ UsageLine: "{{.Exec}} engineering", diff --git a/main/commands/all/engineering/errors.generated.go b/main/commands/all/engineering/errors.generated.go index 20af01b9a..8ae305824 100644 --- a/main/commands/all/engineering/errors.generated.go +++ b/main/commands/all/engineering/errors.generated.go @@ -1,6 +1,6 @@ package engineering -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/main/commands/all/engineering/reversepb.go b/main/commands/all/engineering/reversepb.go index df75a6afb..f75676e4f 100644 --- a/main/commands/all/engineering/reversepb.go +++ b/main/commands/all/engineering/reversepb.go @@ -8,10 +8,10 @@ import ( "github.com/golang/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/infra/conf/jsonpb" - "github.com/v2fly/v2ray-core/v4/infra/conf/v2jsonpb" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/infra/conf/jsonpb" + "github.com/v2fly/v2ray-core/v5/infra/conf/v2jsonpb" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var cmdReversePb = &base.Command{ diff --git a/main/commands/all/errors.generated.go b/main/commands/all/errors.generated.go index 4131a75f9..5d196cfd8 100644 --- a/main/commands/all/errors.generated.go +++ b/main/commands/all/errors.generated.go @@ -1,6 +1,6 @@ package all -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/main/commands/all/format_doc.go b/main/commands/all/format_doc.go index cdb081064..84ec25ae1 100644 --- a/main/commands/all/format_doc.go +++ b/main/commands/all/format_doc.go @@ -1,7 +1,7 @@ package all import ( - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var docFormat = &base.Command{ diff --git a/main/commands/all/jsonv4/convert.go b/main/commands/all/jsonv4/convert.go index 901de7732..8bf8ce969 100644 --- a/main/commands/all/jsonv4/convert.go +++ b/main/commands/all/jsonv4/convert.go @@ -10,12 +10,12 @@ import ( "google.golang.org/protobuf/proto" "gopkg.in/yaml.v2" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/infra/conf/jsonpb" - "github.com/v2fly/v2ray-core/v4/infra/conf/merge" - "github.com/v2fly/v2ray-core/v4/infra/conf/v2jsonpb" - "github.com/v2fly/v2ray-core/v4/main/commands/base" - "github.com/v2fly/v2ray-core/v4/main/commands/helpers" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/infra/conf/jsonpb" + "github.com/v2fly/v2ray-core/v5/infra/conf/merge" + "github.com/v2fly/v2ray-core/v5/infra/conf/v2jsonpb" + "github.com/v2fly/v2ray-core/v5/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/helpers" ) var cmdConvert = &base.Command{ diff --git a/main/commands/all/jsonv4/init.go b/main/commands/all/jsonv4/init.go index 7bdd0d93e..d7478acac 100644 --- a/main/commands/all/jsonv4/init.go +++ b/main/commands/all/jsonv4/init.go @@ -1,6 +1,6 @@ package jsonv4 -import "github.com/v2fly/v2ray-core/v4/main/commands/base" +import "github.com/v2fly/v2ray-core/v5/main/commands/base" func init() { base.RegisterCommand(cmdConvert) diff --git a/main/commands/all/love.go b/main/commands/all/love.go index 90a211d42..d73bcfd67 100644 --- a/main/commands/all/love.go +++ b/main/commands/all/love.go @@ -7,9 +7,9 @@ import ( "encoding/base64" "fmt" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var cmdLove = &base.Command{ diff --git a/main/commands/all/merge_doc.go b/main/commands/all/merge_doc.go index 2999943f8..15ab4ddb4 100644 --- a/main/commands/all/merge_doc.go +++ b/main/commands/all/merge_doc.go @@ -1,7 +1,7 @@ package all import ( - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var docMerge = &base.Command{ diff --git a/main/commands/all/tls/cert.go b/main/commands/all/tls/cert.go index 7caa74edd..b34d04712 100644 --- a/main/commands/all/tls/cert.go +++ b/main/commands/all/tls/cert.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) // cmdCert is the tls cert command diff --git a/main/commands/all/tls/ping.go b/main/commands/all/tls/ping.go index ae6b62ff2..003f2fcab 100644 --- a/main/commands/all/tls/ping.go +++ b/main/commands/all/tls/ping.go @@ -7,8 +7,8 @@ import ( "fmt" "net" - "github.com/v2fly/v2ray-core/v4/main/commands/base" - v2tls "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/main/commands/base" + v2tls "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) // cmdPing is the tls ping command diff --git a/main/commands/all/tls/tls.go b/main/commands/all/tls/tls.go index 8b09e01c5..f32407571 100644 --- a/main/commands/all/tls/tls.go +++ b/main/commands/all/tls/tls.go @@ -1,7 +1,7 @@ package tls import ( - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) // CmdTLS holds all tls sub commands diff --git a/main/commands/all/uuid.go b/main/commands/all/uuid.go index 11ad9488b..edff0bc27 100644 --- a/main/commands/all/uuid.go +++ b/main/commands/all/uuid.go @@ -3,8 +3,8 @@ package all import ( "fmt" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var cmdUUID = &base.Command{ diff --git a/main/commands/all/verify.go b/main/commands/all/verify.go index 63636f3ba..4da46383b 100644 --- a/main/commands/all/verify.go +++ b/main/commands/all/verify.go @@ -5,7 +5,7 @@ import ( "github.com/v2fly/VSign/signerVerify" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) var cmdVerify = &base.Command{ diff --git a/main/commands/errors.generated.go b/main/commands/errors.generated.go index 4c4f268ed..ca0165d31 100644 --- a/main/commands/errors.generated.go +++ b/main/commands/errors.generated.go @@ -1,6 +1,6 @@ package commands -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/main/commands/helpers/config_load.go b/main/commands/helpers/config_load.go index 0620f6d49..3d2b86afd 100644 --- a/main/commands/helpers/config_load.go +++ b/main/commands/helpers/config_load.go @@ -4,10 +4,10 @@ import ( "bytes" "os" - "github.com/v2fly/v2ray-core/v4/infra/conf/merge" - "github.com/v2fly/v2ray-core/v4/infra/conf/mergers" - "github.com/v2fly/v2ray-core/v4/infra/conf/serial" - v4 "github.com/v2fly/v2ray-core/v4/infra/conf/v4" + "github.com/v2fly/v2ray-core/v5/infra/conf/merge" + "github.com/v2fly/v2ray-core/v5/infra/conf/mergers" + "github.com/v2fly/v2ray-core/v5/infra/conf/serial" + v4 "github.com/v2fly/v2ray-core/v5/infra/conf/v4" ) // LoadConfig load config files to *conf.Config, it will: diff --git a/main/commands/run.go b/main/commands/run.go index f0d721f16..1e88b84b9 100644 --- a/main/commands/run.go +++ b/main/commands/run.go @@ -11,10 +11,10 @@ import ( "strings" "syscall" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common/cmdarg" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common/cmdarg" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) // CmdRun runs V2Ray with config diff --git a/main/commands/test.go b/main/commands/test.go index c71981ba9..3087879b8 100644 --- a/main/commands/test.go +++ b/main/commands/test.go @@ -3,7 +3,7 @@ package commands import ( "fmt" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) // CmdTest tests config files diff --git a/main/commands/version.go b/main/commands/version.go index 3209a55df..e414b0026 100644 --- a/main/commands/version.go +++ b/main/commands/version.go @@ -3,8 +3,8 @@ package commands import ( "fmt" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/main/commands/base" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/main/commands/base" ) // CmdVersion prints V2Ray Versions diff --git a/main/distro/all/all.go b/main/distro/all/all.go index aa89ad021..68f1b36dd 100644 --- a/main/distro/all/all.go +++ b/main/distro/all/all.go @@ -4,94 +4,94 @@ import ( // The following are necessary as they register handlers in their init functions. // Mandatory features. Can't remove unless there are replacements. - _ "github.com/v2fly/v2ray-core/v4/app/dispatcher" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/inbound" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" + _ "github.com/v2fly/v2ray-core/v5/app/dispatcher" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/inbound" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound" // Default commander and all its services. This is an optional feature. - _ "github.com/v2fly/v2ray-core/v4/app/commander" - _ "github.com/v2fly/v2ray-core/v4/app/log/command" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/command" - _ "github.com/v2fly/v2ray-core/v4/app/stats/command" + _ "github.com/v2fly/v2ray-core/v5/app/commander" + _ "github.com/v2fly/v2ray-core/v5/app/log/command" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/command" + _ "github.com/v2fly/v2ray-core/v5/app/stats/command" // Developer preview services - _ "github.com/v2fly/v2ray-core/v4/app/instman/command" - _ "github.com/v2fly/v2ray-core/v4/app/observatory/command" + _ "github.com/v2fly/v2ray-core/v5/app/instman/command" + _ "github.com/v2fly/v2ray-core/v5/app/observatory/command" // Other optional features. - _ "github.com/v2fly/v2ray-core/v4/app/dns" - _ "github.com/v2fly/v2ray-core/v4/app/dns/fakedns" - _ "github.com/v2fly/v2ray-core/v4/app/log" - _ "github.com/v2fly/v2ray-core/v4/app/policy" - _ "github.com/v2fly/v2ray-core/v4/app/reverse" - _ "github.com/v2fly/v2ray-core/v4/app/router" - _ "github.com/v2fly/v2ray-core/v4/app/stats" + _ "github.com/v2fly/v2ray-core/v5/app/dns" + _ "github.com/v2fly/v2ray-core/v5/app/dns/fakedns" + _ "github.com/v2fly/v2ray-core/v5/app/log" + _ "github.com/v2fly/v2ray-core/v5/app/policy" + _ "github.com/v2fly/v2ray-core/v5/app/reverse" + _ "github.com/v2fly/v2ray-core/v5/app/router" + _ "github.com/v2fly/v2ray-core/v5/app/stats" // Fix dependency cycle caused by core import in internet package - _ "github.com/v2fly/v2ray-core/v4/transport/internet/tagged/taggedimpl" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/tagged/taggedimpl" // Developer preview features - _ "github.com/v2fly/v2ray-core/v4/app/instman" - _ "github.com/v2fly/v2ray-core/v4/app/observatory" - _ "github.com/v2fly/v2ray-core/v4/app/restfulapi" + _ "github.com/v2fly/v2ray-core/v5/app/instman" + _ "github.com/v2fly/v2ray-core/v5/app/observatory" + _ "github.com/v2fly/v2ray-core/v5/app/restfulapi" // Inbound and outbound proxies. - _ "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - _ "github.com/v2fly/v2ray-core/v4/proxy/dns" - _ "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - _ "github.com/v2fly/v2ray-core/v4/proxy/freedom" - _ "github.com/v2fly/v2ray-core/v4/proxy/http" - _ "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" - _ "github.com/v2fly/v2ray-core/v4/proxy/socks" - _ "github.com/v2fly/v2ray-core/v4/proxy/trojan" - _ "github.com/v2fly/v2ray-core/v4/proxy/vless/inbound" - _ "github.com/v2fly/v2ray-core/v4/proxy/vless/outbound" - _ "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - _ "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" + _ "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + _ "github.com/v2fly/v2ray-core/v5/proxy/dns" + _ "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + _ "github.com/v2fly/v2ray-core/v5/proxy/freedom" + _ "github.com/v2fly/v2ray-core/v5/proxy/http" + _ "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks" + _ "github.com/v2fly/v2ray-core/v5/proxy/socks" + _ "github.com/v2fly/v2ray-core/v5/proxy/trojan" + _ "github.com/v2fly/v2ray-core/v5/proxy/vless/inbound" + _ "github.com/v2fly/v2ray-core/v5/proxy/vless/outbound" + _ "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + _ "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" // Transports - _ "github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/grpc" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/http" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/quic" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/tcp" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/udp" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/websocket" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/domainsocket" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/grpc" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/http" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/quic" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/tcp" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/udp" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/websocket" // Transport headers - _ "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/headers/noop" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/headers/srtp" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/headers/tls" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/headers/utp" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wechat" - _ "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wireguard" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/noop" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/srtp" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/tls" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/utp" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wechat" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wireguard" // Geo loaders - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/memconservative" - _ "github.com/v2fly/v2ray-core/v4/infra/conf/geodata/standard" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/memconservative" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/geodata/standard" // JSON, TOML, YAML config support. (jsonv4) This disable selective compile - _ "github.com/v2fly/v2ray-core/v4/main/formats" + _ "github.com/v2fly/v2ray-core/v5/main/formats" // commands - _ "github.com/v2fly/v2ray-core/v4/main/commands/all" + _ "github.com/v2fly/v2ray-core/v5/main/commands/all" // engineering commands - _ "github.com/v2fly/v2ray-core/v4/main/commands/all/engineering" + _ "github.com/v2fly/v2ray-core/v5/main/commands/all/engineering" // Commands that rely on jsonv4 format This disable selective compile - _ "github.com/v2fly/v2ray-core/v4/main/commands/all/api/jsonv4" - _ "github.com/v2fly/v2ray-core/v4/main/commands/all/jsonv4" + _ "github.com/v2fly/v2ray-core/v5/main/commands/all/api/jsonv4" + _ "github.com/v2fly/v2ray-core/v5/main/commands/all/jsonv4" // V5 version of json configure file parser - _ "github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" + _ "github.com/v2fly/v2ray-core/v5/infra/conf/v5cfg" // Simplified config - _ "github.com/v2fly/v2ray-core/v4/proxy/http/simplified" - _ "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks/simplified" - _ "github.com/v2fly/v2ray-core/v4/proxy/socks/simplified" - _ "github.com/v2fly/v2ray-core/v4/proxy/trojan/simplified" + _ "github.com/v2fly/v2ray-core/v5/proxy/http/simplified" + _ "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks/simplified" + _ "github.com/v2fly/v2ray-core/v5/proxy/socks/simplified" + _ "github.com/v2fly/v2ray-core/v5/proxy/trojan/simplified" ) diff --git a/main/errors.generated.go b/main/errors.generated.go index 4f2041bd2..0f1529105 100644 --- a/main/errors.generated.go +++ b/main/errors.generated.go @@ -1,6 +1,6 @@ package main -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/main/formats/errors.generated.go b/main/formats/errors.generated.go index 4b53f3147..a83c4fd64 100644 --- a/main/formats/errors.generated.go +++ b/main/formats/errors.generated.go @@ -1,6 +1,6 @@ package formats -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/main/formats/formats.go b/main/formats/formats.go index 88ef36a1a..00bfbafeb 100644 --- a/main/formats/formats.go +++ b/main/formats/formats.go @@ -3,11 +3,11 @@ package formats import ( "bytes" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/infra/conf/merge" - "github.com/v2fly/v2ray-core/v4/infra/conf/mergers" - "github.com/v2fly/v2ray-core/v4/infra/conf/serial" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/infra/conf/merge" + "github.com/v2fly/v2ray-core/v5/infra/conf/mergers" + "github.com/v2fly/v2ray-core/v5/infra/conf/serial" ) func init() { diff --git a/main/main.go b/main/main.go index 2b33ebede..f1279bade 100644 --- a/main/main.go +++ b/main/main.go @@ -1,9 +1,9 @@ package main import ( - "github.com/v2fly/v2ray-core/v4/main/commands" - "github.com/v2fly/v2ray-core/v4/main/commands/base" - _ "github.com/v2fly/v2ray-core/v4/main/distro/all" + "github.com/v2fly/v2ray-core/v5/main/commands" + "github.com/v2fly/v2ray-core/v5/main/commands/base" + _ "github.com/v2fly/v2ray-core/v5/main/distro/all" ) func main() { diff --git a/main/v2binding/v2api/api.go b/main/v2binding/v2api/api.go index 958457009..c4ab3ed00 100644 --- a/main/v2binding/v2api/api.go +++ b/main/v2binding/v2api/api.go @@ -3,7 +3,7 @@ package main import ( "time" - "github.com/v2fly/v2ray-core/v4/main/v2binding" + "github.com/v2fly/v2ray-core/v5/main/v2binding" ) func main() { diff --git a/main/v2binding/v2binding.go b/main/v2binding/v2binding.go index 36e87ac19..67b2820fc 100644 --- a/main/v2binding/v2binding.go +++ b/main/v2binding/v2binding.go @@ -3,20 +3,20 @@ package v2binding import ( "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/commander" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/instman" - "github.com/v2fly/v2ray-core/v4/app/instman/command" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/commander" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/instman" + "github.com/v2fly/v2ray-core/v5/app/instman/command" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" // Initialization - _ "github.com/v2fly/v2ray-core/v4/main/distro/all" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" + _ "github.com/v2fly/v2ray-core/v5/main/distro/all" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" ) type bindingInstance struct { diff --git a/mocks.go b/mocks.go index 7a903b3ac..45922e5d7 100644 --- a/mocks.go +++ b/mocks.go @@ -2,8 +2,8 @@ package core //go:generate env GOBIN=$PWD go install -v github.com/golang/mock/mockgen@latest //go:generate ./mockgen -package mocks -destination testing/mocks/io.go -mock_names Reader=Reader,Writer=Writer io Reader,Writer -//go:generate ./mockgen -package mocks -destination testing/mocks/log.go -mock_names Handler=LogHandler github.com/v2fly/v2ray-core/v4/common/log Handler -//go:generate ./mockgen -package mocks -destination testing/mocks/mux.go -mock_names ClientWorkerFactory=MuxClientWorkerFactory github.com/v2fly/v2ray-core/v4/common/mux ClientWorkerFactory -//go:generate ./mockgen -package mocks -destination testing/mocks/dns.go -mock_names Client=DNSClient github.com/v2fly/v2ray-core/v4/features/dns Client -//go:generate ./mockgen -package mocks -destination testing/mocks/outbound.go -mock_names Manager=OutboundManager,HandlerSelector=OutboundHandlerSelector github.com/v2fly/v2ray-core/v4/features/outbound Manager,HandlerSelector -//go:generate ./mockgen -package mocks -destination testing/mocks/proxy.go -mock_names Inbound=ProxyInbound,Outbound=ProxyOutbound github.com/v2fly/v2ray-core/v4/proxy Inbound,Outbound +//go:generate ./mockgen -package mocks -destination testing/mocks/log.go -mock_names Handler=LogHandler github.com/v2fly/v2ray-core/v5/common/log Handler +//go:generate ./mockgen -package mocks -destination testing/mocks/mux.go -mock_names ClientWorkerFactory=MuxClientWorkerFactory github.com/v2fly/v2ray-core/v5/common/mux ClientWorkerFactory +//go:generate ./mockgen -package mocks -destination testing/mocks/dns.go -mock_names Client=DNSClient github.com/v2fly/v2ray-core/v5/features/dns Client +//go:generate ./mockgen -package mocks -destination testing/mocks/outbound.go -mock_names Manager=OutboundManager,HandlerSelector=OutboundHandlerSelector github.com/v2fly/v2ray-core/v5/features/outbound Manager,HandlerSelector +//go:generate ./mockgen -package mocks -destination testing/mocks/proxy.go -mock_names Inbound=ProxyInbound,Outbound=ProxyOutbound github.com/v2fly/v2ray-core/v5/proxy Inbound,Outbound diff --git a/proxy/blackhole/blackhole.go b/proxy/blackhole/blackhole.go index c52dd6095..67bb83a0f 100644 --- a/proxy/blackhole/blackhole.go +++ b/proxy/blackhole/blackhole.go @@ -1,15 +1,15 @@ // Package blackhole is an outbound handler that blocks all connections. package blackhole -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // Handler is an outbound connection that silently swallow the entire payload. diff --git a/proxy/blackhole/blackhole_test.go b/proxy/blackhole/blackhole_test.go index c6b222868..226abf629 100644 --- a/proxy/blackhole/blackhole_test.go +++ b/proxy/blackhole/blackhole_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) func TestBlackHoleHTTPResponse(t *testing.T) { diff --git a/proxy/blackhole/config.go b/proxy/blackhole/config.go index 207439dd6..224932278 100644 --- a/proxy/blackhole/config.go +++ b/proxy/blackhole/config.go @@ -1,9 +1,9 @@ package blackhole import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/serial" ) const ( diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go index 1455a4b27..6f97cf724 100644 --- a/proxy/blackhole/config.pb.go +++ b/proxy/blackhole/config.pb.go @@ -7,7 +7,7 @@ package blackhole import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -206,7 +206,7 @@ var file_proxy_blackhole_config_proto_rawDesc = []byte{ 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x68, 0x6f, 0x6c, 0x65, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, - 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, + 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x68, 0x6f, 0x6c, 0x65, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x68, 0x6f, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/blackhole/config.proto b/proxy/blackhole/config.proto index 61d5af498..2446d07dd 100644 --- a/proxy/blackhole/config.proto +++ b/proxy/blackhole/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.blackhole; option csharp_namespace = "V2Ray.Core.Proxy.Blackhole"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/blackhole"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/blackhole"; option java_package = "com.v2ray.core.proxy.blackhole"; option java_multiple_files = true; diff --git a/proxy/blackhole/config_test.go b/proxy/blackhole/config_test.go index 603162cb9..fa84b7026 100644 --- a/proxy/blackhole/config_test.go +++ b/proxy/blackhole/config_test.go @@ -5,9 +5,9 @@ import ( "net/http" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/proxy/blackhole" ) func TestHTTPResponse(t *testing.T) { diff --git a/proxy/blackhole/errors.generated.go b/proxy/blackhole/errors.generated.go index 237b8fcef..664f86119 100644 --- a/proxy/blackhole/errors.generated.go +++ b/proxy/blackhole/errors.generated.go @@ -1,6 +1,6 @@ package blackhole -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/dns/config.pb.go b/proxy/dns/config.pb.go index baf8f0443..5e5bc32d7 100644 --- a/proxy/dns/config.pb.go +++ b/proxy/dns/config.pb.go @@ -7,8 +7,8 @@ package dns import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -139,7 +139,7 @@ var file_proxy_dns_config_proto_rawDesc = []byte{ 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x64, 0x6e, 0x73, 0x50, 0x01, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, - 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, + 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x64, 0x6e, 0x73, 0xaa, 0x02, 0x14, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x44, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/dns/config.proto b/proxy/dns/config.proto index 00304a37e..fb20fd4cf 100644 --- a/proxy/dns/config.proto +++ b/proxy/dns/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.dns; option csharp_namespace = "V2Ray.Core.Proxy.Dns"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/dns"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/dns"; option java_package = "com.v2ray.core.proxy.dns"; option java_multiple_files = true; diff --git a/proxy/dns/dns.go b/proxy/dns/dns.go index 64016ba88..c6b2837d8 100644 --- a/proxy/dns/dns.go +++ b/proxy/dns/dns.go @@ -8,18 +8,18 @@ import ( "golang.org/x/net/dns/dnsmessage" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - dns_proto "github.com/v2fly/v2ray-core/v4/common/protocol/dns" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + dns_proto "github.com/v2fly/v2ray-core/v5/common/protocol/dns" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func init() { diff --git a/proxy/dns/dns_test.go b/proxy/dns/dns_test.go index 4291ca984..06aa35a9f 100644 --- a/proxy/dns/dns_test.go +++ b/proxy/dns/dns_test.go @@ -9,20 +9,20 @@ import ( "github.com/miekg/dns" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - dnsapp "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/app/policy" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/inbound" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - dns_proxy "github.com/v2fly/v2ray-core/v4/proxy/dns" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + dnsapp "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/app/policy" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/inbound" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + dns_proxy "github.com/v2fly/v2ray-core/v5/proxy/dns" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" ) type staticHandler struct{} diff --git a/proxy/dns/errors.generated.go b/proxy/dns/errors.generated.go index 438eb646e..e69b94752 100644 --- a/proxy/dns/errors.generated.go +++ b/proxy/dns/errors.generated.go @@ -1,6 +1,6 @@ package dns -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/dokodemo/config.go b/proxy/dokodemo/config.go index 866c186fb..4b1546f2c 100644 --- a/proxy/dokodemo/config.go +++ b/proxy/dokodemo/config.go @@ -1,7 +1,7 @@ package dokodemo import ( - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) // GetPredefinedAddress returns the defined address from proto config. Null if address is not valid. diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go index 2b4b4d29e..80cec91c2 100644 --- a/proxy/dokodemo/config.pb.go +++ b/proxy/dokodemo/config.pb.go @@ -7,8 +7,8 @@ package dokodemo import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -245,7 +245,7 @@ var file_proxy_dokodemo_config_proto_rawDesc = []byte{ 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x64, 0x6f, 0x6b, 0x6f, 0x64, 0x65, 0x6d, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, - 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x64, 0x6f, 0x6b, 0x6f, + 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x64, 0x6f, 0x6b, 0x6f, 0x64, 0x65, 0x6d, 0x6f, 0xaa, 0x02, 0x19, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x44, 0x6f, 0x6b, 0x6f, 0x64, 0x65, 0x6d, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/dokodemo/config.proto b/proxy/dokodemo/config.proto index 71fddebda..5c127032a 100644 --- a/proxy/dokodemo/config.proto +++ b/proxy/dokodemo/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.dokodemo; option csharp_namespace = "V2Ray.Core.Proxy.Dokodemo"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/dokodemo"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/dokodemo"; option java_package = "com.v2ray.core.proxy.dokodemo"; option java_multiple_files = true; diff --git a/proxy/dokodemo/dokodemo.go b/proxy/dokodemo/dokodemo.go index a5d77b6b0..f27f15377 100644 --- a/proxy/dokodemo/dokodemo.go +++ b/proxy/dokodemo/dokodemo.go @@ -1,24 +1,24 @@ package dokodemo -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "sync/atomic" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func init() { diff --git a/proxy/dokodemo/errors.generated.go b/proxy/dokodemo/errors.generated.go index 587d4194a..f900687d8 100644 --- a/proxy/dokodemo/errors.generated.go +++ b/proxy/dokodemo/errors.generated.go @@ -1,6 +1,6 @@ package dokodemo -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/freedom/config.pb.go b/proxy/freedom/config.pb.go index 5b3199a54..6853c34a9 100644 --- a/proxy/freedom/config.pb.go +++ b/proxy/freedom/config.pb.go @@ -7,8 +7,8 @@ package freedom import ( - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -275,7 +275,7 @@ var file_proxy_freedom_config_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x66, 0x72, 0x65, 0x65, 0x64, 0x6f, 0x6d, 0x50, 0x01, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, - 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, + 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x66, 0x72, 0x65, 0x65, 0x64, 0x6f, 0x6d, 0xaa, 0x02, 0x18, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x46, 0x72, 0x65, 0x65, 0x64, 0x6f, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, diff --git a/proxy/freedom/config.proto b/proxy/freedom/config.proto index a101c7a8c..e095dc8ee 100644 --- a/proxy/freedom/config.proto +++ b/proxy/freedom/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.freedom; option csharp_namespace = "V2Ray.Core.Proxy.Freedom"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/freedom"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/freedom"; option java_package = "com.v2ray.core.proxy.freedom"; option java_multiple_files = true; diff --git a/proxy/freedom/errors.generated.go b/proxy/freedom/errors.generated.go index 359d2ce3a..00b0a8fec 100644 --- a/proxy/freedom/errors.generated.go +++ b/proxy/freedom/errors.generated.go @@ -1,6 +1,6 @@ package freedom -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go index a4a84a178..90b0fd927 100644 --- a/proxy/freedom/freedom.go +++ b/proxy/freedom/freedom.go @@ -1,24 +1,24 @@ package freedom -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func init() { diff --git a/proxy/http/client.go b/proxy/http/client.go index 1fdd862b9..eba4ee7b1 100644 --- a/proxy/http/client.go +++ b/proxy/http/client.go @@ -11,20 +11,20 @@ import ( "golang.org/x/net/http2" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/bytespool" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/bytespool" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) type Client struct { diff --git a/proxy/http/config.go b/proxy/http/config.go index 0a25993dc..cb3bfc841 100644 --- a/proxy/http/config.go +++ b/proxy/http/config.go @@ -1,7 +1,7 @@ package http import ( - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) func (a *Account) Equals(another protocol.Account) bool { diff --git a/proxy/http/config.pb.go b/proxy/http/config.pb.go index 1753c8503..357b23fbe 100644 --- a/proxy/http/config.pb.go +++ b/proxy/http/config.pb.go @@ -7,7 +7,7 @@ package http import ( - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -236,7 +236,7 @@ var file_proxy_http_config_proto_rawDesc = []byte{ 0x72, 0x42, 0x60, 0x0a, 0x19, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, - 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, + 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x68, 0x74, 0x74, 0x70, 0xaa, 0x02, 0x15, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/http/config.proto b/proxy/http/config.proto index 0456e8eb4..8c1773a16 100644 --- a/proxy/http/config.proto +++ b/proxy/http/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.http; option csharp_namespace = "V2Ray.Core.Proxy.Http"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/http"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/http"; option java_package = "com.v2ray.core.proxy.http"; option java_multiple_files = true; diff --git a/proxy/http/errors.generated.go b/proxy/http/errors.generated.go index bbaec46a4..f738ccf1d 100644 --- a/proxy/http/errors.generated.go +++ b/proxy/http/errors.generated.go @@ -1,6 +1,6 @@ package http -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/http/http.go b/proxy/http/http.go index 0ef5118f0..0c0aefec5 100644 --- a/proxy/http/http.go +++ b/proxy/http/http.go @@ -1,3 +1,3 @@ package http -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/proxy/http/server.go b/proxy/http/server.go index 795e1a16f..26dc66b83 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -9,20 +9,20 @@ import ( "strings" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - http_proto "github.com/v2fly/v2ray-core/v4/common/protocol/http" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + http_proto "github.com/v2fly/v2ray-core/v5/common/protocol/http" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // Server is an HTTP proxy server. diff --git a/proxy/http/simplified/config.go b/proxy/http/simplified/config.go index 9d6383954..ef80de16b 100644 --- a/proxy/http/simplified/config.go +++ b/proxy/http/simplified/config.go @@ -3,9 +3,9 @@ package simplified import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/proxy/http" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/proxy/http" ) func init() { diff --git a/proxy/http/simplified/config.pb.go b/proxy/http/simplified/config.pb.go index b59e35d2b..aa0b63b2a 100644 --- a/proxy/http/simplified/config.pb.go +++ b/proxy/http/simplified/config.pb.go @@ -7,8 +7,8 @@ package simplified import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -141,7 +141,7 @@ var file_proxy_http_simplified_config_proto_rawDesc = []byte{ 0x68, 0x74, 0x74, 0x70, 0x2e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x73, 0x69, 0x6d, + 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0xaa, 0x02, 0x20, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x2e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, diff --git a/proxy/http/simplified/config.proto b/proxy/http/simplified/config.proto index fd8f9816d..e097ff368 100644 --- a/proxy/http/simplified/config.proto +++ b/proxy/http/simplified/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.http.simplified; option csharp_namespace = "V2Ray.Core.Proxy.Http.Simplified"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/http/simplified"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/http/simplified"; option java_package = "com.v2ray.core.proxy.http.simplified"; option java_multiple_files = true; diff --git a/proxy/loopback/config.go b/proxy/loopback/config.go index 7154fabf4..4c25e3ea1 100644 --- a/proxy/loopback/config.go +++ b/proxy/loopback/config.go @@ -1,3 +1,3 @@ package loopback -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/proxy/loopback/config.pb.go b/proxy/loopback/config.pb.go index e7ecdf0be..c6b619c82 100644 --- a/proxy/loopback/config.pb.go +++ b/proxy/loopback/config.pb.go @@ -7,7 +7,7 @@ package loopback import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -85,7 +85,7 @@ var file_proxy_loopback_config_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x01, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, - 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x6c, 0x6f, 0x6f, + 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x6c, 0x6f, 0x6f, 0x70, 0x62, 0x61, 0x63, 0x6b, 0xaa, 0x02, 0x19, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x4c, 0x6f, 0x6f, 0x70, 0x62, 0x61, 0x63, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/loopback/config.proto b/proxy/loopback/config.proto index 28fbfd680..7fc70c263 100644 --- a/proxy/loopback/config.proto +++ b/proxy/loopback/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.loopback; option csharp_namespace = "V2Ray.Core.Proxy.Loopback"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/loopback"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/loopback"; option java_package = "com.v2ray.core.proxy.loopback"; option java_multiple_files = true; diff --git a/proxy/loopback/errors.generated.go b/proxy/loopback/errors.generated.go index d8b24536d..80bff8785 100644 --- a/proxy/loopback/errors.generated.go +++ b/proxy/loopback/errors.generated.go @@ -1,6 +1,6 @@ package loopback -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/loopback/loopback.go b/proxy/loopback/loopback.go index 24a644880..35b07c0e8 100644 --- a/proxy/loopback/loopback.go +++ b/proxy/loopback/loopback.go @@ -6,16 +6,16 @@ package loopback import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type Loopback struct { diff --git a/proxy/proxy.go b/proxy/proxy.go index a22c637f8..45a89dad5 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -8,11 +8,11 @@ package proxy import ( "context" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // An Inbound processes inbound connections. diff --git a/proxy/shadowsocks/client.go b/proxy/shadowsocks/client.go index 07efbed00..e0d183682 100644 --- a/proxy/shadowsocks/client.go +++ b/proxy/shadowsocks/client.go @@ -4,18 +4,18 @@ import ( "context" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // Client is an inbound handler for Shadowsocks protocol diff --git a/proxy/shadowsocks/config.go b/proxy/shadowsocks/config.go index 97dab5094..4138b1141 100644 --- a/proxy/shadowsocks/config.go +++ b/proxy/shadowsocks/config.go @@ -12,11 +12,11 @@ import ( "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/hkdf" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/antireplay" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/crypto" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/antireplay" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/crypto" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) // MemoryAccount is an account type converted from Account. diff --git a/proxy/shadowsocks/config.pb.go b/proxy/shadowsocks/config.pb.go index 080e00cc3..32e32c1bc 100644 --- a/proxy/shadowsocks/config.pb.go +++ b/proxy/shadowsocks/config.pb.go @@ -7,8 +7,8 @@ package shadowsocks import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" + net "github.com/v2fly/v2ray-core/v5/common/net" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -302,7 +302,7 @@ var file_proxy_shadowsocks_config_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, - 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0xaa, 0x02, 0x1c, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/shadowsocks/config.proto b/proxy/shadowsocks/config.proto index e4e7a22b3..fb1d12e42 100644 --- a/proxy/shadowsocks/config.proto +++ b/proxy/shadowsocks/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.shadowsocks; option csharp_namespace = "V2Ray.Core.Proxy.Shadowsocks"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks"; option java_package = "com.v2ray.core.proxy.shadowsocks"; option java_multiple_files = true; diff --git a/proxy/shadowsocks/config_test.go b/proxy/shadowsocks/config_test.go index 8befa6684..df8bb7474 100644 --- a/proxy/shadowsocks/config_test.go +++ b/proxy/shadowsocks/config_test.go @@ -6,9 +6,9 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks" ) func TestAEADCipherUDP(t *testing.T) { diff --git a/proxy/shadowsocks/errors.generated.go b/proxy/shadowsocks/errors.generated.go index e7456a1c0..4e225f4d6 100644 --- a/proxy/shadowsocks/errors.generated.go +++ b/proxy/shadowsocks/errors.generated.go @@ -1,6 +1,6 @@ package shadowsocks -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/shadowsocks/protocol.go b/proxy/shadowsocks/protocol.go index 1cf5c5797..ae19bf11e 100644 --- a/proxy/shadowsocks/protocol.go +++ b/proxy/shadowsocks/protocol.go @@ -7,11 +7,11 @@ import ( "hash/crc32" "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/drain" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/drain" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) const ( diff --git a/proxy/shadowsocks/protocol_test.go b/proxy/shadowsocks/protocol_test.go index 3db64e88c..8ec36a338 100644 --- a/proxy/shadowsocks/protocol_test.go +++ b/proxy/shadowsocks/protocol_test.go @@ -5,11 +5,11 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - . "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + . "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks" ) func toAccount(a *Account) protocol.Account { diff --git a/proxy/shadowsocks/server.go b/proxy/shadowsocks/server.go index 16c938b61..d5fda1df9 100644 --- a/proxy/shadowsocks/server.go +++ b/proxy/shadowsocks/server.go @@ -4,20 +4,20 @@ import ( "context" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - udp_proto "github.com/v2fly/v2ray-core/v4/common/protocol/udp" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + udp_proto "github.com/v2fly/v2ray-core/v5/common/protocol/udp" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/udp" ) type Server struct { diff --git a/proxy/shadowsocks/shadowsocks.go b/proxy/shadowsocks/shadowsocks.go index ef3d71767..ecba3df35 100644 --- a/proxy/shadowsocks/shadowsocks.go +++ b/proxy/shadowsocks/shadowsocks.go @@ -5,4 +5,4 @@ // R.I.P Shadowsocks package shadowsocks -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/proxy/shadowsocks/simplified/config.go b/proxy/shadowsocks/simplified/config.go index b239e1637..bf792c6df 100644 --- a/proxy/shadowsocks/simplified/config.go +++ b/proxy/shadowsocks/simplified/config.go @@ -3,11 +3,11 @@ package simplified import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks" ) func init() { diff --git a/proxy/shadowsocks/simplified/config.pb.go b/proxy/shadowsocks/simplified/config.pb.go index a0479aac1..fce4af3a3 100644 --- a/proxy/shadowsocks/simplified/config.pb.go +++ b/proxy/shadowsocks/simplified/config.pb.go @@ -7,8 +7,8 @@ package simplified import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -192,7 +192,7 @@ var file_proxy_shadowsocks_simplified_config_proto_rawDesc = []byte{ 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x2e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x68, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0xaa, 0x02, 0x27, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, diff --git a/proxy/shadowsocks/simplified/config.proto b/proxy/shadowsocks/simplified/config.proto index be05f48ec..04c710f74 100644 --- a/proxy/shadowsocks/simplified/config.proto +++ b/proxy/shadowsocks/simplified/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.shadowsocks.simplified; option csharp_namespace = "V2Ray.Core.Proxy.Shadowsocks.Simplified"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks/simplified"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks/simplified"; option java_package = "com.v2ray.core.proxy.shadowsocks.simplified"; option java_multiple_files = true; diff --git a/proxy/socks/client.go b/proxy/socks/client.go index 6eafd612b..987b120c6 100644 --- a/proxy/socks/client.go +++ b/proxy/socks/client.go @@ -4,19 +4,19 @@ import ( "context" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // Client is a Socks5 client. diff --git a/proxy/socks/config.go b/proxy/socks/config.go index 30f51e756..766684457 100644 --- a/proxy/socks/config.go +++ b/proxy/socks/config.go @@ -1,6 +1,6 @@ package socks -import "github.com/v2fly/v2ray-core/v4/common/protocol" +import "github.com/v2fly/v2ray-core/v5/common/protocol" func (a *Account) Equals(another protocol.Account) bool { if account, ok := another.(*Account); ok { diff --git a/proxy/socks/config.pb.go b/proxy/socks/config.pb.go index bde98e076..9cfd30f60 100644 --- a/proxy/socks/config.pb.go +++ b/proxy/socks/config.pb.go @@ -7,8 +7,8 @@ package socks import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" + net "github.com/v2fly/v2ray-core/v5/common/net" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -26,7 +26,7 @@ const ( type AuthType int32 const ( - // NO_AUTH is for anounymous authentication. + // NO_AUTH is for anonymous authentication. AuthType_NO_AUTH AuthType = 0 // PASSWORD is for username/password authentication. AuthType_PASSWORD AuthType = 1 @@ -379,7 +379,7 @@ var file_proxy_socks_config_proto_rawDesc = []byte{ 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0xaa, 0x02, 0x16, + 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0xaa, 0x02, 0x16, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/proxy/socks/config.proto b/proxy/socks/config.proto index 68b814b46..9406cbbde 100644 --- a/proxy/socks/config.proto +++ b/proxy/socks/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.socks; option csharp_namespace = "V2Ray.Core.Proxy.Socks"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/socks"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/socks"; option java_package = "com.v2ray.core.proxy.socks"; option java_multiple_files = true; diff --git a/proxy/socks/errors.generated.go b/proxy/socks/errors.generated.go index d7fb17c0d..8712d760d 100644 --- a/proxy/socks/errors.generated.go +++ b/proxy/socks/errors.generated.go @@ -1,6 +1,6 @@ package socks -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/socks/protocol.go b/proxy/socks/protocol.go index 04cabb9a6..9ab6a805e 100644 --- a/proxy/socks/protocol.go +++ b/proxy/socks/protocol.go @@ -4,10 +4,10 @@ import ( "encoding/binary" "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) const ( diff --git a/proxy/socks/protocol_test.go b/proxy/socks/protocol_test.go index 83548f839..82a7b75bf 100644 --- a/proxy/socks/protocol_test.go +++ b/proxy/socks/protocol_test.go @@ -6,11 +6,11 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - . "github.com/v2fly/v2ray-core/v4/proxy/socks" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + . "github.com/v2fly/v2ray-core/v5/proxy/socks" ) func TestUDPEncoding(t *testing.T) { diff --git a/proxy/socks/server.go b/proxy/socks/server.go index 033dc5d9b..ad2927f59 100644 --- a/proxy/socks/server.go +++ b/proxy/socks/server.go @@ -5,21 +5,21 @@ import ( "io" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - udp_proto "github.com/v2fly/v2ray-core/v4/common/protocol/udp" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + udp_proto "github.com/v2fly/v2ray-core/v5/common/protocol/udp" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/udp" ) // Server is a SOCKS 5 proxy server diff --git a/proxy/socks/simplified/config.go b/proxy/socks/simplified/config.go index 4e871ad5c..17f8168f6 100644 --- a/proxy/socks/simplified/config.go +++ b/proxy/socks/simplified/config.go @@ -3,9 +3,9 @@ package simplified import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/proxy/socks" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/proxy/socks" ) func init() { diff --git a/proxy/socks/simplified/config.pb.go b/proxy/socks/simplified/config.pb.go index 878b99b6d..1f3144327 100644 --- a/proxy/socks/simplified/config.pb.go +++ b/proxy/socks/simplified/config.pb.go @@ -7,8 +7,8 @@ package simplified import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -164,7 +164,7 @@ var file_proxy_socks_simplified_config_proto_rawDesc = []byte{ 0x78, 0x79, 0x2e, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x2e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, - 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x6f, 0x63, 0x6b, + 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0xaa, 0x02, 0x21, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x73, 0x2e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, diff --git a/proxy/socks/simplified/config.proto b/proxy/socks/simplified/config.proto index 1bcadf2de..1b97d4492 100644 --- a/proxy/socks/simplified/config.proto +++ b/proxy/socks/simplified/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.socks.simplified; option csharp_namespace = "V2Ray.Core.Proxy.Socks.Simplified"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/socks/simplified"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/socks/simplified"; option java_package = "com.v2ray.core.proxy.socks.simplified"; option java_multiple_files = true; diff --git a/proxy/socks/socks.go b/proxy/socks/socks.go index ec2a3de5f..96657c90e 100644 --- a/proxy/socks/socks.go +++ b/proxy/socks/socks.go @@ -1,4 +1,4 @@ // Package socks provides implements of Socks protocol 4, 4a and 5. package socks -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/proxy/trojan/client.go b/proxy/trojan/client.go index 0c0622305..293e20797 100644 --- a/proxy/trojan/client.go +++ b/proxy/trojan/client.go @@ -4,18 +4,18 @@ import ( "context" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // Client is an inbound handler for trojan protocol diff --git a/proxy/trojan/config.go b/proxy/trojan/config.go index e0859c16e..ef86776aa 100644 --- a/proxy/trojan/config.go +++ b/proxy/trojan/config.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "fmt" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) // MemoryAccount is an account type converted from Account. diff --git a/proxy/trojan/config.pb.go b/proxy/trojan/config.pb.go index 89a5666dd..01885a74d 100644 --- a/proxy/trojan/config.pb.go +++ b/proxy/trojan/config.pb.go @@ -7,7 +7,7 @@ package trojan import ( - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -286,7 +286,7 @@ var file_proxy_trojan_config_proto_rawDesc = []byte{ 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x74, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, - 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, + 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x74, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0xaa, 0x02, 0x17, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x54, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/trojan/config.proto b/proxy/trojan/config.proto index 2fdd3d1ac..9e09945cf 100644 --- a/proxy/trojan/config.proto +++ b/proxy/trojan/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.trojan; option csharp_namespace = "V2Ray.Core.Proxy.Trojan"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/trojan"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/trojan"; option java_package = "com.v2ray.core.proxy.trojan"; option java_multiple_files = true; diff --git a/proxy/trojan/errors.generated.go b/proxy/trojan/errors.generated.go index e033f3c73..1e9f73798 100644 --- a/proxy/trojan/errors.generated.go +++ b/proxy/trojan/errors.generated.go @@ -1,6 +1,6 @@ package trojan -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/trojan/protocol.go b/proxy/trojan/protocol.go index b5bdb0882..03a17edf8 100644 --- a/proxy/trojan/protocol.go +++ b/proxy/trojan/protocol.go @@ -4,9 +4,9 @@ import ( "encoding/binary" "io" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) var ( diff --git a/proxy/trojan/protocol_test.go b/proxy/trojan/protocol_test.go index dbc2861d2..00bdc13e0 100644 --- a/proxy/trojan/protocol_test.go +++ b/proxy/trojan/protocol_test.go @@ -5,11 +5,11 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - . "github.com/v2fly/v2ray-core/v4/proxy/trojan" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + . "github.com/v2fly/v2ray-core/v5/proxy/trojan" ) func toAccount(a *Account) protocol.Account { diff --git a/proxy/trojan/server.go b/proxy/trojan/server.go index 45035fa04..909cf93e5 100644 --- a/proxy/trojan/server.go +++ b/proxy/trojan/server.go @@ -6,23 +6,23 @@ import ( "strconv" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - udp_proto "github.com/v2fly/v2ray-core/v4/common/protocol/udp" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "github.com/v2fly/v2ray-core/v4/transport/internet/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + udp_proto "github.com/v2fly/v2ray-core/v5/common/protocol/udp" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/transport/internet/udp" ) func init() { diff --git a/proxy/trojan/simplified/config.go b/proxy/trojan/simplified/config.go index f2b0b2435..b66170471 100644 --- a/proxy/trojan/simplified/config.go +++ b/proxy/trojan/simplified/config.go @@ -3,10 +3,10 @@ package simplified import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/trojan" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/trojan" ) func init() { diff --git a/proxy/trojan/simplified/config.pb.go b/proxy/trojan/simplified/config.pb.go index ae05c9fc6..09bf4a123 100644 --- a/proxy/trojan/simplified/config.pb.go +++ b/proxy/trojan/simplified/config.pb.go @@ -7,8 +7,8 @@ package simplified import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -161,7 +161,7 @@ var file_proxy_trojan_simplified_config_proto_rawDesc = []byte{ 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x74, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0x2e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x50, 0x01, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, - 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, + 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x74, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0xaa, 0x02, 0x22, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x54, 0x72, 0x6f, 0x6a, 0x61, 0x6e, diff --git a/proxy/trojan/simplified/config.proto b/proxy/trojan/simplified/config.proto index 0b253ec3b..cf95fb9ec 100644 --- a/proxy/trojan/simplified/config.proto +++ b/proxy/trojan/simplified/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.trojan.simplified; option csharp_namespace = "V2Ray.Core.Proxy.Trojan.Simplified"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/trojan/simplified"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/trojan/simplified"; option java_package = "com.v2ray.core.proxy.trojan.simplified"; option java_multiple_files = true; diff --git a/proxy/trojan/validator.go b/proxy/trojan/validator.go index ad11980c3..ab4a93716 100644 --- a/proxy/trojan/validator.go +++ b/proxy/trojan/validator.go @@ -4,7 +4,7 @@ import ( "strings" "sync" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) // Validator stores valid trojan users. diff --git a/proxy/vless/account.go b/proxy/vless/account.go index 607e373fc..dd9123f97 100644 --- a/proxy/vless/account.go +++ b/proxy/vless/account.go @@ -4,8 +4,8 @@ package vless import ( - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) // AsAccount implements protocol.Account.AsAccount(). diff --git a/proxy/vless/account.pb.go b/proxy/vless/account.pb.go index 32efa271f..293fffe8b 100644 --- a/proxy/vless/account.pb.go +++ b/proxy/vless/account.pb.go @@ -101,7 +101,7 @@ var file_proxy_vless_account_proto_rawDesc = []byte{ 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, - 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6c, 0x65, 0x73, 0x73, 0xaa, 0x02, + 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6c, 0x65, 0x73, 0x73, 0xaa, 0x02, 0x16, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x56, 0x6c, 0x65, 0x73, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/proxy/vless/account.proto b/proxy/vless/account.proto index bbe743a0d..edb8b8894 100644 --- a/proxy/vless/account.proto +++ b/proxy/vless/account.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.vless; option csharp_namespace = "V2Ray.Core.Proxy.Vless"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/vless"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/vless"; option java_package = "com.v2ray.core.proxy.vless"; option java_multiple_files = true; diff --git a/proxy/vless/encoding/addons.go b/proxy/vless/encoding/addons.go index 1259439f6..e50f14eac 100644 --- a/proxy/vless/encoding/addons.go +++ b/proxy/vless/encoding/addons.go @@ -8,9 +8,9 @@ import ( "google.golang.org/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) // EncodeHeaderAddons Add addons byte to the header diff --git a/proxy/vless/encoding/addons.pb.go b/proxy/vless/encoding/addons.pb.go index 6fb493c85..d9e44fc4a 100644 --- a/proxy/vless/encoding/addons.pb.go +++ b/proxy/vless/encoding/addons.pb.go @@ -89,7 +89,7 @@ var file_proxy_vless_encoding_addons_proto_rawDesc = []byte{ 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, - 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, + 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0xaa, 0x02, 0x1f, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x56, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x45, 0x6e, diff --git a/proxy/vless/encoding/addons.proto b/proxy/vless/encoding/addons.proto index 2db7d5def..3752d7c8b 100644 --- a/proxy/vless/encoding/addons.proto +++ b/proxy/vless/encoding/addons.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.vless.encoding; option csharp_namespace = "V2Ray.Core.Proxy.Vless.Encoding"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/vless/encoding"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/vless/encoding"; option java_package = "com.v2ray.core.proxy.vless.encoding"; option java_multiple_files = true; diff --git a/proxy/vless/encoding/encoding.go b/proxy/vless/encoding/encoding.go index 7c4ad36df..2e37ab603 100644 --- a/proxy/vless/encoding/encoding.go +++ b/proxy/vless/encoding/encoding.go @@ -1,14 +1,14 @@ package encoding -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "io" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/proxy/vless" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/proxy/vless" ) const ( diff --git a/proxy/vless/encoding/encoding_test.go b/proxy/vless/encoding/encoding_test.go index 4276dc6e1..17dd1611f 100644 --- a/proxy/vless/encoding/encoding_test.go +++ b/proxy/vless/encoding/encoding_test.go @@ -6,13 +6,13 @@ import ( "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/testing/protocmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/vless" - . "github.com/v2fly/v2ray-core/v4/proxy/vless/encoding" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/vless" + . "github.com/v2fly/v2ray-core/v5/proxy/vless/encoding" ) func toAccount(a *vless.Account) protocol.Account { diff --git a/proxy/vless/encoding/errors.generated.go b/proxy/vless/encoding/errors.generated.go index 00ebc85f0..77998c87e 100644 --- a/proxy/vless/encoding/errors.generated.go +++ b/proxy/vless/encoding/errors.generated.go @@ -1,6 +1,6 @@ package encoding -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vless/errors.generated.go b/proxy/vless/errors.generated.go index dc7869716..0bc99b83c 100644 --- a/proxy/vless/errors.generated.go +++ b/proxy/vless/errors.generated.go @@ -1,6 +1,6 @@ package vless -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vless/inbound/config.pb.go b/proxy/vless/inbound/config.pb.go index 9312f87b9..cdb3ccd80 100644 --- a/proxy/vless/inbound/config.pb.go +++ b/proxy/vless/inbound/config.pb.go @@ -7,8 +7,8 @@ package inbound import ( - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -250,7 +250,7 @@ var file_proxy_vless_inbound_config_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, - 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, + 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0xaa, 0x02, 0x1e, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x56, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, diff --git a/proxy/vless/inbound/config.proto b/proxy/vless/inbound/config.proto index 3223ab472..94de61de9 100644 --- a/proxy/vless/inbound/config.proto +++ b/proxy/vless/inbound/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.vless.inbound; option csharp_namespace = "V2Ray.Core.Proxy.Vless.Inbound"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/vless/inbound"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/vless/inbound"; option java_package = "com.v2ray.core.proxy.vless.inbound"; option java_multiple_files = true; diff --git a/proxy/vless/inbound/errors.generated.go b/proxy/vless/inbound/errors.generated.go index 91f661e21..2ced900b1 100644 --- a/proxy/vless/inbound/errors.generated.go +++ b/proxy/vless/inbound/errors.generated.go @@ -1,6 +1,6 @@ package inbound -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vless/inbound/inbound.go b/proxy/vless/inbound/inbound.go index da9416f1f..c81294204 100644 --- a/proxy/vless/inbound/inbound.go +++ b/proxy/vless/inbound/inbound.go @@ -1,6 +1,6 @@ package inbound -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -8,26 +8,26 @@ import ( "strconv" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/dns" - feature_inbound "github.com/v2fly/v2ray-core/v4/features/inbound" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/proxy/vless" - "github.com/v2fly/v2ray-core/v4/proxy/vless/encoding" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/dns" + feature_inbound "github.com/v2fly/v2ray-core/v5/features/inbound" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/proxy/vless" + "github.com/v2fly/v2ray-core/v5/proxy/vless/encoding" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) func init() { diff --git a/proxy/vless/outbound/config.pb.go b/proxy/vless/outbound/config.pb.go index d3b8e1411..a3515668f 100644 --- a/proxy/vless/outbound/config.pb.go +++ b/proxy/vless/outbound/config.pb.go @@ -7,9 +7,9 @@ package outbound import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -164,7 +164,7 @@ var file_proxy_vless_outbound_config_proto_rawDesc = []byte{ 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, - 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, + 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0xaa, 0x02, 0x1f, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x56, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x4f, 0x75, 0x74, 0x62, diff --git a/proxy/vless/outbound/config.proto b/proxy/vless/outbound/config.proto index 9630159ea..38c6f32df 100644 --- a/proxy/vless/outbound/config.proto +++ b/proxy/vless/outbound/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.vless.outbound; option csharp_namespace = "V2Ray.Core.Proxy.Vless.Outbound"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/vless/outbound"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/vless/outbound"; option java_package = "com.v2ray.core.proxy.vless.outbound"; option java_multiple_files = true; diff --git a/proxy/vless/outbound/errors.generated.go b/proxy/vless/outbound/errors.generated.go index 1d0f494bd..44135e859 100644 --- a/proxy/vless/outbound/errors.generated.go +++ b/proxy/vless/outbound/errors.generated.go @@ -1,6 +1,6 @@ package outbound -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vless/outbound/outbound.go b/proxy/vless/outbound/outbound.go index 0fccb0c62..94c57bebf 100644 --- a/proxy/vless/outbound/outbound.go +++ b/proxy/vless/outbound/outbound.go @@ -1,26 +1,26 @@ package outbound -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/proxy/vless" - "github.com/v2fly/v2ray-core/v4/proxy/vless/encoding" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/proxy/vless" + "github.com/v2fly/v2ray-core/v5/proxy/vless/encoding" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func init() { diff --git a/proxy/vless/validator.go b/proxy/vless/validator.go index 7e8c29af5..b2702cbf8 100644 --- a/proxy/vless/validator.go +++ b/proxy/vless/validator.go @@ -4,8 +4,8 @@ import ( "strings" "sync" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) // Validator stores valid VLESS users. diff --git a/proxy/vless/vless.go b/proxy/vless/vless.go index 5decff436..61be9deb1 100644 --- a/proxy/vless/vless.go +++ b/proxy/vless/vless.go @@ -5,4 +5,4 @@ // clients with 'socks' for proxying. package vless -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/proxy/vmess/account.go b/proxy/vmess/account.go index 8d7a38046..a4c8f202e 100644 --- a/proxy/vmess/account.go +++ b/proxy/vmess/account.go @@ -6,9 +6,9 @@ package vmess import ( "strings" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) // MemoryAccount is an in-memory form of VMess account. diff --git a/proxy/vmess/account.pb.go b/proxy/vmess/account.pb.go index e12361f19..b28d9344e 100644 --- a/proxy/vmess/account.pb.go +++ b/proxy/vmess/account.pb.go @@ -7,7 +7,7 @@ package vmess import ( - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -120,7 +120,7 @@ var file_proxy_vmess_account_proto_rawDesc = []byte{ 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x6d, 0x65, 0x73, 0x73, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6d, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6d, 0x65, 0x73, 0x73, 0xaa, 0x02, 0x16, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x56, 0x6d, 0x65, 0x73, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proxy/vmess/account.proto b/proxy/vmess/account.proto index 335c61b59..61ac5fcd1 100644 --- a/proxy/vmess/account.proto +++ b/proxy/vmess/account.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.vmess; option csharp_namespace = "V2Ray.Core.Proxy.Vmess"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/vmess"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/vmess"; option java_package = "com.v2ray.core.proxy.vmess"; option java_multiple_files = true; diff --git a/proxy/vmess/aead/authid.go b/proxy/vmess/aead/authid.go index 60aa09959..e9d05a1df 100644 --- a/proxy/vmess/aead/authid.go +++ b/proxy/vmess/aead/authid.go @@ -12,8 +12,8 @@ import ( "math" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/antireplay" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/antireplay" ) var ( diff --git a/proxy/vmess/aead/encrypt.go b/proxy/vmess/aead/encrypt.go index 84b982f93..38d91f5bf 100644 --- a/proxy/vmess/aead/encrypt.go +++ b/proxy/vmess/aead/encrypt.go @@ -9,7 +9,7 @@ import ( "io" "time" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) func SealVMessAEADHeader(key [16]byte, data []byte) []byte { diff --git a/proxy/vmess/encoding/auth.go b/proxy/vmess/encoding/auth.go index b35dc3f78..12ed3758c 100644 --- a/proxy/vmess/encoding/auth.go +++ b/proxy/vmess/encoding/auth.go @@ -7,8 +7,8 @@ import ( "golang.org/x/crypto/sha3" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/crypto" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/crypto" ) // Authenticate authenticates a byte array using Fnv hash. diff --git a/proxy/vmess/encoding/auth_test.go b/proxy/vmess/encoding/auth_test.go index f5657093f..8ecd6000c 100644 --- a/proxy/vmess/encoding/auth_test.go +++ b/proxy/vmess/encoding/auth_test.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/proxy/vmess/encoding" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/proxy/vmess/encoding" ) func TestFnvAuth(t *testing.T) { diff --git a/proxy/vmess/encoding/client.go b/proxy/vmess/encoding/client.go index 96837c36c..10f07425c 100644 --- a/proxy/vmess/encoding/client.go +++ b/proxy/vmess/encoding/client.go @@ -15,16 +15,16 @@ import ( "golang.org/x/crypto/chacha20poly1305" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/bitmask" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/crypto" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/drain" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - vmessaead "github.com/v2fly/v2ray-core/v4/proxy/vmess/aead" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/bitmask" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/crypto" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/drain" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + vmessaead "github.com/v2fly/v2ray-core/v5/proxy/vmess/aead" ) func hashTimestamp(h hash.Hash, t protocol.Timestamp) []byte { diff --git a/proxy/vmess/encoding/commands.go b/proxy/vmess/encoding/commands.go index b3ab5003b..8bcd89b1f 100644 --- a/proxy/vmess/encoding/commands.go +++ b/proxy/vmess/encoding/commands.go @@ -4,12 +4,12 @@ import ( "encoding/binary" "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) var ( diff --git a/proxy/vmess/encoding/commands_test.go b/proxy/vmess/encoding/commands_test.go index cb9cc8f88..6419b35dd 100644 --- a/proxy/vmess/encoding/commands_test.go +++ b/proxy/vmess/encoding/commands_test.go @@ -6,11 +6,11 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" - . "github.com/v2fly/v2ray-core/v4/proxy/vmess/encoding" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" + . "github.com/v2fly/v2ray-core/v5/proxy/vmess/encoding" ) func TestSwitchAccount(t *testing.T) { diff --git a/proxy/vmess/encoding/encoding.go b/proxy/vmess/encoding/encoding.go index 2d2b475bf..4ef9e7aea 100644 --- a/proxy/vmess/encoding/encoding.go +++ b/proxy/vmess/encoding/encoding.go @@ -1,11 +1,11 @@ package encoding import ( - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen const ( Version = byte(1) diff --git a/proxy/vmess/encoding/encoding_test.go b/proxy/vmess/encoding/encoding_test.go index e2d2ea90c..10305e208 100644 --- a/proxy/vmess/encoding/encoding_test.go +++ b/proxy/vmess/encoding/encoding_test.go @@ -6,13 +6,13 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - . "github.com/v2fly/v2ray-core/v4/proxy/vmess/encoding" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + . "github.com/v2fly/v2ray-core/v5/proxy/vmess/encoding" ) func toAccount(a *vmess.Account) protocol.Account { diff --git a/proxy/vmess/encoding/errors.generated.go b/proxy/vmess/encoding/errors.generated.go index 00ebc85f0..77998c87e 100644 --- a/proxy/vmess/encoding/errors.generated.go +++ b/proxy/vmess/encoding/errors.generated.go @@ -1,6 +1,6 @@ package encoding -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vmess/encoding/server.go b/proxy/vmess/encoding/server.go index 202de2a95..fd4a6c55a 100644 --- a/proxy/vmess/encoding/server.go +++ b/proxy/vmess/encoding/server.go @@ -14,16 +14,16 @@ import ( "golang.org/x/crypto/chacha20poly1305" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/bitmask" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/crypto" - "github.com/v2fly/v2ray-core/v4/common/drain" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - vmessaead "github.com/v2fly/v2ray-core/v4/proxy/vmess/aead" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/bitmask" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/crypto" + "github.com/v2fly/v2ray-core/v5/common/drain" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + vmessaead "github.com/v2fly/v2ray-core/v5/proxy/vmess/aead" ) type sessionID struct { diff --git a/proxy/vmess/errors.generated.go b/proxy/vmess/errors.generated.go index 6572e81c3..0b749b95f 100644 --- a/proxy/vmess/errors.generated.go +++ b/proxy/vmess/errors.generated.go @@ -1,6 +1,6 @@ package vmess -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vmess/inbound/config.pb.go b/proxy/vmess/inbound/config.pb.go index f2fd39e25..d53d1cf20 100644 --- a/proxy/vmess/inbound/config.pb.go +++ b/proxy/vmess/inbound/config.pb.go @@ -7,8 +7,8 @@ package inbound import ( - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -284,7 +284,7 @@ var file_proxy_vmess_inbound_config_proto_rawDesc = []byte{ 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x6d, 0x65, 0x73, 0x73, 0x2e, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, - 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6d, 0x65, 0x73, 0x73, + 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6d, 0x65, 0x73, 0x73, 0x2f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0xaa, 0x02, 0x1e, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x56, 0x6d, 0x65, 0x73, 0x73, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, diff --git a/proxy/vmess/inbound/config.proto b/proxy/vmess/inbound/config.proto index e864a4650..2835c7fef 100644 --- a/proxy/vmess/inbound/config.proto +++ b/proxy/vmess/inbound/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.vmess.inbound; option csharp_namespace = "V2Ray.Core.Proxy.Vmess.Inbound"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound"; option java_package = "com.v2ray.core.proxy.vmess.inbound"; option java_multiple_files = true; diff --git a/proxy/vmess/inbound/errors.generated.go b/proxy/vmess/inbound/errors.generated.go index 91f661e21..2ced900b1 100644 --- a/proxy/vmess/inbound/errors.generated.go +++ b/proxy/vmess/inbound/errors.generated.go @@ -1,6 +1,6 @@ package inbound -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go index cd0a451e9..954121c09 100644 --- a/proxy/vmess/inbound/inbound.go +++ b/proxy/vmess/inbound/inbound.go @@ -1,6 +1,6 @@ package inbound -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -9,25 +9,25 @@ import ( "sync" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/common/uuid" - feature_inbound "github.com/v2fly/v2ray-core/v4/features/inbound" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/encoding" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/common/uuid" + feature_inbound "github.com/v2fly/v2ray-core/v5/features/inbound" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/encoding" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type userByEmail struct { diff --git a/proxy/vmess/outbound/command.go b/proxy/vmess/outbound/command.go index a990a97ee..527d59ab0 100644 --- a/proxy/vmess/outbound/command.go +++ b/proxy/vmess/outbound/command.go @@ -3,10 +3,10 @@ package outbound import ( "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" ) func (h *Handler) handleSwitchAccount(cmd *protocol.CommandSwitchAccount) { diff --git a/proxy/vmess/outbound/config.pb.go b/proxy/vmess/outbound/config.pb.go index 50c3059ba..1d6392666 100644 --- a/proxy/vmess/outbound/config.pb.go +++ b/proxy/vmess/outbound/config.pb.go @@ -7,9 +7,9 @@ package outbound import ( - net "github.com/v2fly/v2ray-core/v4/common/net" - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + net "github.com/v2fly/v2ray-core/v5/common/net" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -165,7 +165,7 @@ var file_proxy_vmess_outbound_config_proto_rawDesc = []byte{ 0x78, 0x79, 0x2e, 0x76, 0x6d, 0x65, 0x73, 0x73, 0x2e, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, - 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6d, 0x65, 0x73, 0x73, 0x2f, + 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6d, 0x65, 0x73, 0x73, 0x2f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0xaa, 0x02, 0x1f, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x56, 0x6d, 0x65, 0x73, 0x73, 0x2e, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, diff --git a/proxy/vmess/outbound/config.proto b/proxy/vmess/outbound/config.proto index c62943b60..e5e91322f 100644 --- a/proxy/vmess/outbound/config.proto +++ b/proxy/vmess/outbound/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.proxy.vmess.outbound; option csharp_namespace = "V2Ray.Core.Proxy.Vmess.Outbound"; -option go_package = "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound"; +option go_package = "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound"; option java_package = "com.v2ray.core.proxy.vmess.outbound"; option java_multiple_files = true; diff --git a/proxy/vmess/outbound/errors.generated.go b/proxy/vmess/outbound/errors.generated.go index 1d0f494bd..44135e859 100644 --- a/proxy/vmess/outbound/errors.generated.go +++ b/proxy/vmess/outbound/errors.generated.go @@ -1,6 +1,6 @@ package outbound -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/proxy/vmess/outbound/outbound.go b/proxy/vmess/outbound/outbound.go index a8435fb4a..2c2bfe374 100644 --- a/proxy/vmess/outbound/outbound.go +++ b/proxy/vmess/outbound/outbound.go @@ -1,6 +1,6 @@ package outbound -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "context" @@ -9,22 +9,22 @@ import ( "hash/crc64" "time" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/platform" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/encoding" - "github.com/v2fly/v2ray-core/v4/transport" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/platform" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/encoding" + "github.com/v2fly/v2ray-core/v5/transport" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // Handler is an outbound connection handler for VMess protocol. diff --git a/proxy/vmess/validator.go b/proxy/vmess/validator.go index 934a41226..65e007b8d 100644 --- a/proxy/vmess/validator.go +++ b/proxy/vmess/validator.go @@ -9,12 +9,12 @@ import ( "sync/atomic" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/aead" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/aead" ) const ( diff --git a/proxy/vmess/validator_test.go b/proxy/vmess/validator_test.go index 4a9d0cc15..abb50968a 100644 --- a/proxy/vmess/validator_test.go +++ b/proxy/vmess/validator_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - . "github.com/v2fly/v2ray-core/v4/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + . "github.com/v2fly/v2ray-core/v5/proxy/vmess" ) func toAccount(a *Account) protocol.Account { diff --git a/proxy/vmess/vmess.go b/proxy/vmess/vmess.go index d7cf8ae39..3fe4352e1 100644 --- a/proxy/vmess/vmess.go +++ b/proxy/vmess/vmess.go @@ -5,4 +5,4 @@ // clients with 'socks' for proxying. package vmess -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/release/debian/control b/release/debian/control index ad2d321e2..4097a84c7 100644 --- a/release/debian/control +++ b/release/debian/control @@ -9,7 +9,7 @@ Homepage: https://github.com/v2fly/v2ray-core #Vcs-Browser: https://salsa.debian.org/debian/v2ray-core #Vcs-Git: https://salsa.debian.org/debian/v2ray-core.git Rules-Requires-Root: no -XS-Go-Import-Path: github.com/v2fly/v2ray-core/v4 +XS-Go-Import-Path: github.com/v2fly/v2ray-core/v5 Package: v2ray Architecture: any diff --git a/release/debian/rules b/release/debian/rules index 019d9f26f..5064961f3 100755 --- a/release/debian/rules +++ b/release/debian/rules @@ -12,9 +12,9 @@ execute_after_dh_auto_configure: cp -r vendor/* _build/src override_dh_auto_build: - DH_GOPKG="github.com/v2fly/v2ray-core/v4/main" dh_auto_build -- -ldflags "-s -w" + DH_GOPKG="github.com/v2fly/v2ray-core/v5/main" dh_auto_build -- -ldflags "-s -w" cd $(BUILDDIR); mv bin/main bin/v2ray - DH_GOPKG="github.com/v2fly/v2ray-core/v4/infra/control/main" dh_auto_build -- -ldflags "-s -w" -tags confonly + DH_GOPKG="github.com/v2fly/v2ray-core/v5/infra/control/main" dh_auto_build -- -ldflags "-s -w" -tags confonly cd $(BUILDDIR); mv bin/main bin/v2ctl override_dh_auto_install: diff --git a/release/user-package.sh b/release/user-package.sh index 7928ed34f..8bfb0c4f4 100755 --- a/release/user-package.sh +++ b/release/user-package.sh @@ -33,7 +33,7 @@ build_v2() { local VERSIONTAG=$(git describe --abbrev=0 --tags) fi - LDFLAGS="-s -w -buildid= -X github.com/v2fly/v2ray-core/v4.codename=${CODENAME} -X github.com/v2fly/v2ray-core/v4.build=${BUILDNAME} -X github.com/v2fly/v2ray-core/v4.version=${VERSIONTAG}" + LDFLAGS="-s -w -buildid= -X github.com/v2fly/v2ray-core/v5.codename=${CODENAME} -X github.com/v2fly/v2ray-core/v5.build=${BUILDNAME} -X github.com/v2fly/v2ray-core/v5.version=${VERSIONTAG}" echo ">>> Compile v2ray ..." env CGO_ENABLED=0 go build -o "$TMP"/v2ray"${EXESUFFIX}" -ldflags "$LDFLAGS" ./main diff --git a/testing/mocks/dns.go b/testing/mocks/dns.go index 0e05f1125..6f7b5c822 100644 --- a/testing/mocks/dns.go +++ b/testing/mocks/dns.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/v2fly/v2ray-core/v4/features/dns (interfaces: Client) +// Source: github.com/v2fly/v2ray-core/v5/features/dns (interfaces: Client) // Package mocks is a generated GoMock package. package mocks diff --git a/testing/mocks/log.go b/testing/mocks/log.go index 436d97e7b..074c0e2ca 100644 --- a/testing/mocks/log.go +++ b/testing/mocks/log.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/v2fly/v2ray-core/v4/common/log (interfaces: Handler) +// Source: github.com/v2fly/v2ray-core/v5/common/log (interfaces: Handler) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - log "github.com/v2fly/v2ray-core/v4/common/log" + log "github.com/v2fly/v2ray-core/v5/common/log" ) // LogHandler is a mock of Handler interface. diff --git a/testing/mocks/mux.go b/testing/mocks/mux.go index e22d78798..33686e20b 100644 --- a/testing/mocks/mux.go +++ b/testing/mocks/mux.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/v2fly/v2ray-core/v4/common/mux (interfaces: ClientWorkerFactory) +// Source: github.com/v2fly/v2ray-core/v5/common/mux (interfaces: ClientWorkerFactory) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - mux "github.com/v2fly/v2ray-core/v4/common/mux" + mux "github.com/v2fly/v2ray-core/v5/common/mux" ) // MuxClientWorkerFactory is a mock of ClientWorkerFactory interface. diff --git a/testing/mocks/outbound.go b/testing/mocks/outbound.go index ec576b1c8..8d8bdc762 100644 --- a/testing/mocks/outbound.go +++ b/testing/mocks/outbound.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/v2fly/v2ray-core/v4/features/outbound (interfaces: Manager,HandlerSelector) +// Source: github.com/v2fly/v2ray-core/v5/features/outbound (interfaces: Manager,HandlerSelector) // Package mocks is a generated GoMock package. package mocks @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - outbound "github.com/v2fly/v2ray-core/v4/features/outbound" + outbound "github.com/v2fly/v2ray-core/v5/features/outbound" ) // OutboundManager is a mock of Manager interface. diff --git a/testing/mocks/proxy.go b/testing/mocks/proxy.go index 0b625fc64..d2cf3e1c7 100644 --- a/testing/mocks/proxy.go +++ b/testing/mocks/proxy.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/v2fly/v2ray-core/v4/proxy (interfaces: Inbound,Outbound) +// Source: github.com/v2fly/v2ray-core/v5/proxy (interfaces: Inbound,Outbound) // Package mocks is a generated GoMock package. package mocks @@ -9,10 +9,10 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - net "github.com/v2fly/v2ray-core/v4/common/net" - routing "github.com/v2fly/v2ray-core/v4/features/routing" - transport "github.com/v2fly/v2ray-core/v4/transport" - internet "github.com/v2fly/v2ray-core/v4/transport/internet" + net "github.com/v2fly/v2ray-core/v5/common/net" + routing "github.com/v2fly/v2ray-core/v5/features/routing" + transport "github.com/v2fly/v2ray-core/v5/transport" + internet "github.com/v2fly/v2ray-core/v5/transport/internet" ) // ProxyInbound is a mock of Inbound interface. diff --git a/testing/scenarios/command_test.go b/testing/scenarios/command_test.go index 60e3f950f..a59f9d150 100644 --- a/testing/scenarios/command_test.go +++ b/testing/scenarios/command_test.go @@ -13,25 +13,25 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/commander" - "github.com/v2fly/v2ray-core/v4/app/policy" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/app/proxyman/command" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/stats" - statscmd "github.com/v2fly/v2ray-core/v4/app/stats/command" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/commander" + "github.com/v2fly/v2ray-core/v5/app/policy" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/app/proxyman/command" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/stats" + statscmd "github.com/v2fly/v2ray-core/v5/app/stats/command" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func TestCommanderRemoveHandler(t *testing.T) { diff --git a/testing/scenarios/common.go b/testing/scenarios/common.go index da9499aa1..a63512df1 100644 --- a/testing/scenarios/common.go +++ b/testing/scenarios/common.go @@ -15,15 +15,15 @@ import ( "google.golang.org/protobuf/proto" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/retry" - "github.com/v2fly/v2ray-core/v4/common/serial" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/retry" + "github.com/v2fly/v2ray-core/v5/common/serial" ) func xor(b []byte) []byte { @@ -119,7 +119,7 @@ func genTestBinaryPath() { } func GetSourcePath() string { - return filepath.Join("github.com", "v2fly", "v2ray-core", "v4", "main") + return filepath.Join("github.com", "v2fly", "v2ray-core", "v5", "main") } func CloseAllServers(servers []*exec.Cmd) { diff --git a/testing/scenarios/common_coverage.go b/testing/scenarios/common_coverage.go index 71323410f..d58be2109 100644 --- a/testing/scenarios/common_coverage.go +++ b/testing/scenarios/common_coverage.go @@ -8,7 +8,7 @@ import ( "os" "os/exec" - "github.com/v2fly/v2ray-core/v4/common/uuid" + "github.com/v2fly/v2ray-core/v5/common/uuid" ) func BuildV2Ray() error { @@ -17,7 +17,7 @@ func BuildV2Ray() error { return nil } - cmd := exec.Command("go", "test", "-tags", "coverage coveragemain", "-coverpkg", "github.com/v2fly/v2ray-core/v4/...", "-c", "-o", testBinaryPath, GetSourcePath()) + cmd := exec.Command("go", "test", "-tags", "coverage coveragemain", "-coverpkg", "github.com/v2fly/v2ray-core/v5/...", "-c", "-o", testBinaryPath, GetSourcePath()) return cmd.Run() } diff --git a/testing/scenarios/dns_test.go b/testing/scenarios/dns_test.go index 5411a5a78..4561d1794 100644 --- a/testing/scenarios/dns_test.go +++ b/testing/scenarios/dns_test.go @@ -8,18 +8,18 @@ import ( xproxy "golang.org/x/net/proxy" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dns" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/socks" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dns" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/socks" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func TestResolveIP(t *testing.T) { diff --git a/testing/scenarios/dokodemo_test.go b/testing/scenarios/dokodemo_test.go index c8751405e..c2d280945 100644 --- a/testing/scenarios/dokodemo_test.go +++ b/testing/scenarios/dokodemo_test.go @@ -7,22 +7,22 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" ) func TestDokodemoTCP(t *testing.T) { diff --git a/testing/scenarios/feature_test.go b/testing/scenarios/feature_test.go index a06d7b426..37f2778aa 100644 --- a/testing/scenarios/feature_test.go +++ b/testing/scenarios/feature_test.go @@ -11,30 +11,30 @@ import ( xproxy "golang.org/x/net/proxy" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/inbound" - _ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - v2http "github.com/v2fly/v2ray-core/v4/proxy/http" - "github.com/v2fly/v2ray-core/v4/proxy/socks" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" - "github.com/v2fly/v2ray-core/v4/transport/internet" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/inbound" + _ "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + v2http "github.com/v2fly/v2ray-core/v5/proxy/http" + "github.com/v2fly/v2ray-core/v5/proxy/socks" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func TestPassiveConnection(t *testing.T) { diff --git a/testing/scenarios/http_test.go b/testing/scenarios/http_test.go index d2f4f3bb0..715657558 100644 --- a/testing/scenarios/http_test.go +++ b/testing/scenarios/http_test.go @@ -12,16 +12,16 @@ import ( "github.com/google/go-cmp/cmp" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - v2http "github.com/v2fly/v2ray-core/v4/proxy/http" - v2httptest "github.com/v2fly/v2ray-core/v4/testing/servers/http" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + v2http "github.com/v2fly/v2ray-core/v5/proxy/http" + v2httptest "github.com/v2fly/v2ray-core/v5/testing/servers/http" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func TestHttpConformance(t *testing.T) { diff --git a/testing/scenarios/policy_test.go b/testing/scenarios/policy_test.go index 40f7a5554..8b6908869 100644 --- a/testing/scenarios/policy_test.go +++ b/testing/scenarios/policy_test.go @@ -8,22 +8,22 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/policy" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/policy" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func startQuickClosingTCPServer() (net.Listener, error) { diff --git a/testing/scenarios/reverse_test.go b/testing/scenarios/reverse_test.go index 3ee738b19..0276590d6 100644 --- a/testing/scenarios/reverse_test.go +++ b/testing/scenarios/reverse_test.go @@ -7,26 +7,26 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/policy" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/app/reverse" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/app/router/routercommon" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/policy" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/app/reverse" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/app/router/routercommon" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func TestReverseProxy(t *testing.T) { diff --git a/testing/scenarios/shadowsocks_test.go b/testing/scenarios/shadowsocks_test.go index 1bd4308b6..6de4e462d 100644 --- a/testing/scenarios/shadowsocks_test.go +++ b/testing/scenarios/shadowsocks_test.go @@ -7,19 +7,19 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/shadowsocks" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" ) func TestShadowsocksChaCha20Poly1305TCP(t *testing.T) { diff --git a/testing/scenarios/socks_test.go b/testing/scenarios/socks_test.go index ad8f61ab9..d40730ebc 100644 --- a/testing/scenarios/socks_test.go +++ b/testing/scenarios/socks_test.go @@ -8,19 +8,19 @@ import ( "google.golang.org/protobuf/types/known/anypb" socks4 "h12.io/socks" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/app/router" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/proxy/blackhole" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/socks" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/app/router" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/proxy/blackhole" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/socks" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" ) func TestSocksBridgeTCP(t *testing.T) { diff --git a/testing/scenarios/tls_test.go b/testing/scenarios/tls_test.go index acdf31ff0..0b28259ea 100644 --- a/testing/scenarios/tls_test.go +++ b/testing/scenarios/tls_test.go @@ -9,25 +9,25 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "github.com/v2fly/v2ray-core/v4/transport/internet/websocket" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/transport/internet/websocket" ) func TestSimpleTLSConnection(t *testing.T) { diff --git a/testing/scenarios/transport_test.go b/testing/scenarios/transport_test.go index 6dad4904f..20a8dca54 100644 --- a/testing/scenarios/transport_test.go +++ b/testing/scenarios/transport_test.go @@ -9,28 +9,28 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wechat" - "github.com/v2fly/v2ray-core/v4/transport/internet/quic" - tcptransport "github.com/v2fly/v2ray-core/v4/transport/internet/tcp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/domainsocket" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wechat" + "github.com/v2fly/v2ray-core/v5/transport/internet/quic" + tcptransport "github.com/v2fly/v2ray-core/v5/transport/internet/tcp" ) func TestHTTPConnectionHeader(t *testing.T) { diff --git a/testing/scenarios/vmess_test.go b/testing/scenarios/vmess_test.go index 01842016a..e1acd4556 100644 --- a/testing/scenarios/vmess_test.go +++ b/testing/scenarios/vmess_test.go @@ -9,24 +9,24 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/anypb" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/log" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - clog "github.com/v2fly/v2ray-core/v4/common/log" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/freedom" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/inbound" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/log" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + clog "github.com/v2fly/v2ray-core/v5/common/log" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/freedom" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/inbound" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" ) func TestVMessDynamicPort(t *testing.T) { diff --git a/testing/servers/http/http.go b/testing/servers/http/http.go index 6c83c5f20..fc1fe65ae 100644 --- a/testing/servers/http/http.go +++ b/testing/servers/http/http.go @@ -3,7 +3,7 @@ package tcp import ( "net/http" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) type Server struct { diff --git a/testing/servers/tcp/port.go b/testing/servers/tcp/port.go index 9026ffd2d..1b04f8f09 100644 --- a/testing/servers/tcp/port.go +++ b/testing/servers/tcp/port.go @@ -1,6 +1,6 @@ package tcp -import "github.com/v2fly/v2ray-core/v4/common/net" +import "github.com/v2fly/v2ray-core/v5/common/net" // PickPort returns an unused TCP port of the system. func PickPort() net.Port { diff --git a/testing/servers/tcp/tcp.go b/testing/servers/tcp/tcp.go index c04fcfac7..d317439ff 100644 --- a/testing/servers/tcp/tcp.go +++ b/testing/servers/tcp/tcp.go @@ -5,11 +5,11 @@ import ( "fmt" "io" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) type Server struct { diff --git a/testing/servers/udp/port.go b/testing/servers/udp/port.go index 44211661d..d80969737 100644 --- a/testing/servers/udp/port.go +++ b/testing/servers/udp/port.go @@ -1,6 +1,6 @@ package udp -import "github.com/v2fly/v2ray-core/v4/common/net" +import "github.com/v2fly/v2ray-core/v5/common/net" // PickPort returns an unused UDP port of the system. func PickPort() net.Port { diff --git a/testing/servers/udp/udp.go b/testing/servers/udp/udp.go index 8a450362a..eb91b2e12 100644 --- a/testing/servers/udp/udp.go +++ b/testing/servers/udp/udp.go @@ -3,7 +3,7 @@ package udp import ( "fmt" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) type Server struct { diff --git a/transport/config.go b/transport/config.go index 505cd6535..a7f3131ac 100644 --- a/transport/config.go +++ b/transport/config.go @@ -1,7 +1,7 @@ package transport import ( - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // Apply applies this Config. diff --git a/transport/config.pb.go b/transport/config.pb.go index 3cf759460..10049722f 100644 --- a/transport/config.pb.go +++ b/transport/config.pb.go @@ -7,7 +7,7 @@ package transport import ( - internet "github.com/v2fly/v2ray-core/v4/transport/internet" + internet "github.com/v2fly/v2ray-core/v5/transport/internet" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -90,7 +90,7 @@ var file_transport_config_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x50, 0x01, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, - 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0xaa, 0x02, 0x14, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/transport/config.proto b/transport/config.proto index d89014c97..034780a74 100644 --- a/transport/config.proto +++ b/transport/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport; option csharp_namespace = "V2Ray.Core.Transport"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport"; option java_package = "com.v2ray.core.transport"; option java_multiple_files = true; diff --git a/transport/internet/config.go b/transport/internet/config.go index 74610063a..8a0d01982 100644 --- a/transport/internet/config.go +++ b/transport/internet/config.go @@ -5,10 +5,10 @@ import ( "github.com/golang/protobuf/proto" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protoext" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protoext" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/features" ) type ConfigCreator func() interface{} diff --git a/transport/internet/config.pb.go b/transport/internet/config.pb.go index 1fd7f06b0..3d74364fe 100644 --- a/transport/internet/config.pb.go +++ b/transport/internet/config.pb.go @@ -628,7 +628,7 @@ var file_transport_internet_config_proto_rawDesc = []byte{ 0x72, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x1d, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, diff --git a/transport/internet/config.proto b/transport/internet/config.proto index 2645ba5fe..b5584a3ac 100644 --- a/transport/internet/config.proto +++ b/transport/internet/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet; option csharp_namespace = "V2Ray.Core.Transport.Internet"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet"; option java_package = "com.v2ray.core.transport.internet"; option java_multiple_files = true; diff --git a/transport/internet/connection.go b/transport/internet/connection.go index e4112a659..6d77721d9 100644 --- a/transport/internet/connection.go +++ b/transport/internet/connection.go @@ -3,7 +3,7 @@ package internet import ( "net" - "github.com/v2fly/v2ray-core/v4/features/stats" + "github.com/v2fly/v2ray-core/v5/features/stats" ) type Connection interface { diff --git a/transport/internet/dialer.go b/transport/internet/dialer.go index 337afdab6..0f978fbf9 100644 --- a/transport/internet/dialer.go +++ b/transport/internet/dialer.go @@ -3,9 +3,9 @@ package internet import ( "context" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/transport/internet/tagged" ) // Dialer is the interface for dialing outbound connections. diff --git a/transport/internet/dialer_test.go b/transport/internet/dialer_test.go index ee58833f2..42f68cc6f 100644 --- a/transport/internet/dialer_test.go +++ b/transport/internet/dialer_test.go @@ -6,10 +6,10 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - . "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + . "github.com/v2fly/v2ray-core/v5/transport/internet" ) func TestDialWithLocalAddr(t *testing.T) { diff --git a/transport/internet/domainsocket/config.go b/transport/internet/domainsocket/config.go index 3fce8f283..24c819e4b 100644 --- a/transport/internet/domainsocket/config.go +++ b/transport/internet/domainsocket/config.go @@ -1,9 +1,9 @@ package domainsocket import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) const ( diff --git a/transport/internet/domainsocket/config.pb.go b/transport/internet/domainsocket/config.pb.go index 8d33dfc8b..e44ef4e6b 100644 --- a/transport/internet/domainsocket/config.pb.go +++ b/transport/internet/domainsocket/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.19.1 +// protoc v3.17.3 // source: transport/internet/domainsocket/config.proto package domainsocket @@ -109,7 +109,7 @@ var file_transport_internet_domainsocket_config_proto_rawDesc = []byte{ 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, - 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, + 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0xaa, 0x02, 0x2a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, diff --git a/transport/internet/domainsocket/config.proto b/transport/internet/domainsocket/config.proto index 3cc5f07be..1188b595f 100644 --- a/transport/internet/domainsocket/config.proto +++ b/transport/internet/domainsocket/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.domainsocket; option csharp_namespace = "V2Ray.Core.Transport.Internet.DomainSocket"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/domainsocket"; option java_package = "com.v2ray.core.transport.internet.domainsocket"; option java_multiple_files = true; diff --git a/transport/internet/domainsocket/dial.go b/transport/internet/domainsocket/dial.go index f830c7b38..4ba3e4768 100644 --- a/transport/internet/domainsocket/dial.go +++ b/transport/internet/domainsocket/dial.go @@ -6,10 +6,10 @@ package domainsocket import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (internet.Connection, error) { diff --git a/transport/internet/domainsocket/errgen.go b/transport/internet/domainsocket/errgen.go index 568f702e4..64d42e3de 100644 --- a/transport/internet/domainsocket/errgen.go +++ b/transport/internet/domainsocket/errgen.go @@ -1,3 +1,3 @@ package domainsocket -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/domainsocket/errors.generated.go b/transport/internet/domainsocket/errors.generated.go index 54d7578c2..232e21b4b 100644 --- a/transport/internet/domainsocket/errors.generated.go +++ b/transport/internet/domainsocket/errors.generated.go @@ -1,6 +1,6 @@ package domainsocket -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/domainsocket/listener.go b/transport/internet/domainsocket/listener.go index 0c8417015..7d886511a 100644 --- a/transport/internet/domainsocket/listener.go +++ b/transport/internet/domainsocket/listener.go @@ -11,10 +11,10 @@ import ( "golang.org/x/sys/unix" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) type Listener struct { diff --git a/transport/internet/domainsocket/listener_test.go b/transport/internet/domainsocket/listener_test.go index 8c68f853e..9774c5ab7 100644 --- a/transport/internet/domainsocket/listener_test.go +++ b/transport/internet/domainsocket/listener_test.go @@ -8,11 +8,11 @@ import ( "runtime" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" - . "github.com/v2fly/v2ray-core/v4/transport/internet/domainsocket" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" + . "github.com/v2fly/v2ray-core/v5/transport/internet/domainsocket" ) func TestListen(t *testing.T) { diff --git a/transport/internet/errors.generated.go b/transport/internet/errors.generated.go index 07872c102..e604e1a8d 100644 --- a/transport/internet/errors.generated.go +++ b/transport/internet/errors.generated.go @@ -1,6 +1,6 @@ package internet -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/grpc/config.go b/transport/internet/grpc/config.go index ed1009cba..5b0d0ae42 100644 --- a/transport/internet/grpc/config.go +++ b/transport/internet/grpc/config.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) const protocolName = "gun" diff --git a/transport/internet/grpc/config.pb.go b/transport/internet/grpc/config.pb.go index 88b954a74..1ae1a7954 100644 --- a/transport/internet/grpc/config.pb.go +++ b/transport/internet/grpc/config.pb.go @@ -7,7 +7,7 @@ package grpc import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -97,7 +97,7 @@ var file_transport_internet_grpc_config_proto_rawDesc = []byte{ 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0xaa, 0x02, 0x22, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, diff --git a/transport/internet/grpc/config.proto b/transport/internet/grpc/config.proto index 8065b99be..3e012f044 100644 --- a/transport/internet/grpc/config.proto +++ b/transport/internet/grpc/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.grpc.encoding; option csharp_namespace = "V2Ray.Core.Transport.Internet.Grpc"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/grpc"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/grpc"; option java_package = "com.v2ray.core.transport.internet.grpc"; import "common/protoext/extensions.proto"; diff --git a/transport/internet/grpc/dial.go b/transport/internet/grpc/dial.go index b67b6b23e..2d5be743e 100644 --- a/transport/internet/grpc/dial.go +++ b/transport/internet/grpc/dial.go @@ -14,13 +14,13 @@ import ( "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/grpc/encoding" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/grpc/encoding" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (internet.Connection, error) { diff --git a/transport/internet/grpc/encoding/encoding.go b/transport/internet/grpc/encoding/encoding.go index 68f157499..8e9008a99 100644 --- a/transport/internet/grpc/encoding/encoding.go +++ b/transport/internet/grpc/encoding/encoding.go @@ -1,3 +1,3 @@ package encoding -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/grpc/encoding/errors.generated.go b/transport/internet/grpc/encoding/errors.generated.go index 00ebc85f0..77998c87e 100644 --- a/transport/internet/grpc/encoding/errors.generated.go +++ b/transport/internet/grpc/encoding/errors.generated.go @@ -1,6 +1,6 @@ package encoding -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/grpc/encoding/stream.pb.go b/transport/internet/grpc/encoding/stream.pb.go index 7e156afcf..50122ebfd 100644 --- a/transport/internet/grpc/encoding/stream.pb.go +++ b/transport/internet/grpc/encoding/stream.pb.go @@ -90,7 +90,7 @@ var file_transport_internet_grpc_encoding_stream_proto_rawDesc = []byte{ 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, - 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, + 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0xaa, 0x02, 0x2b, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, diff --git a/transport/internet/grpc/encoding/stream.proto b/transport/internet/grpc/encoding/stream.proto index 8bd7e3007..778056e31 100644 --- a/transport/internet/grpc/encoding/stream.proto +++ b/transport/internet/grpc/encoding/stream.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.grpc.encoding; option csharp_namespace = "V2Ray.Core.Transport.Internet.Grpc.Encoding"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/grpc/encoding"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/grpc/encoding"; option java_package = "com.v2ray.core.transport.internet.grpc.encoding"; message Hunk { diff --git a/transport/internet/grpc/encoding/stream_grpc.pb.go b/transport/internet/grpc/encoding/stream_grpc.pb.go index d036f0d3d..0fe7ca36f 100644 --- a/transport/internet/grpc/encoding/stream_grpc.pb.go +++ b/transport/internet/grpc/encoding/stream_grpc.pb.go @@ -1,4 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.17.3 +// source: transport/internet/grpc/encoding/stream.proto package encoding diff --git a/transport/internet/grpc/errors.generated.go b/transport/internet/grpc/errors.generated.go index 3a47f4177..7e5fc0e13 100644 --- a/transport/internet/grpc/errors.generated.go +++ b/transport/internet/grpc/errors.generated.go @@ -1,6 +1,6 @@ package grpc -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/grpc/grpc.go b/transport/internet/grpc/grpc.go index a302d9ea9..cd72a0b6f 100644 --- a/transport/internet/grpc/grpc.go +++ b/transport/internet/grpc/grpc.go @@ -3,4 +3,4 @@ package grpc -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/grpc/hub.go b/transport/internet/grpc/hub.go index c466e2d0e..172145b7d 100644 --- a/transport/internet/grpc/hub.go +++ b/transport/internet/grpc/hub.go @@ -9,12 +9,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/grpc/encoding" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/grpc/encoding" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) type Listener struct { diff --git a/transport/internet/header.go b/transport/internet/header.go index 944a727b6..3c04f1eec 100644 --- a/transport/internet/header.go +++ b/transport/internet/header.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) type PacketHeader interface { diff --git a/transport/internet/header_test.go b/transport/internet/header_test.go index 14c37a40e..8f1d6609e 100644 --- a/transport/internet/header_test.go +++ b/transport/internet/header_test.go @@ -3,13 +3,13 @@ package internet_test import ( "testing" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/noop" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/srtp" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/utp" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wechat" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wireguard" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/noop" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/srtp" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/utp" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wechat" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wireguard" ) func TestAllHeadersLoadable(t *testing.T) { diff --git a/transport/internet/headers/http/config.go b/transport/internet/headers/http/config.go index 9af29dbed..9a41dc23e 100644 --- a/transport/internet/headers/http/config.go +++ b/transport/internet/headers/http/config.go @@ -3,7 +3,7 @@ package http import ( "strings" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common/dice" ) func pickString(arr []string) string { diff --git a/transport/internet/headers/http/config.pb.go b/transport/internet/headers/http/config.pb.go index ab1ad0ac9..8a76036a8 100644 --- a/transport/internet/headers/http/config.pb.go +++ b/transport/internet/headers/http/config.pb.go @@ -495,7 +495,7 @@ var file_transport_internet_headers_http_config_proto_rawDesc = []byte{ 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x50, 0x01, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0xaa, 0x02, 0x2a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, diff --git a/transport/internet/headers/http/config.proto b/transport/internet/headers/http/config.proto index 884ffe379..d2d363de7 100644 --- a/transport/internet/headers/http/config.proto +++ b/transport/internet/headers/http/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.headers.http; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Http"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http"; option java_package = "com.v2ray.core.transport.internet.headers.http"; option java_multiple_files = true; diff --git a/transport/internet/headers/http/errors.generated.go b/transport/internet/headers/http/errors.generated.go index bbaec46a4..f738ccf1d 100644 --- a/transport/internet/headers/http/errors.generated.go +++ b/transport/internet/headers/http/errors.generated.go @@ -1,6 +1,6 @@ package http -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/headers/http/http.go b/transport/internet/headers/http/http.go index c1d630263..f82a717e0 100644 --- a/transport/internet/headers/http/http.go +++ b/transport/internet/headers/http/http.go @@ -1,6 +1,6 @@ package http -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen import ( "bufio" @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" ) const ( diff --git a/transport/internet/headers/http/http_test.go b/transport/internet/headers/http/http_test.go index 00b4d3c5c..c737a02cf 100644 --- a/transport/internet/headers/http/http_test.go +++ b/transport/internet/headers/http/http_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - . "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + . "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" ) func TestReaderWriter(t *testing.T) { diff --git a/transport/internet/headers/noop/config.pb.go b/transport/internet/headers/noop/config.pb.go index f24de2e5d..de5c894dd 100644 --- a/transport/internet/headers/noop/config.pb.go +++ b/transport/internet/headers/noop/config.pb.go @@ -111,7 +111,7 @@ var file_transport_internet_headers_noop_config_proto_rawDesc = []byte{ 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x6f, 0x6f, 0x70, 0x50, 0x01, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, - 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, + 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x6f, 0x6f, 0x70, 0xaa, 0x02, 0x2a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, diff --git a/transport/internet/headers/noop/config.proto b/transport/internet/headers/noop/config.proto index 0be13f08d..616ff6b61 100644 --- a/transport/internet/headers/noop/config.proto +++ b/transport/internet/headers/noop/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.headers.noop; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Noop"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/headers/noop"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/headers/noop"; option java_package = "com.v2ray.core.transport.internet.headers.noop"; option java_multiple_files = true; diff --git a/transport/internet/headers/noop/noop.go b/transport/internet/headers/noop/noop.go index dcbb33207..5ebfc390a 100644 --- a/transport/internet/headers/noop/noop.go +++ b/transport/internet/headers/noop/noop.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) type Header struct{} diff --git a/transport/internet/headers/srtp/config.pb.go b/transport/internet/headers/srtp/config.pb.go index 48dd344fd..621e7e46e 100644 --- a/transport/internet/headers/srtp/config.pb.go +++ b/transport/internet/headers/srtp/config.pb.go @@ -132,7 +132,7 @@ var file_transport_internet_headers_srtp_config_proto_rawDesc = []byte{ 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x73, 0x72, 0x74, 0x70, 0x50, 0x01, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, - 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, + 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x73, 0x72, 0x74, 0x70, 0xaa, 0x02, 0x2a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, diff --git a/transport/internet/headers/srtp/config.proto b/transport/internet/headers/srtp/config.proto index 676ea547b..8137ba10f 100644 --- a/transport/internet/headers/srtp/config.proto +++ b/transport/internet/headers/srtp/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.headers.srtp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Srtp"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/headers/srtp"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/headers/srtp"; option java_package = "com.v2ray.core.transport.internet.headers.srtp"; option java_multiple_files = true; diff --git a/transport/internet/headers/srtp/srtp.go b/transport/internet/headers/srtp/srtp.go index 9db32a932..6adc678aa 100644 --- a/transport/internet/headers/srtp/srtp.go +++ b/transport/internet/headers/srtp/srtp.go @@ -4,8 +4,8 @@ import ( "context" "encoding/binary" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" ) type SRTP struct { diff --git a/transport/internet/headers/srtp/srtp_test.go b/transport/internet/headers/srtp/srtp_test.go index c07f3e36c..4327c018b 100644 --- a/transport/internet/headers/srtp/srtp_test.go +++ b/transport/internet/headers/srtp/srtp_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/transport/internet/headers/srtp" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/transport/internet/headers/srtp" ) func TestSRTPWrite(t *testing.T) { diff --git a/transport/internet/headers/tls/config.pb.go b/transport/internet/headers/tls/config.pb.go index 17a715567..6d544ed2c 100644 --- a/transport/internet/headers/tls/config.pb.go +++ b/transport/internet/headers/tls/config.pb.go @@ -72,7 +72,7 @@ var file_transport_internet_headers_tls_config_proto_rawDesc = []byte{ 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, - 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, + 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x74, 0x6c, 0x73, 0xaa, 0x02, 0x29, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, diff --git a/transport/internet/headers/tls/config.proto b/transport/internet/headers/tls/config.proto index c3237b9e1..fc59ff0ab 100644 --- a/transport/internet/headers/tls/config.proto +++ b/transport/internet/headers/tls/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.headers.tls; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Tls"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/headers/tls"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/headers/tls"; option java_package = "com.v2ray.core.transport.internet.headers.tls"; option java_multiple_files = true; diff --git a/transport/internet/headers/tls/dtls.go b/transport/internet/headers/tls/dtls.go index d80bfd716..95899460b 100644 --- a/transport/internet/headers/tls/dtls.go +++ b/transport/internet/headers/tls/dtls.go @@ -3,8 +3,8 @@ package tls import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" ) // DTLS writes header as DTLS. See https://tools.ietf.org/html/rfc6347 diff --git a/transport/internet/headers/tls/dtls_test.go b/transport/internet/headers/tls/dtls_test.go index 220e956d3..e8b0417e8 100644 --- a/transport/internet/headers/tls/dtls_test.go +++ b/transport/internet/headers/tls/dtls_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/transport/internet/headers/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/transport/internet/headers/tls" ) func TestDTLSWrite(t *testing.T) { diff --git a/transport/internet/headers/utp/config.pb.go b/transport/internet/headers/utp/config.pb.go index 3e30b1dfd..88e796314 100644 --- a/transport/internet/headers/utp/config.pb.go +++ b/transport/internet/headers/utp/config.pb.go @@ -82,7 +82,7 @@ var file_transport_internet_headers_utp_config_proto_rawDesc = []byte{ 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x75, 0x74, 0x70, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, - 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, + 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x75, 0x74, 0x70, 0xaa, 0x02, 0x29, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, diff --git a/transport/internet/headers/utp/config.proto b/transport/internet/headers/utp/config.proto index 4e6a9d1a4..068c0e336 100644 --- a/transport/internet/headers/utp/config.proto +++ b/transport/internet/headers/utp/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.headers.utp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Utp"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/headers/utp"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/headers/utp"; option java_package = "com.v2ray.core.transport.internet.headers.utp"; option java_multiple_files = true; diff --git a/transport/internet/headers/utp/utp.go b/transport/internet/headers/utp/utp.go index 2396267de..96df7aafa 100644 --- a/transport/internet/headers/utp/utp.go +++ b/transport/internet/headers/utp/utp.go @@ -4,8 +4,8 @@ import ( "context" "encoding/binary" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" ) type UTP struct { diff --git a/transport/internet/headers/utp/utp_test.go b/transport/internet/headers/utp/utp_test.go index c01b95baf..5db41a247 100644 --- a/transport/internet/headers/utp/utp_test.go +++ b/transport/internet/headers/utp/utp_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/transport/internet/headers/utp" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/transport/internet/headers/utp" ) func TestUTPWrite(t *testing.T) { diff --git a/transport/internet/headers/wechat/config.pb.go b/transport/internet/headers/wechat/config.pb.go index 8ea9e80c3..13cc7ba00 100644 --- a/transport/internet/headers/wechat/config.pb.go +++ b/transport/internet/headers/wechat/config.pb.go @@ -73,7 +73,7 @@ var file_transport_internet_headers_wechat_config_proto_rawDesc = []byte{ 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x77, 0x65, 0x63, 0x68, 0x61, 0x74, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, - 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, + 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x77, 0x65, 0x63, 0x68, 0x61, 0x74, 0xaa, 0x02, 0x2c, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, diff --git a/transport/internet/headers/wechat/config.proto b/transport/internet/headers/wechat/config.proto index 0d0ccfdeb..9f43f3ba7 100644 --- a/transport/internet/headers/wechat/config.proto +++ b/transport/internet/headers/wechat/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.headers.wechat; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Wechat"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wechat"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wechat"; option java_package = "com.v2ray.core.transport.internet.headers.wechat"; option java_multiple_files = true; diff --git a/transport/internet/headers/wechat/wechat.go b/transport/internet/headers/wechat/wechat.go index 94a240053..756c92a72 100644 --- a/transport/internet/headers/wechat/wechat.go +++ b/transport/internet/headers/wechat/wechat.go @@ -4,8 +4,8 @@ import ( "context" "encoding/binary" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" ) type VideoChat struct { diff --git a/transport/internet/headers/wechat/wechat_test.go b/transport/internet/headers/wechat/wechat_test.go index 15b641691..b8afca3a3 100644 --- a/transport/internet/headers/wechat/wechat_test.go +++ b/transport/internet/headers/wechat/wechat_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wechat" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wechat" ) func TestUTPWrite(t *testing.T) { diff --git a/transport/internet/headers/wireguard/config.pb.go b/transport/internet/headers/wireguard/config.pb.go index d6f31683e..5c00483bd 100644 --- a/transport/internet/headers/wireguard/config.pb.go +++ b/transport/internet/headers/wireguard/config.pb.go @@ -74,7 +74,7 @@ var file_transport_internet_headers_wireguard_config_proto_rawDesc = []byte{ 0x61, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x77, 0x69, 0x72, 0x65, 0x67, 0x75, 0x61, 0x72, 0x64, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x77, 0x69, 0x72, 0x65, 0x67, 0x75, 0x61, 0x72, 0x64, 0xaa, 0x02, 0x2f, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, diff --git a/transport/internet/headers/wireguard/config.proto b/transport/internet/headers/wireguard/config.proto index 4ecc9f635..8bfe0cb2a 100644 --- a/transport/internet/headers/wireguard/config.proto +++ b/transport/internet/headers/wireguard/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.headers.wireguard; option csharp_namespace = "V2Ray.Core.Transport.Internet.Headers.Wireguard"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wireguard"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wireguard"; option java_package = "com.v2ray.core.transport.internet.headers.wireguard"; option java_multiple_files = true; diff --git a/transport/internet/headers/wireguard/wireguard.go b/transport/internet/headers/wireguard/wireguard.go index a1871bf7c..649f5b0d3 100644 --- a/transport/internet/headers/wireguard/wireguard.go +++ b/transport/internet/headers/wireguard/wireguard.go @@ -3,7 +3,7 @@ package wireguard import ( "context" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) type Wireguard struct{} diff --git a/transport/internet/http/config.go b/transport/internet/http/config.go index b9ac37d13..1a15bb4d4 100644 --- a/transport/internet/http/config.go +++ b/transport/internet/http/config.go @@ -1,9 +1,9 @@ package http import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) const protocolName = "http" diff --git a/transport/internet/http/config.pb.go b/transport/internet/http/config.pb.go index 5bae193b6..f92ad0f28 100644 --- a/transport/internet/http/config.pb.go +++ b/transport/internet/http/config.pb.go @@ -7,7 +7,7 @@ package http import ( - http "github.com/v2fly/v2ray-core/v4/transport/internet/headers/http" + http "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -116,7 +116,7 @@ var file_transport_internet_http_config_proto_rawDesc = []byte{ 0x72, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x50, 0x01, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, - 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, + 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x68, 0x74, 0x74, 0x70, 0xaa, 0x02, 0x22, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, diff --git a/transport/internet/http/config.proto b/transport/internet/http/config.proto index 714197b53..add92f592 100644 --- a/transport/internet/http/config.proto +++ b/transport/internet/http/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.http; option csharp_namespace = "V2Ray.Core.Transport.Internet.Http"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/http"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/http"; option java_package = "com.v2ray.core.transport.internet.http"; option java_multiple_files = true; diff --git a/transport/internet/http/dialer.go b/transport/internet/http/dialer.go index 919d7a3b2..f214e9573 100644 --- a/transport/internet/http/dialer.go +++ b/transport/internet/http/dialer.go @@ -9,13 +9,13 @@ import ( "golang.org/x/net/http2" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) var ( diff --git a/transport/internet/http/errors.generated.go b/transport/internet/http/errors.generated.go index bbaec46a4..f738ccf1d 100644 --- a/transport/internet/http/errors.generated.go +++ b/transport/internet/http/errors.generated.go @@ -1,6 +1,6 @@ package http -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/http/http.go b/transport/internet/http/http.go index 0ef5118f0..0c0aefec5 100644 --- a/transport/internet/http/http.go +++ b/transport/internet/http/http.go @@ -1,3 +1,3 @@ package http -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/http/http_test.go b/transport/internet/http/http_test.go index 565774808..0e4d324b3 100644 --- a/transport/internet/http/http_test.go +++ b/transport/internet/http/http_test.go @@ -8,14 +8,14 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/transport/internet" - . "github.com/v2fly/v2ray-core/v4/transport/internet/http" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/transport/internet" + . "github.com/v2fly/v2ray-core/v5/transport/internet/http" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) func TestHTTPConnection(t *testing.T) { diff --git a/transport/internet/http/hub.go b/transport/internet/http/hub.go index 8f3bab437..21223b829 100644 --- a/transport/internet/http/hub.go +++ b/transport/internet/http/hub.go @@ -10,14 +10,14 @@ import ( "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - http_proto "github.com/v2fly/v2ray-core/v4/common/protocol/http" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + http_proto "github.com/v2fly/v2ray-core/v5/common/protocol/http" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) type Listener struct { diff --git a/transport/internet/internet.go b/transport/internet/internet.go index b9f4f7af0..aced0dc69 100644 --- a/transport/internet/internet.go +++ b/transport/internet/internet.go @@ -1,3 +1,3 @@ package internet -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/kcp/config.go b/transport/internet/kcp/config.go index e0cd43834..02cad824c 100644 --- a/transport/internet/kcp/config.go +++ b/transport/internet/kcp/config.go @@ -3,9 +3,9 @@ package kcp import ( "crypto/cipher" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) const protocolName = "mkcp" diff --git a/transport/internet/kcp/config.pb.go b/transport/internet/kcp/config.pb.go index c1641bf8c..67166696b 100644 --- a/transport/internet/kcp/config.pb.go +++ b/transport/internet/kcp/config.pb.go @@ -7,7 +7,7 @@ package kcp import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -593,7 +593,7 @@ var file_transport_internet_kcp_config_proto_rawDesc = []byte{ 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x6b, 0x63, 0x70, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, - 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x6b, 0x63, 0x70, 0xaa, 0x02, 0x21, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x4b, 0x63, 0x70, 0x62, 0x06, 0x70, 0x72, diff --git a/transport/internet/kcp/config.proto b/transport/internet/kcp/config.proto index 5d3076abe..5f4d2d07b 100644 --- a/transport/internet/kcp/config.proto +++ b/transport/internet/kcp/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.kcp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Kcp"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/kcp"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/kcp"; option java_package = "com.v2ray.core.transport.internet.kcp"; option java_multiple_files = true; diff --git a/transport/internet/kcp/connection.go b/transport/internet/kcp/connection.go index fd050745a..61faa9227 100644 --- a/transport/internet/kcp/connection.go +++ b/transport/internet/kcp/connection.go @@ -9,9 +9,9 @@ import ( "sync/atomic" "time" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/signal/semaphore" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/signal/semaphore" ) var ( diff --git a/transport/internet/kcp/connection_test.go b/transport/internet/kcp/connection_test.go index 7fe80f295..f48e7ed54 100644 --- a/transport/internet/kcp/connection_test.go +++ b/transport/internet/kcp/connection_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" ) type NoOpCloser int diff --git a/transport/internet/kcp/crypt.go b/transport/internet/kcp/crypt.go index ae4b24b83..b407194c4 100644 --- a/transport/internet/kcp/crypt.go +++ b/transport/internet/kcp/crypt.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "hash/fnv" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) // SimpleAuthenticator is a legacy AEAD used for KCP encryption. diff --git a/transport/internet/kcp/crypt_test.go b/transport/internet/kcp/crypt_test.go index faa1ff801..c0511a88e 100644 --- a/transport/internet/kcp/crypt_test.go +++ b/transport/internet/kcp/crypt_test.go @@ -5,8 +5,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - . "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" + "github.com/v2fly/v2ray-core/v5/common" + . "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" ) func TestSimpleAuthenticator(t *testing.T) { diff --git a/transport/internet/kcp/cryptreal.go b/transport/internet/kcp/cryptreal.go index 72934f77e..a99ea91d3 100644 --- a/transport/internet/kcp/cryptreal.go +++ b/transport/internet/kcp/cryptreal.go @@ -5,7 +5,7 @@ import ( "crypto/cipher" "crypto/sha256" - "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v5/common" ) func NewAEADAESGCMBasedOnSeed(seed string) cipher.AEAD { diff --git a/transport/internet/kcp/dialer.go b/transport/internet/kcp/dialer.go index ab14b8e57..68b56c190 100644 --- a/transport/internet/kcp/dialer.go +++ b/transport/internet/kcp/dialer.go @@ -5,12 +5,12 @@ import ( "io" "sync/atomic" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/dice" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/dice" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) var globalConv = uint32(dice.RollUint16()) diff --git a/transport/internet/kcp/errors.generated.go b/transport/internet/kcp/errors.generated.go index 2192c7648..545be0e42 100644 --- a/transport/internet/kcp/errors.generated.go +++ b/transport/internet/kcp/errors.generated.go @@ -1,6 +1,6 @@ package kcp -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/kcp/io.go b/transport/internet/kcp/io.go index e03a5c2e1..075ae20f7 100644 --- a/transport/internet/kcp/io.go +++ b/transport/internet/kcp/io.go @@ -5,9 +5,9 @@ import ( "crypto/rand" "io" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type PacketReader interface { diff --git a/transport/internet/kcp/io_test.go b/transport/internet/kcp/io_test.go index 3d7ae0313..4c93d68fd 100644 --- a/transport/internet/kcp/io_test.go +++ b/transport/internet/kcp/io_test.go @@ -3,7 +3,7 @@ package kcp_test import ( "testing" - . "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" + . "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" ) func TestKCPPacketReader(t *testing.T) { diff --git a/transport/internet/kcp/kcp.go b/transport/internet/kcp/kcp.go index 847f13998..3c02a33bc 100644 --- a/transport/internet/kcp/kcp.go +++ b/transport/internet/kcp/kcp.go @@ -5,4 +5,4 @@ // xtaci@github for translating to Golang package kcp -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/kcp/kcp_test.go b/transport/internet/kcp/kcp_test.go index 13d51e059..d10534a27 100644 --- a/transport/internet/kcp/kcp_test.go +++ b/transport/internet/kcp/kcp_test.go @@ -10,11 +10,11 @@ import ( "github.com/google/go-cmp/cmp" "golang.org/x/sync/errgroup" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" - . "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" + . "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" ) func TestDialAndListen(t *testing.T) { diff --git a/transport/internet/kcp/listener.go b/transport/internet/kcp/listener.go index 965664cd8..b63fe952f 100644 --- a/transport/internet/kcp/listener.go +++ b/transport/internet/kcp/listener.go @@ -6,12 +6,12 @@ import ( gotls "crypto/tls" "sync" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - "github.com/v2fly/v2ray-core/v4/transport/internet/udp" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/transport/internet/udp" ) type ConnectionID struct { diff --git a/transport/internet/kcp/output.go b/transport/internet/kcp/output.go index dbfb5b3d4..f6d1f010d 100644 --- a/transport/internet/kcp/output.go +++ b/transport/internet/kcp/output.go @@ -4,8 +4,8 @@ import ( "io" "sync" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/retry" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/retry" ) type SegmentWriter interface { diff --git a/transport/internet/kcp/receiving.go b/transport/internet/kcp/receiving.go index 4779f5790..682aa3645 100644 --- a/transport/internet/kcp/receiving.go +++ b/transport/internet/kcp/receiving.go @@ -3,7 +3,7 @@ package kcp import ( "sync" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) type ReceivingWindow struct { diff --git a/transport/internet/kcp/segment.go b/transport/internet/kcp/segment.go index 847351e50..7d74d32ea 100644 --- a/transport/internet/kcp/segment.go +++ b/transport/internet/kcp/segment.go @@ -3,7 +3,7 @@ package kcp import ( "encoding/binary" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) // Command is a KCP command that indicate the purpose of a Segment. diff --git a/transport/internet/kcp/segment_test.go b/transport/internet/kcp/segment_test.go index 6d6bd41d2..56f9367c8 100644 --- a/transport/internet/kcp/segment_test.go +++ b/transport/internet/kcp/segment_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - . "github.com/v2fly/v2ray-core/v4/transport/internet/kcp" + . "github.com/v2fly/v2ray-core/v5/transport/internet/kcp" ) func TestBadSegment(t *testing.T) { diff --git a/transport/internet/kcp/sending.go b/transport/internet/kcp/sending.go index 1533adbe3..59566e1c9 100644 --- a/transport/internet/kcp/sending.go +++ b/transport/internet/kcp/sending.go @@ -4,7 +4,7 @@ import ( "container/list" "sync" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) type SendingWindow struct { diff --git a/transport/internet/quic/config.go b/transport/internet/quic/config.go index 55e322526..1dcd6f200 100644 --- a/transport/internet/quic/config.go +++ b/transport/internet/quic/config.go @@ -7,10 +7,10 @@ import ( "golang.org/x/crypto/chacha20poly1305" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func getAuth(config *Config) (cipher.AEAD, error) { diff --git a/transport/internet/quic/config.pb.go b/transport/internet/quic/config.pb.go index 5652c8074..f2ce5575e 100644 --- a/transport/internet/quic/config.pb.go +++ b/transport/internet/quic/config.pb.go @@ -7,7 +7,7 @@ package quic import ( - protocol "github.com/v2fly/v2ray-core/v4/common/protocol" + protocol "github.com/v2fly/v2ray-core/v5/common/protocol" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -110,7 +110,7 @@ var file_transport_internet_quic_config_proto_rawDesc = []byte{ 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x71, 0x75, 0x69, 0x63, 0x50, 0x01, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, - 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, + 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x71, 0x75, 0x69, 0x63, 0xaa, 0x02, 0x22, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x51, 0x75, 0x69, diff --git a/transport/internet/quic/config.proto b/transport/internet/quic/config.proto index dbcd2e783..6672ed559 100644 --- a/transport/internet/quic/config.proto +++ b/transport/internet/quic/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.quic; option csharp_namespace = "V2Ray.Core.Transport.Internet.Quic"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/quic"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/quic"; option java_package = "com.v2ray.core.transport.internet.quic"; option java_multiple_files = true; diff --git a/transport/internet/quic/conn.go b/transport/internet/quic/conn.go index 7258e1489..e24fd50b8 100644 --- a/transport/internet/quic/conn.go +++ b/transport/internet/quic/conn.go @@ -9,10 +9,10 @@ import ( "github.com/lucas-clemente/quic-go" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type sysConn struct { diff --git a/transport/internet/quic/dialer.go b/transport/internet/quic/dialer.go index a19ed62cf..c2d90d674 100644 --- a/transport/internet/quic/dialer.go +++ b/transport/internet/quic/dialer.go @@ -7,11 +7,11 @@ import ( "github.com/lucas-clemente/quic-go" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/task" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/task" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) type sessionContext struct { diff --git a/transport/internet/quic/errors.generated.go b/transport/internet/quic/errors.generated.go index 2f47d0560..43873d537 100644 --- a/transport/internet/quic/errors.generated.go +++ b/transport/internet/quic/errors.generated.go @@ -1,6 +1,6 @@ package quic -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/quic/hub.go b/transport/internet/quic/hub.go index 78d52c029..a771cdb22 100644 --- a/transport/internet/quic/hub.go +++ b/transport/internet/quic/hub.go @@ -6,12 +6,12 @@ import ( "github.com/lucas-clemente/quic-go" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) // Listener is an internet.Listener that listens for TCP connections. diff --git a/transport/internet/quic/pool.go b/transport/internet/quic/pool.go index 683dbc172..550fcff28 100644 --- a/transport/internet/quic/pool.go +++ b/transport/internet/quic/pool.go @@ -3,7 +3,7 @@ package quic import ( "sync" - "github.com/v2fly/v2ray-core/v4/common/bytespool" + "github.com/v2fly/v2ray-core/v5/common/bytespool" ) var pool *sync.Pool diff --git a/transport/internet/quic/quic.go b/transport/internet/quic/quic.go index e49124ddc..5ef1047c4 100644 --- a/transport/internet/quic/quic.go +++ b/transport/internet/quic/quic.go @@ -1,11 +1,11 @@ package quic import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen // Here is some modification needs to be done before update quic vendor. // * use bytespool in buffer_pool.go diff --git a/transport/internet/quic/quic_test.go b/transport/internet/quic/quic_test.go index 3e34b9e90..efe6b4d2c 100644 --- a/transport/internet/quic/quic_test.go +++ b/transport/internet/quic/quic_test.go @@ -8,17 +8,17 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/testing/servers/udp" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/headers/wireguard" - "github.com/v2fly/v2ray-core/v4/transport/internet/quic" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/testing/servers/udp" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/headers/wireguard" + "github.com/v2fly/v2ray-core/v5/transport/internet/quic" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) func TestQuicConnection(t *testing.T) { diff --git a/transport/internet/sockopt_linux_test.go b/transport/internet/sockopt_linux_test.go index afead4d8d..5a2b96c8b 100644 --- a/transport/internet/sockopt_linux_test.go +++ b/transport/internet/sockopt_linux_test.go @@ -5,10 +5,10 @@ import ( "syscall" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - . "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + . "github.com/v2fly/v2ray-core/v5/transport/internet" ) func TestSockOptMark(t *testing.T) { diff --git a/transport/internet/sockopt_test.go b/transport/internet/sockopt_test.go index d8ddaf8f0..56e978e06 100644 --- a/transport/internet/sockopt_test.go +++ b/transport/internet/sockopt_test.go @@ -6,10 +6,10 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - . "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + . "github.com/v2fly/v2ray-core/v5/transport/internet" ) func TestTCPFastOpen(t *testing.T) { diff --git a/transport/internet/system_dialer.go b/transport/internet/system_dialer.go index 578e434d2..626792574 100644 --- a/transport/internet/system_dialer.go +++ b/transport/internet/system_dialer.go @@ -5,8 +5,8 @@ import ( "syscall" "time" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" ) var effectiveSystemDialer SystemDialer = &DefaultSystemDialer{} diff --git a/transport/internet/system_listener.go b/transport/internet/system_listener.go index a5b139dfb..d95f2d542 100644 --- a/transport/internet/system_listener.go +++ b/transport/internet/system_listener.go @@ -8,8 +8,8 @@ import ( "github.com/pires/go-proxyproto" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" ) var effectiveListener = DefaultListener{} diff --git a/transport/internet/system_listener_test.go b/transport/internet/system_listener_test.go index 330e88277..e8440e4ce 100644 --- a/transport/internet/system_listener_test.go +++ b/transport/internet/system_listener_test.go @@ -5,8 +5,8 @@ import ( "net" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func TestRegisterListenerController(t *testing.T) { diff --git a/transport/internet/tagged/tagged.go b/transport/internet/tagged/tagged.go index a4bfb3e0f..e80f897ef 100644 --- a/transport/internet/tagged/tagged.go +++ b/transport/internet/tagged/tagged.go @@ -3,7 +3,7 @@ package tagged import ( "context" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) type DialFunc func(ctx context.Context, dest net.Destination, tag string) (net.Conn, error) diff --git a/transport/internet/tagged/taggedimpl/errors.generated.go b/transport/internet/tagged/taggedimpl/errors.generated.go index 88339a09c..82fdf4ac2 100644 --- a/transport/internet/tagged/taggedimpl/errors.generated.go +++ b/transport/internet/tagged/taggedimpl/errors.generated.go @@ -1,6 +1,6 @@ package taggedimpl -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/tagged/taggedimpl/impl.go b/transport/internet/tagged/taggedimpl/impl.go index 64b8b4c6d..da29c0974 100644 --- a/transport/internet/tagged/taggedimpl/impl.go +++ b/transport/internet/tagged/taggedimpl/impl.go @@ -6,11 +6,11 @@ package taggedimpl import ( "context" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport/internet/tagged" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport/internet/tagged" ) func DialTaggedOutbound(ctx context.Context, dest net.Destination, tag string) (net.Conn, error) { diff --git a/transport/internet/tagged/taggedimpl/taggedimpl.go b/transport/internet/tagged/taggedimpl/taggedimpl.go index 1597c7b75..25d47ca99 100644 --- a/transport/internet/tagged/taggedimpl/taggedimpl.go +++ b/transport/internet/tagged/taggedimpl/taggedimpl.go @@ -1,3 +1,3 @@ package taggedimpl -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/tcp/config.go b/transport/internet/tcp/config.go index 929a1bbf5..0623e649e 100644 --- a/transport/internet/tcp/config.go +++ b/transport/internet/tcp/config.go @@ -1,8 +1,8 @@ package tcp import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) const protocolName = "tcp" diff --git a/transport/internet/tcp/config.pb.go b/transport/internet/tcp/config.pb.go index b79e81dd4..c55c92705 100644 --- a/transport/internet/tcp/config.pb.go +++ b/transport/internet/tcp/config.pb.go @@ -7,7 +7,7 @@ package tcp import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -102,7 +102,7 @@ var file_transport_internet_tcp_config_proto_rawDesc = []byte{ 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x74, 0x63, 0x70, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, - 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, + 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x74, 0x63, 0x70, 0xaa, 0x02, 0x21, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, diff --git a/transport/internet/tcp/config.proto b/transport/internet/tcp/config.proto index 68207f31d..1ed0be39c 100644 --- a/transport/internet/tcp/config.proto +++ b/transport/internet/tcp/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.tcp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Tcp"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/tcp"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/tcp"; option java_package = "com.v2ray.core.transport.internet.tcp"; option java_multiple_files = true; diff --git a/transport/internet/tcp/dialer.go b/transport/internet/tcp/dialer.go index 310a9b43f..d721e4bbf 100644 --- a/transport/internet/tcp/dialer.go +++ b/transport/internet/tcp/dialer.go @@ -3,12 +3,12 @@ package tcp import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) // Dial dials a new TCP connection to the given destination. diff --git a/transport/internet/tcp/errors.generated.go b/transport/internet/tcp/errors.generated.go index 6f16e9b1d..3a1fab5fa 100644 --- a/transport/internet/tcp/errors.generated.go +++ b/transport/internet/tcp/errors.generated.go @@ -1,6 +1,6 @@ package tcp -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/tcp/hub.go b/transport/internet/tcp/hub.go index b80a15aa9..a5c5c3be7 100644 --- a/transport/internet/tcp/hub.go +++ b/transport/internet/tcp/hub.go @@ -6,12 +6,12 @@ import ( "strings" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) // Listener is an internet.Listener that listens for TCP connections. diff --git a/transport/internet/tcp/sockopt_freebsd.go b/transport/internet/tcp/sockopt_freebsd.go index 624942e0e..71fb134bd 100644 --- a/transport/internet/tcp/sockopt_freebsd.go +++ b/transport/internet/tcp/sockopt_freebsd.go @@ -4,8 +4,8 @@ package tcp import ( - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // GetOriginalDestination from tcp conn diff --git a/transport/internet/tcp/sockopt_linux.go b/transport/internet/tcp/sockopt_linux.go index ee689d7ab..50fc3821f 100644 --- a/transport/internet/tcp/sockopt_linux.go +++ b/transport/internet/tcp/sockopt_linux.go @@ -6,8 +6,8 @@ package tcp import ( "syscall" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) const SO_ORIGINAL_DST = 80 // nolint: revive,stylecheck diff --git a/transport/internet/tcp/sockopt_linux_test.go b/transport/internet/tcp/sockopt_linux_test.go index a1706c269..cae9bbd71 100644 --- a/transport/internet/tcp/sockopt_linux_test.go +++ b/transport/internet/tcp/sockopt_linux_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" - "github.com/v2fly/v2ray-core/v4/transport/internet" - . "github.com/v2fly/v2ray-core/v4/transport/internet/tcp" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" + "github.com/v2fly/v2ray-core/v5/transport/internet" + . "github.com/v2fly/v2ray-core/v5/transport/internet/tcp" ) func TestGetOriginalDestination(t *testing.T) { diff --git a/transport/internet/tcp/sockopt_other.go b/transport/internet/tcp/sockopt_other.go index 22fabfe23..481a6e067 100644 --- a/transport/internet/tcp/sockopt_other.go +++ b/transport/internet/tcp/sockopt_other.go @@ -4,8 +4,8 @@ package tcp import ( - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func GetOriginalDestination(conn internet.Connection) (net.Destination, error) { diff --git a/transport/internet/tcp/tcp.go b/transport/internet/tcp/tcp.go index 1c1ee9439..a89f12d80 100644 --- a/transport/internet/tcp/tcp.go +++ b/transport/internet/tcp/tcp.go @@ -1,3 +1,3 @@ package tcp -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/tcp_hub.go b/transport/internet/tcp_hub.go index 48141e629..177b56887 100644 --- a/transport/internet/tcp_hub.go +++ b/transport/internet/tcp_hub.go @@ -3,7 +3,7 @@ package internet import ( "context" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) var transportListenerCache = make(map[string]ListenFunc) diff --git a/transport/internet/tls/config.go b/transport/internet/tls/config.go index 68eec8dd1..f7356b240 100644 --- a/transport/internet/tls/config.go +++ b/transport/internet/tls/config.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) var globalSessionCache = tls.NewLRUClientSessionCache(128) diff --git a/transport/internet/tls/config.pb.go b/transport/internet/tls/config.pb.go index 2685ec2e8..a408f5a01 100644 --- a/transport/internet/tls/config.pb.go +++ b/transport/internet/tls/config.pb.go @@ -7,7 +7,7 @@ package tls import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -335,7 +335,7 @@ var file_transport_internet_tls_config_proto_rawDesc = []byte{ 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x74, 0x6c, 0x73, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, - 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, + 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x74, 0x6c, 0x73, 0xaa, 0x02, 0x21, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x54, 0x6c, 0x73, 0x62, diff --git a/transport/internet/tls/config.proto b/transport/internet/tls/config.proto index f8d16ff7d..6d1b8bdd9 100644 --- a/transport/internet/tls/config.proto +++ b/transport/internet/tls/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.tls; option csharp_namespace = "V2Ray.Core.Transport.Internet.Tls"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/tls"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/tls"; option java_package = "com.v2ray.core.transport.internet.tls"; option java_multiple_files = true; diff --git a/transport/internet/tls/config_test.go b/transport/internet/tls/config_test.go index 804e940d0..f4c87d8d8 100644 --- a/transport/internet/tls/config_test.go +++ b/transport/internet/tls/config_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - . "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + . "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) func TestCertificateIssuing(t *testing.T) { diff --git a/transport/internet/tls/errors.generated.go b/transport/internet/tls/errors.generated.go index d925cf647..912a257eb 100644 --- a/transport/internet/tls/errors.generated.go +++ b/transport/internet/tls/errors.generated.go @@ -1,6 +1,6 @@ package tls -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/tls/tls.go b/transport/internet/tls/tls.go index a16ad5d42..abaec9af7 100644 --- a/transport/internet/tls/tls.go +++ b/transport/internet/tls/tls.go @@ -4,12 +4,12 @@ import ( "context" "crypto/tls" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen var _ buf.Writer = (*Conn)(nil) diff --git a/transport/internet/udp/config.go b/transport/internet/udp/config.go index fb77c23ba..8b0b1f4e0 100644 --- a/transport/internet/udp/config.go +++ b/transport/internet/udp/config.go @@ -1,8 +1,8 @@ package udp import ( - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func init() { diff --git a/transport/internet/udp/config.pb.go b/transport/internet/udp/config.pb.go index 297db2ed8..d79fb8c05 100644 --- a/transport/internet/udp/config.pb.go +++ b/transport/internet/udp/config.pb.go @@ -70,7 +70,7 @@ var file_transport_internet_udp_config_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x75, 0x64, 0x70, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, - 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, + 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x75, 0x64, 0x70, 0xaa, 0x02, 0x21, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, diff --git a/transport/internet/udp/config.proto b/transport/internet/udp/config.proto index 16a18495b..8b152ddb1 100644 --- a/transport/internet/udp/config.proto +++ b/transport/internet/udp/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.udp; option csharp_namespace = "V2Ray.Core.Transport.Internet.Udp"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/udp"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/udp"; option java_package = "com.v2ray.core.transport.internet.udp"; option java_multiple_files = true; diff --git a/transport/internet/udp/dialer.go b/transport/internet/udp/dialer.go index 727e178d8..3e08f8a2e 100644 --- a/transport/internet/udp/dialer.go +++ b/transport/internet/udp/dialer.go @@ -3,9 +3,9 @@ package udp import ( "context" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) func init() { diff --git a/transport/internet/udp/dispatcher.go b/transport/internet/udp/dispatcher.go index b205074bb..2ae1151fa 100644 --- a/transport/internet/udp/dispatcher.go +++ b/transport/internet/udp/dispatcher.go @@ -6,15 +6,15 @@ import ( "sync" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/udp" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/udp" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport" ) type ResponseCallback func(ctx context.Context, packet *udp.Packet) diff --git a/transport/internet/udp/dispatcher_test.go b/transport/internet/udp/dispatcher_test.go index 45d500272..12c9e7c8a 100644 --- a/transport/internet/udp/dispatcher_test.go +++ b/transport/internet/udp/dispatcher_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/udp" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/transport" - . "github.com/v2fly/v2ray-core/v4/transport/internet/udp" - "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/udp" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/transport" + . "github.com/v2fly/v2ray-core/v5/transport/internet/udp" + "github.com/v2fly/v2ray-core/v5/transport/pipe" ) type TestDispatcher struct { diff --git a/transport/internet/udp/errors.generated.go b/transport/internet/udp/errors.generated.go index 690703f19..da6f5e441 100644 --- a/transport/internet/udp/errors.generated.go +++ b/transport/internet/udp/errors.generated.go @@ -1,6 +1,6 @@ package udp -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/udp/hub.go b/transport/internet/udp/hub.go index 2801174a2..a544c26d5 100644 --- a/transport/internet/udp/hub.go +++ b/transport/internet/udp/hub.go @@ -3,10 +3,10 @@ package udp import ( "context" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/udp" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/udp" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) type HubOption func(h *Hub) diff --git a/transport/internet/udp/hub_freebsd.go b/transport/internet/udp/hub_freebsd.go index 83f0d2a91..f5f853c34 100644 --- a/transport/internet/udp/hub_freebsd.go +++ b/transport/internet/udp/hub_freebsd.go @@ -8,8 +8,8 @@ import ( "encoding/gob" "io" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) // RetrieveOriginalDest from stored laddr, caddr diff --git a/transport/internet/udp/hub_linux.go b/transport/internet/udp/hub_linux.go index b4de0f917..9fcfa55bd 100644 --- a/transport/internet/udp/hub_linux.go +++ b/transport/internet/udp/hub_linux.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) func RetrieveOriginalDest(oob []byte) net.Destination { diff --git a/transport/internet/udp/hub_other.go b/transport/internet/udp/hub_other.go index 67ddeba0a..322c242bc 100644 --- a/transport/internet/udp/hub_other.go +++ b/transport/internet/udp/hub_other.go @@ -4,7 +4,7 @@ package udp import ( - "github.com/v2fly/v2ray-core/v4/common/net" + "github.com/v2fly/v2ray-core/v5/common/net" ) func RetrieveOriginalDest(oob []byte) net.Destination { diff --git a/transport/internet/udp/udp.go b/transport/internet/udp/udp.go index 613b44349..19a56972e 100644 --- a/transport/internet/udp/udp.go +++ b/transport/internet/udp/udp.go @@ -1,5 +1,5 @@ package udp -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen const protocolName = "udp" diff --git a/transport/internet/websocket/config.go b/transport/internet/websocket/config.go index 5345b4684..82dcf176d 100644 --- a/transport/internet/websocket/config.go +++ b/transport/internet/websocket/config.go @@ -3,8 +3,8 @@ package websocket import ( "net/http" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/transport/internet" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/transport/internet" ) const protocolName = "websocket" diff --git a/transport/internet/websocket/config.pb.go b/transport/internet/websocket/config.pb.go index 3c7fd0310..40be67a1e 100644 --- a/transport/internet/websocket/config.pb.go +++ b/transport/internet/websocket/config.pb.go @@ -7,7 +7,7 @@ package websocket import ( - _ "github.com/v2fly/v2ray-core/v4/common/protoext" + _ "github.com/v2fly/v2ray-core/v5/common/protoext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -204,7 +204,7 @@ var file_transport_internet_websocket_config_proto_rawDesc = []byte{ 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, + 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0xaa, 0x02, 0x27, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, diff --git a/transport/internet/websocket/config.proto b/transport/internet/websocket/config.proto index 49d5bce30..939a03551 100644 --- a/transport/internet/websocket/config.proto +++ b/transport/internet/websocket/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2ray.core.transport.internet.websocket; option csharp_namespace = "V2Ray.Core.Transport.Internet.Websocket"; -option go_package = "github.com/v2fly/v2ray-core/v4/transport/internet/websocket"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/websocket"; option java_package = "com.v2ray.core.transport.internet.websocket"; option java_multiple_files = true; diff --git a/transport/internet/websocket/connection.go b/transport/internet/websocket/connection.go index 3c72e1131..86798a341 100644 --- a/transport/internet/websocket/connection.go +++ b/transport/internet/websocket/connection.go @@ -8,9 +8,9 @@ import ( "github.com/gorilla/websocket" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/errors" - "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/errors" + "github.com/v2fly/v2ray-core/v5/common/serial" ) var _ buf.Writer = (*connection)(nil) diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go index 7d5dd5dcf..a56e0a6d2 100644 --- a/transport/internet/websocket/dialer.go +++ b/transport/internet/websocket/dialer.go @@ -10,13 +10,13 @@ import ( "github.com/gorilla/websocket" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/features/extension" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + core "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/features/extension" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) // Dial dials a WebSocket connection to the given destination. diff --git a/transport/internet/websocket/errors.generated.go b/transport/internet/websocket/errors.generated.go index 533f42122..c0b8812cb 100644 --- a/transport/internet/websocket/errors.generated.go +++ b/transport/internet/websocket/errors.generated.go @@ -1,6 +1,6 @@ package websocket -import "github.com/v2fly/v2ray-core/v4/common/errors" +import "github.com/v2fly/v2ray-core/v5/common/errors" type errPathObjHolder struct{} diff --git a/transport/internet/websocket/hub.go b/transport/internet/websocket/hub.go index 4e83f2360..f8500dfea 100644 --- a/transport/internet/websocket/hub.go +++ b/transport/internet/websocket/hub.go @@ -13,12 +13,12 @@ import ( "github.com/gorilla/websocket" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - http_proto "github.com/v2fly/v2ray-core/v4/common/protocol/http" - "github.com/v2fly/v2ray-core/v4/common/session" - "github.com/v2fly/v2ray-core/v4/transport/internet" - v2tls "github.com/v2fly/v2ray-core/v4/transport/internet/tls" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + http_proto "github.com/v2fly/v2ray-core/v5/common/protocol/http" + "github.com/v2fly/v2ray-core/v5/common/session" + "github.com/v2fly/v2ray-core/v5/transport/internet" + v2tls "github.com/v2fly/v2ray-core/v5/transport/internet/tls" ) type requestHandler struct { diff --git a/transport/internet/websocket/ws.go b/transport/internet/websocket/ws.go index 54bf9e7a3..19d994403 100644 --- a/transport/internet/websocket/ws.go +++ b/transport/internet/websocket/ws.go @@ -4,4 +4,4 @@ Websocket transport implements an HTTP(S) compliable, surveillance proof transpo */ package websocket -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen diff --git a/transport/internet/websocket/ws_test.go b/transport/internet/websocket/ws_test.go index c912d8c7e..8ee40b86d 100644 --- a/transport/internet/websocket/ws_test.go +++ b/transport/internet/websocket/ws_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol/tls/cert" - "github.com/v2fly/v2ray-core/v4/transport/internet" - "github.com/v2fly/v2ray-core/v4/transport/internet/tls" - . "github.com/v2fly/v2ray-core/v4/transport/internet/websocket" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol/tls/cert" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/tls" + . "github.com/v2fly/v2ray-core/v5/transport/internet/websocket" ) func Test_listenWSAndDial(t *testing.T) { diff --git a/transport/link.go b/transport/link.go index be8a58fb8..2c517f919 100644 --- a/transport/link.go +++ b/transport/link.go @@ -1,6 +1,6 @@ package transport -import "github.com/v2fly/v2ray-core/v4/common/buf" +import "github.com/v2fly/v2ray-core/v5/common/buf" // Link is a utility for connecting between an inbound and an outbound proxy handler. type Link struct { diff --git a/transport/pipe/impl.go b/transport/pipe/impl.go index 797b3b968..e8c4186ab 100644 --- a/transport/pipe/impl.go +++ b/transport/pipe/impl.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/signal/done" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/signal/done" ) type state byte diff --git a/transport/pipe/pipe.go b/transport/pipe/pipe.go index b21abd299..cd61e8200 100644 --- a/transport/pipe/pipe.go +++ b/transport/pipe/pipe.go @@ -3,9 +3,9 @@ package pipe import ( "context" - "github.com/v2fly/v2ray-core/v4/common/signal" - "github.com/v2fly/v2ray-core/v4/common/signal/done" - "github.com/v2fly/v2ray-core/v4/features/policy" + "github.com/v2fly/v2ray-core/v5/common/signal" + "github.com/v2fly/v2ray-core/v5/common/signal/done" + "github.com/v2fly/v2ray-core/v5/features/policy" ) // Option for creating new Pipes. diff --git a/transport/pipe/pipe_test.go b/transport/pipe/pipe_test.go index 984ebf228..f755a7ab0 100644 --- a/transport/pipe/pipe_test.go +++ b/transport/pipe/pipe_test.go @@ -9,9 +9,9 @@ import ( "github.com/google/go-cmp/cmp" "golang.org/x/sync/errgroup" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/buf" - . "github.com/v2fly/v2ray-core/v4/transport/pipe" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/buf" + . "github.com/v2fly/v2ray-core/v5/transport/pipe" ) func TestPipeReadWrite(t *testing.T) { diff --git a/transport/pipe/reader.go b/transport/pipe/reader.go index b5c0181ae..c209b47b9 100644 --- a/transport/pipe/reader.go +++ b/transport/pipe/reader.go @@ -3,7 +3,7 @@ package pipe import ( "time" - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) // Reader is a buf.Reader that reads content from a pipe. diff --git a/transport/pipe/writer.go b/transport/pipe/writer.go index b3cb8c041..38c08b699 100644 --- a/transport/pipe/writer.go +++ b/transport/pipe/writer.go @@ -1,7 +1,7 @@ package pipe import ( - "github.com/v2fly/v2ray-core/v4/common/buf" + "github.com/v2fly/v2ray-core/v5/common/buf" ) // Writer is a buf.Writer that writes data into a pipe. diff --git a/v2ray.go b/v2ray.go index 390a17b13..14333268c 100644 --- a/v2ray.go +++ b/v2ray.go @@ -5,16 +5,16 @@ import ( "reflect" "sync" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/features" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/dns/localdns" - "github.com/v2fly/v2ray-core/v4/features/inbound" - "github.com/v2fly/v2ray-core/v4/features/outbound" - "github.com/v2fly/v2ray-core/v4/features/policy" - "github.com/v2fly/v2ray-core/v4/features/routing" - "github.com/v2fly/v2ray-core/v4/features/stats" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/features" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/dns/localdns" + "github.com/v2fly/v2ray-core/v5/features/inbound" + "github.com/v2fly/v2ray-core/v5/features/outbound" + "github.com/v2fly/v2ray-core/v5/features/policy" + "github.com/v2fly/v2ray-core/v5/features/routing" + "github.com/v2fly/v2ray-core/v5/features/stats" ) // Server is an instance of V2Ray. At any time, there must be at most one Server instance running. diff --git a/v2ray_test.go b/v2ray_test.go index e87ca79d1..709d2338a 100644 --- a/v2ray_test.go +++ b/v2ray_test.go @@ -6,21 +6,21 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - . "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/app/dispatcher" - "github.com/v2fly/v2ray-core/v4/app/proxyman" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/common/net" - "github.com/v2fly/v2ray-core/v4/common/protocol" - "github.com/v2fly/v2ray-core/v4/common/serial" - "github.com/v2fly/v2ray-core/v4/common/uuid" - "github.com/v2fly/v2ray-core/v4/features/dns" - "github.com/v2fly/v2ray-core/v4/features/dns/localdns" - _ "github.com/v2fly/v2ray-core/v4/main/distro/all" - "github.com/v2fly/v2ray-core/v4/proxy/dokodemo" - "github.com/v2fly/v2ray-core/v4/proxy/vmess" - "github.com/v2fly/v2ray-core/v4/proxy/vmess/outbound" - "github.com/v2fly/v2ray-core/v4/testing/servers/tcp" + . "github.com/v2fly/v2ray-core/v5" + "github.com/v2fly/v2ray-core/v5/app/dispatcher" + "github.com/v2fly/v2ray-core/v5/app/proxyman" + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/protocol" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/common/uuid" + "github.com/v2fly/v2ray-core/v5/features/dns" + "github.com/v2fly/v2ray-core/v5/features/dns/localdns" + _ "github.com/v2fly/v2ray-core/v5/main/distro/all" + "github.com/v2fly/v2ray-core/v5/proxy/dokodemo" + "github.com/v2fly/v2ray-core/v5/proxy/vmess" + "github.com/v2fly/v2ray-core/v5/proxy/vmess/outbound" + "github.com/v2fly/v2ray-core/v5/testing/servers/tcp" ) func TestV2RayDependency(t *testing.T) {