lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-19 10:56:06 -05:00
Code Issues Releases Wiki Activity

Load Configure from json

Browse Source
This commit is contained in:
Shelikhoo 2016-08-13 21:39:34 +08:00
parent 8c4a6d94f9
commit 2eced2bd6c
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transport/config_json.go
View File

@ -7,12 +7,14 @@ import (
"github.com/v2ray/v2ray-core/transport/internet/kcp" "github.com/v2ray/v2ray-core/transport/internet/kcp"
"github.com/v2ray/v2ray-core/transport/internet/tcp" "github.com/v2ray/v2ray-core/transport/internet/tcp"
"github.com/v2ray/v2ray-core/transport/internet/ws"
) )
func (this *Config) UnmarshalJSON(data []byte) error { func (this *Config) UnmarshalJSON(data []byte) error {
type JsonConfig struct { type JsonConfig struct {
TCPConfig *tcp.Config `json:"tcpSettings"` TCPConfig *tcp.Config `json:"tcpSettings"`
KCPConfig kcp.Config `json:"kcpSettings"` KCPConfig kcp.Config `json:"kcpSettings"`
WSConfig *ws.Config `json:"wsSettings"`
} }
jsonConfig := &JsonConfig{ jsonConfig := &JsonConfig{
KCPConfig: kcp.DefaultConfig(), KCPConfig: kcp.DefaultConfig(),
@ -22,6 +24,6 @@ func (this *Config) UnmarshalJSON(data []byte) error {
} }
this.tcpConfig = jsonConfig.TCPConfig this.tcpConfig = jsonConfig.TCPConfig
this.kcpConfig = jsonConfig.KCPConfig this.kcpConfig = jsonConfig.KCPConfig
this.wsConfig = jsonConfig.WSConfig
return nil return nil
} }