Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
diff --git a/net/quic/quic_config.cc b/net/quic/quic_config.cc
index f69aa37..b383230 100644
--- a/net/quic/quic_config.cc
+++ b/net/quic/quic_config.cc
@@ -412,6 +412,7 @@
*error_details = "Missing " + QuicUtils::TagToString(tag_);
break;
case QUIC_NO_ERROR:
+ DVLOG(1) << "Received Connection Option tags from receiver.";
has_receive_values_ = true;
for (size_t i = 0; i < received_tags_length; ++i) {
receive_values_.push_back(received_tags[i]);
@@ -426,7 +427,7 @@
QuicConfig::QuicConfig()
: congestion_feedback_(kCGST, PRESENCE_REQUIRED),
- congestion_options_(kCOPT, PRESENCE_OPTIONAL),
+ connection_options_(kCOPT, PRESENCE_OPTIONAL),
loss_detection_(kLOSS, PRESENCE_OPTIONAL),
idle_connection_state_lifetime_seconds_(kICSL, PRESENCE_REQUIRED),
keepalive_timeout_seconds_(kKATO, PRESENCE_OPTIONAL),
@@ -434,8 +435,8 @@
max_time_before_crypto_handshake_(QuicTime::Delta::Zero()),
initial_congestion_window_(kSWND, PRESENCE_OPTIONAL),
initial_round_trip_time_us_(kIRTT, PRESENCE_OPTIONAL),
- // TODO(rjshade): Make this PRESENCE_REQUIRED when retiring
- // QUIC_VERSION_17.
+ // TODO(rjshade): Make this PRESENCE_REQUIRED when QUIC_VERSION_16 and
+ // QUIC_VERSION_15 are retired.
initial_flow_control_window_bytes_(kIFCW, PRESENCE_OPTIONAL),
// TODO(rjshade): Make this PRESENCE_REQUIRED when retiring
// QUIC_VERSION_19.
@@ -457,17 +458,25 @@
return congestion_feedback_.GetTag();
}
-void QuicConfig::SetCongestionOptionsToSend(
- const QuicTagVector& congestion_options) {
- congestion_options_.SetSendValues(congestion_options);
+void QuicConfig::SetConnectionOptionsToSend(
+ const QuicTagVector& connection_options) {
+ connection_options_.SetSendValues(connection_options);
}
-bool QuicConfig::HasReceivedCongestionOptions() const {
- return congestion_options_.HasReceivedValues();
+bool QuicConfig::HasReceivedConnectionOptions() const {
+ return connection_options_.HasReceivedValues();
}
-QuicTagVector QuicConfig::ReceivedCongestionOptions() const {
- return congestion_options_.GetReceivedValues();
+QuicTagVector QuicConfig::ReceivedConnectionOptions() const {
+ return connection_options_.GetReceivedValues();
+}
+
+bool QuicConfig::HasSendConnectionOptions() const {
+ return connection_options_.HasSendValues();
+}
+
+QuicTagVector QuicConfig::SendConnectionOptions() const {
+ return connection_options_.GetSendValues();
}
void QuicConfig::SetLossDetectionToSend(QuicTag loss_detection) {
@@ -659,7 +668,7 @@
initial_flow_control_window_bytes_.ToHandshakeMessage(out);
initial_stream_flow_control_window_bytes_.ToHandshakeMessage(out);
initial_session_flow_control_window_bytes_.ToHandshakeMessage(out);
- congestion_options_.ToHandshakeMessage(out);
+ connection_options_.ToHandshakeMessage(out);
}
QuicErrorCode QuicConfig::ProcessPeerHello(
@@ -710,7 +719,7 @@
peer_hello, hello_type, error_details);
}
if (error == QUIC_NO_ERROR) {
- error = congestion_options_.ProcessPeerHello(
+ error = connection_options_.ProcessPeerHello(
peer_hello, hello_type, error_details);
}
return error;