| Index: net/quic/quic_protocol.h
|
| diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
|
| index 4f6a8bcbeb253ecb0ab8351973ecda5101cfb3d1..f7855630f6b03a05d5271a203b1a92e49fc3771f 100644
|
| --- a/net/quic/quic_protocol.h
|
| +++ b/net/quic/quic_protocol.h
|
| @@ -108,11 +108,12 @@ const QuicStreamId kHeadersStreamId = 3;
|
| // Maximum delayed ack time, in ms.
|
| const int kMaxDelayedAckTimeMs = 25;
|
|
|
| -// This is the default network timeout a for connection till the crypto
|
| -// handshake succeeds and the negotiated timeout from the handshake is received.
|
| +// The default idle timeout before the crypto handshake succeeds.
|
| const int64 kDefaultInitialTimeoutSecs = 120; // 2 mins.
|
| -const int64 kDefaultTimeoutSecs = 60 * 10; // 10 minutes.
|
| -const int64 kDefaultMaxTimeForCryptoHandshakeSecs = 5; // 5 secs.
|
| +// The maximum idle timeout that can be negotiated.
|
| +const int64 kMaximumIdleTimeoutSecs = 60 * 10; // 10 minutes.
|
| +// The default timeout for a connection until the crypto handshake succeeds.
|
| +const int64 kDefaultMaxTimeForCryptoHandshakeSecs = 10; // 10 secs.
|
|
|
| // Default ping timeout.
|
| const int64 kPingTimeoutSecs = 15; // 15 secs.
|
| @@ -472,6 +473,8 @@ enum QuicErrorCode {
|
| QUIC_DECOMPRESSION_FAILURE = 24,
|
| // We hit our prenegotiated (or default) timeout
|
| QUIC_CONNECTION_TIMED_OUT = 25,
|
| + // We hit our overall connection timeout
|
| + QUIC_CONNECTION_OVERALL_TIMED_OUT = 67,
|
| // There was an error encountered migrating addresses
|
| QUIC_ERROR_MIGRATING_ADDRESS = 26,
|
| // There was an error while writing to the socket.
|
| @@ -547,7 +550,7 @@ enum QuicErrorCode {
|
| QUIC_VERSION_NEGOTIATION_MISMATCH = 55,
|
|
|
| // No error. Used as bound while iterating.
|
| - QUIC_LAST_ERROR = 67,
|
| + QUIC_LAST_ERROR = 68,
|
| };
|
|
|
| struct NET_EXPORT_PRIVATE QuicPacketPublicHeader {
|
|
|