lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-04 00:05:21 -05:00
Code Issues Releases Wiki Activity

rename Error to Err

Browse Source
This commit is contained in:
v2ray
2016-06-27 08:53:35 +02:00
parent 5ee87404fd
commit 7f661f5215
41 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/shadowsocks/config_json.go
View File

@@ -46,12 +46,12 @@ func (this *Config) UnmarshalJSON(data []byte) error {
}
default:
log.Error("Shadowsocks: Unknown cipher method: ", jsonConfig.Cipher)
return internal.ErrorBadConfiguration
return internal.ErrBadConfiguration
}
if len(jsonConfig.Password) == 0 {
log.Error("Shadowsocks: Password is not specified.")
return internal.ErrorBadConfiguration
return internal.ErrBadConfiguration
}
this.Key = PasswordToCipherKey(jsonConfig.Password, this.Cipher.KeySize())