Fix broken Mac OS socket code

runtime/bin/socket_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include <errno.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
@@ skipping 22 matching lines @@
 
 bool Socket::Initialize() {
   // Nothing to do on Android.
   return true;
 }
 
 
 intptr_t Socket::CreateConnect(RawAddr addr, const intptr_t port) {
   intptr_t fd;
 
-  fd = TEMP_FAILURE_RETRY(socket(addr.ss_family, SOCK_STREAM, 0));
+  fd = TEMP_FAILURE_RETRY(socket(addr.ss.ss_family, SOCK_STREAM, 0));
   if (fd < 0) {
     Log::PrintErr("Error CreateConnect: %s\n", strerror(errno));
     return -1;
   }
 
   FDUtils::SetCloseOnExec(fd);
   Socket::SetNonBlocking(fd);
 
   SocketAddress::SetAddrPort(&addr, port);
   intptr_t result = TEMP_FAILURE_RETRY(
@@ skipping 59 matching lines @@
   RawAddr raw;
   socklen_t size = sizeof(raw);
   if (TEMP_FAILURE_RETRY(
           getpeername(fd,
                       &raw.addr,
                       &size))) {
     Log::PrintErr("Error getpeername: %s\n", strerror(errno));
     return false;
   }
   const void* src;
-  if (raw.ss_family == AF_INET6) {
+  if (raw.ss.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,
+  if (inet_ntop(raw.ss.ss_family,
                 src,
                 host,
                 INET_ADDRSTRLEN) == NULL) {
     Log::PrintErr("Error inet_ntop: %s\n", strerror(errno));
     return false;
   }
   *port = SocketAddress::GetAddrPort(&raw);
   return true;
 }
 
@@ skipping 49 matching lines @@
   freeaddrinfo(info);
   return addresses;
 }
 
 
 intptr_t ServerSocket::CreateBindListen(RawAddr addr,
                                         intptr_t port,
                                         intptr_t backlog) {
   intptr_t fd;
 
-  fd = TEMP_FAILURE_RETRY(socket(addr.ss_family, SOCK_STREAM, 0));
+  fd = TEMP_FAILURE_RETRY(socket(addr.ss.ss_family, SOCK_STREAM, 0));
   if (fd < 0) return -1;
 
   FDUtils::SetCloseOnExec(fd);
 
   int optval = 1;
   TEMP_FAILURE_RETRY(
       setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
 
-  if (addr.ss_family == AF_INET6) {
+  if (addr.ss.ss_family == AF_INET6) {
     optval = 0;
     TEMP_FAILURE_RETRY(
         setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
   }
 
   SocketAddress::SetAddrPort(&addr, port);
   if (TEMP_FAILURE_RETRY(
           bind(fd,
                &addr.addr,
                SocketAddress::GetAddrLength(addr))) < 0) {
@@ skipping 66 matching lines @@
 bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
   int on = enabled ? 1 : 0;
   return TEMP_FAILURE_RETRY(setsockopt(fd,
                                        SOL_TCP,
                                        TCP_NODELAY,
                                        reinterpret_cast<char *>(&on),
                                        sizeof(on))) == 0;
 }
 
 #endif  // defined(TARGET_OS_ANDROID)