diff --git a/proxy/shadowsocks/config.go b/proxy/shadowsocks/config.go index db0c9b825..9ba221ded 100644 --- a/proxy/shadowsocks/config.go +++ b/proxy/shadowsocks/config.go @@ -62,6 +62,7 @@ type Config struct { Key []byte UDP bool Level protocol.UserLevel + Email string } func PasswordToCipherKey(password string, keySize int) []byte { diff --git a/proxy/shadowsocks/config_json.go b/proxy/shadowsocks/config_json.go index 744615c96..595ada8ad 100644 --- a/proxy/shadowsocks/config_json.go +++ b/proxy/shadowsocks/config_json.go @@ -18,6 +18,7 @@ func (this *Config) UnmarshalJSON(data []byte) error { Password serial.StringLiteral `json:"password"` UDP bool `json:"udp"` Level byte `json:"level"` + Email string `json:"email"` } jsonConfig := new(JsonConfig) if err := json.Unmarshal(data, jsonConfig); err != nil { @@ -55,6 +56,7 @@ func (this *Config) UnmarshalJSON(data []byte) error { this.Key = PasswordToCipherKey(jsonConfig.Password.String(), this.Cipher.KeySize()) this.Level = protocol.UserLevel(jsonConfig.Level) + this.Email = jsonConfig.Email return nil }