Landing Recent QUIC changes until 8/28/2015 18:03 UTC.

net/quic/quic_connection.cc

 // Copyright (c) 2012 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/quic_connection.h"
 
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
@@ skipping 189 matching lines @@
 class MtuDiscoveryAckListener : public QuicAckNotifier::DelegateInterface {
  public:
   MtuDiscoveryAckListener(QuicConnection* connection, QuicByteCount probe_size)
       : connection_(connection), probe_size_(probe_size) {}
 
   void OnAckNotification(int /*num_retransmittable_packets*/,
                          int /*num_retransmittable_bytes*/,
                          QuicTime::Delta /*delta_largest_observed*/) override {
     // Since the probe was successful, increase the maximum packet size to that.
     if (probe_size_ > connection_->max_packet_length()) {
-      connection_->set_max_packet_length(probe_size_);
+      connection_->SetMaxPacketLength(probe_size_);
     }
   }
 
  protected:
   // MtuDiscoveryAckListener is ref counted.
   ~MtuDiscoveryAckListener() override {}
 
  private:
   QuicConnection* connection_;
   QuicByteCount probe_size_;
@@ skipping 99 matching lines @@
       next_mtu_probe_at_(kPacketsBetweenMtuProbesBase),
       largest_received_packet_size_(0),
       goaway_sent_(false),
       goaway_received_(false) {
   DVLOG(1) << ENDPOINT << "Created connection with connection_id: "
            << connection_id;
   framer_.set_visitor(this);
   framer_.set_received_entropy_calculator(&received_packet_manager_);
   stats_.connection_creation_time = clock_->ApproximateNow();
   sent_packet_manager_.set_network_change_visitor(this);
-  if (perspective_ == Perspective::IS_SERVER) {
-    set_max_packet_length(kDefaultServerMaxPacketSize);
-  }
+  // Allow the packet writer to potentially reduce the packet size to a value
+  // even smaller than kDefaultMaxPacketSize.
+  SetMaxPacketLength(perspective_ == Perspective::IS_SERVER
+                         ? kDefaultServerMaxPacketSize
+                         : kDefaultMaxPacketSize);
 }
 
 QuicConnection::~QuicConnection() {
   if (owns_writer_) {
     delete writer_;
   }
   STLDeleteElements(&undecryptable_packets_);
   STLDeleteValues(&group_map_);
   ClearQueuedPackets();
 }
@@ skipping 31 matching lines @@
     packet_generator_.set_fec_send_policy(FecSendPolicy::FEC_ALARM_TRIGGER);
   }
   if (config.HasClientSentConnectionOption(kFRTT, perspective_)) {
     // TODO(rtenneti): Delete this code after the 0.25 RTT FEC experiment.
     const float kFecTimeoutRttMultiplier = 0.25;
     packet_generator_.set_rtt_multiplier_for_fec_timeout(
         kFecTimeoutRttMultiplier);
   }
 
   if (config.HasClientSentConnectionOption(kMTUH, perspective_)) {
-    mtu_discovery_target_ = kMtuDiscoveryTargetPacketSizeHigh;
+    SetMtuDiscoveryTarget(kMtuDiscoveryTargetPacketSizeHigh);
   }
   if (config.HasClientSentConnectionOption(kMTUL, perspective_)) {
-    mtu_discovery_target_ = kMtuDiscoveryTargetPacketSizeLow;
+    SetMtuDiscoveryTarget(kMtuDiscoveryTargetPacketSizeLow);
   }
 }
 
 void QuicConnection::OnSendConnectionState(
     const CachedNetworkParameters& cached_network_params) {
   if (debug_visitor_ != nullptr) {
     debug_visitor_->OnSendConnectionState(cached_network_params);
   }
 }
 
@@ skipping 341 matching lines @@
   if (!ValidateAckFrame(incoming_ack)) {
     SendConnectionClose(QUIC_INVALID_ACK_DATA);
     return false;
   }
 
   if (FLAGS_quic_process_frames_inline) {
     ProcessAckFrame(incoming_ack);
     if (incoming_ack.is_truncated) {
       should_last_packet_instigate_acks_ = true;
     }
-    if (!incoming_ack.missing_packets.empty() &&
-        GetLeastUnacked() > *incoming_ack.missing_packets.begin()) {
+    if (!incoming_ack.missing_packets.Empty() &&
+        GetLeastUnacked() > incoming_ack.missing_packets.Min()) {
       ++stop_waiting_count_;
     } else {
       stop_waiting_count_ = 0;
     }
   } else {
     last_ack_frames_.push_back(incoming_ack);
   }
   return connected_;
 }
 
