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

use the correct error code for handshake timeouts

Browse Source
This commit is contained in:
Marten Seemann
2017-06-01 20:02:57 +02:00
parent 9040fd25e7
commit 13a25a5ba5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
session.go
View File

@@ -328,7 +328,7 @@ runLoop:
s.close(qerr.Error(qerr.NetworkIdleTimeout, "No recent network activity.")) s.close(qerr.Error(qerr.NetworkIdleTimeout, "No recent network activity."))
} }
if !s.handshakeComplete && now.Sub(s.sessionCreationTime) >= s.config.HandshakeTimeout { if !s.handshakeComplete && now.Sub(s.sessionCreationTime) >= s.config.HandshakeTimeout {
s.close(qerr.Error(qerr.NetworkIdleTimeout, "Crypto handshake did not complete in time.")) s.close(qerr.Error(qerr.HandshakeTimeout, "Crypto handshake did not complete in time."))
} }
s.garbageCollectStreams() s.garbageCollectStreams()
} }

12
session_test.go
View File

@@ -1396,7 +1396,8 @@ var _ = Describe("Session", func() {
Context("timeouts", func() { Context("timeouts", func() {
It("times out due to no network activity", func(done Done) { It("times out due to no network activity", func(done Done) {
sess.lastNetworkActivityTime = time.Now().Add(-time.Hour) sess.lastNetworkActivityTime = time.Now().Add(-time.Hour)
sess.run() // Would normally not return err := sess.run() // Would normally not return
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.NetworkIdleTimeout))
Expect(mconn.written[0]).To(ContainSubstring("No recent network activity.")) Expect(mconn.written[0]).To(ContainSubstring("No recent network activity."))
Expect(sess.runClosed).To(BeClosed()) Expect(sess.runClosed).To(BeClosed())
close(done) close(done)
@@ -1404,7 +1405,8 @@ var _ = Describe("Session", func() {
It("times out due to non-completed crypto handshake", func(done Done) { It("times out due to non-completed crypto handshake", func(done Done) {
sess.sessionCreationTime = time.Now().Add(-protocol.DefaultHandshakeTimeout).Add(-time.Second) sess.sessionCreationTime = time.Now().Add(-protocol.DefaultHandshakeTimeout).Add(-time.Second)
sess.run() // Would normally not return err := sess.run() // Would normally not return
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.HandshakeTimeout))
Expect(mconn.written[0]).To(ContainSubstring("Crypto handshake did not complete in time.")) Expect(mconn.written[0]).To(ContainSubstring("Crypto handshake did not complete in time."))
Expect(sess.runClosed).To(BeClosed()) Expect(sess.runClosed).To(BeClosed())
close(done) close(done)
@@ -1414,7 +1416,8 @@ var _ = Describe("Session", func() {
sess.lastNetworkActivityTime = time.Now().Add(-time.Minute) sess.lastNetworkActivityTime = time.Now().Add(-time.Minute)
cpm.idleTime = 99999 * time.Second cpm.idleTime = 99999 * time.Second
sess.packer.connectionParameters = sess.connectionParameters sess.packer.connectionParameters = sess.connectionParameters
sess.run() // Would normally not return err := sess.run() // Would normally not return
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.NetworkIdleTimeout))
Expect(mconn.written[0]).To(ContainSubstring("No recent network activity.")) Expect(mconn.written[0]).To(ContainSubstring("No recent network activity."))
Expect(sess.runClosed).To(BeClosed()) Expect(sess.runClosed).To(BeClosed())
close(done) close(done)
@@ -1424,7 +1427,8 @@ var _ = Describe("Session", func() {
close(aeadChanged) close(aeadChanged)
cpm.idleTime = 0 * time.Millisecond cpm.idleTime = 0 * time.Millisecond
sess.packer.connectionParameters = sess.connectionParameters sess.packer.connectionParameters = sess.connectionParameters
sess.run() // Would normally not return err := sess.run() // Would normally not return
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.NetworkIdleTimeout))
Expect(mconn.written[0]).To(ContainSubstring("No recent network activity.")) Expect(mconn.written[0]).To(ContainSubstring("No recent network activity."))
Expect(sess.runClosed).To(BeClosed()) Expect(sess.runClosed).To(BeClosed())
close(done) close(done)