| Index: net/socket/socks_client_socket.cc
|
| diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
|
| index f7c69f28fd6ccdb26cf65017f090e26eaa31cca9..09295ea577736514325bcac7c4473aef6b1a2370 100644
|
| --- a/net/socket/socks_client_socket.cc
|
| +++ b/net/socket/socks_client_socket.cc
|
| @@ -27,7 +27,7 @@ static const unsigned int kWriteHeaderSize = 8;
|
| static const unsigned int kReadHeaderSize = 8;
|
|
|
| // Server Response codes for SOCKS.
|
| -static const uint8 kServerResponseOk = 0x5A;
|
| +static const uint8 kServerResponseOk = 0x5A;
|
| static const uint8 kServerResponseRejected = 0x5B;
|
| static const uint8 kServerResponseNotReachable = 0x5C;
|
| static const uint8 kServerResponseMismatchedUserId = 0x5D;
|
| @@ -70,7 +70,8 @@ SOCKSClientSocket::SOCKSClientSocket(
|
| host_resolver_(host_resolver),
|
| host_request_info_(req_info),
|
| priority_(priority),
|
| - net_log_(transport_->socket()->NetLog()) {}
|
| + net_log_(transport_->socket()->NetLog()) {
|
| +}
|
|
|
| SOCKSClientSocket::~SOCKSClientSocket() {
|
| Disconnect();
|
| @@ -172,12 +173,12 @@ bool SOCKSClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
|
| }
|
| NOTREACHED();
|
| return false;
|
| -
|
| }
|
|
|
| // Read is called by the transport layer above to read. This can only be done
|
| // if the SOCKS handshake is complete.
|
| -int SOCKSClientSocket::Read(IOBuffer* buf, int buf_len,
|
| +int SOCKSClientSocket::Read(IOBuffer* buf,
|
| + int buf_len,
|
| const CompletionCallback& callback) {
|
| DCHECK(completed_handshake_);
|
| DCHECK_EQ(STATE_NONE, next_state_);
|
| @@ -185,9 +186,11 @@ int SOCKSClientSocket::Read(IOBuffer* buf, int buf_len,
|
| DCHECK(!callback.is_null());
|
|
|
| int rv = transport_->socket()->Read(
|
| - buf, buf_len,
|
| + buf,
|
| + buf_len,
|
| base::Bind(&SOCKSClientSocket::OnReadWriteComplete,
|
| - base::Unretained(this), callback));
|
| + base::Unretained(this),
|
| + callback));
|
| if (rv > 0)
|
| was_ever_used_ = true;
|
| return rv;
|
| @@ -195,7 +198,8 @@ int SOCKSClientSocket::Read(IOBuffer* buf, int buf_len,
|
|
|
| // Write is called by the transport layer. This can only be done if the
|
| // SOCKS handshake is complete.
|
| -int SOCKSClientSocket::Write(IOBuffer* buf, int buf_len,
|
| +int SOCKSClientSocket::Write(IOBuffer* buf,
|
| + int buf_len,
|
| const CompletionCallback& callback) {
|
| DCHECK(completed_handshake_);
|
| DCHECK_EQ(STATE_NONE, next_state_);
|
| @@ -203,9 +207,11 @@ int SOCKSClientSocket::Write(IOBuffer* buf, int buf_len,
|
| DCHECK(!callback.is_null());
|
|
|
| int rv = transport_->socket()->Write(
|
| - buf, buf_len,
|
| + buf,
|
| + buf_len,
|
| base::Bind(&SOCKSClientSocket::OnReadWriteComplete,
|
| - base::Unretained(this), callback));
|
| + base::Unretained(this),
|
| + callback));
|
| if (rv > 0)
|
| was_ever_used_ = true;
|
| return rv;
|
| @@ -350,8 +356,7 @@ int SOCKSClientSocket::DoHandshakeWrite() {
|
| int handshake_buf_len = buffer_.size() - bytes_sent_;
|
| DCHECK_GT(handshake_buf_len, 0);
|
| handshake_buf_ = new IOBuffer(handshake_buf_len);
|
| - memcpy(handshake_buf_->data(), &buffer_[bytes_sent_],
|
| - handshake_buf_len);
|
| + memcpy(handshake_buf_->data(), &buffer_[bytes_sent_], handshake_buf_len);
|
| return transport_->socket()->Write(
|
| handshake_buf_.get(),
|
| handshake_buf_len,
|
|
|