diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 01:11:53 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 01:11:53 +0000 |
| commit | aa4861088333f8cb2638a8a42ff35f2e42834576 (patch) | |
| tree | 3447b65520012c7739809ec5239bebdbd5846963 /net/socket/tcp_client_socket_libevent.cc | |
| parent | ebe42d99cfd8217f70c42b1411bbecd3ba5759ca (diff) | |
| download | chromium_src-aa4861088333f8cb2638a8a42ff35f2e42834576.zip chromium_src-aa4861088333f8cb2638a8a42ff35f2e42834576.tar.gz chromium_src-aa4861088333f8cb2638a8a42ff35f2e42834576.tar.bz2 | |
Fix TCPClientSocket::GetLocalAddress() to work when socket is not connected.
BUG=118312
Review URL: https://chromiumcodereview.appspot.com/10803027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_libevent.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_libevent.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/socket/tcp_client_socket_libevent.cc b/net/socket/tcp_client_socket_libevent.cc index e54eb1e..a3727ff 100644 --- a/net/socket/tcp_client_socket_libevent.cc +++ b/net/socket/tcp_client_socket_libevent.cc @@ -180,7 +180,7 @@ int TCPClientSocketLibevent::Bind(const IPEndPoint& address) { if (!address.ToSockAddr(storage.addr, &storage.addr_len)) return ERR_INVALID_ARGUMENT; - // Create |bound_socket_| and try to bound it to |address|. + // Create |bound_socket_| and try to bind it to |address|. int error = CreateSocket(address.GetFamily(), &bound_socket_); if (error) return MapSystemError(error); @@ -363,6 +363,7 @@ void TCPClientSocketLibevent::Disconnect() { DoDisconnect(); current_address_index_ = -1; + bind_address_.reset(); } void TCPClientSocketLibevent::DoDisconnect() { @@ -718,8 +719,13 @@ int TCPClientSocketLibevent::GetPeerAddress(IPEndPoint* address) const { int TCPClientSocketLibevent::GetLocalAddress(IPEndPoint* address) const { DCHECK(CalledOnValidThread()); DCHECK(address); - if (!IsConnected()) + if (socket_ == kInvalidSocket) { + if (bind_address_.get()) { + *address = *bind_address_; + return OK; + } return ERR_SOCKET_NOT_CONNECTED; + } SockaddrStorage storage; if (getsockname(socket_, storage.addr, &storage.addr_len)) |