use the minimum of the two peers' max_idle_timeouts

This commit is contained in:
Marten Seemann
2019-12-11 14:03:30 +04:00
parent 8dcca046e3
commit 27549c5665
16 changed files with 89 additions and 52 deletions

View File

@@ -111,8 +111,8 @@ var _ = Describe("HTTP tests", func() {
},
DisableCompression: true,
QuicConfig: &quic.Config{
Versions: []protocol.VersionNumber{version},
IdleTimeout: 10 * time.Second,
Versions: []protocol.VersionNumber{version},
MaxIdleTimeout: 10 * time.Second,
},
},
}

View File

@@ -222,7 +222,7 @@ var _ = Describe("MITM test", func() {
BeforeEach(func() {
numCorrupted = 0
serverConfig.IdleTimeout = idleTimeout
serverConfig.MaxIdleTimeout = idleTimeout
})
AfterEach(func() {

View File

@@ -60,7 +60,7 @@ var _ = Describe("Stateless Resets", func() {
getTLSClientConfig(),
&quic.Config{
ConnectionIDLength: connIDLen,
IdleTimeout: 2 * time.Second,
MaxIdleTimeout: 2 * time.Second,
},
)
Expect(err).ToNot(HaveOccurred())

View File

@@ -92,7 +92,7 @@ var _ = Describe("Timeout tests", func() {
sess, err := quic.DialAddr(
fmt.Sprintf("localhost:%d", proxy.LocalPort()),
getTLSClientConfig(),
&quic.Config{IdleTimeout: idleTimeout},
&quic.Config{MaxIdleTimeout: idleTimeout},
)
Expect(err).ToNot(HaveOccurred())
strIn, err := sess.AcceptStream(context.Background())
@@ -155,7 +155,7 @@ var _ = Describe("Timeout tests", func() {
sess, err := quic.DialAddr(
fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
getTLSClientConfig(),
&quic.Config{IdleTimeout: idleTimeout},
&quic.Config{MaxIdleTimeout: idleTimeout},
)
Expect(err).ToNot(HaveOccurred())
startTime := time.Now()
@@ -196,7 +196,7 @@ var _ = Describe("Timeout tests", func() {
sess, err := quic.DialAddr(
fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port),
getTLSClientConfig(),
&quic.Config{IdleTimeout: idleTimeout},
&quic.Config{MaxIdleTimeout: idleTimeout},
)
Expect(err).ToNot(HaveOccurred())