lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-27 22:36:12 -04:00
Code Issues Releases Wiki Activity

delayed timer creation

Browse Source
This commit is contained in:
Darien Raymond 2018-08-09 12:23:08 +02:00
parent e343fe80a2
commit b238188770
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
transport/internet/kcp/connection.go
View File

@ -3,6 +3,7 @@ package kcp
import (
"io"
"net"
"runtime"
"sync"
"sync/atomic"
"time"
@ -280,7 +281,7 @@ func (c *Connection) waitForDataInput() error {
return io.EOF
}
duration := time.Minute
duration := time.Second * 8
if !c.rd.IsZero() {
duration = time.Until(c.rd)
if duration < 0 {
@ -288,9 +289,21 @@ func (c *Connection) waitForDataInput() error {
}
}
for i := 0; i < 16; i++ {
select {
case <-c.dataInput.Wait():
return nil
default:
runtime.Gosched()
}
}
timeout := time.NewTimer(duration)
defer timeout.Stop()
select {
case <-c.dataInput.Wait():
case <-time.After(duration):
case <-timeout.C:
if !c.rd.IsZero() && c.rd.Before(time.Now()) {
return ErrIOTimeout
}
@ -330,9 +343,21 @@ func (c *Connection) waitForDataOutput() error {
}
}
for i := 0; i < 16; i++ {
select {
case <-c.dataInput.Wait():
return nil
default:
runtime.Gosched()
}
}
timeout := time.NewTimer(duration)
defer timeout.Stop()
select {
case <-c.dataOutput.Wait():
case <-time.After(duration):
case <-timeout.C:
if !c.wd.IsZero() && c.wd.Before(time.Now()) {
return ErrIOTimeout
}