Land Recent QUIC Changes.

net/quic/quic_crypto_server_stream.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_crypto_server_stream.h"
 
 #include "base/base64.h"
 #include "crypto/secure_hash.h"
 #include "net/quic/crypto/cached_network_parameters.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_utils.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
 
 using std::string;
 
 namespace net {
 
 void ServerHelloNotifier::OnAckNotification(
-    int num_original_packets,
-    int num_original_bytes,
     int num_retransmitted_packets,
     int num_retransmitted_bytes,
     QuicTime::Delta delta_largest_observed) {
   server_stream_->OnServerHelloAcked();
 }
 
 QuicCryptoServerStream::QuicCryptoServerStream(
     const QuicCryptoServerConfig& crypto_config,
     QuicSession* session)
     : QuicCryptoStream(session),
@@ skipping 89 matching lines @@
       crypto_negotiated_params_.initial_crypters.encrypter.release());
   session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_INITIAL);
   // Set the decrypter immediately so that we no longer accept unencrypted
   // packets.
   session()->connection()->SetDecrypter(
       crypto_negotiated_params_.initial_crypters.decrypter.release(),
       ENCRYPTION_INITIAL);
 
   // We want to be notified when the SHLO is ACKed so that we can disable
   // HANDSHAKE_MODE in the sent packet manager.
-  if (session()->connection()->version() <= QUIC_VERSION_21) {
-    SendHandshakeMessage(reply);
-  } else {
-    scoped_refptr<ServerHelloNotifier> server_hello_notifier(
-        new ServerHelloNotifier(this));
-    SendHandshakeMessage(reply, server_hello_notifier.get());
-  }
+  scoped_refptr<ServerHelloNotifier> server_hello_notifier(
+      new ServerHelloNotifier(this));
+  SendHandshakeMessage(reply, server_hello_notifier.get());
 
   session()->connection()->SetEncrypter(
       ENCRYPTION_FORWARD_SECURE,
       crypto_negotiated_params_.forward_secure_crypters.encrypter.release());
   session()->connection()->SetAlternativeDecrypter(
       crypto_negotiated_params_.forward_secure_crypters.decrypter.release(),
       ENCRYPTION_FORWARD_SECURE, false /* don't latch */);
 
   encryption_established_ = true;
   handshake_confirmed_ = true;
   session()->OnCryptoHandshakeEvent(QuicSession::HANDSHAKE_CONFIRMED);
 }
 
 void QuicCryptoServerStream::SendServerConfigUpdate(
     const CachedNetworkParameters* cached_network_params) {
-  if (session()->connection()->version() <= QUIC_VERSION_21 ||
-      !handshake_confirmed_) {
+  if (!handshake_confirmed_) {
     return;
   }
 
   CryptoHandshakeMessage server_config_update_message;
   if (!crypto_config_.BuildServerConfigUpdateMessage(
           previous_source_address_tokens_,
           session()->connection()->self_address(),
           session()->connection()->peer_address(),
           session()->connection()->clock(),
           session()->connection()->random_generator(),
@@ skipping 90 matching lines @@
 
 void QuicCryptoServerStream::ValidateCallback::RunImpl(
     const CryptoHandshakeMessage& client_hello,
     const Result& result) {
   if (parent_ != nullptr) {
     parent_->FinishProcessingHandshakeMessage(client_hello, result);
   }
 }
 
 }  // namespace net