extern/frp
1
1
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-08-17 16:11:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix config parse logic (#2323)

Browse Source
This commit is contained in:
fatedier
2021-03-22 14:53:30 +08:00
committed by GitHub
parent 6b80861bd6
commit 9a849a29e9
12 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/config/client.go
View File

@ -173,13 +173,21 @@ func GetDefaultClientConf() ClientCommonConf {
}
}
func (cfg *ClientCommonConf) Check() error {
func (cfg *ClientCommonConf) Complete() {
if cfg.LogFile == "console" {
cfg.LogWay = "console"
} else {
cfg.LogWay = "file"
}
}
func (cfg *ClientCommonConf) Validate() error {
if cfg.HeartbeatInterval <= 0 {
return fmt.Errorf("Parse conf error: invalid heartbeat_interval")
return fmt.Errorf("invalid heartbeat_interval")
}
if cfg.HeartbeatTimeout < cfg.HeartbeatInterval {
return fmt.Errorf("Parse conf error: invalid heartbeat_timeout, heartbeat_timeout is less than heartbeat_interval")
return fmt.Errorf("invalid heartbeat_timeout, heartbeat_timeout is less than heartbeat_interval")
}
if cfg.TLSEnable == false {
@ -196,6 +204,10 @@ func (cfg *ClientCommonConf) Check() error {
}
}
if cfg.Protocol != "tcp" && cfg.Protocol != "kcp" && cfg.Protocol != "websocket" {
return fmt.Errorf("invalid protocol")
}
return nil
}