Land Recent QUIC Changes.

net/quic/crypto/quic_crypto_server_config.cc

 // Copyright 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/crypto/quic_crypto_server_config.h"
 
 #include <stdlib.h>
 #include <algorithm>
 
 #include "base/stl_util.h"
@@ skipping 62 matching lines @@
   const IPEndPoint client_ip;
   const QuicWallTime now;
 
   // Outputs from EvaluateClientHello.
   bool valid_source_address_token;
   bool client_nonce_well_formed;
   bool unique;
   StringPiece sni;
   StringPiece client_nonce;
   StringPiece server_nonce;
+  StringPiece user_agent_id;
 };
 
 struct ValidateClientHelloResultCallback::Result {
   Result(const CryptoHandshakeMessage& in_client_hello,
          IPEndPoint in_client_ip,
          QuicWallTime in_now)
       : client_hello(in_client_hello),
         info(in_client_ip, in_now),
         error_code(QUIC_NO_ERROR) {
   }
@@ skipping 789 matching lines @@
     return;
   }
 
   if (client_hello.GetStringPiece(kSNI, &info->sni) &&
       !CryptoUtils::IsValidSNI(info->sni)) {
     helper.ValidationComplete(QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER,
                               "Invalid SNI name");
     return;
   }
 
+  client_hello.GetStringPiece(kUAID, &info->user_agent_id);
+
   StringPiece srct;
   if (requested_config.get() != NULL &&
       client_hello.GetStringPiece(kSourceAddressTokenTag, &srct) &&
       ValidateSourceAddressToken(*requested_config,
                                  srct,
                                  info->client_ip,
                                  info->now)) {
     info->valid_source_address_token = true;
   } else {
     // No server config with the requested ID, or no valid source address token.
@@ skipping 499 matching lines @@
 QuicCryptoServerConfig::Config::Config()
     : channel_id_enabled(false),
       is_primary(false),
       primary_time(QuicWallTime::Zero()),
       priority(0),
       source_address_token_boxer(NULL) {}
 
 QuicCryptoServerConfig::Config::~Config() { STLDeleteElements(&key_exchanges); }
 
 }  // namespace net