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 | 20 |
1 files changed, 11 insertions, 9 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 1209941137d6..98ba59733436 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.cc.orig 2020-11-13 06:36:45 UTC +--- net/base/address_tracker_linux.cc.orig 2021-03-12 23:57:27 UTC +++ net/base/address_tracker_linux.cc @@ -5,7 +5,9 @@ #include "net/base/address_tracker_linux.h" @@ -18,15 +18,18 @@ netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); if (!netlink_fd_.is_valid()) { PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -274,6 +277,7 @@ void AddressTrackerLinux::Init() { +@@ -274,6 +277,10 @@ void AddressTrackerLinux::Init() { base::BindRepeating(&AddressTrackerLinux::OnFileCanReadWithoutBlocking, base::Unretained(this))); } ++#else // !OS_FREEBSD ++ NOTIMPLEMENTED(); ++ AbortAndForceOnline(); +#endif // !OS_FREEBSD } void AddressTrackerLinux::AbortAndForceOnline() { -@@ -285,6 +289,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { +@@ -285,6 +292,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { connection_type_initialized_cv_.Broadcast(); } @@ -34,7 +37,7 @@ AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { AddressTrackerAutoLock lock(*this, address_map_lock_); return address_map_; -@@ -303,6 +308,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter +@@ -303,6 +311,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter const char* interface_name = get_interface_name_(interface_index, buf); return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); } @@ -42,7 +45,7 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { -@@ -361,6 +367,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -361,6 +370,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu bool* address_changed, bool* link_changed, bool* tunnel_changed) { @@ -50,18 +53,17 @@ DCHECK(buffer); // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes // remaining in |buffer|. -@@ -473,6 +480,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -473,6 +483,9 @@ void AddressTrackerLinux::HandleMessage(const char* bu break; } } +#else // !OS_FREEBSD + NOTIMPLEMENTED(); -+ AbortAndForceOnline(); +#endif // !OS_FREEBSD } void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { -@@ -500,6 +511,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const +@@ -500,6 +513,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { @@ -69,7 +71,7 @@ AddressTrackerLinux::AddressMap address_map = GetAddressMap(); std::unordered_set<int> online_links = GetOnlineLinks(); -@@ -525,6 +537,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType( +@@ -525,6 +539,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType( AddressTrackerAutoLock lock(*this, connection_type_lock_); current_connection_type_ = type; |