Remove unused parameter `server_connection_id` from QuicDispatcher::OnExpiredPackets.
PiperOrigin-RevId: 689449098
diff --git a/quiche/quic/core/quic_buffered_packet_store.cc b/quiche/quic/core/quic_buffered_packet_store.cc
index c881588..0392ecf 100644
--- a/quiche/quic/core/quic_buffered_packet_store.cc
+++ b/quiche/quic/core/quic_buffered_packet_store.cc
@@ -501,9 +501,8 @@
break;
}
std::shared_ptr<BufferedPacketListNode> node_ref = node.shared_from_this();
- QuicConnectionId connection_id = node.original_connection_id;
RemoveFromStore(node);
- visitor_->OnExpiredPackets(connection_id, std::move(node));
+ visitor_->OnExpiredPackets(std::move(node));
}
if (!buffered_sessions_.empty()) {
MaybeSetExpirationAlarm();
diff --git a/quiche/quic/core/quic_buffered_packet_store.h b/quiche/quic/core/quic_buffered_packet_store.h
index c430757..37bd432 100644
--- a/quiche/quic/core/quic_buffered_packet_store.h
+++ b/quiche/quic/core/quic_buffered_packet_store.h
@@ -157,8 +157,7 @@
virtual ~VisitorInterface() {}
// Called for each expired connection when alarm fires.
- virtual void OnExpiredPackets(QuicConnectionId connection_id,
- BufferedPacketList early_arrived_packets) = 0;
+ virtual void OnExpiredPackets(BufferedPacketList early_arrived_packets) = 0;
enum class HandleCidCollisionResult {
kOk,
diff --git a/quiche/quic/core/quic_buffered_packet_store_test.cc b/quiche/quic/core/quic_buffered_packet_store_test.cc
index 265d909..107acaa 100644
--- a/quiche/quic/core/quic_buffered_packet_store_test.cc
+++ b/quiche/quic/core/quic_buffered_packet_store_test.cc
@@ -81,8 +81,7 @@
~QuicBufferedPacketStoreVisitor() override {}
- void OnExpiredPackets(QuicConnectionId /*connection_id*/,
- BufferedPacketList early_arrived_packets) override {
+ void OnExpiredPackets(BufferedPacketList early_arrived_packets) override {
last_expired_packet_queue_ = std::move(early_arrived_packets);
}
diff --git a/quiche/quic/core/quic_dispatcher.cc b/quiche/quic/core/quic_dispatcher.cc
index cfae92b..40f8b11 100644
--- a/quiche/quic/core/quic_dispatcher.cc
+++ b/quiche/quic/core/quic_dispatcher.cc
@@ -1120,10 +1120,7 @@
return false;
}
-// TODO(wub): Remove |server_connection_id| because |early_arrived_packets|
-// already contains the original and replaced connection ID.
void QuicDispatcher::OnExpiredPackets(
- QuicConnectionId /*server_connection_id*/,
BufferedPacketList early_arrived_packets) {
QUIC_CODE_COUNT(quic_reject_buffered_packets_expired);
QuicErrorCode error_code = QUIC_HANDSHAKE_FAILED_PACKETS_BUFFERED_TOO_LONG;
diff --git a/quiche/quic/core/quic_dispatcher.h b/quiche/quic/core/quic_dispatcher.h
index 7678bbb..3214a69 100644
--- a/quiche/quic/core/quic_dispatcher.h
+++ b/quiche/quic/core/quic_dispatcher.h
@@ -159,8 +159,7 @@
QuicConnectionIdHash>;
// QuicBufferedPacketStore::VisitorInterface implementation.
- void OnExpiredPackets(QuicConnectionId server_connection_id,
- QuicBufferedPacketStore::BufferedPacketList
+ void OnExpiredPackets(QuicBufferedPacketStore::BufferedPacketList
early_arrived_packets) override;
HandleCidCollisionResult HandleConnectionIdCollision(
const QuicConnectionId& original_connection_id,
