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

fix build break

pull/82/head
v2ray 2016-01-27 15:57:53 +01:00
parent 40c3a01e68
commit 3f634eb54f
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proxy/shadowsocks/config_json.go
View File

@ -12,14 +12,14 @@ import (
func (this *Config) UnmarshalJSON(data []byte) error { func (this *Config) UnmarshalJSON(data []byte) error {
type JsonConfig struct { type JsonConfig struct {
Cipher *serial.StringLiteral `json:"method"` Cipher serial.StringLiteral `json:"method"`
Password *serial.StringLiteral `json:"password"` Password serial.StringLiteral `json:"password"`
} }
jsonConfig := new(JsonConfig) jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil { if err := json.Unmarshal(data, jsonConfig); err != nil {
return err return err
} }
if this.Password == nil { if len(jsonConfig.Password) == 0 {
log.Error("Shadowsocks: Password is not specified.") log.Error("Shadowsocks: Password is not specified.")
return internal.ErrorBadConfiguration return internal.ErrorBadConfiguration
} }
@ -31,12 +31,12 @@ func (this *Config) UnmarshalJSON(data []byte) error {
jsonConfig.Cipher = jsonConfig.Cipher.ToLower() jsonConfig.Cipher = jsonConfig.Cipher.ToLower()
switch jsonConfig.Cipher.String() { switch jsonConfig.Cipher.String() {
case "aes-256-cfb": case "aes-256-cfb":
this.Cipher = &AesCfb { this.Cipher = &AesCfb{
KeyBytes: 32 KeyBytes: 32,
} }
case "aes-128-cfb": case "aes-128-cfb":
this.Cipher = &AesCfb { this.Cipher = &AesCfb{
KeyBytes: 32 KeyBytes: 32,
} }
default: default:
log.Error("Shadowsocks: Unknown cipher method: ", jsonConfig.Cipher) log.Error("Shadowsocks: Unknown cipher method: ", jsonConfig.Cipher)