Fix TCPClientSocket::GetLocalAddress() to work when socket is not connected.

net/socket/tcp_client_socket_libevent.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[wtc, 2012/07/19 18:36:36]

In the CL's description, the BUG=119312 field should be changed
to BUG=118312.

[Sergey Ulanov, 2012/07/19 21:36:20]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/tcp_client_socket.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/tcp.h>
@@ skipping 161 matching lines @@
   if (current_address_index_ >= 0 || bind_address_.get()) {
     // Cannot bind the socket if we are already bound connected or
     // connecting.
     return ERR_UNEXPECTED;
   }
 
   SockaddrStorage storage;
   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);
 
   if (HANDLE_EINTR(bind(bound_socket_, storage.addr, storage.addr_len))) {
     error = errno;
     if (HANDLE_EINTR(close(bound_socket_)) < 0)
       PLOG(ERROR) << "close";
     bound_socket_ = kInvalidSocket;
     return MapSystemError(error);
@@ skipping 517 matching lines @@
   DCHECK(address);
   if (!IsConnected())
     return ERR_SOCKET_NOT_CONNECTED;
   *address = addresses_[current_address_index_];
   return OK;
 }
 
 int TCPClientSocketLibevent::GetLocalAddress(IPEndPoint* address) const {
   DCHECK(CalledOnValidThread());
   DCHECK(address);
-  if (!IsConnected())
-    return ERR_SOCKET_NOT_CONNECTED;
+  if (socket_ == kInvalidSocket) {
+    if (bind_address_.get()) {
+      *address = *bind_address_;
+      return OK;
+    } else {
+      return ERR_SOCKET_NOT_CONNECTED;
+    }
+  }
 
   SockaddrStorage storage;
   if (getsockname(socket_, storage.addr, &storage.addr_len))
     return MapSystemError(errno);
   if (!address->FromSockAddr(storage.addr, storage.addr_len))
     return ERR_FAILED;
 
   return OK;
 }
 
@@ skipping 23 matching lines @@
 
 base::TimeDelta TCPClientSocketLibevent::GetConnectTimeMicros() const {
   return connect_time_micros_;
 }
 
 NextProto TCPClientSocketLibevent::GetNegotiatedProtocol() const {
   return kProtoUnknown;
 }
 
 }  // namespace net