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

update detour config settings

Browse Source
This commit is contained in:
v2ray 2016-04-24 22:40:43 +02:00
parent b59244f2c3
commit 9e1d0d8c5e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proxy/vmess/inbound/config.go
View File

@ -21,4 +21,5 @@ type Config struct {
AllowedUsers []*proto.User
Features *FeaturesConfig
Defaults *DefaultConfig
DetourConfig *DetourConfig
}

10
proxy/vmess/inbound/config_json.go
View File

@ -52,9 +52,10 @@ func (this *DefaultConfig) UnmarshalJSON(data []byte) error {
func (this *Config) UnmarshalJSON(data []byte) error {
type JsonConfig struct {
Users []*proto.User `json:"clients"`
Features *FeaturesConfig `json:"features"`
Defaults *DefaultConfig `json:"default"`
Users []*proto.User `json:"clients"`
Features *FeaturesConfig `json:"features"`
Defaults *DefaultConfig `json:"default"`
DetourConfig *DetourConfig `json:"detour"`
}
jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil {
@ -69,6 +70,9 @@ func (this *Config) UnmarshalJSON(data []byte) error {
AlterIDs: 32,
}
}
if this.Features != nil && this.DetourConfig == nil {
this.DetourConfig = this.Features.Detour
}
return nil
}