| Index: runtime/bin/socket_macos.cc
|
| diff --git a/runtime/bin/socket_macos.cc b/runtime/bin/socket_macos.cc
|
| index be7beca2f90d80eb73b085164362091457285c8d..4b6ead679101ec4dcb397fa0c340f5a688224f48 100644
|
| --- a/runtime/bin/socket_macos.cc
|
| +++ b/runtime/bin/socket_macos.cc
|
| @@ -137,7 +137,7 @@ intptr_t Socket::GetPort(intptr_t fd) {
|
| }
|
|
|
|
|
| -bool Socket::GetRemotePeer(intptr_t fd, char *host, intptr_t *port) {
|
| +SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
|
| ASSERT(fd >= 0);
|
| RawAddr raw;
|
| socklen_t size = sizeof(raw);
|
| @@ -149,23 +149,10 @@ bool Socket::GetRemotePeer(intptr_t fd, char *host, intptr_t *port) {
|
| char error_message[kBufferSize];
|
| strerror_r(errno, error_message, kBufferSize);
|
| Log::PrintErr("Error getpeername: %s\n", error_message);
|
| - return false;
|
| - }
|
| - if (TEMP_FAILURE_RETRY(getnameinfo(&raw.addr,
|
| - size,
|
| - host,
|
| - INET6_ADDRSTRLEN,
|
| - NULL,
|
| - 0,
|
| - NI_NUMERICHOST)) != 0) {
|
| - const int kBufferSize = 1024;
|
| - char error_message[kBufferSize];
|
| - strerror_r(errno, error_message, kBufferSize);
|
| - Log::PrintErr("Error getnameinfo: %s\n", error_message);
|
| - return false;
|
| + return NULL;
|
| }
|
| *port = SocketAddress::GetAddrPort(&raw);
|
| - return true;
|
| + return new SocketAddress(&raw.addr);
|
| }
|
|
|
|
|
|
|