diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 17:57:01 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 17:57:01 +0000 |
| commit | ef95114d4d73b9f561e09c4f7688b5f7c18330ba (patch) | |
| tree | d8d77e0efffa6b3a0a2c392b42e94c7cf36253c9 /net/quic/quic_crypto_client_stream_test.cc | |
| parent | f467442c9e0db18557ee0e1a5060bd25827f9ed9 (diff) | |
| download | chromium_src-ef95114d4d73b9f561e09c4f7688b5f7c18330ba.zip chromium_src-ef95114d4d73b9f561e09c4f7688b5f7c18330ba.tar.gz chromium_src-ef95114d4d73b9f561e09c4f7688b5f7c18330ba.tar.bz2 | |
Land Recent QUIC Changes
QUIC crypto: move config objects.
Currently the client and server configs are setup and torn-down for each
connection. Since they are supposed to be per-client and per-server objects,
this change makes them parameters that are passed into the connection
Merge internal change: 44269387
QUIC crypto steps 6 and 7: per-server strike register.
This change adds a per-server strike-register that allows the server to
complete 0-RTT connections if the client has enough information cached.
Due to the fact that the per-server and per-client objects
(QuicCryptoServerConfig and QuicCryptoClientConfig) are currently setup and
torn down for each connection, there's no tests in this change for a 0-RTT
handshake because we can't do one yet. The next change will move these objects
into the right place so that 0-RTT handshakes can be tested.
This change also reminded me why I had a server nonce: without it the server
cannot terminate any connections if the strike-register fails. So the server
nonce is firmly back.
Merge internal change: 44228897
R=rch@chromium.org
Review URL: https://codereview.chromium.org/13976007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_crypto_client_stream_test.cc')
| -rw-r--r-- | net/quic/quic_crypto_client_stream_test.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/quic/quic_crypto_client_stream_test.cc b/net/quic/quic_crypto_client_stream_test.cc index 251a8ef..d8d2392 100644 --- a/net/quic/quic_crypto_client_stream_test.cc +++ b/net/quic/quic_crypto_client_stream_test.cc @@ -66,7 +66,9 @@ class QuicCryptoClientStreamTest : public ::testing::Test { : addr_(), connection_(new PacketSavingConnection(1, addr_, true)), session_(connection_, true), - stream_(&session_, kServerHostname) { + stream_(kServerHostname, config_, &session_, &crypto_config_) { + config_.SetDefaults(); + crypto_config_.SetDefaults(); } void CompleteCryptoHandshake() { @@ -85,6 +87,8 @@ class QuicCryptoClientStreamTest : public ::testing::Test { QuicCryptoClientStream stream_; CryptoHandshakeMessage message_; scoped_ptr<QuicData> message_data_; + QuicConfig config_; + QuicCryptoClientConfig crypto_config_; }; TEST_F(QuicCryptoClientStreamTest, NotInitiallyConected) { |