merge from kcp-go

This commit is contained in:
hikaricai
2018-11-28 22:36:55 -08:00
parent 3f487568c6
commit 3b4d7cb08d
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -798,7 +798,7 @@ func (kcp *KCP) flush(ackOnly bool) uint32 {
} }
// get the nearest rto // get the nearest rto
if rto := _itimediff(segment.rto, current); rto > 0 && rto < minrto { if rto := _itimediff(segment.resendts, current); rto > 0 && rto < minrto {
minrto = rto minrto = rto
} }
} }
+1 -1
View File
@@ -116,7 +116,7 @@ func main() {
}, },
cli.StringFlag{ cli.StringFlag{
Name: "mode", Name: "mode",
Value: "fast2", Value: "fast",
Usage: "profiles: fast3, fast2, fast, normal, manual", Usage: "profiles: fast3, fast2, fast, normal, manual",
}, },
cli.IntFlag{ cli.IntFlag{
+1 -1
View File
@@ -66,7 +66,7 @@ func main() {
}, },
cli.StringFlag{ cli.StringFlag{
Name: "mode", Name: "mode",
Value: "fast2", Value: "fast",
Usage: "profiles: fast3, fast2, fast, normal, manual", Usage: "profiles: fast3, fast2, fast, normal, manual",
}, },
cli.IntFlag{ cli.IntFlag{