Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

net/quic/core/quic_config.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_config.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "net/quic/core/crypto/crypto_handshake_message.h"
@@ skipping 308 matching lines @@
     }
   }
   return QUIC_NO_ERROR;
 }
 
 QuicConfig::QuicConfig()
     : max_time_before_crypto_handshake_(QuicTime::Delta::Zero()),
       max_idle_time_before_crypto_handshake_(QuicTime::Delta::Zero()),
       max_undecryptable_packets_(0),
       connection_options_(kCOPT, PRESENCE_OPTIONAL),
+      client_connection_options_(kCLOP, PRESENCE_OPTIONAL),
       idle_network_timeout_seconds_(kICSL, PRESENCE_REQUIRED),
       silent_close_(kSCLS, PRESENCE_OPTIONAL),
       max_streams_per_connection_(kMSPC, PRESENCE_OPTIONAL),
       max_incoming_dynamic_streams_(kMIDS, PRESENCE_OPTIONAL),
       bytes_for_connection_id_(kTCID, PRESENCE_OPTIONAL),
       initial_round_trip_time_us_(kIRTT, PRESENCE_OPTIONAL),
       initial_stream_flow_control_window_bytes_(kSFCW, PRESENCE_OPTIONAL),
       initial_session_flow_control_window_bytes_(kCFCW, PRESENCE_OPTIONAL),
       socket_receive_buffer_(kSRBF, PRESENCE_OPTIONAL),
       multipath_enabled_(kMPTH, PRESENCE_OPTIONAL),
@@ skipping 46 matching lines @@
         ContainsQuicTag(ReceivedConnectionOptions(), tag)) {
       return true;
     }
   } else if (HasSendConnectionOptions() &&
              ContainsQuicTag(SendConnectionOptions(), tag)) {
     return true;
   }
   return false;
 }
 
+void QuicConfig::SetClientConnectionOptions(
+    const QuicTagVector& client_connection_options) {
+  client_connection_options_.SetSendValues(client_connection_options);
+}
+
+bool QuicConfig::HasClientRequestedIndependentOption(
+    QuicTag tag,
+    Perspective perspective) const {
+  if (perspective == Perspective::IS_SERVER) {
+    return (HasReceivedConnectionOptions() &&
+            ContainsQuicTag(ReceivedConnectionOptions(), tag));
+  }
+
+  return (client_connection_options_.HasSendValues() &&
+          ContainsQuicTag(client_connection_options_.GetSendValues(), tag));
+}
+
 void QuicConfig::SetIdleNetworkTimeout(
     QuicTime::Delta max_idle_network_timeout,
     QuicTime::Delta default_idle_network_timeout) {
   idle_network_timeout_seconds_.set(
       static_cast<uint32_t>(max_idle_network_timeout.ToSeconds()),
       static_cast<uint32_t>(default_idle_network_timeout.ToSeconds()));
 }
 
 QuicTime::Delta QuicConfig::IdleNetworkTimeout() const {
   return QuicTime::Delta::FromSeconds(
@@ skipping 268 matching lines @@
                                                        error_details);
   }
   if (error == QUIC_NO_ERROR) {
     error = force_hol_blocking_.ProcessPeerHello(peer_hello, hello_type,
                                                  error_details);
   }
   return error;
 }
 
 }  // namespace net