lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-07-26 11:44:22 -04:00
Code Issues Releases Wiki Activity

update version: auto replacement to v5 path

Browse Source
This commit is contained in:
Shelikhoo 2022-01-02 15:16:23 +00:00
parent 9f0d7e7f40
commit 3ef7feaeaf
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
809 changed files with 2669 additions and 2641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/linters/.golangci.yml vendored
View File

@ -4,7 +4,7 @@ run:
- generated.* - generated.*
issues: issues:
new: true new: false
exclude-rules: exclude-rules:
- linters: - linters:
- staticcheck - staticcheck

4
app/browserforwarder/config.pb.go
View File

@ -7,7 +7,7 @@
package browserforwarder package browserforwarder
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 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, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x72, 0x62, 0x06,

2
app/browserforwarder/config.proto
View File

@ -3,7 +3,7 @@ syntax = "proto3";
package v2ray.core.app.browserforwarder; package v2ray.core.app.browserforwarder;
option csharp_namespace = "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_package = "com.v2ray.core.app.browserforwarder";
option java_multiple_files = true; option java_multiple_files = true;

2
app/browserforwarder/errors.generated.go
View File

@ -1,6 +1,6 @@
package browserforwarder package browserforwarder
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

12
app/browserforwarder/forwarder.go
View File

@ -10,14 +10,14 @@ import (
"github.com/v2fly/BrowserBridge/handler" "github.com/v2fly/BrowserBridge/handler"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/platform/securedload" "github.com/v2fly/v2ray-core/v5/common/platform/securedload"
"github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v5/features/extension"
"github.com/v2fly/v2ray-core/v4/transport/internet" "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 { type Forwarder struct {
ctx context.Context ctx context.Context

14
app/commander/commander.go
View File

@ -1,6 +1,6 @@
package commander 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 ( import (
"context" "context"
@ -9,12 +9,12 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v5/common/serial"
"github.com/v2fly/v2ray-core/v4/common/signal/done" "github.com/v2fly/v2ray-core/v5/common/signal/done"
"github.com/v2fly/v2ray-core/v4/features/outbound" "github.com/v2fly/v2ray-core/v5/features/outbound"
"github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg" "github.com/v2fly/v2ray-core/v5/infra/conf/v5cfg"
) )
// Commander is a V2Ray feature that provides gRPC methods to external clients. // Commander is a V2Ray feature that provides gRPC methods to external clients.

4
app/commander/config.pb.go
View File

@ -7,7 +7,7 @@
package commander package commander
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
anypb "google.golang.org/protobuf/types/known/anypb" 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, 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, 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, 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, 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, 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, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,

2
app/commander/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.commander; package v2ray.core.app.commander;
option csharp_namespace = "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_package = "com.v2ray.core.app.commander";
option java_multiple_files = true; option java_multiple_files = true;

2
app/commander/errors.generated.go
View File

@ -1,6 +1,6 @@
package commander package commander
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

8
app/commander/outbound.go
View File

@ -4,10 +4,10 @@ import (
"context" "context"
"sync" "sync"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/signal/done" "github.com/v2fly/v2ray-core/v5/common/signal/done"
"github.com/v2fly/v2ray-core/v4/transport" "github.com/v2fly/v2ray-core/v5/transport"
) )
// OutboundListener is a net.Listener for listening gRPC connections. // OutboundListener is a net.Listener for listening gRPC connections.

2
app/commander/service.go
View File

@ -6,7 +6,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
) )
// Service is a Commander service. // Service is a Commander service.

2
app/dispatcher/config.pb.go
View File

@ -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, 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, 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, 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, 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, 0x70, 0x70, 0x2e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33, 0x72, 0x6f, 0x74, 0x6f, 0x33,

2
app/dispatcher/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.dispatcher; package v2ray.core.app.dispatcher;
option csharp_namespace = "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_package = "com.v2ray.core.app.dispatcher";
option java_multiple_files = true; option java_multiple_files = true;

30
app/dispatcher/default.go
View File

