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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 10399083: Make NetLog take in callbacks that return Values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge error Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gyp ('k') | net/spdy/spdy_proxy_client_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
===================================================================
--- net/socket/ssl_client_socket_nss.cc (revision 141317)
+++ net/socket/ssl_client_socket_nss.cc (working copy)
@@ -382,6 +382,17 @@
CERT_DestroyCertificate(certs[i]);
}
+// Helper function to make it possible to log events from within the
+// SSLClientSocketNSS::Core. Can't use Bind with BoundNetLog::AddEntry directly
+// on Windows because it is overloaded.
+void AddLogEvent(BoundNetLog* net_log,
+ NetLog::EventType event_type,
+ const scoped_refptr<NetLog::EventParameters>& event_params) {
+ if (!net_log)
+ return;
+ net_log->AddEvent(event_type, event_params);
+}
+
// Helper function to make it easier to call BoundNetLog::AddByteTransferEvent
// from within the SSLClientSocketNSS::Core.
// AddByteTransferEvent expects to receive a const char*, which within the
@@ -1292,7 +1303,7 @@
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_REQUESTED,
scoped_refptr<NetLog::EventParameters>()));
@@ -1339,7 +1350,7 @@
// number collision. See crbug.com/97355.
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count", 0))));
@@ -1362,7 +1373,7 @@
CERT_DestroyCertList(cert_chain);
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count", 0))));
@@ -1385,7 +1396,7 @@
int cert_count = 1 + intermediates.size();
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count",
@@ -1398,7 +1409,7 @@
// Send no client certificate.
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count", 0))));
@@ -1420,7 +1431,7 @@
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count", 0))));
@@ -1565,7 +1576,7 @@
}
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count",
@@ -1589,7 +1600,7 @@
// Send no client certificate.
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count", 0))));
@@ -1644,7 +1655,7 @@
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_REQUESTED,
scoped_refptr<NetLog::EventParameters>()));
@@ -1676,7 +1687,7 @@
// NSS will construct the certificate chain.
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count", -1))));
@@ -1688,7 +1699,7 @@
// Send no client certificate.
core->PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, core->weak_net_log_,
+ base::Bind(&AddLogEvent, core->weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count", 0))));
@@ -1939,7 +1950,7 @@
int rv = ERR_UNEXPECTED;
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_READ_ERROR,
make_scoped_refptr(new SSLErrorParams(rv, 0))));
return rv;
@@ -1968,7 +1979,7 @@
int rv = ERR_UNEXPECTED;
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_READ_ERROR,
make_scoped_refptr(new SSLErrorParams(rv, 0))));
return rv;
@@ -2003,7 +2014,7 @@
net_error = ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_HANDSHAKE_ERROR,
make_scoped_refptr(new SSLErrorParams(net_error, 0))));
@@ -2023,7 +2034,7 @@
net_error = ERR_SSL_PROTOCOL_ERROR;
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_HANDSHAKE_ERROR,
make_scoped_refptr(
new SSLErrorParams(net_error, 0))));
@@ -2084,7 +2095,7 @@
} else {
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_HANDSHAKE_ERROR,
make_scoped_refptr(
new SSLErrorParams(net_error, prerr))));
@@ -2125,7 +2136,7 @@
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count",
@@ -2151,7 +2162,7 @@
rv = ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_READ_ERROR,
make_scoped_refptr(new SSLErrorParams(rv, 0))));
return rv;
@@ -2171,7 +2182,7 @@
rv = HandleNSSError(prerr, false);
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_READ_ERROR,
make_scoped_refptr(new SSLErrorParams(rv, prerr))));
return rv;
@@ -2198,7 +2209,7 @@
rv = HandleNSSError(prerr, false);
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_WRITE_ERROR,
make_scoped_refptr(new SSLErrorParams(rv, prerr))));
return rv;
@@ -2446,7 +2457,7 @@
int cert_count = (rv == SECSuccess) ? 1 : 0;
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_CLIENT_CERT_PROVIDED,
make_scoped_refptr(
new NetLogIntegerParameter("cert_count",
@@ -2506,7 +2517,7 @@
if (nss_handshake_state_.server_cert) {
PostOrRunCallback(
FROM_HERE,
- base::Bind(&BoundNetLog::AddEvent, weak_net_log_,
+ base::Bind(&AddLogEvent, weak_net_log_,
NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
make_scoped_refptr(
new X509CertificateNetLogParam(
« no previous file with comments | « net/net.gyp ('k') | net/spdy/spdy_proxy_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698