From 8809cbda817006f8d33c4c9993014d146f7e1138 Mon Sep 17 00:00:00 2001 From: RPRX <63339210+RPRX@users.noreply.github.com> Date: Fri, 18 Oct 2024 01:03:44 +0000 Subject: [PATCH] Transport: Remove GUN (an alias of gRPC) --- infra/conf/transport_internet.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go index 904505bfc737..075f60474e25 100644 --- a/infra/conf/transport_internet.go +++ b/infra/conf/transport_internet.go @@ -669,7 +669,7 @@ func (p TransportProtocol) Build() (string, error) { return "websocket", nil case "h2", "h3", "http": return "http", nil - case "grpc", "gun": + case "grpc": return "grpc", nil case "httpupgrade": return "httpupgrade", nil @@ -807,7 +807,6 @@ type StreamConfig struct { HTTPSettings *HTTPConfig `json:"httpSettings"` SocketSettings *SocketConfig `json:"sockopt"` GRPCConfig *GRPCConfig `json:"grpcSettings"` - GUNConfig *GRPCConfig `json:"gunSettings"` HTTPUPGRADESettings *HttpUpgradeConfig `json:"httpupgradeSettings"` SplitHTTPSettings *SplitHTTPConfig `json:"splithttpSettings"` } @@ -900,9 +899,6 @@ func (c *StreamConfig) Build() (*internet.StreamConfig, error) { Settings: serial.ToTypedMessage(ts), }) } - if c.GRPCConfig == nil { - c.GRPCConfig = c.GUNConfig - } if c.GRPCConfig != nil { gs, err := c.GRPCConfig.Build() if err != nil {