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

Side by Side Diff: net/quic/quic_crypto_client_stream.h

Issue 397803004: Reimplement QuicCryptoClientStream::WasChannelIDSent with a boolean (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
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 #ifndef NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_ 5 #ifndef NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
6 #define NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_ 6 #define NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "net/quic/crypto/channel_id.h" 10 #include "net/quic/crypto/channel_id.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 QuicCryptoClientConfig* const crypto_config_; 126 QuicCryptoClientConfig* const crypto_config_;
127 127
128 // Client's connection nonce (4-byte timestamp + 28 random bytes) 128 // Client's connection nonce (4-byte timestamp + 28 random bytes)
129 std::string nonce_; 129 std::string nonce_;
130 // Server's (hostname, port, is_https, privacy_mode) tuple. 130 // Server's (hostname, port, is_https, privacy_mode) tuple.
131 const QuicServerId server_id_; 131 const QuicServerId server_id_;
132 132
133 // Generation counter from QuicCryptoClientConfig's CachedState. 133 // Generation counter from QuicCryptoClientConfig's CachedState.
134 uint64 generation_counter_; 134 uint64 generation_counter_;
135 135
136 // True if a channel ID was sent.
137 bool channel_id_sent_;
138
136 // channel_id_source_callback_ contains the callback object that we passed 139 // channel_id_source_callback_ contains the callback object that we passed
137 // to an asynchronous channel ID lookup. The ChannelIDSource owns this 140 // to an asynchronous channel ID lookup. The ChannelIDSource owns this
138 // object. 141 // object.
139 ChannelIDSourceCallbackImpl* channel_id_source_callback_; 142 ChannelIDSourceCallbackImpl* channel_id_source_callback_;
140 143
141 // These members are used to store the result of an asynchronous channel ID 144 // These members are used to store the result of an asynchronous channel ID
142 // lookup. These members must not be used after 145 // lookup. These members must not be used after
143 // STATE_GET_CHANNEL_ID_COMPLETE. 146 // STATE_GET_CHANNEL_ID_COMPLETE.
144 scoped_ptr<ChannelIDKey> channel_id_key_; 147 scoped_ptr<ChannelIDKey> channel_id_key_;
145 148
(...skipping 11 matching lines...) Expand all
157 bool verify_ok_; 160 bool verify_ok_;
158 string verify_error_details_; 161 string verify_error_details_;
159 scoped_ptr<ProofVerifyDetails> verify_details_; 162 scoped_ptr<ProofVerifyDetails> verify_details_;
160 163
161 DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientStream); 164 DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientStream);
162 }; 165 };
163 166
164 } // namespace net 167 } // namespace net
165 168
166 #endif // NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_ 169 #endif // NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698