Landing Recent QUIC changes until Sun Sep 4 03:41:00

net/quic/core/quic_server_session_base.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/core/quic_server_session_base.h"
 
 #include "base/logging.h"
 #include "net/quic/core/proto/cached_network_parameters.pb.h"
 #include "net/quic/core/quic_bug_tracker.h"
 #include "net/quic/core/quic_connection.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_spdy_session.h"
 #include "net/quic/core/reliable_quic_stream.h"
 
 using std::string;
 
 namespace net {
 
 QuicServerSessionBase::QuicServerSessionBase(
     const QuicConfig& config,
     QuicConnection* connection,
     Visitor* visitor,
-    Helper* helper,
+    QuicCryptoServerStream::Helper* helper,
     const QuicCryptoServerConfig* crypto_config,
     QuicCompressedCertsCache* compressed_certs_cache)
     : QuicSpdySession(connection, config),
       crypto_config_(crypto_config),
       compressed_certs_cache_(compressed_certs_cache),
       visitor_(visitor),
       helper_(helper),
       bandwidth_resumption_enabled_(false),
       bandwidth_estimate_sent_to_client_(QuicBandwidth::Zero()),
       last_scup_time_(QuicTime::Zero()),
@@ skipping 157 matching lines @@
   }
 
   crypto_stream_->SendServerConfigUpdate(&cached_network_params);
 
   connection()->OnSendConnectionState(cached_network_params);
 
   last_scup_time_ = now;
   last_scup_packet_number_ = connection()->packet_number_of_last_sent_packet();
 }
 
-QuicConnectionId QuicServerSessionBase::GenerateConnectionIdForReject(
-    QuicConnectionId connection_id) {
-  return helper_->GenerateConnectionIdForReject(connection_id);
-}
-
-bool QuicServerSessionBase::CanAcceptClientHello(
-    const CryptoHandshakeMessage& message,
-    string* error_details) {
-  return helper_->CanAcceptClientHello(message, connection()->self_address(),
-                                       error_details);
-}
-
 bool QuicServerSessionBase::ShouldCreateIncomingDynamicStream(QuicStreamId id) {
   if (!connection()->connected()) {
     QUIC_BUG << "ShouldCreateIncomingDynamicStream called when disconnected";
     return false;
   }
 
   if (id % 2 == 0) {
     DVLOG(1) << "Invalid incoming even stream_id:" << id;
     connection()->CloseConnection(
         QUIC_INVALID_STREAM_ID, "Client created even numbered stream",
@@ skipping 26 matching lines @@
 
 int32_t QuicServerSessionBase::BandwidthToCachedParameterBytesPerSecond(
     const QuicBandwidth& bandwidth) {
   int64_t bytes_per_second = bandwidth.ToBytesPerSecond();
   return (bytes_per_second > static_cast<int64_t>(INT32_MAX)
               ? INT32_MAX
               : static_cast<int32_t>(bytes_per_second));
 }
 
 }  // namespace net