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

Unified Diff: net/socket/socks_client_socket.cc

Issue 169643006: Use sockets with unread data if they've never been used before. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mmenke comments Created 6 years, 9 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/socket/socks_client_socket.h ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks_client_socket.cc
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index 67089589cc50eb6fd425608b565600de62685a20..654509210a4c04d1133cc4627028a15472f97072 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -6,6 +6,7 @@
#include "base/basictypes.h"
#include "base/bind.h"
+#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/sys_byteorder.h"
#include "net/base/io_buffer.h"
@@ -65,6 +66,7 @@ SOCKSClientSocket::SOCKSClientSocket(
completed_handshake_(false),
bytes_sent_(0),
bytes_received_(0),
+ was_ever_used_(false),
host_resolver_(host_resolver),
host_request_info_(req_info),
priority_(priority),
@@ -137,11 +139,7 @@ void SOCKSClientSocket::SetOmniboxSpeculation() {
}
bool SOCKSClientSocket::WasEverUsed() const {
- if (transport_.get() && transport_->socket()) {
- return transport_->socket()->WasEverUsed();
- }
- NOTREACHED();
- return false;
+ return was_ever_used_;
}
bool SOCKSClientSocket::UsingTCPFastOpen() const {
@@ -184,8 +182,15 @@ int SOCKSClientSocket::Read(IOBuffer* buf, int buf_len,
DCHECK(completed_handshake_);
DCHECK_EQ(STATE_NONE, next_state_);
DCHECK(user_callback_.is_null());
-
- return transport_->socket()->Read(buf, buf_len, callback);
+ DCHECK(!callback.is_null());
+
+ int rv = transport_->socket()->Read(
+ buf, buf_len,
+ base::Bind(&SOCKSClientSocket::OnReadWriteComplete,
+ base::Unretained(this), callback));
+ if (rv > 0)
+ was_ever_used_ = true;
+ return rv;
}
// Write is called by the transport layer. This can only be done if the
@@ -195,8 +200,15 @@ int SOCKSClientSocket::Write(IOBuffer* buf, int buf_len,
DCHECK(completed_handshake_);
DCHECK_EQ(STATE_NONE, next_state_);
DCHECK(user_callback_.is_null());
-
- return transport_->socket()->Write(buf, buf_len, callback);
+ DCHECK(!callback.is_null());
+
+ int rv = transport_->socket()->Write(
+ buf, buf_len,
+ base::Bind(&SOCKSClientSocket::OnReadWriteComplete,
+ base::Unretained(this), callback));
+ if (rv > 0)
+ was_ever_used_ = true;
+ return rv;
}
bool SOCKSClientSocket::SetReceiveBufferSize(int32 size) {
@@ -213,10 +225,8 @@ void SOCKSClientSocket::DoCallback(int result) {
// Since Run() may result in Read being called,
// clear user_callback_ up front.
- CompletionCallback c = user_callback_;
- user_callback_.Reset();
DVLOG(1) << "Finished setting up SOCKS handshake";
- c.Run(result);
+ base::ResetAndReturn(&user_callback_).Run(result);
}
void SOCKSClientSocket::OnIOComplete(int result) {
@@ -228,6 +238,16 @@ void SOCKSClientSocket::OnIOComplete(int result) {
}
}
+void SOCKSClientSocket::OnReadWriteComplete(const CompletionCallback& callback,
+ int result) {
+ DCHECK_NE(ERR_IO_PENDING, result);
+ DCHECK(!callback.is_null());
+
+ if (result > 0)
+ was_ever_used_ = true;
+ callback.Run(result);
+}
+
int SOCKSClientSocket::DoLoop(int last_io_result) {
DCHECK_NE(next_state_, STATE_NONE);
int rv = last_io_result;
« no previous file with comments | « net/socket/socks_client_socket.h ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698