From de4b4516ee06926587dde92f06db03f809d9394e Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Mon, 13 Jun 2016 17:49:21 +0800 Subject: [PATCH] Fix: check jsonConfig.KcpConfig --- transport/config_json.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/transport/config_json.go b/transport/config_json.go index 8f900701..4328aaa0 100644 --- a/transport/config_json.go +++ b/transport/config_json.go @@ -5,6 +5,7 @@ package transport import ( "encoding/json" + "github.com/v2ray/v2ray-core/common/log" "github.com/v2ray/v2ray-core/transport/hub/kcpv" ) @@ -23,9 +24,15 @@ func (this *Config) UnmarshalJSON(data []byte) error { } this.ConnectionReuse = jsonConfig.ConnectionReuse this.enableKcp = jsonConfig.EnableKcp - this.kcpConfig = jsonConfig.KcpConfig - if jsonConfig.KcpConfig.AdvancedConfigs == nil { - jsonConfig.KcpConfig.AdvancedConfigs = kcpv.DefaultAdvancedConfigs + if jsonConfig.KcpConfig != nil { + this.kcpConfig = jsonConfig.KcpConfig + 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