lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 15:36:41 -05:00
Code Issues Releases Wiki Activity

Email in shadowsocks

Browse Source
This commit is contained in:
v2ray 2016-02-28 14:50:30 +01:00
parent c1c22a50d5
commit 3d4da5822b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proxy/shadowsocks/config.go
View File

@ -62,6 +62,7 @@ type Config struct {
Key []byte Key []byte
UDP bool UDP bool
Level protocol.UserLevel Level protocol.UserLevel
Email string
} }
func PasswordToCipherKey(password string, keySize int) []byte { func PasswordToCipherKey(password string, keySize int) []byte {

2
proxy/shadowsocks/config_json.go
View File

@ -18,6 +18,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
Password serial.StringLiteral `json:"password"` Password serial.StringLiteral `json:"password"`
UDP bool `json:"udp"` UDP bool `json:"udp"`
Level byte `json:"level"` Level byte `json:"level"`
Email string `json:"email"`
} }
jsonConfig := new(JsonConfig) jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil { 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.Key = PasswordToCipherKey(jsonConfig.Password.String(), this.Cipher.KeySize())
this.Level = protocol.UserLevel(jsonConfig.Level) this.Level = protocol.UserLevel(jsonConfig.Level)
this.Email = jsonConfig.Email
return nil return nil
} }