From a1b33c3bd6e0040bd5f4dbc4a7e8a739472997d8 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sun, 6 Jan 2019 20:33:58 +0100 Subject: [PATCH] remove unused functions --- transport/internet/config.go | 22 +++------------------- transport/internet/domainsocket/config.go | 2 +- transport/internet/http/config.go | 2 +- transport/internet/kcp/config.go | 2 +- transport/internet/quic/quic.go | 2 +- transport/internet/tcp/config.go | 2 +- transport/internet/udp/config.go | 2 +- transport/internet/websocket/config.go | 2 +- 8 files changed, 10 insertions(+), 26 deletions(-) diff --git a/transport/internet/config.go b/transport/internet/config.go index 2f8968486..3813c4e94 100644 --- a/transport/internet/config.go +++ b/transport/internet/config.go @@ -30,15 +30,7 @@ func transportProtocolToString(protocol TransportProtocol) string { } } -func RegisterProtocolConfigCreator(protocol TransportProtocol, creator ConfigCreator) error { - name := transportProtocolToString(protocol) - if name == unknownProtocol { - return newError("protocol ", TransportProtocol_name[int32(protocol)], " is not supported").AtError() - } - return RegisterProtocolConfigCreatorByName(name, creator) -} - -func RegisterProtocolConfigCreatorByName(name string, creator ConfigCreator) error { +func RegisterProtocolConfigCreator(name string, creator ConfigCreator) error { if _, found := globalTransportConfigCreatorCache[name]; found { return newError("protocol ", name, " is already registered").AtError() } @@ -46,15 +38,7 @@ func RegisterProtocolConfigCreatorByName(name string, creator ConfigCreator) err return nil } -func CreateTransportConfig(protocol TransportProtocol) (interface{}, error) { - name := transportProtocolToString(protocol) - if name == unknownProtocol { - return nil, newError("protocol ", TransportProtocol_name[int32(protocol)], " is not supported").AtError() - } - return CreateTransportConfigByName(name) -} - -func CreateTransportConfigByName(name string) (interface{}, error) { +func CreateTransportConfig(name string) (interface{}, error) { creator, ok := globalTransportConfigCreatorCache[name] if !ok { return nil, newError("unknown transport protocol: ", name) @@ -106,7 +90,7 @@ func (c *StreamConfig) GetTransportSettingsFor(protocol string) (interface{}, er } } - return CreateTransportConfigByName(protocol) + return CreateTransportConfig(protocol) } func (c *StreamConfig) GetEffectiveSecuritySettings() (interface{}, error) { diff --git a/transport/internet/domainsocket/config.go b/transport/internet/domainsocket/config.go index 220dfe082..e389d652a 100644 --- a/transport/internet/domainsocket/config.go +++ b/transport/internet/domainsocket/config.go @@ -23,7 +23,7 @@ func (c *Config) GetUnixAddr() (*net.UnixAddr, error) { } func init() { - common.Must(internet.RegisterProtocolConfigCreatorByName(protocolName, func() interface{} { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { return new(Config) })) } diff --git a/transport/internet/http/config.go b/transport/internet/http/config.go index 814e96be9..89b06dfbe 100644 --- a/transport/internet/http/config.go +++ b/transport/internet/http/config.go @@ -41,7 +41,7 @@ func (c *Config) getNormalizedPath() string { } func init() { - common.Must(internet.RegisterProtocolConfigCreatorByName(protocolName, func() interface{} { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { return new(Config) })) } diff --git a/transport/internet/kcp/config.go b/transport/internet/kcp/config.go index 02f03d2e2..00a253fcb 100644 --- a/transport/internet/kcp/config.go +++ b/transport/internet/kcp/config.go @@ -99,7 +99,7 @@ func (c *Config) GetReceivingBufferSize() uint32 { } func init() { - common.Must(internet.RegisterProtocolConfigCreatorByName(protocolName, func() interface{} { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { return new(Config) })) } diff --git a/transport/internet/quic/quic.go b/transport/internet/quic/quic.go index 042e30f40..6de1d6021 100644 --- a/transport/internet/quic/quic.go +++ b/transport/internet/quic/quic.go @@ -17,7 +17,7 @@ const protocolName = "quic" const internalDomain = "quic.internal.v2ray.com" func init() { - common.Must(internet.RegisterProtocolConfigCreatorByName(protocolName, func() interface{} { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { return new(Config) })) } diff --git a/transport/internet/tcp/config.go b/transport/internet/tcp/config.go index d5e514401..f98ad3a0a 100644 --- a/transport/internet/tcp/config.go +++ b/transport/internet/tcp/config.go @@ -8,7 +8,7 @@ import ( const protocolName = "tcp" func init() { - common.Must(internet.RegisterProtocolConfigCreatorByName(protocolName, func() interface{} { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { return new(Config) })) } diff --git a/transport/internet/udp/config.go b/transport/internet/udp/config.go index 97838f5b3..f79568cdc 100644 --- a/transport/internet/udp/config.go +++ b/transport/internet/udp/config.go @@ -6,7 +6,7 @@ import ( ) func init() { - common.Must(internet.RegisterProtocolConfigCreatorByName(protocolName, func() interface{} { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { return new(Config) })) } diff --git a/transport/internet/websocket/config.go b/transport/internet/websocket/config.go index 727a24861..9ec0e0cf4 100644 --- a/transport/internet/websocket/config.go +++ b/transport/internet/websocket/config.go @@ -29,7 +29,7 @@ func (c *Config) GetRequestHeader() http.Header { } func init() { - common.Must(internet.RegisterProtocolConfigCreatorByName(protocolName, func() interface{} { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { return new(Config) })) }