commit f7f203a5c1101d477be3baf0915cf35945d4b5fb
author mattm <mattm@google.com> Fri Oct 23 12:19:32 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Oct 23 12:20:04 2020 -0700
tree 11083e5d5172c79eb6460488336d1d7c09314afb
parent a687b7cabb03a4cdc818b58d99379afef63cb897

Add QuicConfig::KeyUpdateSupportedRemotely getter.

PiperOrigin-RevId: 338721786
Change-Id: I9b7e47138fa67d4b642d0e4a28119a5cc4cbbb58

quic/core/quic_config.cc

diff --git a/quic/core/quic_config.cc b/quic/core/quic_config.cc
index 60569b3..3e833ea 100644
--- a/quic/core/quic_config.cc
+++ b/quic/core/quic_config.cc
@@ -870,13 +870,17 @@
 }
 
 bool QuicConfig::KeyUpdateSupportedForConnection() const {
-  return key_update_supported_remotely_ && KeyUpdateSupportedLocally();
+  return KeyUpdateSupportedRemotely() && KeyUpdateSupportedLocally();
 }
 
 bool QuicConfig::KeyUpdateSupportedLocally() const {
   return key_update_supported_locally_;
 }
 
+bool QuicConfig::KeyUpdateSupportedRemotely() const {
+  return key_update_supported_remotely_;
+}
+
 void QuicConfig::SetIPv6AlternateServerAddressToSend(
     const QuicSocketAddress& alternate_server_address_ipv6) {
   if (!alternate_server_address_ipv6.host().IsIPv6()) {

quic/core/quic_config.h

diff --git a/quic/core/quic_config.h b/quic/core/quic_config.h
index 016d5d0..6e9eee1 100644
--- a/quic/core/quic_config.h
+++ b/quic/core/quic_config.h
@@ -391,6 +391,7 @@
   void SetKeyUpdateSupportedLocally();
   bool KeyUpdateSupportedForConnection() const;
   bool KeyUpdateSupportedLocally() const;
+  bool KeyUpdateSupportedRemotely() const;
 
   // IPv6 alternate server address.
   void SetIPv6AlternateServerAddressToSend(

quic/core/quic_config_test.cc

diff --git a/quic/core/quic_config_test.cc b/quic/core/quic_config_test.cc
index 73e8d97..f7f1618 100644
--- a/quic/core/quic_config_test.cc
+++ b/quic/core/quic_config_test.cc
@@ -57,6 +57,7 @@
   EXPECT_FALSE(config_.HasReceivedMaxPacketSize());
   EXPECT_FALSE(config_.KeyUpdateSupportedForConnection());
   EXPECT_FALSE(config_.KeyUpdateSupportedLocally());
+  EXPECT_FALSE(config_.KeyUpdateSupportedRemotely());
 }
 
 TEST_P(QuicConfigTest, AutoSetIetfFlowControl) {
@@ -682,6 +683,7 @@
   }
   EXPECT_FALSE(config_.KeyUpdateSupportedForConnection());
   EXPECT_FALSE(config_.KeyUpdateSupportedLocally());
+  EXPECT_FALSE(config_.KeyUpdateSupportedRemotely());
   TransportParameters params;
   params.key_update_not_yet_supported = true;
   std::string error_details;
@@ -690,6 +692,7 @@
               IsQuicNoError());
   EXPECT_FALSE(config_.KeyUpdateSupportedForConnection());
   EXPECT_FALSE(config_.KeyUpdateSupportedLocally());
+  EXPECT_FALSE(config_.KeyUpdateSupportedRemotely());
 }
 
 TEST_P(QuicConfigTest, KeyUpdateNotYetSupportedTransportParameter) {
@@ -727,6 +730,7 @@
               IsQuicNoError());
   EXPECT_FALSE(config_.KeyUpdateSupportedForConnection());
   EXPECT_FALSE(config_.KeyUpdateSupportedLocally());
+  EXPECT_TRUE(config_.KeyUpdateSupportedRemotely());
 }
 
 TEST_P(QuicConfigTest, KeyUpdateSupported) {
@@ -746,6 +750,7 @@
               IsQuicNoError());
   EXPECT_TRUE(config_.KeyUpdateSupportedForConnection());
   EXPECT_TRUE(config_.KeyUpdateSupportedLocally());
+  EXPECT_TRUE(config_.KeyUpdateSupportedRemotely());
 }
 
 }  // namespace