From 4d3a57cfafbfe04c627ccf099f4c53c057fcf616 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 23 Feb 2021 19:04:59 -0800
Subject: [PATCH] Fix regression in application of padding to congestion
 control

These was broken in 095f402a9ff6539620a26a6d5fc44c71901a9d22, and
rendered needlessly complex by
f1628f87a2d9313fbb0954b09cd10e884e64fa57 before it.
---
 quinn-proto/src/connection/mod.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/quinn-proto/src/connection/mod.rs b/quinn-proto/src/connection/mod.rs
index 02b71eca7..d39f26dec 100644
--- a/quinn-proto/src/connection/mod.rs
+++ b/quinn-proto/src/connection/mod.rs
@@ -865,13 +865,13 @@ where
         let ack_eliciting = builder.ack_eliciting;
         let exact_number = builder.exact_number;
         let space_id = builder.space;
-        let (size, _) = self.finish_packet(builder, buffer);
+        let (size, padded) = self.finish_packet(builder, buffer);
         let sent = match sent {
             Some(sent) => sent,
             None => return,
         };
 
-        let size = match sent.padding || ack_eliciting {
+        let size = match padded || ack_eliciting {
             true => size as u16,
             false => 0,
         };
@@ -3613,7 +3613,6 @@ struct SentFrames {
     retransmits: ThinRetransmits,
     acks: RangeSet,
     stream_frames: StreamMetaVec,
-    padding: bool,
     requires_padding: bool,
 }