From 4ba76099e4c1f5a34df71b29114fd152042e90b6 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Sun, 5 Sep 2021 10:59:02 +0100 Subject: [PATCH] Revert "none security config" This reverts commit 9b883af99c7ce2510ad841b3b7acf556045ac5e7. --- transport/internet/config.go | 6 ------ transport/internet/config.proto | 7 ------- 2 files changed, 13 deletions(-) diff --git a/transport/internet/config.go b/transport/internet/config.go index 78f0b192f..5ab12063a 100644 --- a/transport/internet/config.go +++ b/transport/internet/config.go @@ -128,9 +128,3 @@ func (c *ProxyConfig) HasTag() bool { func (m SocketConfig_TProxyMode) IsEnabled() bool { return m != SocketConfig_Off } - -func init() { - common.Must(common.RegisterConfig((*NoneSecurity)(nil), func(ctx context.Context, config interface{}) (interface{}, error) { - return nil, newError("none security is a placeholder") - })) -} diff --git a/transport/internet/config.proto b/transport/internet/config.proto index 35bf88e74..61383d6f8 100644 --- a/transport/internet/config.proto +++ b/transport/internet/config.proto @@ -8,8 +8,6 @@ option java_multiple_files = true; import "google/protobuf/any.proto"; -import "common/protoext/extensions.proto"; - enum TransportProtocol { TCP = 0; UDP = 1; @@ -96,8 +94,3 @@ message SocketConfig { int32 tcp_keep_alive_interval = 8; } - -message NoneSecurity { - option (v2ray.core.common.protoext.message_opt).type = "security"; - option (v2ray.core.common.protoext.message_opt).short_name = "none"; -} \ No newline at end of file