mirror of https://github.com/v2ray/v2ray-core
update detour config settings
parent
b59244f2c3
commit
9e1d0d8c5e
|
@ -21,4 +21,5 @@ type Config struct {
|
||||||
AllowedUsers []*proto.User
|
AllowedUsers []*proto.User
|
||||||
Features *FeaturesConfig
|
Features *FeaturesConfig
|
||||||
Defaults *DefaultConfig
|
Defaults *DefaultConfig
|
||||||
|
DetourConfig *DetourConfig
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,9 +52,10 @@ func (this *DefaultConfig) UnmarshalJSON(data []byte) error {
|
||||||
|
|
||||||
func (this *Config) UnmarshalJSON(data []byte) error {
|
func (this *Config) UnmarshalJSON(data []byte) error {
|
||||||
type JsonConfig struct {
|
type JsonConfig struct {
|
||||||
Users []*proto.User `json:"clients"`
|
Users []*proto.User `json:"clients"`
|
||||||
Features *FeaturesConfig `json:"features"`
|
Features *FeaturesConfig `json:"features"`
|
||||||
Defaults *DefaultConfig `json:"default"`
|
Defaults *DefaultConfig `json:"default"`
|
||||||
|
DetourConfig *DetourConfig `json:"detour"`
|
||||||
}
|
}
|
||||||
jsonConfig := new(JsonConfig)
|
jsonConfig := new(JsonConfig)
|
||||||
if err := json.Unmarshal(data, jsonConfig); err != nil {
|
if err := json.Unmarshal(data, jsonConfig); err != nil {
|
||||||
|
@ -69,6 +70,9 @@ func (this *Config) UnmarshalJSON(data []byte) error {
|
||||||
AlterIDs: 32,
|
AlterIDs: 32,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if this.Features != nil && this.DetourConfig == nil {
|
||||||
|
this.DetourConfig = this.Features.Detour
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue