Index: runtime/bin/socket_macos.cc |
diff --git a/runtime/bin/socket_macos.cc b/runtime/bin/socket_macos.cc |
index 67201713dcbbc94acc39aee1e275aecc8580a5d2..462e91397252cf6df1cc354627e96943def9b6d2 100644 |
--- a/runtime/bin/socket_macos.cc |
+++ b/runtime/bin/socket_macos.cc |
@@ -19,18 +19,30 @@ |
#include "bin/socket.h" |
+SocketAddress::SocketAddress(struct addrinfo* addrinfo) { |
+ ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN); |
+ RawAddr* raw = reinterpret_cast<RawAddr*>(addrinfo->ai_addr); |
+ const char* result = inet_ntop(addrinfo->ai_family, |
+ &raw->in.sin_addr, |
+ as_string_, |
+ INET6_ADDRSTRLEN); |
+ if (result == NULL) as_string_[0] = 0; |
+ memmove(reinterpret_cast<void *>(&addr_), |
+ addrinfo->ai_addr, |
+ addrinfo->ai_addrlen); |
+} |
+ |
+ |
bool Socket::Initialize() { |
// Nothing to do on Mac OS. |
return true; |
} |
-intptr_t Socket::CreateConnect(const char* host, const intptr_t port) { |
+intptr_t Socket::CreateConnect(RawAddr addr, const intptr_t port) { |
intptr_t fd; |
- struct hostent* server; |
- struct sockaddr_in server_address; |
- fd = TEMP_FAILURE_RETRY(socket(AF_INET, SOCK_STREAM, 0)); |
+ fd = TEMP_FAILURE_RETRY(socket(addr.ss_family, SOCK_STREAM, 0)); |
if (fd < 0) { |
Log::PrintErr("Error CreateConnect: %s\n", strerror(errno)); |
return -1; |
@@ -39,24 +51,15 @@ intptr_t Socket::CreateConnect(const char* host, const intptr_t port) { |
FDUtils::SetCloseOnExec(fd); |
Socket::SetNonBlocking(fd); |
- server = gethostbyname(host); |
- if (server == NULL) { |
- VOID_TEMP_FAILURE_RETRY(close(fd)); |
- Log::PrintErr("Error CreateConnect: %s\n", strerror(errno)); |
- return -1; |
- } |
- |
- server_address.sin_family = AF_INET; |
- server_address.sin_port = htons(port); |
- bcopy(server->h_addr, &server_address.sin_addr.s_addr, server->h_length); |
- memset(&server_address.sin_zero, 0, sizeof(server_address.sin_zero)); |
+ SocketAddress::SetAddrPort(&addr, port); |
intptr_t result = TEMP_FAILURE_RETRY( |
connect(fd, |
- reinterpret_cast<struct sockaddr *>(&server_address), |
- sizeof(server_address))); |
+ &addr.addr, |
+ SocketAddress::GetAddrLength(addr))); |
if (result == 0 || errno == EINPROGRESS) { |
return fd; |
} |
+ TEMP_FAILURE_RETRY(close(fd)); |
return -1; |
} |
@@ -94,38 +97,44 @@ int Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) { |
intptr_t Socket::GetPort(intptr_t fd) { |
ASSERT(fd >= 0); |
- struct sockaddr_in socket_address; |
- socklen_t size = sizeof(socket_address); |
+ RawAddr raw; |
+ socklen_t size = sizeof(raw); |
if (TEMP_FAILURE_RETRY( |
getsockname(fd, |
- reinterpret_cast<struct sockaddr *>(&socket_address), |
+ &raw.addr, |
&size))) { |
Log::PrintErr("Error getsockname: %s\n", strerror(errno)); |
return 0; |
} |
- return ntohs(socket_address.sin_port); |
+ return SocketAddress::GetAddrPort(&raw); |
} |
bool Socket::GetRemotePeer(intptr_t fd, char *host, intptr_t *port) { |
ASSERT(fd >= 0); |
- struct sockaddr_in socket_address; |
- socklen_t size = sizeof(socket_address); |
+ RawAddr raw; |
+ socklen_t size = sizeof(raw); |
if (TEMP_FAILURE_RETRY( |
getpeername(fd, |
- reinterpret_cast<struct sockaddr *>(&socket_address), |
+ &raw.addr, |
&size))) { |
Log::PrintErr("Error getpeername: %s\n", strerror(errno)); |
return false; |
} |
- if (inet_ntop(socket_address.sin_family, |
- reinterpret_cast<const void *>(&socket_address.sin_addr), |
+ const void* src; |
+ if (raw.ss_family == AF_INET6) { |
+ src = reinterpret_cast<const void*>(&raw.in6.sin6_addr); |
+ } else { |
+ src = reinterpret_cast<const void*>(&raw.in.sin_addr); |
+ } |
+ if (inet_ntop(raw.ss_family, |
+ src, |
host, |
INET_ADDRSTRLEN) == NULL) { |
Log::PrintErr("Error inet_ntop: %s\n", strerror(errno)); |
return false; |
} |
- *port = ntohs(socket_address.sin_port); |
+ *port = SocketAddress::GetAddrPort(&raw); |
return true; |
} |
@@ -157,12 +166,15 @@ intptr_t Socket::GetStdioHandle(int num) { |
} |
-const char* Socket::LookupIPv4Address(char* host, OSError** os_error) { |
- // Perform a name lookup for an IPv4 address. |
+SocketAddresses* Socket::LookupAddress(const char* host, |
+ int type, |
+ OSError** os_error) { |
+ // Perform a name lookup for a host name. |
struct addrinfo hints; |
memset(&hints, 0, sizeof(hints)); |
- hints.ai_family = AF_INET; |
+ hints.ai_family = SocketAddress::FromType(type); |
hints.ai_socktype = SOCK_STREAM; |
+ hints.ai_flags = 0; |
hints.ai_protocol = IPPROTO_TCP; |
struct addrinfo* info = NULL; |
int status = getaddrinfo(host, 0, &hints, &info); |
@@ -173,34 +185,29 @@ const char* Socket::LookupIPv4Address(char* host, OSError** os_error) { |
OSError::kGetAddressInfo); |
return NULL; |
} |
- // Convert the address into IPv4 dotted decimal notation. |
- char* buffer = reinterpret_cast<char*>(malloc(INET_ADDRSTRLEN)); |
- sockaddr_in *sockaddr = reinterpret_cast<sockaddr_in *>(info->ai_addr); |
- const char* result = inet_ntop(AF_INET, |
- reinterpret_cast<void *>(&sockaddr->sin_addr), |
- buffer, |
- INET_ADDRSTRLEN); |
- if (result == NULL) { |
- free(buffer); |
- return NULL; |
+ intptr_t count = 0; |
+ for (struct addrinfo* c = info; c != NULL; c = c->ai_next) { |
+ if (c->ai_family == AF_INET || c->ai_family == AF_INET6) count++; |
+ } |
+ SocketAddresses* addresses = new SocketAddresses(count); |
+ intptr_t i = 0; |
+ for (struct addrinfo* c = info; c != NULL; c = c->ai_next) { |
+ if (c->ai_family == AF_INET || c->ai_family == AF_INET6) { |
+ addresses->SetAt(i, new SocketAddress(c)); |
+ i++; |
+ } |
} |
- ASSERT(result == buffer); |
- return buffer; |
+ freeaddrinfo(info); |
+ return addresses; |
} |
-intptr_t ServerSocket::CreateBindListen(const char* host, |
+intptr_t ServerSocket::CreateBindListen(RawAddr addr, |
intptr_t port, |
intptr_t backlog) { |
intptr_t fd; |
- struct sockaddr_in server_address; |
- |
- in_addr_t s_addr = inet_addr(host); |
- if (s_addr == INADDR_NONE) { |
- return -5; |
- } |
- fd = TEMP_FAILURE_RETRY(socket(AF_INET, SOCK_STREAM, 0)); |
+ fd = TEMP_FAILURE_RETRY(socket(addr.ss_family, SOCK_STREAM, 0)); |
if (fd < 0) return -1; |
FDUtils::SetCloseOnExec(fd); |
@@ -209,15 +216,17 @@ intptr_t ServerSocket::CreateBindListen(const char* host, |
VOID_TEMP_FAILURE_RETRY( |
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval))); |
- server_address.sin_family = AF_INET; |
- server_address.sin_port = htons(port); |
- server_address.sin_addr.s_addr = s_addr; |
- memset(&server_address.sin_zero, 0, sizeof(server_address.sin_zero)); |
+ if (addr.ss_family == AF_INET6) { |
+ optval = 0; |
+ VOID_TEMP_FAILURE_RETRY( |
+ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval))); |
+ } |
+ SocketAddress::SetAddrPort(&addr, port); |
if (TEMP_FAILURE_RETRY( |
bind(fd, |
- reinterpret_cast<struct sockaddr *>(&server_address), |
- sizeof(server_address))) < 0) { |
+ &addr.addr, |
+ SocketAddress::GetAddrLength(addr))) < 0) { |
VOID_TEMP_FAILURE_RETRY(close(fd)); |
return -1; |
} |