@@ skipping 63 matching lines @@
 
   if (incoming_ack.largest_observed < sent_packet_manager_.largest_observed()) {
     DLOG(ERROR) << ENDPOINT << "Peer's largest_observed packet decreased:"
                 << incoming_ack.largest_observed << " vs "
                 << sent_packet_manager_.largest_observed();
     // A new ack has a diminished largest_observed value.  Error out.
     // If this was an old packet, we wouldn't even have checked.
     return false;
   }
 
-  if (!incoming_ack.missing_packets.empty() &&
-      *incoming_ack.missing_packets.rbegin() > incoming_ack.largest_observed) {
+  if (!incoming_ack.missing_packets.Empty() &&
+      incoming_ack.missing_packets.Max() > incoming_ack.largest_observed) {
     DLOG(ERROR) << ENDPOINT << "Peer sent missing packet: "
-                << *incoming_ack.missing_packets.rbegin()
+                << incoming_ack.missing_packets.Max()
                 << " which is greater than largest observed: "
                 << incoming_ack.largest_observed;
     return false;
   }
 
-  if (!incoming_ack.missing_packets.empty() &&
-      *incoming_ack.missing_packets.begin() <
+  if (!incoming_ack.missing_packets.Empty() &&
+      incoming_ack.missing_packets.Min() <
           sent_packet_manager_.least_packet_awaited_by_peer()) {
     DLOG(ERROR) << ENDPOINT << "Peer sent missing packet: "
-                << *incoming_ack.missing_packets.begin()
+                << incoming_ack.missing_packets.Min()
                 << " which is smaller than least_packet_awaited_by_peer_: "
                 << sent_packet_manager_.least_packet_awaited_by_peer();
     return false;
   }
 
   if (!sent_entropy_manager_.IsValidEntropy(
           incoming_ack.largest_observed,
           incoming_ack.missing_packets,
           incoming_ack.entropy_hash)) {
     DLOG(ERROR) << ENDPOINT << "Peer sent invalid entropy.";
     return false;
   }
 
   for (QuicPacketNumber revived_packet : incoming_ack.revived_packets) {
-    if (!ContainsKey(incoming_ack.missing_packets, revived_packet)) {
+    if (!incoming_ack.missing_packets.Contains(revived_packet)) {
       DLOG(ERROR) << ENDPOINT
                   << "Peer specified revived packet which was not missing.";
       return false;
     }
   }
   return true;
 }
 
 bool QuicConnection::ValidateStopWaitingFrame(
     const QuicStopWaitingFrame& stop_waiting) {
@@ skipping 25 matching lines @@
     group->UpdateFec(last_decrypted_packet_level_,
                      last_header_.packet_packet_number, fec);
   }
 }
 
 bool QuicConnection::OnRstStreamFrame(const QuicRstStreamFrame& frame) {
   DCHECK(connected_);
   if (debug_visitor_ != nullptr) {
     debug_visitor_->OnRstStreamFrame(frame);
   }
-  DVLOG(1) << ENDPOINT << "Stream reset with error "
+  DVLOG(1) << ENDPOINT
+           << "RST_STREAM_FRAME received for stream: " << frame.stream_id
+           << " with error: "
            << QuicUtils::StreamErrorToString(frame.error_code);
   if (FLAGS_quic_process_frames_inline) {
     visitor_->OnRstStream(frame);
     should_last_packet_instigate_acks_ = true;
   } else {
     last_rst_frames_.push_back(frame);
   }
   return connected_;
 }
 
 bool QuicConnection::OnConnectionCloseFrame(
     const QuicConnectionCloseFrame& frame) {
   DCHECK(connected_);
   if (debug_visitor_ != nullptr) {
     debug_visitor_->OnConnectionCloseFrame(frame);
   }
-  DVLOG(1) << ENDPOINT << "Connection " << connection_id()
-           << " closed with error "
-           << QuicUtils::ErrorToString(frame.error_code)
+  DVLOG(1) << ENDPOINT << "CONNECTION_CLOSE_FRAME received for connection: "
+           << connection_id()
+           << " with error: " << QuicUtils::ErrorToString(frame.error_code)
            << " " << frame.error_details;
   if (FLAGS_quic_process_frames_inline) {
     CloseConnection(frame.error_code, true);
   } else {
     last_close_frames_.push_back(frame);
   }
   return connected_;
 }
 
 bool QuicConnection::OnGoAwayFrame(const QuicGoAwayFrame& frame) {
   DCHECK(connected_);
   if (debug_visitor_ != nullptr) {
     debug_visitor_->OnGoAwayFrame(frame);
   }
-  DVLOG(1) << ENDPOINT << "Go away received with error "
-           << QuicUtils::ErrorToString(frame.error_code)
-           << " and reason:" << frame.reason_phrase;
+  DVLOG(1) << ENDPOINT << "GOAWAY_FRAME received with last good stream: "
+           << frame.last_good_stream_id
+           << " and error: " << QuicUtils::ErrorToString(frame.error_code)
+           << " and reason: " << frame.reason_phrase;
 
   goaway_received_ = true;
   if (FLAGS_quic_process_frames_inline) {
     visitor_->OnGoAway(frame);
     should_last_packet_instigate_acks_ = true;
   } else {
     last_goaway_frames_.push_back(frame);
   }
   return connected_;
 }
 
 bool QuicConnection::OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) {
   DCHECK(connected_);
   if (debug_visitor_ != nullptr) {
     debug_visitor_->OnWindowUpdateFrame(frame);
   }
-  DVLOG(1) << ENDPOINT << "WindowUpdate received for stream: "
-           << frame.stream_id << " with byte offset: " << frame.byte_offset;
+  DVLOG(1) << ENDPOINT
+           << "WINDOW_UPDATE_FRAME received for stream: " << frame.stream_id
+           << " with byte offset: " << frame.byte_offset;
   if (FLAGS_quic_process_frames_inline) {
     visitor_->OnWindowUpdateFrame(frame);
     should_last_packet_instigate_acks_ = true;
   } else {
     last_window_update_frames_.push_back(frame);
   }
   return connected_;
 }
 
 bool QuicConnection::OnBlockedFrame(const QuicBlockedFrame& frame) {
   DCHECK(connected_);
   if (debug_visitor_ != nullptr) {
     debug_visitor_->OnBlockedFrame(frame);
   }
-  DVLOG(1) << ENDPOINT << "Blocked frame received for stream: "
-           << frame.stream_id;
+  DVLOG(1) << ENDPOINT
+           << "BLOCKED_FRAME received for stream: " << frame.stream_id;
   if (FLAGS_quic_process_frames_inline) {
     visitor_->OnBlockedFrame(frame);
     should_last_packet_instigate_acks_ = true;
   } else {
     last_blocked_frames_.push_back(frame);
   }
   return connected_;
 }
 
 void QuicConnection::OnPacketComplete() {
@@ skipping 195 matching lines @@
   return false;
 }
 
 void QuicConnection::UpdateStopWaitingCount() {
   if (last_ack_frames_.empty()) {
     return;
   }
 
   // If the peer is still waiting for a packet that we are no longer planning to
   // send, send an ack to raise the high water mark.
-  if (!last_ack_frames_.back().missing_packets.empty() &&
-      GetLeastUnacked() > *last_ack_frames_.back().missing_packets.begin()) {
+  if (!last_ack_frames_.back().missing_packets.Empty() &&
+      GetLeastUnacked() > last_ack_frames_.back().missing_packets.Min()) {
     ++stop_waiting_count_;
   } else {
     stop_waiting_count_ = 0;
   }
 }
 
 QuicPacketNumber QuicConnection::GetLeastUnacked() const {
   return sent_packet_manager_.GetLeastUnacked();
 }
 
@@ skipping 204 matching lines @@
 
     // Store in case we want to migrate connection in ProcessValidatedPacket.
     migrating_peer_ip_ = peer_address.address();
     migrating_peer_port_ = peer_address.port();
   }
 
   if (!self_address.address().empty() && !self_address_.address().empty()) {
     self_ip_changed_ = (self_address.address() != self_address_.address());
     self_port_changed_ = (self_address.port() != self_address_.port());
   }
