gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

fix a race condition where the session timer could have fired early

Browse Source
This commit is contained in:
Lucas Clemente
2016-05-20 16:49:39 +02:00
parent 57066faef9
commit 2feb376e67
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
session.go
View File

@@ -78,7 +78,8 @@ type Session struct {
lastNetworkActivityTime time.Time lastNetworkActivityTime time.Time
timer *time.Timer timer *time.Timer
timerRead bool
} }
// newSession makes a new session // newSession makes a new session
@@ -154,13 +155,20 @@ func (s *Session) run() {
// Idle connection timeout // Idle connection timeout
firstTimeout = utils.MinDuration(firstTimeout, s.lastNetworkActivityTime.Add(s.connectionParametersManager.GetIdleConnectionStateLifetime()).Sub(now)) firstTimeout = utils.MinDuration(firstTimeout, s.lastNetworkActivityTime.Add(s.connectionParametersManager.GetIdleConnectionStateLifetime()).Sub(now))
// We need to drain the timer if the value from its channel was not read yet.
// See https://groups.google.com/forum/#!topic/golang-dev/c9UUfASVPoU
if !s.timer.Stop() && !s.timerRead {
<-s.timer.C
}
s.timer.Reset(firstTimeout) s.timer.Reset(firstTimeout)
s.timerRead = false
var err error var err error
select { select {
case <-s.closeChan: case <-s.closeChan:
return return
case <-s.timer.C: case <-s.timer.C:
s.timerRead = true
// We do all the interesting stuff after the switch statement, so // We do all the interesting stuff after the switch statement, so
// nothing to see here. // nothing to see here.
case <-s.sendingScheduled: case <-s.sendingScheduled: