Land Recent QUIC Changes.

net/quic/quic_config.h

 // Copyright (c) 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.
 
 #ifndef NET_QUIC_QUIC_CONFIG_H_
 #define NET_QUIC_QUIC_CONFIG_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 240 matching lines @@
   bool has_receive_values_;
 };
 
 // QuicConfig contains non-crypto configuration options that are negotiated in
 // the crypto handshake.
 class NET_EXPORT_PRIVATE QuicConfig {
  public:
   QuicConfig();
   ~QuicConfig();
 
-  void set_congestion_feedback(const QuicTagVector& congestion_feedback,
-                               QuicTag default_congestion_feedback);
+  void SetCongestionFeedback(const QuicTagVector& congestion_feedback,
+                             QuicTag default_congestion_feedback);
 
-  QuicTag congestion_feedback() const;
+  QuicTag CongestionFeedback() const;
 
   void SetConnectionOptionsToSend(const QuicTagVector& connection_options);
 
   bool HasReceivedConnectionOptions() const;
 
   QuicTagVector ReceivedConnectionOptions() const;
 
   bool HasSendConnectionOptions() const;
 
   QuicTagVector SendConnectionOptions() const;
 
-  void set_idle_connection_state_lifetime(
+  void SetIdleConnectionStateLifetime(
       QuicTime::Delta max_idle_connection_state_lifetime,
       QuicTime::Delta default_idle_conection_state_lifetime);
 
-  QuicTime::Delta idle_connection_state_lifetime() const;
+  QuicTime::Delta IdleConnectionStateLifetime() const;
 
-  QuicTime::Delta keepalive_timeout() const;
+  QuicTime::Delta KeepaliveTimeout() const;
 
-  void set_max_streams_per_connection(size_t max_streams,
-                                      size_t default_streams);
+  void SetMaxStreamsPerConnection(size_t max_streams, size_t default_streams);
 
-  uint32 max_streams_per_connection() const;
+  uint32 MaxStreamsPerConnection() const;
 
   void set_max_time_before_crypto_handshake(
-      QuicTime::Delta max_time_before_crypto_handshake);
+      QuicTime::Delta max_time_before_crypto_handshake) {
+    max_time_before_crypto_handshake_ = max_time_before_crypto_handshake;
+  }
 
-  QuicTime::Delta max_time_before_crypto_handshake() const;
+  QuicTime::Delta max_time_before_crypto_handshake() const {
+    return max_time_before_crypto_handshake_;
+  }
+
+  void set_max_idle_time_before_crypto_handshake(
+      QuicTime::Delta max_idle_time_before_crypto_handshake) {
+    max_idle_time_before_crypto_handshake_ =
+        max_idle_time_before_crypto_handshake;
+  }
+
+  QuicTime::Delta max_idle_time_before_crypto_handshake() const {
+    return max_idle_time_before_crypto_handshake_;
+  }
 
   // Sets the peer's default initial congestion window in packets.
   void SetInitialCongestionWindowToSend(size_t initial_window);
 
   bool HasReceivedInitialCongestionWindow() const;
 
   uint32 ReceivedInitialCongestionWindow() const;
 
   // Sets an estimated initial round trip time in us.
   void SetInitialRoundTripTimeUsToSend(size_t rtt_us);
@@ skipping 37 matching lines @@
 
   // Sets socket receive buffer to transmit to the peer.
   void SetSocketReceiveBufferToSend(uint32 window_bytes);
 
   uint32 GetSocketReceiveBufferToSend() const;
 
   bool HasReceivedSocketReceiveBuffer() const;
 
   uint32 ReceivedSocketReceiveBuffer() const;
 
-  bool negotiated();
+  bool negotiated() const;
 
   // SetDefaults sets the members to sensible, default values.
   void SetDefaults();
 
   // ToHandshakeMessage serialises the settings in this object as a series of
   // tags /value pairs and adds them to |out|.
   void ToHandshakeMessage(CryptoHandshakeMessage* out) const;
 
   // Calls ProcessPeerHello on each negotiable parameter. On failure returns
   // the corresponding QuicErrorCode and sets detailed error in |error_details|.
   QuicErrorCode ProcessPeerHello(const CryptoHandshakeMessage& peer_hello,
                                  HelloType hello_type,
                                  std::string* error_details);
 
  private:
   friend class test::QuicConfigPeer;
 
+  // Configurations options that are not negotiated.
+  // Maximum time the session can be alive before crypto handshake is finished.
+  QuicTime::Delta max_time_before_crypto_handshake_;
+  // Maximum idle time before the crypto handshake has completed.
+  QuicTime::Delta max_idle_time_before_crypto_handshake_;
+
   // Congestion control feedback type.
   QuicNegotiableTag congestion_feedback_;
   // Connection options.
   QuicFixedTagVector connection_options_;
   // Idle connection state lifetime
   QuicNegotiableUint32 idle_connection_state_lifetime_seconds_;
   // Keepalive timeout, or 0 to turn off keepalive probes
   QuicNegotiableUint32 keepalive_timeout_seconds_;
   // Maximum number of streams that the connection can support.
   QuicNegotiableUint32 max_streams_per_connection_;
-  // Maximum time till the session can be alive before crypto handshake is
-  // finished. (Not negotiated).
-  QuicTime::Delta max_time_before_crypto_handshake_;
   // Initial congestion window in packets.
   QuicFixedUint32 initial_congestion_window_;
   // Initial round trip time estimate in microseconds.
   QuicFixedUint32 initial_round_trip_time_us_;
 
   // TODO(rjshade): Remove when removing QUIC_VERSION_19.
   // Initial flow control receive window in bytes.
   QuicFixedUint32 initial_flow_control_window_bytes_;
 
   // Initial stream flow control receive window in bytes.
   QuicFixedUint32 initial_stream_flow_control_window_bytes_;
   // Initial session flow control receive window in bytes.
   QuicFixedUint32 initial_session_flow_control_window_bytes_;
 
   // Socket receive buffer in bytes.
   QuicFixedUint32 socket_receive_buffer_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONFIG_H_