Land Recent QUIC Changes

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 <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 162 matching lines @@
   CloseConnection(QUIC_PUBLIC_RESET, true);
 }
 
 bool QuicConnection::OnProtocolVersionMismatch(
     QuicVersionTag received_version) {
   // TODO(satyamshekhar): Implement no server state in this mode.
   if (!is_server_) {
     LOG(DFATAL) << "Framer called OnProtocolVersionMismatch for server. "
                 << "Closing connection.";
     CloseConnection(QUIC_INTERNAL_ERROR, false);
+    return false;
   }
   DCHECK_NE(quic_version_, received_version);
 
   if (debug_visitor_) {
     debug_visitor_->OnProtocolVersionMismatch(received_version);
   }
 
   switch (version_negotiation_state_) {
     case START_NEGOTIATION:
       if (!framer_.IsSupportedVersion(received_version)) {
@@ skipping 29 matching lines @@
   return true;
 }
 
 // Handles version negotiation for client connection.
 void QuicConnection::OnVersionNegotiationPacket(
     const QuicVersionNegotiationPacket& packet) {
   if (is_server_) {
     LOG(DFATAL) << "Framer parsed VersionNegotiationPacket for server."
                 << "Closing connection.";
     CloseConnection(QUIC_INTERNAL_ERROR, false);
+    return;
   }
   if (debug_visitor_) {
     debug_visitor_->OnVersionNegotiationPacket(packet);
   }
 
   if (version_negotiation_state_ == NEGOTIATED_VERSION) {
     // Possibly a duplicate version negotiation packet.
     return;
   }
 
@@ skipping 1000 matching lines @@
            << " delta:" << delta.ToMicroseconds();
   if (delta >= timeout_) {
     SendConnectionClose(QUIC_CONNECTION_TIMED_OUT);
     return true;
   }
   helper_->SetTimeoutAlarm(timeout_.Subtract(delta));
   return false;
 }
 
 }  // namespace net