Chromium Code Reviews| Index: net/socket/tcp_socket_win.cc |
| diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc |
| index b777f2130721867497bcbeeb5d13c9da7f9ad5c8..0d1192d359b30b7840162f13fff395e95e46ce7c 100644 |
| --- a/net/socket/tcp_socket_win.cc |
| +++ b/net/socket/tcp_socket_win.cc |
| @@ -28,18 +28,20 @@ namespace { |
| const int kTCPKeepAliveSeconds = 45; |
| -bool SetSocketReceiveBufferSize(SOCKET socket, int32 size) { |
| +int SetSocketReceiveBufferSize(SOCKET socket, int32 size) { |
| int rv = setsockopt(socket, SOL_SOCKET, SO_RCVBUF, |
| reinterpret_cast<const char*>(&size), sizeof(size)); |
| - DCHECK(!rv) << "Could not set socket receive buffer size: " << GetLastError(); |
| - return rv == 0; |
| + int net_error = (rv == 0) ? OK : MapSystemError(WSAGetLastError()); |
|
Ryan Hamilton
2014/04/08 19:55:11
Possibly again here with the map error code.
jar (doing other things)
2014/04/08 23:16:26
Since I'm not seeing any problems on Windows... I'
|
| + DCHECK(!rv) << "Could not set socket receive buffer size: " << net_error; |
| + return net_error; |
| } |
| -bool SetSocketSendBufferSize(SOCKET socket, int32 size) { |
| +int SetSocketSendBufferSize(SOCKET socket, int32 size) { |
| int rv = setsockopt(socket, SOL_SOCKET, SO_SNDBUF, |
| reinterpret_cast<const char*>(&size), sizeof(size)); |
| - DCHECK(!rv) << "Could not set socket send buffer size: " << GetLastError(); |
| - return rv == 0; |
| + int net_error = (rv == 0) ? OK : MapSystemError(WSAGetLastError()); |
|
Ryan Hamilton
2014/04/08 19:55:11
we could consider doing the DCHECK here too.
jar (doing other things)
2014/04/08 23:16:26
See above.
|
| + DCHECK(!rv) << "Could not set socket send buffer size: " << net_error; |
| + return net_error; |
| } |
| // Disable Nagle. |
| @@ -599,12 +601,12 @@ int TCPSocketWin::SetExclusiveAddrUse() { |
| return OK; |
| } |
| -bool TCPSocketWin::SetReceiveBufferSize(int32 size) { |
| +int TCPSocketWin::SetReceiveBufferSize(int32 size) { |
| DCHECK(CalledOnValidThread()); |
| return SetSocketReceiveBufferSize(socket_, size); |
| } |
| -bool TCPSocketWin::SetSendBufferSize(int32 size) { |
| +int TCPSocketWin::SetSendBufferSize(int32 size) { |
| DCHECK(CalledOnValidThread()); |
| return SetSocketSendBufferSize(socket_, size); |
| } |