From ccc66e8acadcd816e3f9ca19ce34a64bcb83a48d Mon Sep 17 00:00:00 2001 From: "rtenneti@chromium.org" Date: Tue, 26 Mar 2013 08:26:14 +0000 Subject: Land Recent QUIC Changes Removed the tab characters. Fixed review comments from rch. R=rch@chromium.org QUIC - pending changelist - Use static for congestion manager constants. Merger internal change: 43867480 R=rch@chromium.org QUIC - cleanup of stats Merge internal change: 43864412 R=rch@chromium.org QUIC - Add two new methods to QuicConnectionHelper to abstarct away differences between server and chromium. Merge internal change: 43850438 R=rch@chromium.org QUIC - Start tracking number of rejected connections and connection close. Merge internal change: 43846131 R=rch@chromium.org QUIC - Temporary work around for bug with server tests. Merge internal change: 43845688 R=rch@chromium.org QUIC - Bugfix; don't queue ConnectionClosePackets and don't process incoming packets if the connection is closed. Merge internal change: 43813759 R=rch@chromium.org QUIC - More cleanups Merge internal change: 43805954 R=rch@chromium.org QUIC Crypto - Change CryptoHandshakeMessage to a class. Merge internal change: 43798895 R=rch@chromium.org, wtc@chromium.org QUIC crypto: cleanup between steps 4 and 5. Merge internal change: 43791096 R=rch@chromium.org, agl@chromium.org QUIC crypto: steps 3 and 4 from the plan. Merge internal change: 43787806 R=rch@chromium.org, agl@chromium.org QUIC - Improved sendalarm accuracy Merge internal change: 43785455 R=rch@chromium.org Review URL: https://chromiumcodereview.appspot.com/12863007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190594 0039d316-1c4b-4281-b951-d872f2087c98 --- net/quic/quic_crypto_server_stream.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'net/quic/quic_crypto_server_stream.h') diff --git a/net/quic/quic_crypto_server_stream.h b/net/quic/quic_crypto_server_stream.h index ac63495..7841172 100644 --- a/net/quic/quic_crypto_server_stream.h +++ b/net/quic/quic_crypto_server_stream.h @@ -13,7 +13,6 @@ namespace net { class QuicSession; -struct CryptoHandshakeMessage; namespace test { class CryptoTestUtils; @@ -28,6 +27,9 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream { virtual void OnHandshakeMessage( const CryptoHandshakeMessage& message) OVERRIDE; + const QuicNegotiatedParameters& negotiated_params() const; + const QuicCryptoNegotiatedParameters& crypto_negotiated_params() const; + private: friend class test::CryptoTestUtils; @@ -39,7 +41,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream { std::string server_nonce_; QuicNegotiatedParameters negotiated_params_; - QuicCryptoNegotiatedParams crypto_negotiated_params_; + QuicCryptoNegotiatedParameters crypto_negotiated_params_; }; } // namespace net -- cgit v1.1