mirrors/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-14 01:42:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix heartbeat error

Browse Source
This commit is contained in:
fatedier
2017-03-27 17:25:25 +08:00
parent 58d0d41501
commit 30aeaf968e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/control.go
View File

@ -218,7 +218,7 @@ func (ctl *Control) reader() {
return
} else {
ctl.Warn("read error: %v", err)
continue
return
}
} else {
ctl.readCh <- m
@ -262,10 +262,13 @@ func (ctl *Control) manager() {
select {
case <-hbSend.C:
// send heartbeat to server
ctl.Debug("send heartbeat to server")
ctl.sendCh <- &msg.Ping{}
case <-hbCheck.C:
if time.Since(ctl.lastPong) > time.Duration(config.ClientCommonCfg.HeartBeatTimeout)*time.Second {
ctl.Warn("heartbeat timeout")
// let reader() stop
ctl.conn.Close()
return
}
case rawMsg, ok := <-ctl.readCh:
@ -302,6 +305,7 @@ func (ctl *Control) manager() {
ctl.Info("[%s] start proxy success", m.ProxyName)
case *msg.Pong:
ctl.lastPong = time.Now()
ctl.Debug("receive heartbeat from server")
}
}
}