Re-enabling socket tests that were previously flaky.

webrtc/base/nethelpers.cc

 /*
  *  Copyright 2008 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/nethelpers.h"
 
 #include <memory>
 
 #if defined(WEBRTC_WIN)
 #include <ws2spi.h>
 #include <ws2tcpip.h>
 #include "webrtc/base/win32.h"
 #endif
+#if defined(WEBRTC_POSIX) && !defined(__native_client__)
+#if defined(WEBRTC_ANDROID)
+#include "webrtc/base/ifaddrs-android.h"
+#else
+#include <ifaddrs.h>
+#endif
+#endif  // defined(WEBRTC_POSIX) && !defined(__native_client__)
 
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/signalthread.h"
 
 namespace rtc {
 
 int ResolveHostname(const std::string& hostname, int family,
                     std::vector<IPAddress>* addresses) {
 #ifdef __native_client__
@@ skipping 81 matching lines @@
 
 int inet_pton(int af, const char* src, void *dst) {
 #if defined(WEBRTC_WIN)
   return win32_inet_pton(af, src, dst);
 #else
   return ::inet_pton(af, src, dst);
 #endif
 }
 
 bool HasIPv6Enabled() {
-#if !defined(WEBRTC_WIN)
-  // We only need to check this for Windows XP (so far).
-  return true;
-#else
+#if defined(WEBRTC_WIN)
   if (IsWindowsVistaOrLater()) {
     return true;
   }
   if (!IsWindowsXpOrLater()) {
     return false;
   }
   DWORD protbuff_size = 4096;
   std::unique_ptr<char[]> protocols;
   LPWSAPROTOCOL_INFOW protocol_infos = NULL;
   int requested_protocols[2] = {AF_INET6, 0};
@@ skipping 15 matching lines @@
   }
 
   // Even if ret is positive, check specifically for IPv6.
   // Non-IPv6 enabled WinXP will still return a RAW protocol.
   for (int i = 0; i < ret; ++i) {
     if (protocol_infos[i].iAddressFamily == AF_INET6) {
       return true;
     }
   }
   return false;
+#elif defined(WEBRTC_POSIX) && !defined(__native_client__)
+  bool has_ipv6 = false;
+  struct ifaddrs* ifa;
+  if (getifaddrs(&ifa) < 0) {
+    return false;
+  }
+  for (struct ifaddrs* cur = ifa; cur != nullptr; cur = cur->ifa_next) {
+    if (cur->ifa_addr->sa_family == AF_INET6) {
+      has_ipv6 = true;
+      break;
+    }
+  }
+  freeifaddrs(ifa);
+  return has_ipv6;
+#else
+  return true;
 #endif
 }
 }  // namespace rtc