Cleanup GetNetworkList.

net/base/net_util_posix.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/net_util.h"
 
 #include <sys/types.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 
 #if !defined(OS_ANDROID)
 #include <ifaddrs.h>
 #endif
+//#include <netdb.h>

[Sergey Ulanov, 2011/08/11 02:06:37]

remove commented line.

+#include <net/if.h>
+#include <netinet/in.h>
 
 namespace net {
 
 bool FileURLToFilePath(const GURL& url, FilePath* path) {
   *path = FilePath();
   std::string& file_path_str = const_cast<std::string&>(path->value());
   file_path_str.clear();
 
   if (!url.is_valid())
     return false;
@@ skipping 29 matching lines @@
   // TODO: Android API doesn't support ifaddrs. This method was only used by
   // P2PMessage. Consider to implement it until really needed. The possible
   // approach is implementing the similar feature by
   // java.net.NetworkInterface through JNI.
   NOTIMPLEMENTED();
   return false;
 #else
   // getifaddrs() may require IO operations.
   base::ThreadRestrictions::AssertIOAllowed();
 
-  ifaddrs *ifaddr;
-  if (getifaddrs(&ifaddr) < 0) {
+  ifaddrs *interfaces;
+  if (getifaddrs(&interfaces) < 0) {
     PLOG(ERROR) << "getifaddrs";
     return false;
   }
 
-  for (ifaddrs *ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-    int family = ifa->ifa_addr->sa_family;
-    if (family == AF_INET || family == AF_INET6) {
-      IPEndPoint address;
-      std::string name = ifa->ifa_name;
-      if (address.FromSockAddr(ifa->ifa_addr,
-                               sizeof(ifa->ifa_addr)) &&
-          name.substr(0, 2) != "lo") {
-        networks->push_back(NetworkInterface(name, address.address()));
-      }
+  // Enumerate the addresses assigned to network interfaces which are up.
+  // We skip loopback addresses and interfaces.
+  for (ifaddrs *interface = interfaces;
+       interface != NULL;
+       interface = interface->ifa_next) {
+    if (!(IFF_UP & interface->ifa_flags))
+      continue;
+    if (IFF_LOOPBACK & interface->ifa_flags)
+      continue;
+    struct sockaddr* addr = interface->ifa_addr;
+    if (!addr)
+      continue;
+    if (addr->sa_family == AF_INET6) {

[Sergey Ulanov, 2011/08/11 02:06:37]

Add comment saying that we just filter loopback addresses here.

+      struct sockaddr_in6* addr_in6 =
+          reinterpret_cast<struct sockaddr_in6*>(addr);
+      struct in6_addr* sin6_addr = &addr_in6->sin6_addr;
+      if (IN6_IS_ADDR_LOOPBACK(sin6_addr))
+        continue;
+    } else if (addr->sa_family == AF_INET) {
+      struct sockaddr_in* addr_in =
+          reinterpret_cast<struct sockaddr_in*>(addr);
+      if (addr_in->sin_addr.s_addr == INADDR_LOOPBACK)
+        continue;
+    } else {
+      continue;
+    }
+    IPEndPoint address;
+    std::string name = interface->ifa_name;
+    if (address.FromSockAddr(interface->ifa_addr,
+                             sizeof(interface->ifa_addr))) {
+      networks->push_back(NetworkInterface(name, address.address()));
     }
   }
 
-  freeifaddrs(ifaddr);
+  freeifaddrs(interfaces);
 
   return true;
 #endif
 }
 
 }  // namespace net