aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net_base_network__interfaces__linux.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-net_base_network__interfaces__linux.cc')
-rw-r--r--www/chromium/files/patch-net_base_network__interfaces__linux.cc105
1 files changed, 105 insertions, 0 deletions
diff --git a/www/chromium/files/patch-net_base_network__interfaces__linux.cc b/www/chromium/files/patch-net_base_network__interfaces__linux.cc
new file mode 100644
index 000000000000..2fec83fbf0c7
--- /dev/null
+++ b/www/chromium/files/patch-net_base_network__interfaces__linux.cc
@@ -0,0 +1,105 @@
+--- net/base/network_interfaces_linux.cc.orig 2016-05-11 19:02:24 UTC
++++ net/base/network_interfaces_linux.cc
+@@ -4,12 +4,14 @@
+
+ #include "net/base/network_interfaces_linux.h"
+
++#if !defined(OS_FREEBSD)
+ #if !defined(OS_ANDROID)
+ #include <linux/ethtool.h>
+ #endif // !defined(OS_ANDROID)
+ #include <linux/if.h>
+ #include <linux/sockios.h>
+ #include <linux/wireless.h>
++#endif // !defined(OS_FREEBSD)
+ #include <set>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+@@ -44,6 +46,7 @@ bool TryConvertNativeToNetIPAttributes(i
+ // are still progressing through duplicated address detection (DAD)
+ // and shouldn't be used by the application layer until DAD process
+ // is completed.
++#if !defined(OS_FREEBSD)
+ if (native_attributes & (
+ #if !defined(OS_ANDROID)
+ IFA_F_OPTIMISTIC | IFA_F_DADFAILED |
+@@ -61,6 +64,10 @@ bool TryConvertNativeToNetIPAttributes(i
+ }
+
+ return true;
++#else
++ // the flags tested above are not present on FreeBSD
++ return false;
++#endif // !OS_FREEBSD
+ }
+
+ } // namespace
+@@ -79,13 +86,15 @@ NetworkChangeNotifier::ConnectionType Ge
+ if (!s.is_valid())
+ return NetworkChangeNotifier::CONNECTION_UNKNOWN;
+
++#if !defined(OS_FREEBSD)
+ // Test wireless extensions for CONNECTION_WIFI
+ struct iwreq pwrq = {};
+ strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
+ if (ioctl(s.get(), SIOCGIWNAME, &pwrq) != -1)
+ return NetworkChangeNotifier::CONNECTION_WIFI;
++#endif // !defined(OS_FREEBSD)
+
+-#if !defined(OS_ANDROID)
++#if !defined(OS_ANDROID) && !defined(OS_FREEBSD)
+ // Test ethtool for CONNECTION_ETHERNET
+ struct ethtool_cmd ecmd = {};
+ ecmd.cmd = ETHTOOL_GSET;
+@@ -94,12 +103,13 @@ NetworkChangeNotifier::ConnectionType Ge
+ strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
+ if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
+ return NetworkChangeNotifier::CONNECTION_ETHERNET;
+-#endif // !defined(OS_ANDROID)
++#endif // !defined(OS_ANDROID) && !defined(OS_FREEBSD)
+
+ return NetworkChangeNotifier::CONNECTION_UNKNOWN;
+ }
+
+ std::string GetInterfaceSSID(const std::string& ifname) {
++#if !defined(OS_FREEBSD)
+ base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
+ if (!ioctl_socket.is_valid())
+ return "";
+@@ -111,9 +121,11 @@ std::string GetInterfaceSSID(const std::
+ wreq.u.essid.length = IW_ESSID_MAX_SIZE;
+ if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
+ return ssid;
++#endif // !defined(OS_FREEBSD)
+ return "";
+ }
+
++#if !defined(OS_FREEBSD)
+ bool GetNetworkListImpl(
+ NetworkInterfaceList* networks,
+ int policy,
+@@ -182,6 +194,7 @@ bool GetNetworkListImpl(
+
+ return true;
+ }
++#endif // !defined(OS_FREEBSD)
+
+ std::string GetWifiSSIDFromInterfaceListInternal(
+ const NetworkInterfaceList& interfaces,
+@@ -206,12 +219,16 @@ bool GetNetworkList(NetworkInterfaceList
+ if (networks == NULL)
+ return false;
+
++#if !defined(OS_FREEBSD)
+ internal::AddressTrackerLinux tracker;
+ tracker.Init();
+
+ return internal::GetNetworkListImpl(
+ networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(),
+ &internal::AddressTrackerLinux::GetInterfaceName);
++#else
++ return false;
++#endif
+ }
+
+ std::string GetWifiSSID() {