@ -1,6 +1,6 @@
package dispatcher 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 ( import (
"context" "context"
@ -8,20 +8,20 @@ import (
"sync" "sync"
"time" "time"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v4/common/log" "github.com/v2fly/v2ray-core/v5/common/log"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol" "github.com/v2fly/v2ray-core/v5/common/protocol"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/features/outbound" "github.com/v2fly/v2ray-core/v5/features/outbound"
"github.com/v2fly/v2ray-core/v4/features/policy" "github.com/v2fly/v2ray-core/v5/features/policy"
"github.com/v2fly/v2ray-core/v4/features/routing" "github.com/v2fly/v2ray-core/v5/features/routing"
routing_session "github.com/v2fly/v2ray-core/v4/features/routing/session" routing_session "github.com/v2fly/v2ray-core/v5/features/routing/session"
"github.com/v2fly/v2ray-core/v4/features/stats" "github.com/v2fly/v2ray-core/v5/features/stats"
"github.com/v2fly/v2ray-core/v4/transport" "github.com/v2fly/v2ray-core/v5/transport"
"github.com/v2fly/v2ray-core/v4/transport/pipe" "github.com/v2fly/v2ray-core/v5/transport/pipe"
) )
var errSniffingTimeout = newError("timeout on sniffing") var errSniffingTimeout = newError("timeout on sniffing")

2
app/dispatcher/dispatcher.go
View File

@ -1,3 +1,3 @@
package dispatcher 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

2
app/dispatcher/errors.generated.go
View File

@ -1,6 +1,6 @@
package dispatcher package dispatcher
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

10
app/dispatcher/fakednssniffer.go
View File

@ -7,11 +7,11 @@ import (
"context" "context"
"strings" "strings"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
) )
// newFakeDNSSniffer Creates a Fake DNS metadata sniffer // newFakeDNSSniffer Creates a Fake DNS metadata sniffer

12
app/dispatcher/sniffer.go
View File

