From 1dd0b9a635898354f5ebeabc1abb147edfc5e0a2 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Tue, 13 Nov 2018 14:17:40 +0700
Subject: [PATCH] rename the duration that we keep old connection ID mappings
 alive

---
 internal/protocol/server_parameters.go |  4 ++--
 packet_handler_map.go                  | 14 +++++++-------
 packet_handler_map_test.go             |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/internal/protocol/server_parameters.go b/internal/protocol/server_parameters.go
index 2968dc31b..ae189bad8 100644
--- a/internal/protocol/server_parameters.go
+++ b/internal/protocol/server_parameters.go
@@ -94,9 +94,9 @@ const DefaultIdleTimeout = 30 * time.Second
 // DefaultHandshakeTimeout is the default timeout for a connection until the crypto handshake succeeds.
 const DefaultHandshakeTimeout = 10 * time.Second
 
-// ClosedSessionDeleteTimeout the server ignores packets arriving on a connection that is already closed
+// RetiredConnectionIDDeleteTimeout is the time we keep closed sessions around in order to retransmit the CONNECTION_CLOSE.
 // after this time all information about the old connection will be deleted
-const ClosedSessionDeleteTimeout = time.Minute
+const RetiredConnectionIDDeleteTimeout = time.Minute
 
 // MinStreamFrameSize is the minimum size that has to be left in a packet, so that we add another STREAM frame.
 // This avoids splitting up STREAM frames into small pieces, which has 2 advantages:
diff --git a/packet_handler_map.go b/packet_handler_map.go
index ebc751e26..05ad3e0fc 100644
--- a/packet_handler_map.go
+++ b/packet_handler_map.go
@@ -26,7 +26,7 @@ type packetHandlerMap struct {
 	server   unknownPacketHandler
 	closed   bool
 
-	deleteClosedSessionsAfter time.Duration
+	deleteRetiredSessionsAfter time.Duration
 
 	logger utils.Logger
 }
@@ -35,11 +35,11 @@ var _ packetHandlerManager = &packetHandlerMap{}
 
 func newPacketHandlerMap(conn net.PacketConn, connIDLen int, logger utils.Logger) packetHandlerManager {
 	m := &packetHandlerMap{
-		conn:                      conn,
-		connIDLen:                 connIDLen,
-		handlers:                  make(map[string]packetHandler),
-		deleteClosedSessionsAfter: protocol.ClosedSessionDeleteTimeout,
-		logger:                    logger,
+		conn:                       conn,
+		connIDLen:                  connIDLen,
+		handlers:                   make(map[string]packetHandler),
+		deleteRetiredSessionsAfter: protocol.RetiredConnectionIDDeleteTimeout,
+		logger:                     logger,
 	}
 	go m.listen()
 	return m
@@ -56,7 +56,7 @@ func (h *packetHandlerMap) Retire(id protocol.ConnectionID) {
 }
 
 func (h *packetHandlerMap) retireByConnectionIDAsString(id string) {
-	time.AfterFunc(h.deleteClosedSessionsAfter, func() {
+	time.AfterFunc(h.deleteRetiredSessionsAfter, func() {
 		h.mutex.Lock()
 		delete(h.handlers, id)
 		h.mutex.Unlock()
diff --git a/packet_handler_map_test.go b/packet_handler_map_test.go
index f5ac5320e..13d5b2d7f 100644
--- a/packet_handler_map_test.go
+++ b/packet_handler_map_test.go
@@ -89,7 +89,7 @@ var _ = Describe("Packet Handler Map", func() {
 		})
 
 		It("deletes closed session entries after a wait time", func() {
-			handler.deleteClosedSessionsAfter = 10 * time.Millisecond
+			handler.deleteRetiredSessionsAfter = 10 * time.Millisecond
 			connID := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
 			handler.Add(connID, NewMockPacketHandler(mockCtrl))
 			handler.Retire(connID)
@@ -98,7 +98,7 @@ var _ = Describe("Packet Handler Map", func() {
 		})
 
 		It("passes packets arriving late for closed sessions to that session", func() {
-			handler.deleteClosedSessionsAfter = time.Hour
+			handler.deleteRetiredSessionsAfter = time.Hour
 			connID := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
 			packetHandler := NewMockPacketHandler(mockCtrl)
 			packetHandler.EXPECT().GetVersion().Return(protocol.VersionWhatever)