| Index: net/socket/socket_posix.cc
|
| diff --git a/net/socket/socket_posix.cc b/net/socket/socket_posix.cc
|
| index 6955aa2a1e83a565c12f2700db5e2d1a618effce..5900a5c7952a911c1299be2376fef0fda8c423e7 100644
|
| --- a/net/socket/socket_posix.cc
|
| +++ b/net/socket/socket_posix.cc
|
| @@ -98,6 +98,15 @@ int SocketPosix::Open(int address_family) {
|
|
|
| int SocketPosix::AdoptConnectedSocket(SocketDescriptor socket,
|
| const SockaddrStorage& address) {
|
| + int rv = AdoptUnconnectedSocket(socket);
|
| + if (rv != OK)
|
| + return rv;
|
| +
|
| + SetPeerAddress(address);
|
| + return OK;
|
| +}
|
| +
|
| +int SocketPosix::AdoptUnconnectedSocket(SocketDescriptor socket) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK_EQ(kInvalidSocket, socket_fd_);
|
|
|
| @@ -109,7 +118,6 @@ int SocketPosix::AdoptConnectedSocket(SocketDescriptor socket,
|
| return rv;
|
| }
|
|
|
| - SetPeerAddress(address);
|
| return OK;
|
| }
|
|
|
|
|