diff --git a/proxy/vless/inbound/config.proto b/proxy/vless/inbound/config.proto index da95ee789..3223ab472 100644 --- a/proxy/vless/inbound/config.proto +++ b/proxy/vless/inbound/config.proto @@ -25,7 +25,7 @@ message Config { repeated Fallback fallbacks = 3; } -message SimplifiedConfig{ +message SimplifiedConfig { option (v2ray.core.common.protoext.message_opt).type = "inbound"; option (v2ray.core.common.protoext.message_opt).short_name = "vless"; diff --git a/proxy/vless/inbound/inbound.go b/proxy/vless/inbound/inbound.go index 70d44d096..22e2823b0 100644 --- a/proxy/vless/inbound/inbound.go +++ b/proxy/vless/inbound/inbound.go @@ -54,17 +54,10 @@ func init() { } return }(), + Decryption: "none", } - var dc dns.Client - if err := core.RequireFeatures(ctx, func(d dns.Client) error { - dc = d - return nil - }); err != nil { - return nil, err - } - - return New(ctx, fullConfig, dc) + return common.CreateObject(ctx, fullConfig) })) } diff --git a/proxy/vless/outbound/outbound.go b/proxy/vless/outbound/outbound.go index a7dbc6e92..d8cde6cf4 100644 --- a/proxy/vless/outbound/outbound.go +++ b/proxy/vless/outbound/outbound.go @@ -17,9 +17,8 @@ import ( "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/proxy/vmess" + "github.com/v2fly/v2ray-core/v4/protocol/vless" + "github.com/v2fly/v2ray-core/v4/protocol/vless/encoding" "github.com/v2fly/v2ray-core/v4/transport" "github.com/v2fly/v2ray-core/v4/transport/internet" ) @@ -37,13 +36,13 @@ func init() { Port: simplifiedClient.Port, User: []*protocol.User{ { - Account: serial.ToTypedMessage(&vmess.Account{Id: simplifiedClient.Uuid}), + Account: serial.ToTypedMessage(&vless.Account{Id: simplifiedClient.Uuid, Encryption: "none"}), }, }, }, }} - return New(ctx, fullClient) + return common.CreateObject(ctx, fullClient) })) }