Renumber HandshakeFailureReason enums so that there are no big gaps.

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/stl_util.h"
 #include "base/strings/string_util.h"
 #include "net/quic/crypto/cert_compressor.h"
 #include "net/quic/crypto/chacha20_poly1305_encrypter.h"
@@ skipping 577 matching lines @@
   }
 
   const uint32* reject_reasons;
   size_t num_reject_reasons;
   COMPILE_ASSERT(sizeof(QuicTag) == sizeof(uint32), header_out_of_sync);
   if (rej.GetTaglist(kRREJ, &reject_reasons,
                      &num_reject_reasons) == QUIC_NO_ERROR) {
 #if defined(DEBUG)
     uint32 packed_error = 0;
     for (size_t i = 0; i < num_reject_reasons; ++i) {
+      // HANDSHAKE_OK is 0 and don't report that as error.
+      if (reject_reasons[i] == HANDSHAKE_OK || reject_reasons[i] >= 32) {
+        continue;
+      }
       HandshakeFailureReason reason =
           static_cast<HandshakeFailureReason>(reject_reasons[i]);
-      packed_error |= RejectReasonToPackedError(reason);
+      packed_error |= 1 << reason;
     }
     DVLOG(1) << "Reasons for rejection: " << packed_error;
 #endif
   }
 
   return QUIC_NO_ERROR;
 }
 
-uint32 QuicCryptoClientConfig::RejectReasonToPackedError(
-    HandshakeFailureReason reason) {
-  switch (reason) {
-    case HANDSHAKE_OK:
-      return 0;
-    case CLIENT_NONCE_UNKNOWN_FAILURE:
-      return 1u << 5;
-    case CLIENT_NONCE_INVALID_FAILURE:
-      return 2u << 5;
-    case SERVER_NONCE_INVALID_FAILURE:
-      return 1u << 10;
-    case SERVER_NONCE_DECRYPTION_FAILURE:
-      return 2u << 10;
-    case SERVER_NONCE_NOT_UNIQUE_FAILURE:
-      return 3u << 10;
-    case SERVER_CONFIG_INCHOATE_HELLO_FAILURE:
-      return 1u << 15;
-    case SERVER_CONFIG_UNKNOWN_CONFIG_FAILURE:
-      return 2u << 15;
-    case SOURCE_ADDRESS_TOKEN_INVALID_FAILURE:
-      return 1u << 20;
-    case SOURCE_ADDRESS_TOKEN_DECRYPTION_FAILURE:
-      return 2u << 20;
-    case SOURCE_ADDRESS_TOKEN_PARSE_FAILURE:
-      return 3u << 20;
-    case SOURCE_ADDRESS_TOKEN_DIFFERENT_IP_ADDRESS_FAILURE:
-      return 4u << 20;
-    case SOURCE_ADDRESS_TOKEN_CLOCK_SKEW_FAILURE:
-      return 5u << 20;
-    case SOURCE_ADDRESS_TOKEN_EXPIRED_FAILURE:
-      return 6u << 20;
-    default:
-      LOG(FATAL) << "Unsupported RejectReason: " << reason;
-      return 1u << 31;
-  }
-}
-
 QuicErrorCode QuicCryptoClientConfig::ProcessServerHello(
     const CryptoHandshakeMessage& server_hello,
     QuicConnectionId connection_id,
     const QuicVersionVector& negotiated_versions,
     CachedState* cached,
     QuicCryptoNegotiatedParameters* out_params,
     string* error_details) {
   DCHECK(error_details != NULL);
 
   if (server_hello.tag() != kSHLO) {
@@ skipping 141 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