commit 6987b4ab40325b3fab82417cf2ad2125a4819030
author QUICHE team <quiche-dev@google.com> Fri Mar 15 16:23:04 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Mar 16 12:50:20 2019 -0700
tree 8ee2b9a754a6c898b7befeb2719cb43ba91b3299
parent 39a71e5af82f56415d17e6dd22616e26c5b7fe60

Rename ENCRYPTION_NONE to ENCRYPTION_INITIAL

gfe-relnote: n/a (renaming enum value)
PiperOrigin-RevId: 238730788
Change-Id: I628f4a333a257ebffcb018084dc09668ebfcacf1

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index eef291f..cf72fec 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -232,7 +232,7 @@
       per_packet_options_(nullptr),
       writer_(writer),
       owns_writer_(owns_writer),
-      encryption_level_(ENCRYPTION_NONE),
+      encryption_level_(ENCRYPTION_INITIAL),
       clock_(helper->GetClock()),
       random_generator_(helper->GetRandomGenerator()),
       connection_id_(connection_id),
@@ -242,7 +242,7 @@
       last_packet_decrypted_(false),
       last_size_(0),
       current_packet_data_(nullptr),
-      last_decrypted_packet_level_(ENCRYPTION_NONE),
+      last_decrypted_packet_level_(ENCRYPTION_INITIAL),
       should_last_packet_instigate_acks_(false),
       was_last_packet_missing_(false),
       max_undecryptable_packets_(0),
@@ -900,7 +900,7 @@
     debug_visitor_->OnStreamFrame(frame);
   }
   if (frame.stream_id != QuicUtils::GetCryptoStreamId(transport_version()) &&
-      last_decrypted_packet_level_ == ENCRYPTION_NONE) {
+      last_decrypted_packet_level_ == ENCRYPTION_INITIAL) {
     if (MaybeConsiderAsMemoryCorruption(frame)) {
       CloseConnection(QUIC_MAYBE_CORRUPTED_MEMORY,
                       "Received crypto frame on non crypto stream.",
@@ -1968,7 +1968,7 @@
   }
 
   if (perspective_ == Perspective::IS_SERVER &&
-      encryption_level_ == ENCRYPTION_NONE &&
+      encryption_level_ == ENCRYPTION_INITIAL &&
       last_size_ > packet_generator_.GetCurrentMaxPacketLength()) {
     SetMaxPacketLength(last_size_);
   }
@@ -2433,7 +2433,7 @@
 
   QuicPacketNumber packet_number = packet.packet_number;
   if (encryption_level_ == ENCRYPTION_FORWARD_SECURE &&
-      packet.encryption_level == ENCRYPTION_NONE) {
+      packet.encryption_level == ENCRYPTION_INITIAL) {
     // Drop packets that are NULL encrypted since the peer won't accept them
     // anymore.
     QUIC_DLOG(INFO) << ENDPOINT
@@ -2724,7 +2724,8 @@
 void QuicConnection::MaybeProcessUndecryptablePackets() {
   process_undecryptable_packets_alarm_->Cancel();
 
-  if (undecryptable_packets_.empty() || encryption_level_ == ENCRYPTION_NONE) {
+  if (undecryptable_packets_.empty() ||
+      encryption_level_ == ENCRYPTION_INITIAL) {
     return;
   }
 
@@ -3477,7 +3478,7 @@
 bool QuicConnection::MaybeConsiderAsMemoryCorruption(
     const QuicStreamFrame& frame) {
   if (frame.stream_id == QuicUtils::GetCryptoStreamId(transport_version()) ||
-      last_decrypted_packet_level_ != ENCRYPTION_NONE) {
+      last_decrypted_packet_level_ != ENCRYPTION_INITIAL) {
     return false;
   }
 
@@ -3738,7 +3739,7 @@
     }
     return ENCRYPTION_ZERO_RTT;
   }
-  return ENCRYPTION_NONE;
+  return ENCRYPTION_INITIAL;
 }
 
 size_t QuicConnection::min_received_before_ack_decimation() const {