lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-21 15:05:23 +00:00
Code Issues Releases Wiki Activity

fix kcp state wait

Browse Source
This commit is contained in:
Darien Raymond 2018-08-09 13:38:47 +02:00
parent 35129e6518
commit c89531022f
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,18 +277,6 @@ func (c *Connection) ReadMultiBuffer() (buf.MultiBuffer, error) {
}
func (c *Connection) waitForDataInput() error {
if c.State() == StatePeerTerminating {
return io.EOF
}
duration := time.Second * 8
if !c.rd.IsZero() {
duration = time.Until(c.rd)
if duration < 0 {
return ErrIOTimeout
}
}
for i := 0; i < 16; i++ {
select {
case <-c.dataInput.Wait():
@ -298,6 +286,14 @@ func (c *Connection) waitForDataInput() error {
}
}
duration := time.Second * 16
if !c.rd.IsZero() {
duration = time.Until(c.rd)
if duration < 0 {
return ErrIOTimeout
}
}
timeout := time.NewTimer(duration)
defer timeout.Stop()
@ -335,7 +331,16 @@ func (c *Connection) Read(b []byte) (int, error) {
}
func (c *Connection) waitForDataOutput() error {
duration := time.Minute
for i := 0; i < 16; i++ {
select {
case <-c.dataOutput.Wait():
return nil
default:
runtime.Gosched()
}
}
duration := time.Second * 16
if !c.wd.IsZero() {
duration = time.Until(c.wd)
if duration < 0 {
@ -343,15 +348,6 @@ 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()