@ -3,12 +3,12 @@ package dispatcher
import ( import (
"context" "context"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol/bittorrent" "github.com/v2fly/v2ray-core/v5/common/protocol/bittorrent"
"github.com/v2fly/v2ray-core/v4/common/protocol/http" "github.com/v2fly/v2ray-core/v5/common/protocol/http"
"github.com/v2fly/v2ray-core/v4/common/protocol/quic" "github.com/v2fly/v2ray-core/v5/common/protocol/quic"
"github.com/v2fly/v2ray-core/v4/common/protocol/tls" "github.com/v2fly/v2ray-core/v5/common/protocol/tls"
) )
type SniffResult interface { type SniffResult interface {

6
app/dispatcher/stats.go
View File

@ -1,9 +1,9 @@
package dispatcher package dispatcher
import ( import (
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v4/features/stats" "github.com/v2fly/v2ray-core/v5/features/stats"
) )
type SizeStatWriter struct { type SizeStatWriter struct {

6
app/dispatcher/stats_test.go
View File

@ -3,9 +3,9 @@ package dispatcher_test
import ( import (
"testing" "testing"
. "github.com/v2fly/v2ray-core/v4/app/dispatcher" . "github.com/v2fly/v2ray-core/v5/app/dispatcher"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v5/common/buf"
) )
type TestCounter int64 type TestCounter int64

6
app/dns/config.go
View File

@ -4,9 +4,9 @@
package dns package dns
import ( import (
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/strmatcher" "github.com/v2fly/v2ray-core/v5/common/strmatcher"
"github.com/v2fly/v2ray-core/v4/common/uuid" "github.com/v2fly/v2ray-core/v5/common/uuid"
) )
var typeMap = map[DomainMatchingType]strmatcher.Type{ var typeMap = map[DomainMatchingType]strmatcher.Type{

8
app/dns/config.pb.go
View File

@ -7,9 +7,9 @@
package dns package dns
import ( import (
routercommon "github.com/v2fly/v2ray-core/v4/app/router/routercommon" routercommon "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
net "github.com/v2fly/v2ray-core/v4/common/net" net "github.com/v2fly/v2ray-core/v5/common/net"
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }

2
app/dns/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.dns; package v2ray.core.app.dns;
option csharp_namespace = "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_package = "com.v2ray.core.app.dns";
option java_multiple_files = true; option java_multiple_files = true;

24
app/dns/dns.go
View File

@ -4,7 +4,7 @@
// Package dns is an implementation of core.DNS feature. // Package dns is an implementation of core.DNS feature.
package dns 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 ( import (
"context" "context"
@ -12,17 +12,17 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v5/app/router"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/errors" "github.com/v2fly/v2ray-core/v5/common/errors"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v5/common/platform"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/common/strmatcher" "github.com/v2fly/v2ray-core/v5/common/strmatcher"
"github.com/v2fly/v2ray-core/v4/features" "github.com/v2fly/v2ray-core/v5/features"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon" "github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon"
"github.com/v2fly/v2ray-core/v4/infra/conf/geodata" "github.com/v2fly/v2ray-core/v5/infra/conf/geodata"
) )
// DNS is a DNS rely server. // DNS is a DNS rely server.

26
app/dns/dns_test.go
View File

@ -8,19 +8,19 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/anypb"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v5/app/dispatcher"
. "github.com/v2fly/v2ray-core/v4/app/dns" . "github.com/v2fly/v2ray-core/v5/app/dns"
"github.com/v2fly/v2ray-core/v4/app/policy" "github.com/v2fly/v2ray-core/v5/app/policy"
"github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v5/app/proxyman"
_ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" _ "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound"
"github.com/v2fly/v2ray-core/v4/app/router/routercommon" "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v5/common/serial"
feature_dns "github.com/v2fly/v2ray-core/v4/features/dns" feature_dns "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/proxy/freedom" "github.com/v2fly/v2ray-core/v5/proxy/freedom"
"github.com/v2fly/v2ray-core/v4/testing/servers/udp" "github.com/v2fly/v2ray-core/v5/testing/servers/udp"
) )
type staticHandler struct{} type staticHandler struct{}

8
app/dns/dnscommon.go
View File

@ -7,10 +7,10 @@ import (
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/errors" "github.com/v2fly/v2ray-core/v5/common/errors"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
) )
// Fqdn normalizes domain make sure it ends with '.' // Fqdn normalizes domain make sure it ends with '.'

6
app/dns/dnscommon_test.go
View File

@ -9,9 +9,9 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
) )
func Test_parseResponse(t *testing.T) { func Test_parseResponse(t *testing.T) {

2
app/dns/errors.generated.go
View File

@ -1,6 +1,6 @@
package dns package dns
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

2
app/dns/fakedns/errors.generated.go
View File

@ -1,6 +1,6 @@
package fakedns package fakedns
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

8
app/dns/fakedns/fake.go
View File

@ -9,10 +9,10 @@ import (
"math/big" "math/big"
gonet "net" gonet "net"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/cache" "github.com/v2fly/v2ray-core/v5/common/cache"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
) )
type Holder struct { type Holder struct {

2
app/dns/fakedns/fakedns.go
View File

@ -3,4 +3,4 @@
package fakedns 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

4
app/dns/fakedns/fakedns.pb.go
View File

@ -7,7 +7,7 @@
package fakedns package fakedns
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,

2
app/dns/fakedns/fakedns.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.dns.fakedns; package v2ray.core.app.dns.fakedns;
option csharp_namespace = "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_package = "com.v2ray.core.app.dns.fakedns";
option java_multiple_files = true; option java_multiple_files = true;

6
app/dns/fakedns/fakedns_test.go
View File

@ -6,9 +6,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/uuid" "github.com/v2fly/v2ray-core/v5/common/uuid"
) )
func TestNewFakeDnsHolder(_ *testing.T) { func TestNewFakeDnsHolder(_ *testing.T) {

10
app/dns/hosts.go
View File

@ -1,11 +1,11 @@
package dns package dns
import ( import (
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/strmatcher" "github.com/v2fly/v2ray-core/v5/common/strmatcher"
"github.com/v2fly/v2ray-core/v4/features" "github.com/v2fly/v2ray-core/v5/features"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
) )
// StaticHosts represents static domain-ip mapping in DNS server. // StaticHosts represents static domain-ip mapping in DNS server.

8
app/dns/hosts_test.go
View File

@ -5,10 +5,10 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
. "github.com/v2fly/v2ray-core/v4/app/dns" . "github.com/v2fly/v2ray-core/v5/app/dns"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
) )
func TestStaticHosts(t *testing.T) { func TestStaticHosts(t *testing.T) {

14
app/dns/nameserver.go
View File

@ -6,13 +6,13 @@ import (
"strings" "strings"
"time" "time"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/app/router" "github.com/v2fly/v2ray-core/v5/app/router"
"github.com/v2fly/v2ray-core/v4/common/errors" "github.com/v2fly/v2ray-core/v5/common/errors"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/strmatcher" "github.com/v2fly/v2ray-core/v5/common/strmatcher"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/features/routing" "github.com/v2fly/v2ray-core/v5/features/routing"
) )
// Server is the interface for Name Server. // Server is the interface for Name Server.

18
app/dns/nameserver_doh.go
View File

@ -16,15 +16,15 @@ import (
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol/dns" "github.com/v2fly/v2ray-core/v5/common/protocol/dns"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/common/signal/pubsub" "github.com/v2fly/v2ray-core/v5/common/signal/pubsub"
"github.com/v2fly/v2ray-core/v4/common/task" "github.com/v2fly/v2ray-core/v5/common/task"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/features/routing" "github.com/v2fly/v2ray-core/v5/features/routing"
"github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v5/transport/internet"
) )
// DoHNameServer implemented DNS over HTTPS (RFC8484) Wire Format, // DoHNameServer implemented DNS over HTTPS (RFC8484) Wire Format,

8
app/dns/nameserver_doh_test.go
View File

@ -8,10 +8,10 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
. "github.com/v2fly/v2ray-core/v4/app/dns" . "github.com/v2fly/v2ray-core/v5/app/dns"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
) )
func TestDoHLocalNameServer(t *testing.T) { func TestDoHLocalNameServer(t *testing.T) {

6
app/dns/nameserver_fakedns.go
View File

@ -6,9 +6,9 @@ package dns
import ( import (
"context" "context"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
) )
type FakeDNSServer struct { type FakeDNSServer struct {

6
app/dns/nameserver_local.go
View File

@ -6,9 +6,9 @@ package dns
import ( import (
"context" "context"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/features/dns/localdns" "github.com/v2fly/v2ray-core/v5/features/dns/localdns"
) )
// LocalNameServer is an wrapper over local DNS feature. // LocalNameServer is an wrapper over local DNS feature.

8
app/dns/nameserver_local_test.go
View File

@ -5,10 +5,10 @@ import (
"testing" "testing"
"time" "time"
. "github.com/v2fly/v2ray-core/v4/app/dns" . "github.com/v2fly/v2ray-core/v5/app/dns"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v5/features/dns"
) )
func TestLocalNameServer(t *testing.T) { func TestLocalNameServer(t *testing.T) {

18
app/dns/nameserver_quic.go
View File

@ -11,15 +11,15 @@ import (
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
"golang.org/x/net/http2" "golang.org/x/net/http2"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol/dns" "github.com/v2fly/v2ray-core/v5/common/protocol/dns"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/common/signal/pubsub" "github.com/v2fly/v2ray-core/v5/common/signal/pubsub"
"github.com/v2fly/v2ray-core/v4/common/task" "github.com/v2fly/v2ray-core/v5/common/task"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/transport/internet/tls" "github.com/v2fly/v2ray-core/v5/transport/internet/tls"
) )
// NextProtoDQ - During connection establishment, DNS/QUIC support is indicated // NextProtoDQ - During connection establishment, DNS/QUIC support is indicated

8
app/dns/nameserver_quic_test.go
View File

@ -8,10 +8,10 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
. "github.com/v2fly/v2ray-core/v4/app/dns" . "github.com/v2fly/v2ray-core/v5/app/dns"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
) )
func TestQUICNameServer(t *testing.T) { func TestQUICNameServer(t *testing.T) {

20
app/dns/nameserver_tcp.go
View File

@ -14,16 +14,16 @@ import (
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol/dns" "github.com/v2fly/v2ray-core/v5/common/protocol/dns"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/common/signal/pubsub" "github.com/v2fly/v2ray-core/v5/common/signal/pubsub"
"github.com/v2fly/v2ray-core/v4/common/task" "github.com/v2fly/v2ray-core/v5/common/task"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/features/routing" "github.com/v2fly/v2ray-core/v5/features/routing"
"github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v5/transport/internet"
) )
// TCPNameServer implemented DNS over TCP (RFC7766). // TCPNameServer implemented DNS over TCP (RFC7766).

8
app/dns/nameserver_tcp_test.go
View File

@ -8,10 +8,10 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
. "github.com/v2fly/v2ray-core/v4/app/dns" . "github.com/v2fly/v2ray-core/v5/app/dns"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
) )
func TestTCPLocalNameServer(t *testing.T) { func TestTCPLocalNameServer(t *testing.T) {

22
app/dns/nameserver_udp.go
View File

@ -12,17 +12,17 @@ import (
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol/dns" "github.com/v2fly/v2ray-core/v5/common/protocol/dns"
udp_proto "github.com/v2fly/v2ray-core/v4/common/protocol/udp" udp_proto "github.com/v2fly/v2ray-core/v5/common/protocol/udp"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/common/signal/pubsub" "github.com/v2fly/v2ray-core/v5/common/signal/pubsub"
"github.com/v2fly/v2ray-core/v4/common/task" "github.com/v2fly/v2ray-core/v5/common/task"
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns" dns_feature "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v4/features/routing" "github.com/v2fly/v2ray-core/v5/features/routing"
"github.com/v2fly/v2ray-core/v4/transport/internet/udp" "github.com/v2fly/v2ray-core/v5/transport/internet/udp"
) )
// ClassicNameServer implemented traditional UDP DNS. // ClassicNameServer implemented traditional UDP DNS.

6
app/instman/command/command.go
View File

@ -6,9 +6,9 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v5/features/extension"
) )
type service struct { type service struct {

4
app/instman/command/command.pb.go
View File

@ -7,7 +7,7 @@
package command package command
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 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, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0x2e, 0x43, 0x6f, 0x6d,

2
app/instman/command/command.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.instman.command; package v2ray.core.app.instman.command;
option csharp_namespace = "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_package = "com.v2ray.core.app.observatory.instman";
option java_multiple_files = true; option java_multiple_files = true;

4
app/instman/command/command_grpc.pb.go
View File

@ -1,4 +1,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT. // 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 package command

4
app/instman/config.pb.go
View File

@ -7,7 +7,7 @@
package instman package instman
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x6d, 0x61, 0x6e, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,

2
app/instman/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.instman; package v2ray.core.app.instman;
option csharp_namespace = "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_package = "com.v2ray.core.app.instman";
option java_multiple_files = true; option java_multiple_files = true;

2
app/instman/errors.generated.go
View File

@ -1,6 +1,6 @@
package instman package instman
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

8
app/instman/instman.go
View File

@ -3,12 +3,12 @@ package instman
import ( import (
"context" "context"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/features/extension" "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 { type InstanceMgr struct {
config *Config // nolint: structcheck config *Config // nolint: structcheck

10
app/log/command/command.go
View File

@ -1,6 +1,6 @@
package command 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 ( import (
"context" "context"
@ -8,10 +8,10 @@ import (
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/app/log" "github.com/v2fly/v2ray-core/v5/app/log"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
cmlog "github.com/v2fly/v2ray-core/v4/common/log" cmlog "github.com/v2fly/v2ray-core/v5/common/log"
) )
// LoggerServer is the implemention of LoggerService // LoggerServer is the implemention of LoggerService

18
app/log/command/command_test.go
View File

@ -6,15 +6,15 @@ import (
"google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/anypb"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/app/dispatcher" "github.com/v2fly/v2ray-core/v5/app/dispatcher"
"github.com/v2fly/v2ray-core/v4/app/log" "github.com/v2fly/v2ray-core/v5/app/log"
. "github.com/v2fly/v2ray-core/v4/app/log/command" . "github.com/v2fly/v2ray-core/v5/app/log/command"
"github.com/v2fly/v2ray-core/v4/app/proxyman" "github.com/v2fly/v2ray-core/v5/app/proxyman"
_ "github.com/v2fly/v2ray-core/v4/app/proxyman/inbound" _ "github.com/v2fly/v2ray-core/v5/app/proxyman/inbound"
_ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound" _ "github.com/v2fly/v2ray-core/v5/app/proxyman/outbound"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v5/common/serial"
) )
func TestLoggerRestart(t *testing.T) { func TestLoggerRestart(t *testing.T) {

2
app/log/command/config.pb.go
View File

@ -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, 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, 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, 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, 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, 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, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,

2
app/log/command/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.log.command; package v2ray.core.app.log.command;
option csharp_namespace = "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_package = "com.v2ray.core.app.log.command";
option java_multiple_files = true; option java_multiple_files = true;

4
app/log/command/config_grpc.pb.go
View File

@ -1,4 +1,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT. // 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 package command

2
app/log/command/errors.generated.go
View File

@ -1,6 +1,6 @@
package command package command
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

6
app/log/config.pb.go
View File

@ -7,8 +7,8 @@
package log package log
import ( import (
log "github.com/v2fly/v2ray-core/v4/common/log" log "github.com/v2fly/v2ray-core/v5/common/log"
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4c, 0x6f, 0x67, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }

2
app/log/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.log; package v2ray.core.app.log;
option csharp_namespace = "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_package = "com.v2ray.core.app.log";
option java_multiple_files = true; option java_multiple_files = true;

2
app/log/errors.generated.go
View File

@ -1,6 +1,6 @@
package log package log
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

6
app/log/log.go
View File

@ -1,14 +1,14 @@
package log 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 ( import (
"context" "context"
"reflect" "reflect"
"sync" "sync"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/log" "github.com/v2fly/v2ray-core/v5/common/log"
) )
// Instance is a log.Handler that handles logs. // Instance is a log.Handler that handles logs.

4
app/log/log_creator.go
View File

@ -1,8 +1,8 @@
package log package log
import ( import (
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/log" "github.com/v2fly/v2ray-core/v5/common/log"
) )
type HandlerCreatorOptions struct { type HandlerCreatorOptions struct {

8
app/log/log_test.go
View File

@ -6,10 +6,10 @@ import (
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
"github.com/v2fly/v2ray-core/v4/app/log" "github.com/v2fly/v2ray-core/v5/app/log"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
clog "github.com/v2fly/v2ray-core/v4/common/log" clog "github.com/v2fly/v2ray-core/v5/common/log"
"github.com/v2fly/v2ray-core/v4/testing/mocks" "github.com/v2fly/v2ray-core/v5/testing/mocks"
) )
func TestCustomLogHandler(t *testing.T) { func TestCustomLogHandler(t *testing.T) {

2
app/observatory/burst/burst.go
View File

@ -5,7 +5,7 @@ import (
"time" "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 ( const (
rttFailed = time.Duration(math.MaxInt64 - iota) rttFailed = time.Duration(math.MaxInt64 - iota)

12
app/observatory/burst/burstobserver.go
View File

@ -6,12 +6,12 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/app/observatory" "github.com/v2fly/v2ray-core/v5/app/observatory"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/signal/done" "github.com/v2fly/v2ray-core/v5/common/signal/done"
"github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v5/features/extension"
"github.com/v2fly/v2ray-core/v4/features/outbound" "github.com/v2fly/v2ray-core/v5/features/outbound"
) )
type Observer struct { type Observer struct {

4
app/observatory/burst/config.pb.go
View File

@ -7,7 +7,7 @@
package burst package burst
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 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, 0x70, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x42, 0x75,

2
app/observatory/burst/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.observatory.burst; package v2ray.core.app.observatory.burst;
option csharp_namespace = "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_package = "com.v2ray.core.app.observatory.burst";
option java_multiple_files = true; option java_multiple_files = true;

2
app/observatory/burst/errors.generated.go
View File

@ -1,6 +1,6 @@
package burst package burst
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

2
app/observatory/burst/healthping.go
View File

@ -7,7 +7,7 @@ import (
sync "sync" sync "sync"
"time" "time"
"github.com/v2fly/v2ray-core/v4/common/dice" "github.com/v2fly/v2ray-core/v5/common/dice"
) )
// HealthPingSettings holds settings for health Checker // HealthPingSettings holds settings for health Checker

2
app/observatory/burst/healthping_result_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/v2fly/v2ray-core/v4/app/observatory/burst" "github.com/v2fly/v2ray-core/v5/app/observatory/burst"
) )
func TestHealthPingResults(t *testing.T) { func TestHealthPingResults(t *testing.T) {

4
app/observatory/burst/ping.go
View File

@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/transport/internet/tagged" "github.com/v2fly/v2ray-core/v5/transport/internet/tagged"
) )
type pingClient struct { type pingClient struct {

12
app/observatory/command/command.go
View File

@ -3,7 +3,7 @@
package command 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 ( import (
"context" "context"
@ -11,11 +11,11 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"google.golang.org/grpc" "google.golang.org/grpc"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/app/observatory" "github.com/v2fly/v2ray-core/v5/app/observatory"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/features" "github.com/v2fly/v2ray-core/v5/features"
"github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v5/features/extension"
) )
type service struct { type service struct {

4
app/observatory/command/command.pb.go
View File

@ -7,7 +7,7 @@
package command package command
import ( 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" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 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, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74,

2
app/observatory/command/command.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.observatory.command; package v2ray.core.app.observatory.command;
option csharp_namespace = "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_package = "com.v2ray.core.app.observatory.command";
option java_multiple_files = true; option java_multiple_files = true;

4
app/observatory/command/command_grpc.pb.go
View File

@ -1,4 +1,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT. // 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 package command

2
app/observatory/command/errors.generated.go
View File

@ -1,6 +1,6 @@
package command package command
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

4
app/observatory/config.pb.go
View File

@ -7,7 +7,7 @@
package observatory package observatory
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 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, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,

2
app/observatory/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.observatory; package v2ray.core.app.observatory;
option csharp_namespace = "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_package = "com.v2ray.core.app.observatory";
option java_multiple_files = true; option java_multiple_files = true;

2
app/observatory/errors.generated.go
View File

@ -1,6 +1,6 @@
package observatory package observatory
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

2
app/observatory/explainErrors.go
View File

@ -1,6 +1,6 @@
package observatory package observatory
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errorCollector struct { type errorCollector struct {
errors *errors.Error errors *errors.Error

6
app/observatory/multiobservatory/config.pb.go
View File

@ -7,8 +7,8 @@
package multiobservatory package multiobservatory
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
taggedfeatures "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" taggedfeatures "github.com/v2fly/v2ray-core/v5/common/taggedfeatures"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 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, 0x2b, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e,

2
app/observatory/multiobservatory/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.observatory.multiobservatory; package v2ray.core.app.observatory.multiobservatory;
option csharp_namespace = "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_package = "com.v2ray.core.app.observatory.multiObservatory";
option java_multiple_files = true; option java_multiple_files = true;

8
app/observatory/multiobservatory/multi.go
View File

@ -6,10 +6,10 @@ import (
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/taggedfeatures" "github.com/v2fly/v2ray-core/v5/common/taggedfeatures"
"github.com/v2fly/v2ray-core/v4/features" "github.com/v2fly/v2ray-core/v5/features"
"github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v5/features/extension"
) )
type Observer struct { type Observer struct {

2
app/observatory/observatory.go
View File

@ -1,3 +1,3 @@
package observatory 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

18
app/observatory/observer.go
View File

@ -14,15 +14,15 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
v2net "github.com/v2fly/v2ray-core/v4/common/net" v2net "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v4/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v4/common/signal/done" "github.com/v2fly/v2ray-core/v5/common/signal/done"
"github.com/v2fly/v2ray-core/v4/common/task" "github.com/v2fly/v2ray-core/v5/common/task"
"github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v5/features/extension"
"github.com/v2fly/v2ray-core/v4/features/outbound" "github.com/v2fly/v2ray-core/v5/features/outbound"
"github.com/v2fly/v2ray-core/v4/transport/internet/tagged" "github.com/v2fly/v2ray-core/v5/transport/internet/tagged"
) )
type Observer struct { type Observer struct {

2
app/policy/config.go
View File

@ -3,7 +3,7 @@ package policy
import ( import (
"time" "time"
"github.com/v2fly/v2ray-core/v4/features/policy" "github.com/v2fly/v2ray-core/v5/features/policy"
) )
// Duration converts Second to time.Duration. // Duration converts Second to time.Duration.

4
app/policy/config.pb.go
View File

@ -7,7 +7,7 @@
package policy package policy
import ( import (
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" 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, 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, 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, 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, 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, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }

2
app/policy/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.policy; package v2ray.core.app.policy;
option csharp_namespace = "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_package = "com.v2ray.core.app.policy";
option java_multiple_files = true; option java_multiple_files = true;

2
app/policy/errors.generated.go
View File

@ -1,6 +1,6 @@
package policy package policy
import "github.com/v2fly/v2ray-core/v4/common/errors" import "github.com/v2fly/v2ray-core/v5/common/errors"
type errPathObjHolder struct{} type errPathObjHolder struct{}

4
app/policy/manager.go
View File

@ -3,8 +3,8 @@ package policy
import ( import (
"context" "context"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/features/policy" "github.com/v2fly/v2ray-core/v5/features/policy"
) )
// Instance is an instance of Policy manager. // Instance is an instance of Policy manager.

6
app/policy/manager_test.go
View File

@ -5,9 +5,9 @@ import (
"testing" "testing"
"time" "time"
. "github.com/v2fly/v2ray-core/v4/app/policy" . "github.com/v2fly/v2ray-core/v5/app/policy"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/features/policy" "github.com/v2fly/v2ray-core/v5/features/policy"
) )
func TestPolicy(t *testing.T) { func TestPolicy(t *testing.T) {

2
app/policy/policy.go
View File

@ -1,4 +1,4 @@
// Package policy is an implementation of policy.Manager feature. // Package policy is an implementation of policy.Manager feature.
package policy 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

12
app/proxyman/command/command.go
View File

@ -5,12 +5,12 @@ import (
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/common/serial" "github.com/v2fly/v2ray-core/v5/common/serial"
"github.com/v2fly/v2ray-core/v4/features/inbound" "github.com/v2fly/v2ray-core/v5/features/inbound"
"github.com/v2fly/v2ray-core/v4/features/outbound" "github.com/v2fly/v2ray-core/v5/features/outbound"
"github.com/v2fly/v2ray-core/v4/proxy" "github.com/v2fly/v2ray-core/v5/proxy"
) )
// InboundOperation is the interface for operations that applies to inbound handlers. // InboundOperation is the interface for operations that applies to inbound handlers.

20
app/proxyman/command/command.pb.go
View File

@ -7,9 +7,9 @@
package command package command
import ( import (
v4 "github.com/v2fly/v2ray-core/v4" v5 "github.com/v2fly/v2ray-core/v5"
protocol "github.com/v2fly/v2ray-core/v4/common/protocol" protocol "github.com/v2fly/v2ray-core/v5/common/protocol"
_ "github.com/v2fly/v2ray-core/v4/common/protoext" _ "github.com/v2fly/v2ray-core/v5/common/protoext"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
anypb "google.golang.org/protobuf/types/known/anypb" anypb "google.golang.org/protobuf/types/known/anypb"
@ -123,7 +123,7 @@ type AddInboundRequest struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields 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() { func (x *AddInboundRequest) Reset() {
@ -158,7 +158,7 @@ func (*AddInboundRequest) Descriptor() ([]byte, []int) {
return file_app_proxyman_command_command_proto_rawDescGZIP(), []int{2} 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 { if x != nil {
return x.Inbound return x.Inbound
} }
@ -386,7 +386,7 @@ type AddOutboundRequest struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields 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() { func (x *AddOutboundRequest) Reset() {
@ -421,7 +421,7 @@ func (*AddOutboundRequest) Descriptor() ([]byte, []int) {
return file_app_proxyman_command_command_proto_rawDescGZIP(), []int{8} 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 { if x != nil {
return x.Outbound 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, 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, 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, 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, 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, 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, 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 (*AlterOutboundResponse)(nil), // 13: v2ray.core.app.proxyman.command.AlterOutboundResponse
(*Config)(nil), // 14: v2ray.core.app.proxyman.command.Config (*Config)(nil), // 14: v2ray.core.app.proxyman.command.Config
(*protocol.User)(nil), // 15: v2ray.core.common.protocol.User (*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 (*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{ 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 15, // 0: v2ray.core.app.proxyman.command.AddUserOperation.user:type_name -> v2ray.core.common.protocol.User

2
app/proxyman/command/command.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.app.proxyman.command; package v2ray.core.app.proxyman.command;
option csharp_namespace = "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_package = "com.v2ray.core.app.proxyman.command";
option java_multiple_files = true; option java_multiple_files = true;

4
app/proxyman/command/command_grpc.pb.go
View File

@ -1,4 +1,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT. // 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 package command

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