From 35da77afd105b587065c4523b4b323e3f7cff4b9 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 3 Mar 2021 21:52:45 +0800
Subject: [PATCH] only accept 0-RTT it the active_connection_id_limit didn't
 change

---
 internal/wire/transport_parameter_test.go | 31 +++++++++++------------
 internal/wire/transport_parameters.go     |  3 ++-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/internal/wire/transport_parameter_test.go b/internal/wire/transport_parameter_test.go
index 02e6d77e..2dca346d 100644
--- a/internal/wire/transport_parameter_test.go
+++ b/internal/wire/transport_parameter_test.go
@@ -482,7 +482,7 @@ var _ = Describe("Transport Parameters", func() {
 		})
 
 		Context("rejects the parameters if they changed", func() {
-			var p *TransportParameters
+			var p TransportParameters
 			params := &TransportParameters{
 				InitialMaxStreamDataBidiLocal:  1,
 				InitialMaxStreamDataBidiRemote: 2,
@@ -490,48 +490,47 @@ var _ = Describe("Transport Parameters", func() {
 				InitialMaxData:                 4,
 				MaxBidiStreamNum:               5,
 				MaxUniStreamNum:                6,
+				ActiveConnectionIDLimit:        7,
 			}
 
 			BeforeEach(func() {
-				p = &TransportParameters{
-					InitialMaxStreamDataBidiLocal:  1,
-					InitialMaxStreamDataBidiRemote: 2,
-					InitialMaxStreamDataUni:        3,
-					InitialMaxData:                 4,
-					MaxBidiStreamNum:               5,
-					MaxUniStreamNum:                6,
-				}
-				Expect(params.ValidFor0RTT(p)).To(BeTrue())
+				p = *params
+				Expect(params.ValidFor0RTT(&p)).To(BeTrue())
 			})
 
 			It("rejects the parameters if the InitialMaxStreamDataBidiLocal changed", func() {
 				p.InitialMaxStreamDataBidiLocal = 0
-				Expect(params.ValidFor0RTT(p)).To(BeFalse())
+				Expect(params.ValidFor0RTT(&p)).To(BeFalse())
 			})
 
 			It("rejects the parameters if the InitialMaxStreamDataBidiRemote changed", func() {
 				p.InitialMaxStreamDataBidiRemote = 0
-				Expect(params.ValidFor0RTT(p)).To(BeFalse())
+				Expect(params.ValidFor0RTT(&p)).To(BeFalse())
 			})
 
 			It("rejects the parameters if the InitialMaxStreamDataUni changed", func() {
 				p.InitialMaxStreamDataUni = 0
-				Expect(params.ValidFor0RTT(p)).To(BeFalse())
+				Expect(params.ValidFor0RTT(&p)).To(BeFalse())
 			})
 
 			It("rejects the parameters if the InitialMaxData changed", func() {
 				p.InitialMaxData = 0
-				Expect(params.ValidFor0RTT(p)).To(BeFalse())
+				Expect(params.ValidFor0RTT(&p)).To(BeFalse())
 			})
 
 			It("rejects the parameters if the MaxBidiStreamNum changed", func() {
 				p.MaxBidiStreamNum = 0
-				Expect(params.ValidFor0RTT(p)).To(BeFalse())
+				Expect(params.ValidFor0RTT(&p)).To(BeFalse())
 			})
 
 			It("rejects the parameters if the MaxUniStreamNum changed", func() {
 				p.MaxUniStreamNum = 0
-				Expect(params.ValidFor0RTT(p)).To(BeFalse())
+				Expect(params.ValidFor0RTT(&p)).To(BeFalse())
+			})
+
+			It("rejects the parameters if the ActiveConnectionIDLimit changed", func() {
+				p.ActiveConnectionIDLimit = 0
+				Expect(params.ValidFor0RTT(&p)).To(BeFalse())
 			})
 		})
 	})
diff --git a/internal/wire/transport_parameters.go b/internal/wire/transport_parameters.go
index 14724a7e..d4c8194e 100644
--- a/internal/wire/transport_parameters.go
+++ b/internal/wire/transport_parameters.go
@@ -446,7 +446,8 @@ func (p *TransportParameters) ValidFor0RTT(tp *TransportParameters) bool {
 		p.InitialMaxStreamDataUni == tp.InitialMaxStreamDataUni &&
 		p.InitialMaxData == tp.InitialMaxData &&
 		p.MaxBidiStreamNum == tp.MaxBidiStreamNum &&
-		p.MaxUniStreamNum == tp.MaxUniStreamNum
+		p.MaxUniStreamNum == tp.MaxUniStreamNum &&
+		p.ActiveConnectionIDLimit == tp.ActiveConnectionIDLimit
 }
 
 // String returns a string representation, intended for logging.