Landing Recent QUIC changes until 01/31/2016 05:22 UTC

net/quic/quic_utils.cc

 // Copyright (c) 2012 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/quic_utils.h"
 
 #include <ctype.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 233 matching lines @@
     RETURN_STRING_LITERAL(QUIC_CRYPTO_MESSAGE_PARAMETER_NO_OVERLAP);
     RETURN_STRING_LITERAL(QUIC_CRYPTO_MESSAGE_INDEX_NOT_FOUND);
     RETURN_STRING_LITERAL(QUIC_INVALID_STREAM_ID);
     RETURN_STRING_LITERAL(QUIC_INVALID_PRIORITY);
     RETURN_STRING_LITERAL(QUIC_TOO_MANY_OPEN_STREAMS);
     RETURN_STRING_LITERAL(QUIC_PUBLIC_RESET);
     RETURN_STRING_LITERAL(QUIC_INVALID_VERSION);
     RETURN_STRING_LITERAL(QUIC_INVALID_HEADER_ID);
     RETURN_STRING_LITERAL(QUIC_INVALID_NEGOTIATED_VALUE);
     RETURN_STRING_LITERAL(QUIC_DECOMPRESSION_FAILURE);
-    RETURN_STRING_LITERAL(QUIC_CONNECTION_TIMED_OUT);
-    RETURN_STRING_LITERAL(QUIC_CONNECTION_OVERALL_TIMED_OUT);
+    RETURN_STRING_LITERAL(QUIC_NETWORK_IDLE_TIMEOUT);
+    RETURN_STRING_LITERAL(QUIC_HANDSHAKE_TIMEOUT);
     RETURN_STRING_LITERAL(QUIC_ERROR_MIGRATING_ADDRESS);
     RETURN_STRING_LITERAL(QUIC_PACKET_WRITE_ERROR);
     RETURN_STRING_LITERAL(QUIC_PACKET_READ_ERROR);
     RETURN_STRING_LITERAL(QUIC_INVALID_STREAM_FRAME);
     RETURN_STRING_LITERAL(QUIC_INVALID_HEADERS_STREAM_DATA);
     RETURN_STRING_LITERAL(QUIC_FLOW_CONTROL_RECEIVED_TOO_MUCH_DATA);
     RETURN_STRING_LITERAL(QUIC_FLOW_CONTROL_SENT_TOO_MUCH_DATA);
     RETURN_STRING_LITERAL(QUIC_FLOW_CONTROL_INVALID_WINDOW);
     RETURN_STRING_LITERAL(QUIC_CONNECTION_IP_POOLED);
     RETURN_STRING_LITERAL(QUIC_PROOF_INVALID);
@@ skipping 186 matching lines @@
     delete it->stream_frame;
     it = frames->erase(it);
   }
 }
 
 // static
 void QuicUtils::ClearSerializedPacket(SerializedPacket* serialized_packet) {
   if (!serialized_packet->retransmittable_frames.empty()) {
     DeleteFrames(&serialized_packet->retransmittable_frames);
   }
-  delete serialized_packet->packet;
-  serialized_packet->packet = nullptr;
+  serialized_packet->encrypted_buffer = nullptr;
+  serialized_packet->encrypted_length = 0;
 }
 
 // static
 uint64_t QuicUtils::PackPathIdAndPacketNumber(QuicPathId path_id,
                                               QuicPacketNumber packet_number) {
   // Setting the nonce below relies on QuicPathId and QuicPacketNumber being
   // specific sizes.
   static_assert(sizeof(path_id) == 1, "Size of QuicPathId changed.");
   static_assert(sizeof(packet_number) == 8,
                 "Size of QuicPacketNumber changed.");
   // Use path_id and lower 7 bytes of packet_number as lower 8 bytes of nonce.
   uint64_t path_id_packet_number =
       (static_cast<uint64_t>(path_id) << 56) | packet_number;
   DCHECK(path_id != kDefaultPathId || path_id_packet_number == packet_number);
   return path_id_packet_number;
 }
 
+char* QuicUtils::CopyBuffer(const SerializedPacket& packet) {
+  char* dst_buffer = new char[packet.encrypted_length];
+  memcpy(dst_buffer, packet.encrypted_buffer, packet.encrypted_length);
+  return dst_buffer;
+}
+
 }  // namespace net