github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix deadlock in kcp.read

pull/215/head
v2ray 2016-07-12 12:54:09 +02:00
parent e13ea7a54f
commit a88a120938
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,8 +179,12 @@ func (this *Connection) Read(b []byte) (int, error) {
return nBytes, nil return nBytes, nil
} }
var timer *time.Timer var timer *time.Timer
if !this.rd.IsZero() && this.rd.Before(time.Now()) { if !this.rd.IsZero() {
timer = time.AfterFunc(this.rd.Sub(time.Now()), this.dataInputCond.Signal) duration := this.rd.Sub(time.Now())
if duration <= 0 {
return 0, errTimeout
}
timer = time.AfterFunc(duration, this.dataInputCond.Signal)
} }
this.dataInputCond.L.Lock() this.dataInputCond.L.Lock()
this.dataInputCond.Wait() this.dataInputCond.Wait()