From f9ef94f155dd6a026ed74ddf4968a940b4ca4eff Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 21 May 2020 16:23:35 -0700
Subject: [PATCH] Discard Retry packets after successfully decrypting anything
 else

---
 quinn-proto/src/connection/mod.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quinn-proto/src/connection/mod.rs b/quinn-proto/src/connection/mod.rs
index 854f75040..62a930181 100644
--- a/quinn-proto/src/connection/mod.rs
+++ b/quinn-proto/src/connection/mod.rs
@@ -152,6 +152,8 @@ where
     remote_validated: bool,
     /// Total UDP datagram bytes received, tracked for handshake anti-amplification
     total_recvd: u64,
+    /// Number of packets authenticated
+    total_authed_packets: u64,
     total_sent: u64,
 
     streams: Streams,
@@ -247,6 +249,7 @@ where
             receiving_ecn: false,
             remote_validated,
             total_recvd: 0,
+            total_authed_packets: 0,
             total_sent: 0,
 
             streams: Streams::new(
@@ -1262,6 +1265,7 @@ where
         spin: bool,
         is_1rtt: bool,
     ) {
+        self.total_authed_packets += 1;
         self.reset_keep_alive(now);
         self.reset_idle_timeout(now);
         self.permit_idle_reset = true;
@@ -1736,7 +1740,7 @@ where
                             );
                         }
 
-                        if self.retry_src_cid.is_some()
+                        if self.total_authed_packets > 1
                             || packet.payload.len() <= 16 // token + 16 byte tag
                             || !S::is_valid_retry(
                                 &self.rem_cid,