purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-24 14:16:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Transport: Remove GUN (an alias of gRPC)

Browse Source
This commit is contained in:
RPRX 2024-10-18 01:03:44 +00:00
parent 9bdf72d658
commit 8809cbda81
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infra/conf/transport_internet.go
View File

@ -669,7 +669,7 @@ func (p TransportProtocol) Build() (string, error) {
return "websocket", nil return "websocket", nil
case "h2", "h3", "http": case "h2", "h3", "http":
return "http", nil return "http", nil
case "grpc", "gun": case "grpc":
return "grpc", nil return "grpc", nil
case "httpupgrade": case "httpupgrade":
return "httpupgrade", nil return "httpupgrade", nil
@ -807,7 +807,6 @@ type StreamConfig struct {
HTTPSettings *HTTPConfig `json:"httpSettings"` HTTPSettings *HTTPConfig `json:"httpSettings"`
SocketSettings *SocketConfig `json:"sockopt"` SocketSettings *SocketConfig `json:"sockopt"`
GRPCConfig *GRPCConfig `json:"grpcSettings"` GRPCConfig *GRPCConfig `json:"grpcSettings"`
GUNConfig *GRPCConfig `json:"gunSettings"`
HTTPUPGRADESettings *HttpUpgradeConfig `json:"httpupgradeSettings"` HTTPUPGRADESettings *HttpUpgradeConfig `json:"httpupgradeSettings"`
SplitHTTPSettings *SplitHTTPConfig `json:"splithttpSettings"` SplitHTTPSettings *SplitHTTPConfig `json:"splithttpSettings"`
} }
@ -900,9 +899,6 @@ func (c *StreamConfig) Build() (*internet.StreamConfig, error) {
Settings: serial.ToTypedMessage(ts), Settings: serial.ToTypedMessage(ts),
}) })
} }
if c.GRPCConfig == nil {
c.GRPCConfig = c.GUNConfig
}
if c.GRPCConfig != nil { if c.GRPCConfig != nil {
gs, err := c.GRPCConfig.Build() gs, err := c.GRPCConfig.Build()
if err != nil { if err != nil {