QUIC - enabled FLAGS_allow_truncated_connection_ids_for_quic

net/quic/test_tools/quic_test_packet_maker.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/test_tools/quic_test_packet_maker.h"
 
 #include <list>
 
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_http_utils.h"
@@ skipping 13 matching lines @@
       clock_(clock),
       spdy_request_framer_(SPDY3),
       spdy_response_framer_(SPDY3) {
 }
 
 QuicTestPacketMaker::~QuicTestPacketMaker() {
 }
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRstPacket(
     QuicPacketSequenceNumber num,
+    QuicConnectionIdLength connection_id_length,
     bool include_version,
     QuicStreamId stream_id,
     QuicRstStreamErrorCode error_code) {
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = connection_id_length;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = include_version;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
   header.packet_sequence_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
   header.fec_group = 0;
 
   QuicRstStreamFrame rst(stream_id, error_code, 0);
   return scoped_ptr<QuicEncryptedPacket>(MakePacket(header, QuicFrame(&rst)));
 }
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
     QuicPacketSequenceNumber num,
     bool include_version,
     QuicStreamId stream_id,
     QuicRstStreamErrorCode error_code,
     QuicPacketSequenceNumber largest_received,
     QuicPacketSequenceNumber least_unacked,
     bool send_feedback) {
-
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = PACKET_8BYTE_CONNECTION_ID;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = include_version;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
   header.packet_sequence_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
   header.fec_group = 0;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.delta_time_largest_observed = QuicTime::Delta::Zero();
@@ skipping 24 matching lines @@
   scoped_ptr<QuicPacket> packet(
       BuildUnsizedDataPacket(&framer, header, frames).packet);
   return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
       ENCRYPTION_NONE, header.packet_sequence_number, *packet));
 }
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeConnectionClosePacket(
     QuicPacketSequenceNumber num) {
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = PACKET_0BYTE_CONNECTION_ID;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = false;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
   header.packet_sequence_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
   header.fec_group = 0;
 
   QuicConnectionCloseFrame close;
   close.error_code = QUIC_CRYPTO_VERSION_NOT_SUPPORTED;
   close.error_details = "Time to panic!";
   return scoped_ptr<QuicEncryptedPacket>(MakePacket(header, QuicFrame(&close)));
 }
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckPacket(
     QuicPacketSequenceNumber sequence_number,
+    QuicConnectionIdLength connection_id_length,
     QuicPacketSequenceNumber largest_received,
     QuicPacketSequenceNumber least_unacked,
     bool send_feedback) {
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = connection_id_length;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = false;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
   header.packet_sequence_number = sequence_number;
   header.entropy_flag = false;
   header.fec_flag = false;
   header.fec_group = 0;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.delta_time_largest_observed = QuicTime::Delta::Zero();
@@ skipping 25 matching lines @@
 }
 
 // Returns a newly created packet to send kData on stream 1.
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeDataPacket(
     QuicPacketSequenceNumber sequence_number,
     QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
     QuicStreamOffset offset,
     base::StringPiece data) {
-  InitializeHeader(sequence_number, should_include_version);
+  InitializeHeader(sequence_number, PACKET_8BYTE_CONNECTION_ID,
+                   should_include_version);
   QuicStreamFrame frame(stream_id, fin, offset, MakeIOVector(data));
   return MakePacket(header_, QuicFrame(&frame));
 }
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRequestHeadersPacket(
     QuicPacketSequenceNumber sequence_number,
     QuicStreamId stream_id,
+    QuicConnectionIdLength connection_id_length,
     bool should_include_version,
     bool fin,
     const SpdyHeaderBlock& headers) {
-  InitializeHeader(sequence_number, should_include_version);
+  InitializeHeader(sequence_number, connection_id_length,
+                   should_include_version);
   SpdySynStreamIR syn_stream(stream_id);
   syn_stream.set_name_value_block(headers);
   syn_stream.set_fin(fin);
   syn_stream.set_priority(0);
   scoped_ptr<SpdySerializedFrame> spdy_frame(
       spdy_request_framer_.SerializeSynStream(syn_stream));
   QuicStreamFrame frame(kHeadersStreamId, false, 0,
                         MakeIOVector(base::StringPiece(spdy_frame->data(),
                                                        spdy_frame->size())));
   return MakePacket(header_, QuicFrame(&frame));
 }
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeResponseHeadersPacket(
     QuicPacketSequenceNumber sequence_number,
     QuicStreamId stream_id,
+    QuicConnectionIdLength connection_id_length,
     bool should_include_version,
     bool fin,
     const SpdyHeaderBlock& headers) {
-  InitializeHeader(sequence_number, should_include_version);
+  InitializeHeader(sequence_number, connection_id_length,
+                   should_include_version);
   SpdySynReplyIR syn_reply(stream_id);
   syn_reply.set_name_value_block(headers);
   syn_reply.set_fin(fin);
   scoped_ptr<SpdySerializedFrame> spdy_frame(
       spdy_response_framer_.SerializeSynReply(syn_reply));
   QuicStreamFrame frame(kHeadersStreamId, false, 0,
                         MakeIOVector(base::StringPiece(spdy_frame->data(),
                                                        spdy_frame->size())));
   return MakePacket(header_, QuicFrame(&frame));
 }
@@ skipping 27 matching lines @@
   QuicFrames frames;
   frames.push_back(frame);
   scoped_ptr<QuicPacket> packet(
       BuildUnsizedDataPacket(&framer, header, frames).packet);
   return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
       ENCRYPTION_NONE, header.packet_sequence_number, *packet));
 }
 
 void QuicTestPacketMaker::InitializeHeader(
     QuicPacketSequenceNumber sequence_number,
+    QuicConnectionIdLength connection_id_length,
     bool should_include_version) {
   header_.public_header.connection_id = connection_id_;
+  header_.public_header.connection_id_length = connection_id_length;
   header_.public_header.reset_flag = false;
   header_.public_header.version_flag = should_include_version;
   header_.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
   header_.packet_sequence_number = sequence_number;
   header_.fec_group = 0;
   header_.entropy_flag = false;
   header_.fec_flag = false;
 }
 
 }  // namespace test
 }  // namespace net