github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-09-06 07:06:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

change ping calculate, fix window size calculate

Browse Source
This commit is contained in:
ffdfgdfg
2019-10-08 13:38:42 +08:00
parent b3ed822c72
commit d9f9dc6acb
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mux/mux.go
View File

@@ -150,7 +150,7 @@ func (s *Mux) writeBuf() {
func (s *Mux) ping() {
go func() {
now, _ := time.Now().MarshalText()
now, _ := time.Now().UTC().MarshalText()
s.sendInfo(common.MUX_PING_FLAG, common.MUX_PING, now)
// send the ping flag and get the latency first
ticker := time.NewTicker(time.Second * 15)
@@ -166,7 +166,7 @@ func (s *Mux) ping() {
if (math.MaxInt32 - s.id) < 10000 {
s.id = 0
}
now, _ := time.Now().MarshalText()
now, _ := time.Now().UTC().MarshalText()
s.sendInfo(common.MUX_PING_FLAG, common.MUX_PING, now)
if s.pingOk > 10 && s.connType == "kcp" {
s.Close()
@@ -188,8 +188,11 @@ func (s *Mux) pingReturn() {
break
}
_ = now.UnmarshalText(data)
s.latency = time.Since(now).Seconds()
s.sendInfo(common.MUX_PING_RETURN, common.MUX_PING, nil)
s.latency = time.Now().UTC().Sub(now).Seconds() / 2
//logs.Warn("latency", s.latency)
if s.latency <= 0 {
logs.Warn("latency err", s.latency)
}
}
}()
}
@@ -214,9 +217,10 @@ func (s *Mux) readSession() {
s.sendInfo(common.MUX_NEW_CONN_OK, connection.connId, nil)
continue
case common.MUX_PING_FLAG: //ping
s.pingCh <- pack.Content
s.sendInfo(common.MUX_PING_RETURN, common.MUX_PING, pack.Content)
continue
case common.MUX_PING_RETURN:
s.pingCh <- pack.Content
continue
}
if connection, ok := s.connMap.Get(pack.Id); ok && !connection.isClose {