QUIC - Added separate error condition for invalid expiry seconds and

net/quic/crypto/quic_crypto_client_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_client_config.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ skipping 22 matching lines @@
 namespace {
 
 enum ServerConfigState {
   // WARNING: Do not change the numerical values of any of server config state.
   // Do not remove deprecated server config states - just comment them as
   // deprecated.
   SERVER_CONFIG_EMPTY = 0,
   SERVER_CONFIG_INVALID = 1,
   SERVER_CONFIG_CORRUPTED = 2,
   SERVER_CONFIG_EXPIRED = 3,
+  SERVER_CONFIG_INVALID_EXPIRY_SECONDS = 4,

[wtc, 2014/08/04 23:36:30]

Nit: this can be shortened to "SERVER_CONFIG_INVALID_EXPIRY".

If you make this change, please update histograms.xml as well.

[ramant (doing other things), 2014/08/05 22:07:25]

Done.

 
   // NOTE: Add new server config states only immediately above this line. Make
   // sure to update the QuicServerConfigState enum in
   // tools/metrics/histograms/histograms.xml accordingly.
   SERVER_CONFIG_COUNT
 };
 
 void RecordServerConfigState(ServerConfigState server_config_state) {
   UMA_HISTOGRAM_ENUMERATION("Net.QuicClientHelloServerConfigState",
                             server_config_state, SERVER_CONFIG_COUNT);
@@ skipping 27 matching lines @@
 
   const CryptoHandshakeMessage* scfg = GetServerConfig();
   if (!scfg) {
     // Should be impossible short of cache corruption.
     DCHECK(false);
     RecordServerConfigState(SERVER_CONFIG_CORRUPTED);
     return false;
   }
 
   uint64 expiry_seconds;
-  if (scfg->GetUint64(kEXPY, &expiry_seconds) != QUIC_NO_ERROR ||
-      now.ToUNIXSeconds() >= expiry_seconds) {
+  if (scfg->GetUint64(kEXPY, &expiry_seconds) != QUIC_NO_ERROR) {
+    RecordServerConfigState(SERVER_CONFIG_INVALID_EXPIRY_SECONDS);
+    return false;
+  }
+  if (now.ToUNIXSeconds() >= expiry_seconds) {
+    UMA_HISTOGRAM_TIMES(
+        "Net.QuicClientHelloServerConfig.HowExpired",
+        base::TimeDelta::FromSeconds(now.ToUNIXSeconds() - expiry_seconds));
     RecordServerConfigState(SERVER_CONFIG_EXPIRED);
     return false;
   }
 
   return true;
 }
 
 bool QuicCryptoClientConfig::CachedState::IsEmpty() const {
   return server_config_.empty();
 }
@@ skipping 742 matching lines @@
     return;
   }
 
   // Update canonical version to point at the "most recent" entry.
   canonical_server_map_[suffix_server_id] = server_id;
 
   server_state->InitializeFrom(*canonical_state);
 }
 
 }  // namespace net