lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

Add grpcSettings (alias of gunSettings)

Browse Source
This commit is contained in:
RPRX 2021-03-11 16:01:57 +00:00 committed by GitHub
parent 971eddaa12
commit 3b7ed982fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/conf/transport.go
View File

@ -14,6 +14,7 @@ type TransportConfig struct {
DSConfig *DomainSocketConfig `json:"dsSettings"` DSConfig *DomainSocketConfig `json:"dsSettings"`
QUICConfig *QUICConfig `json:"quicSettings"` QUICConfig *QUICConfig `json:"quicSettings"`
GunConfig *GunConfig `json:"gunSettings"` GunConfig *GunConfig `json:"gunSettings"`
GRPCConfig *GunConfig `json:"grpcSettings"`
} }
// Build implements Buildable. // Build implements Buildable.
@ -86,6 +87,9 @@ func (c *TransportConfig) Build() (*transport.Config, error) {
}) })
} }
if c.GunConfig == nil {
c.GunConfig = c.GRPCConfig
}
if c.GunConfig != nil { if c.GunConfig != nil {
gs, err := c.GunConfig.Build() gs, err := c.GunConfig.Build()
if err != nil { if err != nil {

4
infra/conf/transport_internet.go
View File

@ -336,9 +336,7 @@ func (p TransportProtocol) Build() (string, error) {
return "domainsocket", nil return "domainsocket", nil
case "quic": case "quic":
return "quic", nil return "quic", nil
case "gun": case "gun", "grpc":
return "gun", nil
case "grpc": // gun alias
return "gun", nil return "gun", nil
default: default:
return "", newError("Config: unknown transport protocol: ", p) return "", newError("Config: unknown transport protocol: ", p)