Land Recent QUIC Changes.

net/quic/quic_server_session.cc

 // Copyright 2014 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_server_session.h"
 
 #include "base/logging.h"
 #include "net/quic/quic_connection.h"
+#include "net/quic/quic_flags.h"
 #include "net/quic/quic_spdy_server_stream.h"
 #include "net/quic/reliable_quic_stream.h"
 
 namespace net {
 
 QuicServerSession::QuicServerSession(
     const QuicConfig& config,
     QuicConnection* connection,
     QuicPerConnectionPacketWriter* connection_packet_writer,
     QuicServerSessionVisitor* visitor)
     : QuicSession(connection, config),
       connection_packet_writer_(connection_packet_writer),
       visitor_(visitor) {}
 
 QuicServerSession::~QuicServerSession() {}
 
 void QuicServerSession::InitializeSession(
     const QuicCryptoServerConfig& crypto_config) {
   crypto_stream_.reset(CreateQuicCryptoServerStream(crypto_config));
 }
 
 QuicCryptoServerStream* QuicServerSession::CreateQuicCryptoServerStream(
     const QuicCryptoServerConfig& crypto_config) {
   return new QuicCryptoServerStream(crypto_config, this);
 }
 
+void QuicServerSession::OnConfigNegotiated() {
+  QuicSession::OnConfigNegotiated();
+  if (!FLAGS_enable_quic_fec ||
+      !config()->HasReceivedConnectionOptions() ||
+      !ContainsQuicTag(config()->ReceivedConnectionOptions(), kFHDR)) {
+    return;
+  }
+  // kFHDR config maps to FEC protection always for headers stream.
+  // TODO(jri): Add crypto stream in addition to headers for kHDR.
+  headers_stream_->set_fec_policy(FEC_PROTECT_ALWAYS);
+}
+
 void QuicServerSession::OnConnectionClosed(QuicErrorCode error,
                                            bool from_peer) {
   QuicSession::OnConnectionClosed(error, from_peer);
   // In the unlikely event we get a connection close while doing an asynchronous
   // crypto event, make sure we cancel the callback.
   if (crypto_stream_.get() != NULL) {
     crypto_stream_->CancelOutstandingCallbacks();
   }
   visitor_->OnConnectionClosed(connection()->connection_id(), error);
 }
@@ skipping 30 matching lines @@
 QuicDataStream* QuicServerSession::CreateOutgoingDataStream() {
   DLOG(ERROR) << "Server push not yet supported";
   return NULL;
 }
 
 QuicCryptoServerStream* QuicServerSession::GetCryptoStream() {
   return crypto_stream_.get();
 }
 
 }  // namespace net