Fix flag counts for quic_do_not_override_connection_id In cl/251599233 I added more flag counts and forgot to update the other ones. gfe-relnote: n/a, flag count only, protected by quic_do_not_override_connection_id PiperOrigin-RevId: 251609520 Change-Id: I02cbeaed9bc2e426e82d34d5f53cf730d9bb4452
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc index 34b5dbb..43885ea 100644 --- a/quic/core/quic_framer.cc +++ b/quic/core/quic_framer.cc
@@ -2707,7 +2707,7 @@ header->destination_connection_id = last_serialized_server_connection_id_; } } else { - QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 5, 5); + QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 5, 7); if (header->source_connection_id_included == CONNECTION_ID_ABSENT) { if (!header->source_connection_id.IsEmpty()) { DCHECK(!version_.SupportsClientConnectionIds());
diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc index e411664..20566de 100644 --- a/quic/core/quic_packet_creator.cc +++ b/quic/core/quic_packet_creator.cc
@@ -750,7 +750,7 @@ if (!GetQuicRestartFlag(quic_do_not_override_connection_id)) { return server_connection_id_; } - QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 1, 5); + QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 1, 7); if (framer_->perspective() == Perspective::IS_SERVER) { return client_connection_id_; } @@ -761,7 +761,7 @@ if (!GetQuicRestartFlag(quic_do_not_override_connection_id)) { return server_connection_id_; } - QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 6, 6); + QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 6, 7); if (framer_->perspective() == Perspective::IS_CLIENT) { return client_connection_id_; } @@ -794,7 +794,7 @@ } if (GetQuicRestartFlag(quic_do_not_override_connection_id) && framer_->perspective() == Perspective::IS_SERVER) { - QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 2, 5); + QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 2, 7); return server_connection_id_included_; } return CONNECTION_ID_ABSENT;
diff --git a/quic/core/quic_packets.cc b/quic/core/quic_packets.cc index 35212b5..0e67689 100644 --- a/quic/core/quic_packets.cc +++ b/quic/core/quic_packets.cc
@@ -43,7 +43,7 @@ !GetQuicRestartFlag(quic_do_not_override_connection_id)) { return header.destination_connection_id; } - QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 3, 5); + QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 3, 7); return header.source_connection_id; } @@ -54,7 +54,7 @@ !GetQuicRestartFlag(quic_do_not_override_connection_id)) { return header.destination_connection_id_included; } - QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 4, 5); + QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 4, 7); return header.source_connection_id_included; } @@ -64,7 +64,7 @@ !GetQuicRestartFlag(quic_do_not_override_connection_id)) { return header.source_connection_id; } - QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 3, 5); + QUIC_RESTART_FLAG_COUNT_N(quic_do_not_override_connection_id, 7, 7); return header.destination_connection_id; }