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

Side by Side Diff: net/socket/ssl_client_socket_nss.h

Issue 11366155: SSLClientSocket::IsConnected should care for internal buffers (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: add unit test Created 8 years 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
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_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 7
8 #include <certt.h> 8 #include <certt.h>
9 #include <keyt.h> 9 #include <keyt.h>
10 #include <nspr.h> 10 #include <nspr.h>
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 ServerBoundCertService* server_bound_cert_service_; 164 ServerBoundCertService* server_bound_cert_service_;
165 165
166 // ssl_session_cache_shard_ is an opaque string that partitions the SSL 166 // ssl_session_cache_shard_ is an opaque string that partitions the SSL
167 // session cache. i.e. sessions created with one value will not attempt to 167 // session cache. i.e. sessions created with one value will not attempt to
168 // resume on the socket with a different value. 168 // resume on the socket with a different value.
169 const std::string ssl_session_cache_shard_; 169 const std::string ssl_session_cache_shard_;
170 170
171 // True if the SSL handshake has been completed. 171 // True if the SSL handshake has been completed.
172 bool completed_handshake_; 172 bool completed_handshake_;
173 173
174 // True if |core_| detects EOF.
tyoshino (SeeGerritForStatus) 2012/12/14 15:13:54 has detected
Takashi Toyoshima 2012/12/21 06:39:03 Done.
175 bool core_recv_eof_;
wtc 2012/12/14 22:55:14 I suggest we name this member ssl_recv_eof_, to co
176
174 State next_handshake_state_; 177 State next_handshake_state_;
175 178
176 // The NSS SSL state machine. This is owned by |core_|. 179 // The NSS SSL state machine. This is owned by |core_|.
177 // TODO(rsleevi): http://crbug.com/130616 - Remove this member once 180 // TODO(rsleevi): http://crbug.com/130616 - Remove this member once
178 // ExportKeyingMaterial is updated to be asynchronous. 181 // ExportKeyingMaterial is updated to be asynchronous.
179 PRFileDesc* nss_fd_; 182 PRFileDesc* nss_fd_;
180 183
181 BoundNetLog net_log_; 184 BoundNetLog net_log_;
182 185
183 base::TimeTicks start_cert_verification_time_; 186 base::TimeTicks start_cert_verification_time_;
184 187
185 TransportSecurityState* transport_security_state_; 188 TransportSecurityState* transport_security_state_;
186 189
187 // The following two variables are added for debugging bug 65948. Will 190 // The following two variables are added for debugging bug 65948. Will
188 // remove this code after fixing bug 65948. 191 // remove this code after fixing bug 65948.
189 // Added the following code Debugging in release mode. 192 // Added the following code Debugging in release mode.
190 mutable base::Lock lock_; 193 mutable base::Lock lock_;
191 // This is mutable so that CalledOnValidThread can set it. 194 // This is mutable so that CalledOnValidThread can set it.
192 // It's guarded by |lock_|. 195 // It's guarded by |lock_|.
193 mutable base::PlatformThreadId valid_thread_id_; 196 mutable base::PlatformThreadId valid_thread_id_;
194 }; 197 };
195 198
196 } // namespace net 199 } // namespace net
197 200
198 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 201 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698