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

use a different network timeout before the crypto handshake completes

Browse Source 
ref #320
This commit is contained in:
Lucas Clemente
2016-09-08 13:48:26 +02:00
parent 3b66d2f35d
commit d6e40cc3da
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
session.go
View File

@@ -200,7 +200,7 @@ func (s *Session) run() {
if err := s.sendPacket(); err != nil {
s.Close(err)
}
if time.Now().Sub(s.lastNetworkActivityTime) >= s.connectionParametersManager.GetIdleConnectionStateLifetime() {
if time.Now().Sub(s.lastNetworkActivityTime) >= s.idleTimeout() {
s.Close(qerr.Error(qerr.NetworkIdleTimeout, "No recent network activity."))
}
if !s.cryptoSetup.HandshakeComplete() && time.Now().Sub(s.sessionCreationTime) >= protocol.MaxTimeForCryptoHandshake {
@@ -211,7 +211,7 @@ func (s *Session) run() {
}
func (s *Session) maybeResetTimer() {
nextDeadline := s.lastNetworkActivityTime.Add(s.connectionParametersManager.GetIdleConnectionStateLifetime())
nextDeadline := s.lastNetworkActivityTime.Add(s.idleTimeout())
if !s.delayedAckOriginTime.IsZero() {
nextDeadline = utils.MinTime(nextDeadline, s.delayedAckOriginTime.Add(protocol.AckSendDelay))
@@ -240,6 +240,13 @@ func (s *Session) maybeResetTimer() {
s.currentDeadline = nextDeadline
}
func (s *Session) idleTimeout() time.Duration {
if s.cryptoSetup.HandshakeComplete() {
return s.connectionParametersManager.GetIdleConnectionStateLifetime()
}
return protocol.InitialIdleTimeout
}
func (s *Session) handlePacketImpl(p *receivedPacket) error {
if p.rcvTime.IsZero() {
// To simplify testing