commit 59c653b852366c72b7b865219aa7c46831419b90
author fkastenholz <fkastenholz@google.com> Mon Jul 15 09:55:53 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 15 09:56:42 2019 -0700
tree 90e02859e7844fc37cfcb7907627f1dc95e5bf4f
parent b402517c01d42d3930b8add316ae6d74b9712cbd

Change delayed_ack_time to local_.. and peer...

Changes the name of delayed_ack_time_ to local_max_ack_delay_.
Add peer_max_ack_delay_, to be the delay that the peer is using.
This is a refactoring/etc in preparation of supporting the max ack
delay transport parameter negotiation for IETF QUIC.

gfe-relnote: N/A just a refactoring/name-change.
PiperOrigin-RevId: 258183470
Change-Id: I90d670b6a3d9516a224d6ef06f57d9111ffd1e2c

quic/core/quic_sent_packet_manager.h

diff --git a/quic/core/quic_sent_packet_manager.h b/quic/core/quic_sent_packet_manager.h
index 944c556..b90d977 100644
--- a/quic/core/quic_sent_packet_manager.h
+++ b/quic/core/quic_sent_packet_manager.h
@@ -353,12 +353,18 @@
     return pending_timer_transmission_count_;
   }
 
-  QuicTime::Delta delayed_ack_time() const { return delayed_ack_time_; }
+  QuicTime::Delta local_max_ack_delay() const { return local_max_ack_delay_; }
 
-  void set_delayed_ack_time(QuicTime::Delta delayed_ack_time) {
+  void set_local_max_ack_delay(QuicTime::Delta local_max_ack_delay) {
     // The delayed ack time should never be more than one half the min RTO time.
-    DCHECK_LE(delayed_ack_time, (min_rto_timeout_ * 0.5));
-    delayed_ack_time_ = delayed_ack_time;
+    DCHECK_LE(local_max_ack_delay, (min_rto_timeout_ * 0.5));
+    local_max_ack_delay_ = local_max_ack_delay;
+  }
+
+  QuicTime::Delta peer_max_ack_delay() const { return peer_max_ack_delay_; }
+
+  void set_peer_max_ack_delay(QuicTime::Delta peer_max_ack_delay) {
+    peer_max_ack_delay_ = peer_max_ack_delay;
   }
 
   const QuicUnackedPacketMap& unacked_packets() const {
@@ -604,9 +610,14 @@
   QuicPacketNumber
       largest_packets_peer_knows_is_acked_[NUM_PACKET_NUMBER_SPACES];
 
-  // The maximum amount of time to wait before sending an acknowledgement.
-  // The recovery code assumes the delayed ack time is the same on both sides.
-  QuicTime::Delta delayed_ack_time_;
+  // The local node's maximum ack delay time. This is the maximum amount of
+  // time to wait before sending an acknowledgement.
+  QuicTime::Delta local_max_ack_delay_;
+
+  // The maximum ACK delay time that the peer uses. Initialized to be the
+  // same as local_max_ack_delay_, may be changed via transport parameter
+  // negotiation.
+  QuicTime::Delta peer_max_ack_delay_;
 
   // Latest received ack frame.
   QuicAckFrame last_ack_frame_;