Index: net/socket/tcp_socket_libevent.cc |
=================================================================== |
--- net/socket/tcp_socket_libevent.cc (revision 254575) |
+++ net/socket/tcp_socket_libevent.cc (working copy) |
@@ -611,9 +611,9 @@ |
NOTREACHED(); |
if (IGNORE_EINTR(close(new_socket)) < 0) |
PLOG(ERROR) << "close"; |
- net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, |
- ERR_ADDRESS_INVALID); |
- return ERR_ADDRESS_INVALID; |
+ int net_error = ERR_ADDRESS_INVALID; |
+ net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, net_error); |
+ return net_error; |
} |
scoped_ptr<TCPSocketLibevent> tcp_socket(new TCPSocketLibevent( |
net_log_.net_log(), net_log_.source())); |
@@ -639,7 +639,7 @@ |
if (!use_tcp_fastopen_) { |
SockaddrStorage storage; |
if (!peer_address_->ToSockAddr(storage.addr, &storage.addr_len)) |
- return ERR_INVALID_ARGUMENT; |
+ return ERR_ADDRESS_INVALID; |
if (!HANDLE_EINTR(connect(socket_, storage.addr, storage.addr_len))) { |
// Connected without waiting! |
@@ -825,7 +825,7 @@ |
if (use_tcp_fastopen_ && !tcp_fastopen_connected_) { |
SockaddrStorage storage; |
if (!peer_address_->ToSockAddr(storage.addr, &storage.addr_len)) { |
- errno = EINVAL; |
wtc
2014/03/04 00:43:28
Setting errno to EINVAL here was apparently an att
eroman
2014/03/04 03:01:10
That is kind of gross
|
+ errno = EADDRNOTAVAIL; |
return -1; |
} |