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 156 matching lines @@
           break;
         case NONCE_INVALID_TIME_FAILURE:
           client_nonce_error = CLIENT_NONCE_INVALID_TIME_FAILURE;
           break;
         case STRIKE_REGISTER_TIMEOUT:
           client_nonce_error = CLIENT_NONCE_STRIKE_REGISTER_TIMEOUT;
           break;
         case STRIKE_REGISTER_FAILURE:
           client_nonce_error = CLIENT_NONCE_STRIKE_REGISTER_FAILURE;
           break;
+        case NONCE_UNKNOWN_FAILURE:
+          client_nonce_error = CLIENT_NONCE_UNKNOWN_FAILURE;
+          break;
         case NONCE_OK:
-        case NONCE_UNKNOWN_FAILURE:
         default:
-          LOG(WARNING) << "Unexpected nonce error: " << nonce_error;
+          LOG(DFATAL) << "Unexpected client nonce error: " << nonce_error;
           client_nonce_error = CLIENT_NONCE_UNKNOWN_FAILURE;
           break;
       }
       result_->info.reject_reasons.push_back(client_nonce_error);
     }
     done_cb_->Run(result_);
   }
 
  private:
   ValidateClientHelloResultCallback::Result* result_;
@@ skipping 1287 matching lines @@
           StrikeRegister::NO_STARTUP_PERIOD_NEEDED));
     }
     nonce_error = server_nonce_strike_register_->Insert(
         server_nonce, static_cast<uint32>(now.ToUNIXSeconds()));
   }
 
   switch (nonce_error) {
     case NONCE_OK:
       return HANDSHAKE_OK;
     case NONCE_INVALID_FAILURE:
+    case NONCE_INVALID_ORBIT_FAILURE:
       return SERVER_NONCE_INVALID_FAILURE;
     case NONCE_NOT_UNIQUE_FAILURE:
       return SERVER_NONCE_NOT_UNIQUE_FAILURE;
     case NONCE_INVALID_TIME_FAILURE:
       return SERVER_NONCE_INVALID_TIME_FAILURE;
     case NONCE_UNKNOWN_FAILURE:
-    case NONCE_INVALID_ORBIT_FAILURE:
     case STRIKE_REGISTER_TIMEOUT:
     case STRIKE_REGISTER_FAILURE:
     default:
-      LOG(WARNING) << "Unexpected nonce error: " << nonce_error;
+      LOG(DFATAL) << "Unexpected server nonce error: " << nonce_error;
       return SERVER_NONCE_NOT_UNIQUE_FAILURE;
   }
 }
 
 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