Fix most UDP issues on Mac OS

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 583 matching lines @@
 static bool JoinOrLeaveMulticast(intptr_t fd,
                                  RawAddr* addr,
                                  RawAddr* interface,
                                  int interfaceIndex,
                                  bool join) {
   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,
-            SocketAddress::GetAddrLength(addr));
+            SocketAddress::GetInAddrLength(addr));
     memmove(&mreq.imr_interface,
             &interface->in.sin_addr,
-            SocketAddress::GetAddrLength(interface));
+            SocketAddress::GetInAddrLength(interface));
     if (join) {
       return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
           fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq))) == 0;
     } else {
       return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
           fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq))) == 0;
     }
   } else {
     ASSERT(addr->addr.sa_family == AF_INET6);
     struct ipv6_mreq mreq;
     memmove(&mreq.ipv6mr_multiaddr,
             &addr->in6.sin6_addr,
-            SocketAddress::GetAddrLength(addr));
+            SocketAddress::GetInAddrLength(addr));
     mreq.ipv6mr_interface = interfaceIndex;
     if (join) {
       return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
           fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq))) == 0;
     } else {
       return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
           fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq, sizeof(mreq))) == 0;
     }
   }
 }
 
 bool Socket::JoinMulticast(
   intptr_t fd, RawAddr* addr, RawAddr* interface, int interfaceIndex) {
     return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, true);

[Anders Johnsen, 2013/12/18 11:29:49]

Indentation here and line above.

[Søren Gjesse, 2013/12/18 11:56:29]

Done.

-  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,
-            SocketAddress::GetAddrLength(addr));
-    memmove(&mreq.imr_interface,
-            &interface->in.sin_addr,
-            SocketAddress::GetAddrLength(interface));
-    return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
-        fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq))) == 0;
-  } else {
-    ASSERT(addr->addr.sa_family == AF_INET6);
-    ASSERT(interface->addr.sa_family == AF_INET6);
-    struct ipv6_mreq mreq;
-    memmove(&mreq.ipv6mr_multiaddr,
-            &addr->in6.sin6_addr,
-            SocketAddress::GetAddrLength(addr));
-    mreq.ipv6mr_interface = interfaceIndex;
-    return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
-        fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq))) == 0;
-  }
 }
 
 
 bool Socket::LeaveMulticast(
     intptr_t fd, RawAddr* addr, RawAddr* interface, int interfaceIndex) {
   return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, false);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)