github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

format log

pull/314/head
Darien Raymond 2016-09-18 00:46:16 +02:00
parent d08cba000f
commit 8b37edd02d
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ func (this *DetourConfig) UnmarshalJSON(data []byte) error {
} }
jsonConfig := new(JsonDetourConfig) jsonConfig := new(JsonDetourConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil { if err := json.Unmarshal(data, jsonConfig); err != nil {
return errors.New("VMessIn: Failed to parse detour config: " + err.Error()) return errors.New("VMess|Inbound: Failed to parse detour config: " + err.Error())
} }
this.ToTag = jsonConfig.ToTag this.ToTag = jsonConfig.ToTag
return nil return nil
@ -33,7 +33,7 @@ func (this *FeaturesConfig) UnmarshalJSON(data []byte) error {
} }
jsonConfig := new(JsonFeaturesConfig) jsonConfig := new(JsonFeaturesConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil { if err := json.Unmarshal(data, jsonConfig); err != nil {
return errors.New("VMessIn: Failed to parse features config: " + err.Error()) return errors.New("VMess|Inbound: Failed to parse features config: " + err.Error())
} }
this.Detour = jsonConfig.Detour this.Detour = jsonConfig.Detour
return nil return nil
@ -46,7 +46,7 @@ func (this *DefaultConfig) UnmarshalJSON(data []byte) error {
} }
jsonConfig := new(JsonDefaultConfig) jsonConfig := new(JsonDefaultConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil { if err := json.Unmarshal(data, jsonConfig); err != nil {
return errors.New("VMessIn: Failed to parse default config: " + err.Error()) return errors.New("VMess|Inbound: Failed to parse default config: " + err.Error())
} }
this.AlterIDs = jsonConfig.AlterIDs this.AlterIDs = jsonConfig.AlterIDs
if this.AlterIDs == 0 { if this.AlterIDs == 0 {
@ -65,7 +65,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
} }
jsonConfig := new(JsonConfig) jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil { if err := json.Unmarshal(data, jsonConfig); err != nil {
return errors.New("VMessIn: Failed to parse config: " + err.Error()) return errors.New("VMess|Inbound: Failed to parse config: " + err.Error())
} }
this.Features = jsonConfig.Features // Backward compatibility this.Features = jsonConfig.Features // Backward compatibility
this.Defaults = jsonConfig.Defaults this.Defaults = jsonConfig.Defaults