lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 10:08:15 -05:00
Code Issues Releases Wiki Activity

Fix: check jsonConfig.KcpConfig

Browse Source
This commit is contained in:
Shelikhoo 2016-06-13 17:49:21 +08:00
parent bcf87d1592
commit de4b4516ee
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
transport/config_json.go
View File

@ -5,6 +5,7 @@ package transport
import ( import (
"encoding/json" "encoding/json"
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/transport/hub/kcpv" "github.com/v2ray/v2ray-core/transport/hub/kcpv"
) )
@ -23,9 +24,15 @@ 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 = jsonConfig.KcpConfig if jsonConfig.KcpConfig != nil {
if jsonConfig.KcpConfig.AdvancedConfigs == nil { this.kcpConfig = jsonConfig.KcpConfig
jsonConfig.KcpConfig.AdvancedConfigs = kcpv.DefaultAdvancedConfigs if jsonConfig.KcpConfig.AdvancedConfigs == nil {
jsonConfig.KcpConfig.AdvancedConfigs = kcpv.DefaultAdvancedConfigs
}
} else {
if jsonConfig.EnableKcp {
log.Error("transport: You have enabled KCP but no configure is given")
}
} }
return nil return nil