lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-26 12:05:35 -05:00
Code Issues Releases Wiki Activity

apply user settings to shadowsocks

Browse Source
This commit is contained in:
v2ray
2016-02-03 12:18:28 +01:00
parent 2147ba5ab3
commit 2932d23b32
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/shadowsocks/config_json.go
View File

@@ -6,6 +6,7 @@ import (
"encoding/json"
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/common/serial"
"github.com/v2ray/v2ray-core/proxy/internal"
"github.com/v2ray/v2ray-core/proxy/internal/config"
@@ -16,6 +17,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
Cipher serial.StringLiteral `json:"method"`
Password serial.StringLiteral `json:"password"`
UDP bool `json:"udp"`
Level byte `json:"level"`
}
jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil {
@@ -44,6 +46,8 @@ func (this *Config) UnmarshalJSON(data []byte) error {
}
this.Key = PasswordToCipherKey(jsonConfig.Password.String(), this.Cipher.KeySize())
this.Level = protocol.UserLevel(jsonConfig.Level)
return nil
}