Reafctor to use 'const RawAddr&' or 'RawAddr*' in the eventhandler code

runtime/bin/socket_macos.cc

 // Copyright (c) 2013, 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_MACOS)
 
 #include <errno.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
@@ skipping 10 matching lines @@
 
 #include "platform/signal_blocker.h"
 
 
 namespace dart {
 namespace bin {
 
 SocketAddress::SocketAddress(struct sockaddr* sa) {
   ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
   if (!Socket::FormatNumericAddress(
-          reinterpret_cast<RawAddr*>(sa), as_string_, INET6_ADDRSTRLEN)) {
+          *reinterpret_cast<RawAddr*>(sa), as_string_, INET6_ADDRSTRLEN)) {
     as_string_[0] = 0;
   }
-  socklen_t salen = GetAddrLength(reinterpret_cast<RawAddr*>(sa));
+  socklen_t salen = GetAddrLength(*reinterpret_cast<RawAddr*>(sa));
   memmove(reinterpret_cast<void *>(&addr_), sa, salen);
 }
 
 
-bool Socket::FormatNumericAddress(RawAddr* addr, char* address, int len) {
+bool Socket::FormatNumericAddress(const RawAddr& addr, char* address, int len) {
   socklen_t salen = SocketAddress::GetAddrLength(addr);
-  if (NO_RETRY_EXPECTED(getnameinfo(&addr->addr,
+  if (NO_RETRY_EXPECTED(getnameinfo(&addr.addr,
                                     salen,
                                     address,
                                     len,
                                     NULL,
                                     0,
                                     NI_NUMERICHOST)) != 0) {
     return false;
   }
   return true;
 }
 
 
 bool Socket::Initialize() {
   // Nothing to do on Mac OS.
   return true;
 }
 
 
-static intptr_t Create(RawAddr addr) {
+static intptr_t Create(const RawAddr& addr) {
   intptr_t fd;
   fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, SOCK_STREAM, 0));
   if (fd < 0) {
     return -1;
   }
   FDUtils::SetCloseOnExec(fd);
   return fd;
 }
 
 
-static intptr_t Connect(intptr_t fd, RawAddr addr, const intptr_t port) {
-  SocketAddress::SetAddrPort(&addr, port);
+static intptr_t Connect(intptr_t fd, const RawAddr& addr) {
   intptr_t result = TEMP_FAILURE_RETRY(
-      connect(fd, &addr.addr, SocketAddress::GetAddrLength(&addr)));
+      connect(fd, &addr.addr, SocketAddress::GetAddrLength(addr)));
   if (result == 0 || errno == EINPROGRESS) {
     return fd;
   }
   VOID_TEMP_FAILURE_RETRY(close(fd));
   return -1;
 }
 
 
-intptr_t Socket::CreateConnect(const RawAddr& addr, const intptr_t port) {
+intptr_t Socket::CreateConnect(const RawAddr& addr) {
   intptr_t fd = Create(addr);
   if (fd < 0) {
     return fd;
   }
 
   FDUtils::SetNonBlocking(fd);
 
-  return Connect(fd, addr, port);
+  return Connect(fd, addr);
 }
 
 
 intptr_t Socket::CreateBindConnect(const RawAddr& addr,
-                                   const intptr_t port,
                                    const RawAddr& source_addr) {
   intptr_t fd = Create(addr);
   if (fd < 0) {
     return fd;
   }
 
   intptr_t result = TEMP_FAILURE_RETRY(
-      bind(fd, &source_addr.addr, SocketAddress::GetAddrLength(&source_addr)));
+      bind(fd, &source_addr.addr, SocketAddress::GetAddrLength(source_addr)));
   if (result != 0 && errno != EINPROGRESS) {
     VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
-  return Connect(fd, addr, port);
+  return Connect(fd, addr);
 }
 
 
 intptr_t Socket::Available(intptr_t fd) {
   return FDUtils::AvailableBytes(fd);
 }
 
 
 intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
   ASSERT(fd >= 0);
   ssize_t read_bytes = TEMP_FAILURE_RETRY(read(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (read_bytes == -1 && errno == EWOULDBLOCK) {
     // If the read would block we need to retry and therefore return 0
     // as the number of bytes written.
     read_bytes = 0;
   }
   return read_bytes;
 }
 
 
-intptr_t Socket::RecvFrom(intptr_t fd, void* buffer, intptr_t num_bytes,
-                     RawAddr* addr) {
+intptr_t Socket::RecvFrom(
+    intptr_t fd, void* buffer, intptr_t num_bytes, RawAddr* addr) {
   ASSERT(fd >= 0);
   socklen_t addr_len = sizeof(addr->ss);
   ssize_t read_bytes = TEMP_FAILURE_RETRY(
       recvfrom(fd, buffer, num_bytes, 0, &addr->addr, &addr_len));
   if (read_bytes == -1 && errno == EWOULDBLOCK) {
     // If the read would block we need to retry and therefore return 0
     // as the number of bytes written.
     read_bytes = 0;
   }
   return read_bytes;
 }
 
 
 intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
   ASSERT(fd >= 0);
   ssize_t written_bytes = TEMP_FAILURE_RETRY(write(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (written_bytes == -1 && errno == EWOULDBLOCK) {
     // If the would block we need to retry and therefore return 0 as
     // the number of bytes written.
     written_bytes = 0;
   }
   return written_bytes;
 }
 
 
-intptr_t Socket::SendTo(intptr_t fd, const void* buffer, intptr_t num_bytes,
-                   RawAddr addr) {
+intptr_t Socket::SendTo(
+    intptr_t fd, const void* buffer, intptr_t num_bytes, const RawAddr& addr) {
   ASSERT(fd >= 0);
   ssize_t written_bytes = TEMP_FAILURE_RETRY(
       sendto(fd, buffer, num_bytes, 0,
-             &addr.addr, SocketAddress::GetAddrLength(&addr)));
+             &addr.addr, SocketAddress::GetAddrLength(addr)));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (written_bytes == -1 && errno == EWOULDBLOCK) {
     // If the would block we need to retry and therefore return 0 as
     // the number of bytes written.
     written_bytes = 0;
   }
   return written_bytes;
 }
 
 
 intptr_t Socket::GetPort(intptr_t fd) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
   if (NO_RETRY_EXPECTED(getsockname(fd, &raw.addr, &size))) {
     return 0;
   }
-  return SocketAddress::GetAddrPort(&raw);
+  return SocketAddress::GetAddrPort(raw);
 }
 
 
 SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
   if (NO_RETRY_EXPECTED(getpeername(fd, &raw.addr, &size))) {
     return NULL;
   }
-  *port = SocketAddress::GetAddrPort(&raw);
+  *port = SocketAddress::GetAddrPort(raw);
   return new SocketAddress(&raw.addr);
 }
 
 
 void Socket::GetError(intptr_t fd, OSError* os_error) {
   int len = sizeof(errno);
   getsockopt(fd,
              SOL_SOCKET,
              SO_ERROR,
              &errno,
@@ skipping 47 matching lines @@
     if (c->ai_family == AF_INET || c->ai_family == AF_INET6) {
       addresses->SetAt(i, new SocketAddress(c->ai_addr));
       i++;
     }
   }
   freeaddrinfo(info);
   return addresses;
 }
 
 
-bool Socket::ReverseLookup(RawAddr addr,
+bool Socket::ReverseLookup(const RawAddr& addr,
                            char* host,
                            intptr_t host_len,
                            OSError** os_error) {
   ASSERT(host_len >= NI_MAXHOST);
   int status = NO_RETRY_EXPECTED(getnameinfo(
       &addr.addr,
-      SocketAddress::GetAddrLength(&addr),
+      SocketAddress::GetAddrLength(addr),
       host,
       host_len,
       NULL,
       0,
       NI_NAMEREQD));
   if (status != 0) {
     ASSERT(*os_error == NULL);
     *os_error = new OSError(status,
                             gai_strerror(status),
                             OSError::kGetAddressInfo);
     return false;
   }
   return true;
 }
 
 
 bool Socket::ParseAddress(int type, const char* address, RawAddr* addr) {
   int result;
   if (type == SocketAddress::TYPE_IPV4) {
     result = inet_pton(AF_INET, address, &addr->in.sin_addr);
   } else {
     ASSERT(type == SocketAddress::TYPE_IPV6);
     result = inet_pton(AF_INET6, address, &addr->in6.sin6_addr);
   }
   return result == 1;
 }
 
 
-intptr_t Socket::CreateBindDatagram(
-    RawAddr* addr, intptr_t port, bool reuseAddress) {
+intptr_t Socket::CreateBindDatagram(const RawAddr& addr, bool reuseAddress) {
   intptr_t fd;
 
-  fd = NO_RETRY_EXPECTED(socket(addr->addr.sa_family, SOCK_DGRAM, IPPROTO_UDP));
+  fd = NO_RETRY_EXPECTED(socket(addr.addr.sa_family, SOCK_DGRAM, IPPROTO_UDP));
   if (fd < 0) return -1;
 
   FDUtils::SetCloseOnExec(fd);
 
   if (reuseAddress) {
     int optval = 1;
     VOID_NO_RETRY_EXPECTED(
         setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
   }
 
-  SocketAddress::SetAddrPort(addr, port);
   if (NO_RETRY_EXPECTED(
-          bind(fd, &addr->addr, SocketAddress::GetAddrLength(addr))) < 0) {
+          bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
     VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
   FDUtils::SetNonBlocking(fd);
   return fd;
 }
 
 
 static bool ShouldIncludeIfaAddrs(struct ifaddrs* ifa, int lookup_family) {
@@ skipping 40 matching lines @@
       addresses->SetAt(i, new InterfaceSocketAddress(
           ifa->ifa_addr, strdup(ifa->ifa_name), if_nametoindex(ifa->ifa_name)));
       i++;
     }
   }
   freeifaddrs(ifaddr);
   return addresses;
 }
 
 
-intptr_t ServerSocket::CreateBindListen(RawAddr addr,
-                                        intptr_t port,
+intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
                                         intptr_t backlog,
                                         bool v6_only) {
   intptr_t fd;
 
   fd = TEMP_FAILURE_RETRY(socket(addr.ss.ss_family, SOCK_STREAM, 0));
   if (fd < 0) return -1;
 
   FDUtils::SetCloseOnExec(fd);
 
   int optval = 1;
   VOID_NO_RETRY_EXPECTED(
       setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
 
   if (addr.ss.ss_family == AF_INET6) {
     optval = v6_only ? 1 : 0;
     VOID_NO_RETRY_EXPECTED(
         setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
   }
 
-  SocketAddress::SetAddrPort(&addr, port);
   if (NO_RETRY_EXPECTED(
-          bind(fd, &addr.addr, SocketAddress::GetAddrLength(&addr))) < 0) {
+          bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
     VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
   // Test for invalid socket port 65535 (some browsers disallow it).
-  if (port == 0 && Socket::GetPort(fd) == 65535) {
+  if (SocketAddress::GetAddrPort(addr) == 0 && Socket::GetPort(fd) == 65535) {
     // Don't close the socket until we have created a new socket, ensuring
     // that we do not get the bad port number again.
-    intptr_t new_fd = CreateBindListen(addr, 0, backlog, v6_only);
+    intptr_t new_fd = CreateBindListen(addr, backlog, v6_only);
     int err = errno;
     VOID_TEMP_FAILURE_RETRY(close(fd));
     errno = err;
     return new_fd;
   }
 
   if (NO_RETRY_EXPECTED(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
     VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
@@ skipping 142 matching lines @@
   int on = enabled ? 1 : 0;
   return NO_RETRY_EXPECTED(setsockopt(fd,
                                       SOL_SOCKET,
                                       SO_BROADCAST,
                                       reinterpret_cast<char *>(&on),
                                       sizeof(on))) == 0;
 }
 
 
 static bool JoinOrLeaveMulticast(intptr_t fd,
-                                 RawAddr* addr,
-                                 RawAddr* interface,
+                                 const RawAddr& addr,
+                                 const RawAddr& interface,
                                  int interfaceIndex,
                                  bool join) {
-  if (addr->addr.sa_family == AF_INET) {
-    ASSERT(interface->addr.sa_family == AF_INET);
+  if (addr.addr.sa_family == AF_INET) {
+    ASSERT(interface.addr.sa_family == AF_INET);
     struct ip_mreq mreq;
     memmove(&mreq.imr_multiaddr,
-            &addr->in.sin_addr,
+            &addr.in.sin_addr,
             SocketAddress::GetInAddrLength(addr));
     memmove(&mreq.imr_interface,
-            &interface->in.sin_addr,
+            &interface.in.sin_addr,
             SocketAddress::GetInAddrLength(interface));
     if (join) {
       return NO_RETRY_EXPECTED(setsockopt(
           fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq))) == 0;
     } else {
       return NO_RETRY_EXPECTED(setsockopt(
           fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq))) == 0;
     }
   } else {
-    ASSERT(addr->addr.sa_family == AF_INET6);
+    ASSERT(addr.addr.sa_family == AF_INET6);
     struct ipv6_mreq mreq;
     memmove(&mreq.ipv6mr_multiaddr,
-            &addr->in6.sin6_addr,
+            &addr.in6.sin6_addr,
             SocketAddress::GetInAddrLength(addr));
     mreq.ipv6mr_interface = interfaceIndex;
     if (join) {
       return NO_RETRY_EXPECTED(setsockopt(
           fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq))) == 0;
     } else {
       return NO_RETRY_EXPECTED(setsockopt(
           fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq, sizeof(mreq))) == 0;
     }
   }
 }
 
-bool Socket::JoinMulticast(
-    intptr_t fd, RawAddr* addr, RawAddr* interface, int interfaceIndex) {
+bool Socket::JoinMulticast(intptr_t fd,
+                           const RawAddr& addr,
+                           const RawAddr& interface,
+                           int interfaceIndex) {
   return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, true);
 }
 
 
-bool Socket::LeaveMulticast(
-    intptr_t fd, RawAddr* addr, RawAddr* interface, int interfaceIndex) {
+bool Socket::LeaveMulticast(intptr_t fd,
+                            const RawAddr& addr,
+                            const RawAddr& interface,
+                            int interfaceIndex) {
   return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, false);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)