+
+  // TODO(vasilvv): reset maximum packet size on connection migration. Whenever
+  // the connection is migrated, it usually ends up being on a different path,
+  // with possibly smaller MTU.  This means the max packet size has to be reset
+  // and MTU discovery mechanism re-initialized.  The main reason the code does
+  // not do it now is that the retransmission code currently cannot deal with
+  // the case when it needs to resend a packet created with larger MTU (see
+  // b/22172803).
 }
 
 void QuicConnection::OnCanWrite() {
   DCHECK(!writer_->IsWriteBlocked());
 
   WriteQueuedPackets();
   WritePendingRetransmissions();
 
   // Sending queued packets may have caused the socket to become write blocked,
   // or the congestion manager to prohibit sending.  If we've sent everything
@@ skipping 54 matching lines @@
   DVLOG(1) << ENDPOINT << "time of last received packet: "
            << time_of_last_received_packet_.ToDebuggingValue();
 
   if (last_size_ > largest_received_packet_size_) {
     largest_received_packet_size_ = last_size_;
   }
 
   if (perspective_ == Perspective::IS_SERVER &&
       encryption_level_ == ENCRYPTION_NONE &&
       last_size_ > packet_generator_.GetMaxPacketLength()) {
-    set_max_packet_length(last_size_);
+    SetMaxPacketLength(last_size_);
   }
   return true;
 }
 
 void QuicConnection::WriteQueuedPackets() {
   DCHECK(!writer_->IsWriteBlocked());
 
   if (pending_version_negotiation_packet_) {
     SendVersionNegotiationPacket();
   }
@@ skipping 631 matching lines @@
     group_map_.erase(it);
     delete fec_group;
     it = next;
   }
 }
 
 QuicByteCount QuicConnection::max_packet_length() const {
   return packet_generator_.GetMaxPacketLength();
 }
 
