commit dcae63612462cd937667cae9c348e4519ddd9e79
author fayang <fayang@google.com> Wed Mar 16 13:14:46 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Mar 16 13:15:28 2022 -0700
tree 1a753de3bc583963327e447e6942321f111c1d6b
parent 8abef162bd3257a94f6cf065e84fad58d8182e2a

Add more debug logging for b/112480134.

PiperOrigin-RevId: 435138021

quic/core/quic_packet_creator.cc

diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc
index 95149b1..5fa63b7 100644
--- a/quic/core/quic_packet_creator.cc
+++ b/quic/core/quic_packet_creator.cc
@@ -1124,9 +1124,10 @@
       << ENDPOINT << "Attempt to serialize empty coalesced packet";
   size_t packet_length = 0;
   size_t initial_length = 0;
+  size_t padding_size = 0;
   if (coalesced.initial_packet() != nullptr) {
     // Padding coalesced packet containing initial packet to full.
-    size_t padding_size = coalesced.max_packet_length() - coalesced.length();
+    padding_size = coalesced.max_packet_length() - coalesced.length();
     if (framer_->perspective() == Perspective::IS_SERVER &&
         QuicUtils::ContainsFrameType(
             coalesced.initial_packet()->retransmittable_frames,
@@ -1143,6 +1144,22 @@
              "coalesced packet";
       return 0;
     }
+    QUIC_BUG_IF(quic_reserialize_initial_packet_unexpected_size,
+                coalesced.initial_packet()->encrypted_length + padding_size !=
+                    initial_length)
+        << "Reserialize initial packet in coalescer has unexpected size, "
+           "original_length: "
+        << coalesced.initial_packet()->encrypted_length
+        << ", coalesced.max_packet_length: " << coalesced.max_packet_length()
+        << ", coalesced.length: " << coalesced.length()
+        << ", padding_size: " << padding_size
+        << ", serialized_length: " << initial_length
+        << ", retransmittable frames: "
+        << QuicFramesToString(
+               coalesced.initial_packet()->retransmittable_frames)
+        << ", nonretransmittable frames: "
+        << QuicFramesToString(
+               coalesced.initial_packet()->nonretransmittable_frames);
     buffer += initial_length;
     buffer_len -= initial_length;
     packet_length += initial_length;
@@ -1152,6 +1169,7 @@
     QUIC_BUG(quic_serialize_coalesced_packet_copy_failure)
         << "SerializeCoalescedPacket failed. buffer_len:" << buffer_len
         << ", initial_length:" << initial_length
+        << ", padding_size: " << padding_size
         << ", length_copied:" << length_copied
         << ", coalesced.length:" << coalesced.length()
         << ", coalesced.max_packet_length:" << coalesced.max_packet_length()