Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1267)

Side by Side Diff: net/quic/quic_crypto_stream.cc

Issue 342983004: Fix a bug where QUIC ack frames were not bundled with crypto stream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/quic/quic_connection_test.cc ('k') | net/quic/quic_packet_creator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_crypto_stream.h" 5 #include "net/quic/quic_crypto_stream.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/string_piece.h" 9 #include "base/strings/string_piece.h"
10 #include "net/quic/crypto/crypto_handshake.h" 10 #include "net/quic/crypto/crypto_handshake.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 51
52 QuicPriority QuicCryptoStream::EffectivePriority() const { 52 QuicPriority QuicCryptoStream::EffectivePriority() const {
53 return QuicUtils::HighestPriority(); 53 return QuicUtils::HighestPriority();
54 } 54 }
55 55
56 void QuicCryptoStream::SendHandshakeMessage( 56 void QuicCryptoStream::SendHandshakeMessage(
57 const CryptoHandshakeMessage& message) { 57 const CryptoHandshakeMessage& message) {
58 session()->OnCryptoHandshakeMessageSent(message); 58 session()->OnCryptoHandshakeMessageSent(message);
59 const QuicData& data = message.GetSerialized(); 59 const QuicData& data = message.GetSerialized();
60 // To make reasoning about crypto frames easier, we don't combine them with
61 // any other frames in a single packet.
62 session()->connection()->Flush();
63 // TODO(wtc): check the return value. 60 // TODO(wtc): check the return value.
64 WriteOrBufferData(string(data.data(), data.length()), false, NULL); 61 WriteOrBufferData(string(data.data(), data.length()), false, NULL);
65 session()->connection()->Flush();
66 } 62 }
67 63
68 const QuicCryptoNegotiatedParameters& 64 const QuicCryptoNegotiatedParameters&
69 QuicCryptoStream::crypto_negotiated_params() const { 65 QuicCryptoStream::crypto_negotiated_params() const {
70 return crypto_negotiated_params_; 66 return crypto_negotiated_params_;
71 } 67 }
72 68
73 } // namespace net 69 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_connection_test.cc ('k') | net/quic/quic_packet_creator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698