-void QuicConnection::set_max_packet_length(QuicByteCount length) {
-  return packet_generator_.SetMaxPacketLength(length, /*force=*/false);
+void QuicConnection::SetMaxPacketLength(QuicByteCount length) {
+  return packet_generator_.SetMaxPacketLength(LimitMaxPacketSize(length),
+                                              /*force=*/false);
 }
 
 bool QuicConnection::HasQueuedData() const {
   return pending_version_negotiation_packet_ ||
       !queued_packets_.empty() || packet_generator_.HasQueuedFrames();
 }
 
 bool QuicConnection::CanWriteStreamData() {
   // Don't write stream data if there are negotiation or queued data packets
   // to send. Otherwise, continue and bundle as many frames as possible.
@@ skipping 209 matching lines @@
     return false;
   }
   for (const QuicFrame& frame : retransmittable_frames->frames()) {
     if (frame.type == CONNECTION_CLOSE_FRAME) {
       return true;
     }
   }
   return false;
 }
 
+void QuicConnection::SetMtuDiscoveryTarget(QuicByteCount target) {
+  mtu_discovery_target_ = LimitMaxPacketSize(target);
+}
+
+QuicByteCount QuicConnection::LimitMaxPacketSize(
+    QuicByteCount suggested_max_packet_size) {
+  if (FLAGS_quic_allow_oversized_packets_for_test) {
+    return suggested_max_packet_size;
+  }
+
+  if (!FLAGS_quic_limit_mtu_by_writer) {
+    return suggested_max_packet_size;
+  }
+
+  if (peer_address_.address().empty()) {
+    LOG(DFATAL) << "Attempted to use a connection without a valid peer address";
+    return suggested_max_packet_size;
+  }
+
+  const QuicByteCount writer_limit = writer_->GetMaxPacketSize(peer_address());
+
+  QuicByteCount max_packet_size = suggested_max_packet_size;
+  if (max_packet_size > writer_limit) {
+    max_packet_size = writer_limit;
+  }
+  if (max_packet_size > kMaxPacketSize) {
+    max_packet_size = kMaxPacketSize;
+  }
+  return max_packet_size;
+}
+
 void QuicConnection::SendMtuDiscoveryPacket(QuicByteCount target_mtu) {
+  // Currently, this limit is ensured by the caller.
+  DCHECK_EQ(target_mtu, LimitMaxPacketSize(target_mtu));
+
   // Create a listener for the new probe.  The ownership of the listener is
   // transferred to the AckNotifierManager.  The notifier will get destroyed
   // before the connection (because it's stored in one of the connection's
   // subfields), hence |this| pointer is guaranteed to stay valid at all times.
   scoped_refptr<MtuDiscoveryAckListener> last_mtu_discovery_ack_listener(
       new MtuDiscoveryAckListener(this, target_mtu));
 
   // Send the probe.
   packet_generator_.GenerateMtuDiscoveryPacket(
       target_mtu, last_mtu_discovery_ack_listener.get());
@@ skipping 16 matching lines @@
       packet_number_of_last_sent_packet_ + packets_between_mtu_probes_ + 1;
   ++mtu_probe_count_;
 
   DVLOG(2) << "Sending a path MTU discovery packet #" << mtu_probe_count_;
   SendMtuDiscoveryPacket(mtu_discovery_target_);
 
   DCHECK(!mtu_discovery_alarm_->IsSet());
 }
 
 }  // namespace net