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

KCP: Fixed transport/config_json.go jsonConfig.KcpConfig, jsonConfig.KcpConfig.AdvancedConfig == nil

pull/170/head
Shelikhoo 2016-06-12 14:10:19 +08:00
parent e72a7cb96f
commit cbb183ec58
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/config_json.go
View File

@ -23,6 +23,10 @@ func (this *Config) UnmarshalJSON(data []byte) error {
} }
this.ConnectionReuse = jsonConfig.ConnectionReuse this.ConnectionReuse = jsonConfig.ConnectionReuse
this.enableKcp = jsonConfig.EnableKcp this.enableKcp = jsonConfig.EnableKcp
this.kcpConfig = kcpConfig this.kcpConfig = jsonConfig.KcpConfig
if jsonConfig.KcpConfig.AdvancedConfig == nil {
jsonConfig.KcpConfig.AdvancedConfig = kcpv.DefaultAdvancedConfigs
}
return nil return nil
} }