diff options
Diffstat (limited to 'www/chromium/files/patch-net_base_address__tracker__linux.cc')
| -rw-r--r-- | www/chromium/files/patch-net_base_address__tracker__linux.cc | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc index 6f0926f45068..2146beb80cd8 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc @@ -1,15 +1,6 @@ ---- net/base/address_tracker_linux.cc.orig 2018-01-21 13:54:41.810603000 +0100 -+++ net/base/address_tracker_linux.cc 2018-01-21 14:00:43.013272000 +0100 -@@ -5,7 +5,7 @@ - #include "net/base/address_tracker_linux.h" - - #include <errno.h> --#include <linux/if.h> -+#include <net/if.h> - #include <stdint.h> - #include <sys/ioctl.h> - -@@ -18,96 +18,9 @@ +--- net/base/address_tracker_linux.cc.orig 2018-06-13 00:10:21.000000000 +0200 ++++ net/base/address_tracker_linux.cc 2018-07-19 15:22:53.324530000 +0200 +@@ -19,96 +19,10 @@ namespace net { namespace internal { @@ -103,11 +94,12 @@ - if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0) - strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1); - return buf; ++ NOTIMPLEMENTED(); + return NULL; } AddressTrackerLinux::AddressTrackerLinux() -@@ -150,93 +63,8 @@ +@@ -151,93 +65,8 @@ } void AddressTrackerLinux::Init() { @@ -191,7 +183,7 @@ - - if (tracking_) { - rv = base::MessageLoopForIO::current()->WatchFileDescriptor( -- netlink_fd_, true, base::MessageLoopForIO::WATCH_READ, &watcher_, this); +- netlink_fd_, true, base::MessagePumpForIO::WATCH_READ, &watcher_, this); - if (rv < 0) { - PLOG(ERROR) << "Could not watch NETLINK socket"; - AbortAndForceOnline(); @@ -203,7 +195,7 @@ } void AddressTrackerLinux::AbortAndForceOnline() { -@@ -247,25 +75,6 @@ +@@ -248,25 +77,6 @@ connection_type_initialized_cv_.Broadcast(); } @@ -229,7 +221,7 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { // http://crbug.com/125097 -@@ -316,102 +125,7 @@ +@@ -317,102 +127,7 @@ bool* address_changed, bool* link_changed, bool* tunnel_changed) { @@ -333,7 +325,7 @@ } void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { -@@ -443,34 +157,7 @@ +@@ -449,34 +164,7 @@ } void AddressTrackerLinux::UpdateCurrentConnectionType() { |